Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

crash start rework #77541

Merged
merged 12 commits into from
Nov 13, 2024
10 changes: 10 additions & 0 deletions data/json/mapgen/map_extras/mayhem.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@
"place_nested": [ { "chunks": [ "24x24_mayhem_crash", "24x24_mayhem_limo", "24x24_mayhem_tire_change" ], "x": 0, "y": 0 } ]
}
},
{
"type": "mapgen",
"method": "json",
"update_mapgen_id": "mx_mayhem_crash_start",
"object": {
"flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ],
"place_nested": [ { "chunks": [ "24x24_mayhem_crash" ], "x": 0, "y": 0 } ]
}
},
{
"type": "mapgen",
"method": "json",
Expand Down Expand Up @@ -50,6 +59,7 @@
"2": [ { "item": "corpses", "chance": 100 }, { "item": "guns_pistol_common_display", "chance": 80 } ]
},
"place_item": [ { "item": "9mm_casing", "x": [ 15, 17 ], "y": [ 2, 4 ], "chance": 50, "repeat": 9 } ],
"place_zones": [ { "type": "ZONE_START_POINT", "faction": "your_followers", "x": [ 18, 18 ], "y": [ 9, 9 ] } ],
"fields": { "1": { "field": "fd_blood", "intensity": [ 1, 3 ] }, "~": { "field": "fd_blood" }, "2": { "field": "fd_blood" } },
"flags": [ "ALLOW_TERRAIN_UNDER_OTHER_DATA" ]
}
Expand Down
12 changes: 12 additions & 0 deletions data/json/overmap/map_extras.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,18 @@
"autonote": true,
"flags": [ "MAN_MADE", "CLASSIC" ]
},
{
"id": "mx_mayhem_crash_start",
"type": "map_extra",
"name": { "str": "Car Crash" },
"description": "Car crash is here.",
"generator": { "generator_method": "update_mapgen", "generator_id": "mx_mayhem_crash_start" },
"min_max_zlevel": [ 0, 0 ],
"sym": "M",
"color": "light_red",
"autonote": true,
"flags": [ "MAN_MADE", "CLASSIC" ]
},
{
"id": "mx_roadblock",
"type": "map_extra",
Expand Down
2 changes: 1 addition & 1 deletion data/json/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@
"description": "You decided the open road would be a better prospect than the zombie-filled cities. While en route to your destination, you were involved in a crash that totaled your vehicle. Injured and alone, you'll need to think fast if you want to survive.",
"allowed_locs": [ "sloc_road" ],
"start_name": "Crash Site",
"map_extra": "mx_mayhem",
"map_extra": "mx_mayhem_crash_start",
"flags": [ "CHALLENGE", "HELI_CRASH", "LONE_START" ]
},
{
Expand Down
1 change: 1 addition & 0 deletions data/json/start_locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,7 @@
"type": "start_location",
"id": "sloc_road",
"name": "Road",
"city_distance": [ 10, -1 ],
"terrain": [ { "om_terrain": "road", "om_terrain_match_type": "TYPE" } ]
},
{
Expand Down
Loading