From e2a131e9e4ba675e06cb98b2345062557ed67e9d Mon Sep 17 00:00:00 2001 From: CountSerg Date: Tue, 31 Dec 2019 14:39:05 +0300 Subject: [PATCH 1/8] Adds military helipad location --- .../terrain-floors-outdoors.json | 18 ++ data/json/mapgen/helipad.json | 211 ++++++++++++++++++ data/json/mapgen_palettes/helipad.json | 75 +++++++ .../overmap/overmap_special/specials.json | 20 ++ .../overmap_terrain_military.json | 49 ++++ 5 files changed, 373 insertions(+) create mode 100644 data/json/mapgen/helipad.json create mode 100644 data/json/mapgen_palettes/helipad.json diff --git a/data/json/furniture_and_terrain/terrain-floors-outdoors.json b/data/json/furniture_and_terrain/terrain-floors-outdoors.json index 2f832f031efce..6bcbcdc05b17f 100644 --- a/data/json/furniture_and_terrain/terrain-floors-outdoors.json +++ b/data/json/furniture_and_terrain/terrain-floors-outdoors.json @@ -231,6 +231,24 @@ "items": [ { "item": "rock", "count": [ 2, 15 ] }, { "item": "rebar", "count": [ 0, 4 ] } ] } }, + { + "type": "terrain", + "id": "t_concrete_y", + "name": "concrete", + "description": "A newer segment of poured concrete with surface finishes for aesthetics and resistance to freeze-thaw cycles. Covered with a streak of yellow paint.", + "symbol": ".", + "color": "yellow", + "looks_like": "t_wall_y", + "move_cost": 2, + "flags": [ "TRANSPARENT", "FLAT", "ROAD", "MINEABLE" ], + "bash": { + "ter_set": "t_null", + "str_min": 50, + "str_max": 400, + "str_min_supported": 100, + "items": [ { "item": "rock", "count": [ 2, 15 ] }, { "item": "rebar", "count": [ 0, 4 ] } ] + } + }, { "type": "terrain", "id": "t_floor_noroof", diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json new file mode 100644 index 0000000000000..4cee6330da7bf --- /dev/null +++ b/data/json/mapgen/helipad.json @@ -0,0 +1,211 @@ +[ + { + "method": "json", + "om_terrain": [ [ "helipad_nw", "helipad_ne" ], [ "helipad_sw", "helipad_se" ] ], + "type": "mapgen", + "weight": 500, + "object": { + "fill_ter": "t_floor", + "rows": [ + "FFF.......pppppppp...........................FFF", + "FTFFWWWWWF!!!!!!!!FFFFFFFFFFFFFFFFFFFFFFFFFFFFTF", + "FFG.W4ddw.pppppppp...........................GFF", + ".F..W-c?w.pppppppp...|||||||||||||||||||||||..F.", + ".F..WmWWW.pppppppp...|%____B________C__B___|..F.", + ".F..pppppppppppppppppM___C_____B___C_CC_B__|..F.", + ".F..pppppppppppppppppM_______C____CCCCC____|..F.", + ".F..pppppppppppppppppM_B__C___B__B___C_B___|..F.", + ".F..pppppyppppyppppppM__________________B__|..F.", + ".F..pppppyppppyppppppM__B___C___B__C__B____|..F.", + ".F..pppppyppppyppp...|____C___B____________|..F.", + ".F..pppppyppppypppooom___________B______%__|..F.", + ".F..pppppyppppyppp...||||||||m|MMMMMMMMM||||..F.", + ".F..pppppyppppyppp...|_rrrr|y___________%__|..F.", + ".F..............oo...|_____|_______________|..F.", + "FFF.............oo...|_rrrr|_____________RR|.FFF", + "FTG.WwWWwWwwWwwW++WwW|M|||||_____________sR|.GTF", + "FFF.W----+-----+-----m_____m___IIIIIIIII_75|.FFF", + ".F..W-?ddWdc--dW--WWW|||||||___IUUUUUUUI___|..F.", + ".F..Wy-cfWd?f?dW--W&W|_____m___IUUUUUUUI_RR|..F.", + ".F..WWWWWWWWWWWWy-+-W|ggggg|___IUUUUUUUI_sR|..F.", + ".F..W[[[HH##O#SW--WSW|||||||___IUUUUUUUI_85|..F.", + ".F..W----------+--WWW|lllll|___IUUUUUUUI___|..F.", + ".F..W-cttc---1WW--+-W|_____M___IUUUUUUUI___|..F.", + ".F..W-cttc-y-2W<--WhW|lllll|___IUUUUUUUI%__|..F.", + ".F..WWwwwWwwwWWW++WWW||||||||m|MMMMMMMMM||||..F.", + ".F.......3P.....oo...........o.=========6666..F.", + ".F..========================================..F.", + ".F..========================================..F.", + ".F..========================================..F.", + "FFF.========================================.FFF", + "FTG..o,,,,,o..o,,,,,,,,,,,,,,,,,,o..o,,,,,o..GTF", + "FFF..o=====o..o==================o..o=====o..FFF", + ".F..$=========o$==,,========,,$==o==========..F.", + ".F..==========o===,,========,,===o==========..F.", + ".F..=,=====,==o===,,========,,===o=,=====,==..F.", + ".F..=,=====,==o===,,========,,===o=,=====,==..F.", + ".F..=,=====,==o===,,,,,,,,,,,,===o=,=====,==..F.", + ".F..=,,,,,,,==o===,,,,,,,,,,,,===o=,,,,,,,==..F.", + ".F..=,,,,,,,==o===,,========,,===o=,,,,,,,==..F.", + ".F..=,=====,==o===,,========,,===o=,=====,==..F.", + ".F..=,=====,==o===,,========,,===o=,=====,==..F.", + ".F..=,=====,==o===,,========,,===o=,=====,==..F.", + ".F..==========o==================o==========..F.", + ".F..==========o==================o==========..F.", + "FFG............FGF............FGF............GFF", + "FTFFFFFFFFFFFFFFTFFFFFFFFFFFFFFTFFFFFFFFFFFFFFTF", + "FFF............FFF............FFF............FFF" + ], + "palettes": [ "helipad_palette" ], + "toilets": { "&": { } }, + "gaspumps": { "$": { } }, + "items": { + "B": { + "item": { + "subtype": "distribution", + "entries": [ + { "item": "gasoline", "charges": [ 0, 80 ], "container-item": "30gal_drum", "prob": 25 }, + { "item": "motor_oil", "charges": [ 0, 30 ], "container-item": "jerrycan", "prob": 5 }, + { "item": "30gal_drum", "prob": 70 } + ] + }, + "chance": 75 + }, + "C": { + "item": { + "subtype": "distribution", + "entries": [ + { "group": "military_patrol_food", "prob": 50, "repeat": [ 3, 5 ] }, + { "group": "infantry_common_gear", "prob": 5, "repeat": [ 0, 2 ] }, + { "group": "mil_food", "prob": 40, "repeat": [ 2, 5 ] }, + { "group": "infantry_medical_gear", "prob": 5, "repeat": [ 0, 2 ] }, + { "group": "supplies_metal", "prob": 150, "repeat": [ 2, 5 ] }, + { "group": "supplies_mechanics", "prob": 50, "repeat": [ 0, 2 ] } + ] + }, + "chance": 75 + }, + "r": { + "subtype": "distribution", + "entries": [ { "group": "military_standard_assault_rifles", "prob": 45 }, { "group": "military_standard_shotguns", "prob": 5 } ], + "chance": 10 + }, + "l": { + "item": { + "subtype": "distribution", + "entries": [ + { "group": "army_personal_locker", "prob": 50, "repeat": [ 1, 5 ] }, + { "group": "military_patrol_food", "prob": 25, "repeat": [ 2, 8 ] }, + { "group": "supplies_plumbing", "prob": 50, "repeat": [ 1, 2 ] } + ], + "chance": 33 + } + }, + "L": { "item": "army_personal_locker", "repeat": [ 0, 4 ] }, + "d": { "item": "SUS_office_desk" }, + "f": { "item": "SUS_office_filing_cabinet" }, + "4": { "item": "military_standard_shotguns", "chance": 50 }, + "#": { "item": "SUS_utensils", "chance": 25, "repeat": [ 1, 3 ] }, + "t": { "item": "SUS_dishes", "chance": 50, "repeat": [ 1, 2 ] }, + "[": { "item": "SUS_fridge" }, + "O": { "item": "SUS_oven" }, + "H": { "item": "SUS_spice_collection" } + }, + "place_monsters": [ + { "monster": "mon_mech_lifter", "x": 27, "y": 10, "chance": 25 }, + { "monster": "GROUP_MIL_WEAK", "x": 32, "y": 15, "density": 0.75 }, + { "monster": "GROUP_MIL_WEAK", "x": 24, "y": 15 } + ], + "monster": { "T": { "monster": "mon_turret_rifle" } }, + "place_vehicles": [ + { "vehicle": "parkinglotbasic", "x": 4, "y": 9, "chance": 75, "rotation": 270, "status": -1 }, + { "vehicle": "flatbed_truck", "x": 11, "y": 4, "chance": 25, "rotation": 90, "status": -1 }, + { "vehicle": "helicopter_wreck_3a", "x": 5, "y": 34, "chance": 50, "rotation": 90, "status": -1 }, + { "vehicle": "helicopter_wreck_1a", "x": 18, "y": 34, "chance": 25, "rotation": 270, "status": -1 }, + { "vehicle": "helicopter_wreck_3a", "x": 32, "y": 34, "chance": 75, "rotation": 90, "status": -1 } + ] + } + }, + { + "method": "json", + "om_terrain": [ [ "helipad2f_nw", "helipad2f_ne" ], [ "helipad_sw2f", "helipad2f_se" ] ], + "type": "mapgen", + "weight": 500, + "object": { + "fill_ter": "t_floor", + "rows": [ + "************************************************", + "****RRRRR***************************************", + "****RRRRR***************************************", + "****RRRRR************=======================****", + "****RRRRR************=======================****", + "*********************=======================****", + "*********************=======================****", + "*********************=======================****", + "*********************=======================****", + "*********************=======================****", + "*********************=======================****", + "*********************=======================****", + "*********************=======================****", + "*********************=======================****", + "*********************=======================****", + "****WWWWWWWWWWWWWWWWW=======================****", + "****WbttbWbttbWSjjWhW=======================****", + "****Wb--bWb--bW-----W=======================****", + "****WL--LWL--LW-LLWhW=======================****", + "****WW+WWWW+WWW+WWWWW=======================****", + "****W-----------W&-SW=======================****", + "****WW+WWWW+WWW-WW+WW=======================****", + "****WL--LWL--LW-----+=======================****", + "****Wb--bWb--bW-WW+WW=======================****", + "****WbttbWbttbW>W&-SW===================DD==****", + "****WWWWWWWWWWWWWWWWW=======================****", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************", + "************************************************" + ], + "palettes": [ "helipad_palette_roof" ], + "toilets": { "&": { } }, + "items": { + "t": { "item": "bedroom", "chance": 50, "repeat": [ 0, 4 ] }, + "b": { "item": "bed", "repeat": [ 0, 3 ] }, + "h": { "item": "SUS_bathroom_sink" }, + "L": { "item": "army_personal_locker" }, + "=": { "item": "roof_trash", "chance": 2 }, + "&": { "item": "SUS_toilet" } + }, + "place_monsters": [ { "monster": "GROUP_MIL_WEAK", "x": 10, "y": 20, "density": 0.5 } ], + "place_nested": [ + { + "chunks": [ [ "roof_2x2_infrastructure", 40 ], [ "roof_2x2_infrastructure_2", 30 ], [ "roof_2x2_utilities", 30 ] ], + "x": [ 24, 42 ], + "y": [ 4, 13 ] + }, + { + "chunks": [ [ "roof_2x2_infrastructure", 40 ], [ "roof_2x2_infrastructure_2", 30 ], [ "roof_2x2_utilities", 30 ] ], + "x": [ 24, 42 ], + "y": [ 14, 22 ] + } + ] + } + } +] diff --git a/data/json/mapgen_palettes/helipad.json b/data/json/mapgen_palettes/helipad.json new file mode 100644 index 0000000000000..667baaa650287 --- /dev/null +++ b/data/json/mapgen_palettes/helipad.json @@ -0,0 +1,75 @@ +[ + { + "type": "palette", + "id": "helipad_palette", + "terrain": { + "+": "t_door_c", + "W": "t_wall_w", + "-": "t_floor", + "w": "t_window", + "G": "t_chaingate_l", + "|": "t_concrete_wall", + "F": "t_fence_barbed", + "!": "t_guardrail", + "p": "t_pavement", + "m": "t_door_metal_c", + "y": "t_pavement_y", + ".": "t_grass", + "T": "t_grass", + "=": "t_concrete", + "%": "t_gates_mech_control", + "_": "t_thconc_floor", + "B": "t_thconc_floor", + "C": "t_thconc_floor", + "r": "t_thconc_floor", + "l": "t_thconc_floor", + "R": "t_thconc_floor", + "s": "t_thconc_floor", + "M": "t_door_metal_locked", + ",": "t_concrete_y", + "o": "t_sidewalk", + "?": "t_console_broken", + "g": "t_generator_broken", + "P": "t_water_pump", + "5": "t_machinery_light", + "6": "t_bulk_tank", + "I": "t_thconc_y", + "U": "t_metal_floor" + }, + "furniture": { + "C": "f_crate_c", + "r": "f_rack", + "y": [ "f_indoor_plant_y", "f_indoor_plant" ], + "L": "f_locker", + "4": "f_locker", + "c": "f_chair", + "s": "f_chair", + "l": "f_utility_shelf", + "d": "f_desk", + "f": "f_filing_cabinet", + "[": "f_fridge", + "O": "f_oven", + "S": "f_sink", + "t": "f_table", + "R": "f_workbench", + "3": "f_standing_tank", + "H": "f_cupboard", + "7": "f_drill_press", + "8": "f_router" + } + }, + { + "type": "palette", + "id": "helipad_palette_roof", + "terrain": { + "+": "t_door_c", + "W": "t_wall_w", + "-": "t_floor", + "w": "t_window_domestic", + "*": "t_open_air", + "=": "t_flat_roof", + "R": "t_flat_roof" + }, + "furniture": { "L": "f_locker", "b": "f_bed", "h": "f_shower", "S": "f_sink", "t": "f_table", "D": "f_small_satelitte_dish" } + } +] diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index 72f9c6e06043e..43ffc9dbf0230 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -6428,5 +6428,25 @@ "city_sizes": [ 4, 20 ], "occurrences": [ 0, 2 ], "flags": [ "CLASSIC" ] + }, + { + "type": "overmap_special", + "id": "military helipad", + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "helipad_nw_north" }, + { "point": [ 1, 0, 0 ], "overmap": "helipad_ne_north" }, + { "point": [ 0, 1, 0 ], "overmap": "helipad_sw_north" }, + { "point": [ 1, 1, 0 ], "overmap": "helipad_se_north" }, + { "point": [ 0, 0, 1 ], "overmap": "helipad2f_nw_north" }, + { "point": [ 1, 0, 1 ], "overmap": "helipad2f_ne_north" }, + { "point": [ 0, 1, 1 ], "overmap": "helipad2f_sw_north" }, + { "point": [ 1, 1, 1 ], "overmap": "helipad2f_se_north" } + ], + "locations": [ "land" ], + "connections": [ { "point": [ 1, -1, 0 ], "terrain": "road", "connection": "local_road" } ], + "city_distance": [ 10, 100 ], + "city_sizes": [ 3, 12 ], + "occurrences": [ 0, 2 ], + "flags": [ "CLASSIC" ] } ] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_military.json b/data/json/overmap/overmap_terrain/overmap_terrain_military.json index f8ae0a542a99a..990c8e4fc438b 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_military.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_military.json @@ -359,5 +359,54 @@ "sym": "c", "color": "brown", "flags": [ "SOURCE_SAFETY", "SOURCE_PEOPLE" ] + }, + { + "type": "overmap_terrain", + "abstract": "generic_mil_helipad", + "name": "military helipad", + "sym": "H", + "color": "red", + "see_cost": 5, + "flags": [ "SOURCE_FUEL", "SOURCE_GUN", "SOURCE_VEHICLES", "RISK_HIGH" ] + }, + { + "type": "overmap_terrain", + "id": "helipad_nw", + "copy-from": "generic_mil_helipad" + }, + { + "type": "overmap_terrain", + "id": "helipad_ne", + "copy-from": "generic_mil_helipad" + }, + { + "type": "overmap_terrain", + "id": "helipad_sw", + "copy-from": "generic_mil_helipad" + }, + { + "type": "overmap_terrain", + "id": "helipad_se", + "copy-from": "generic_mil_helipad" + }, + { + "type": "overmap_terrain", + "id": "helipad2f_nw", + "copy-from": "generic_mil_helipad" + }, + { + "type": "overmap_terrain", + "id": "helipad2f_ne", + "copy-from": "generic_mil_helipad" + }, + { + "type": "overmap_terrain", + "id": "helipad2f_sw", + "copy-from": "generic_mil_helipad" + }, + { + "type": "overmap_terrain", + "id": "helipad2f_se", + "copy-from": "generic_mil_helipad" } ] From 229e685605a5a71c8475a8578f5c19b41cf8f545 Mon Sep 17 00:00:00 2001 From: CountSerg Date: Mon, 6 Jan 2020 11:51:24 +0300 Subject: [PATCH 2/8] JSON fixes. --- data/json/mapgen/helipad.json | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json index 4cee6330da7bf..84c46c14e1128 100644 --- a/data/json/mapgen/helipad.json +++ b/data/json/mapgen/helipad.json @@ -75,31 +75,35 @@ "item": { "subtype": "distribution", "entries": [ - { "group": "military_patrol_food", "prob": 50, "repeat": [ 3, 5 ] }, - { "group": "infantry_common_gear", "prob": 5, "repeat": [ 0, 2 ] }, - { "group": "mil_food", "prob": 40, "repeat": [ 2, 5 ] }, - { "group": "infantry_medical_gear", "prob": 5, "repeat": [ 0, 2 ] }, - { "group": "supplies_metal", "prob": 150, "repeat": [ 2, 5 ] }, - { "group": "supplies_mechanics", "prob": 50, "repeat": [ 0, 2 ] } + { "group": "military_patrol_food", "prob": 50 }, + { "group": "infantry_common_gear", "prob": 5 }, + { "group": "mil_food", "prob": 40 }, + { "group": "infantry_medical_gear", "prob": 5 }, + { "group": "supplies_metal", "prob": 150 }, + { "group": "supplies_mechanics", "prob": 50 } ] }, - "chance": 75 + "chance": 75, + "repeat": [ 3, 5 ] }, "r": { - "subtype": "distribution", - "entries": [ { "group": "military_standard_assault_rifles", "prob": 45 }, { "group": "military_standard_shotguns", "prob": 5 } ], + "item": { + "subtype": "distribution", + "entries": [ { "group": "military_standard_assault_rifles", "prob": 45 }, { "group": "military_standard_shotguns", "prob": 5 } ] + }, "chance": 10 }, "l": { "item": { "subtype": "distribution", "entries": [ - { "group": "army_personal_locker", "prob": 50, "repeat": [ 1, 5 ] }, - { "group": "military_patrol_food", "prob": 25, "repeat": [ 2, 8 ] }, - { "group": "supplies_plumbing", "prob": 50, "repeat": [ 1, 2 ] } - ], - "chance": 33 - } + { "group": "army_personal_locker", "prob": 50 }, + { "group": "military_patrol_food", "prob": 25 }, + { "group": "supplies_plumbing", "prob": 50 } + ] + }, + "chance": 33, + "repeat": [ 1, 5 ] }, "L": { "item": "army_personal_locker", "repeat": [ 0, 4 ] }, "d": { "item": "SUS_office_desk" }, From fcfafc7f955c0e154e5f685cac2424e13071ca7e Mon Sep 17 00:00:00 2001 From: CountSerg Date: Mon, 6 Jan 2020 12:11:37 +0300 Subject: [PATCH 3/8] Moster placing fix. --- data/json/mapgen/helipad.json | 5 ++--- data/json/mapgen_palettes/helipad.json | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json index 84c46c14e1128..997719aee9acf 100644 --- a/data/json/mapgen/helipad.json +++ b/data/json/mapgen/helipad.json @@ -15,7 +15,7 @@ ".F..pppppppppppppppppM___C_____B___C_CC_B__|..F.", ".F..pppppppppppppppppM_______C____CCCCC____|..F.", ".F..pppppppppppppppppM_B__C___B__B___C_B___|..F.", - ".F..pppppyppppyppppppM__________________B__|..F.", + ".F..pppppyppppyppppppM________*_________B__|..F.", ".F..pppppyppppyppppppM__B___C___B__C__B____|..F.", ".F..pppppyppppyppp...|____C___B____________|..F.", ".F..pppppyppppypppooom___________B______%__|..F.", @@ -116,11 +116,10 @@ "H": { "item": "SUS_spice_collection" } }, "place_monsters": [ - { "monster": "mon_mech_lifter", "x": 27, "y": 10, "chance": 25 }, { "monster": "GROUP_MIL_WEAK", "x": 32, "y": 15, "density": 0.75 }, { "monster": "GROUP_MIL_WEAK", "x": 24, "y": 15 } ], - "monster": { "T": { "monster": "mon_turret_rifle" } }, + "monster": { "T": { "monster": "mon_turret_rifle" }, "*": { "monster": "mon_mech_lifter" } }, "place_vehicles": [ { "vehicle": "parkinglotbasic", "x": 4, "y": 9, "chance": 75, "rotation": 270, "status": -1 }, { "vehicle": "flatbed_truck", "x": 11, "y": 4, "chance": 25, "rotation": 90, "status": -1 }, diff --git a/data/json/mapgen_palettes/helipad.json b/data/json/mapgen_palettes/helipad.json index 667baaa650287..a9c96908b5e64 100644 --- a/data/json/mapgen_palettes/helipad.json +++ b/data/json/mapgen_palettes/helipad.json @@ -25,6 +25,7 @@ "l": "t_thconc_floor", "R": "t_thconc_floor", "s": "t_thconc_floor", + "*": "t_thconc_floor", "M": "t_door_metal_locked", ",": "t_concrete_y", "o": "t_sidewalk", From d12eb2626eba50e8d610a7056aabcf6c463471fe Mon Sep 17 00:00:00 2001 From: CountSerg Date: Mon, 6 Jan 2020 21:08:28 +0300 Subject: [PATCH 4/8] Terrain id fix. --- data/json/mapgen/helipad.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json index 997719aee9acf..27982b9ffea5e 100644 --- a/data/json/mapgen/helipad.json +++ b/data/json/mapgen/helipad.json @@ -131,7 +131,7 @@ }, { "method": "json", - "om_terrain": [ [ "helipad2f_nw", "helipad2f_ne" ], [ "helipad_sw2f", "helipad2f_se" ] ], + "om_terrain": [ [ "helipad2f_nw", "helipad2f_ne" ], [ "helipad2f_sw", "helipad2f_se" ] ], "type": "mapgen", "weight": 500, "object": { From 49ea7e41939898a3a6cbc8d043f89d385db4d1df Mon Sep 17 00:00:00 2001 From: CountSerg Date: Mon, 6 Jan 2020 21:50:56 +0300 Subject: [PATCH 5/8] Replace mech lifter with a forklift. --- data/json/mapgen/helipad.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json index 27982b9ffea5e..0238045c226f2 100644 --- a/data/json/mapgen/helipad.json +++ b/data/json/mapgen/helipad.json @@ -11,9 +11,9 @@ "FTFFWWWWWF!!!!!!!!FFFFFFFFFFFFFFFFFFFFFFFFFFFFTF", "FFG.W4ddw.pppppppp...........................GFF", ".F..W-c?w.pppppppp...|||||||||||||||||||||||..F.", - ".F..WmWWW.pppppppp...|%____B________C__B___|..F.", - ".F..pppppppppppppppppM___C_____B___C_CC_B__|..F.", - ".F..pppppppppppppppppM_______C____CCCCC____|..F.", + ".F..WmWWW.pppppppp...|%_____________C__B___|..F.", + ".F..pppppppppppppppppM___C_________C_CC_B__|..F.", + ".F..pppppppppppppppppM____________CCCCC____|..F.", ".F..pppppppppppppppppM_B__C___B__B___C_B___|..F.", ".F..pppppyppppyppppppM________*_________B__|..F.", ".F..pppppyppppyppppppM__B___C___B__C__B____|..F.", @@ -119,8 +119,9 @@ { "monster": "GROUP_MIL_WEAK", "x": 32, "y": 15, "density": 0.75 }, { "monster": "GROUP_MIL_WEAK", "x": 24, "y": 15 } ], - "monster": { "T": { "monster": "mon_turret_rifle" }, "*": { "monster": "mon_mech_lifter" } }, + "monster": { "T": { "monster": "mon_turret_rifle" } }, "place_vehicles": [ + { "vehicle": "forklift", "x": 29, "y": 6, "rotation": 180, "status": 1 }, { "vehicle": "parkinglotbasic", "x": 4, "y": 9, "chance": 75, "rotation": 270, "status": -1 }, { "vehicle": "flatbed_truck", "x": 11, "y": 4, "chance": 25, "rotation": 90, "status": -1 }, { "vehicle": "helicopter_wreck_3a", "x": 5, "y": 34, "chance": 50, "rotation": 90, "status": -1 }, From adcc3323aa4ae59d17ce709cf5f9f5bfa995f6dd Mon Sep 17 00:00:00 2001 From: CountSerg Date: Tue, 7 Jan 2020 12:54:48 +0300 Subject: [PATCH 6/8] Review changes --- data/json/itemgroups/supplies.json | 11 +++++++++++ data/json/mapgen/helipad.json | 13 +++---------- data/json/mapgen_palettes/helipad.json | 4 ++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index 94a0e2f301fac..c3ef9468754fa 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -496,5 +496,16 @@ [ "whistle", 5 ], [ "airhorn", 2 ] ] + }, + { + "id": "fuel_barrel", + "type": "item_group", + "//": "barrel with gasoline, diesel or motor oil like you would find at fuel depot", + "subtype": "distribution", + "entries": [ + { "item": "gasoline", "charges": [ 0, 80 ], "container-item": "30gal_drum", "prob": 30 }, + { "item": "diesel", "charges": [ 0, 80 ], "container-item": "30gal_drum", "prob": 10 }, + { "item": "motor_oil", "charges": [ 0, 30 ], "container-item": "jerrycan", "prob": 5 } + ] } ] diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json index 0238045c226f2..0156725172707 100644 --- a/data/json/mapgen/helipad.json +++ b/data/json/mapgen/helipad.json @@ -63,11 +63,7 @@ "B": { "item": { "subtype": "distribution", - "entries": [ - { "item": "gasoline", "charges": [ 0, 80 ], "container-item": "30gal_drum", "prob": 25 }, - { "item": "motor_oil", "charges": [ 0, 30 ], "container-item": "jerrycan", "prob": 5 }, - { "item": "30gal_drum", "prob": 70 } - ] + "entries": [ { "group": "fuel_barrel", "prob": 30 }, { "item": "30gal_drum", "prob": 70 } ] }, "chance": 75 }, @@ -115,10 +111,7 @@ "O": { "item": "SUS_oven" }, "H": { "item": "SUS_spice_collection" } }, - "place_monsters": [ - { "monster": "GROUP_MIL_WEAK", "x": 32, "y": 15, "density": 0.75 }, - { "monster": "GROUP_MIL_WEAK", "x": 24, "y": 15 } - ], + "place_monsters": [ { "monster": "GROUP_MIL_STRONG", "x": 32, "y": 15 }, { "monster": "GROUP_MIL_WEAK", "x": 24, "y": 30, "density": 2 } ], "monster": { "T": { "monster": "mon_turret_rifle" } }, "place_vehicles": [ { "vehicle": "forklift", "x": 29, "y": 6, "rotation": 180, "status": 1 }, @@ -197,7 +190,7 @@ "=": { "item": "roof_trash", "chance": 2 }, "&": { "item": "SUS_toilet" } }, - "place_monsters": [ { "monster": "GROUP_MIL_WEAK", "x": 10, "y": 20, "density": 0.5 } ], + "place_monsters": [ { "monster": "GROUP_MIL_WEAK", "x": 10, "y": 20, "density": 1.2 } ], "place_nested": [ { "chunks": [ [ "roof_2x2_infrastructure", 40 ], [ "roof_2x2_infrastructure_2", 30 ], [ "roof_2x2_utilities", 30 ] ], diff --git a/data/json/mapgen_palettes/helipad.json b/data/json/mapgen_palettes/helipad.json index a9c96908b5e64..a4fd7eb74ceb7 100644 --- a/data/json/mapgen_palettes/helipad.json +++ b/data/json/mapgen_palettes/helipad.json @@ -14,8 +14,8 @@ "p": "t_pavement", "m": "t_door_metal_c", "y": "t_pavement_y", - ".": "t_grass", - "T": "t_grass", + ".": "t_region_groundcover_urban", + "T": "t_region_groundcover_urban", "=": "t_concrete", "%": "t_gates_mech_control", "_": "t_thconc_floor", From 06da44a8e02140aa1052e0b9f1186435ae50b4e4 Mon Sep 17 00:00:00 2001 From: CountSerg Date: Tue, 7 Jan 2020 15:19:06 +0300 Subject: [PATCH 7/8] Set of small fixes - spawns etc. --- data/json/itemgroups/supplies.json | 6 +- data/json/mapgen/helipad.json | 81 ++++++++++--------- data/json/mapgen_palettes/helipad.json | 19 +++-- .../overmap/overmap_special/specials.json | 2 +- 4 files changed, 60 insertions(+), 48 deletions(-) diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index c3ef9468754fa..d34df1cd111a7 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -503,9 +503,9 @@ "//": "barrel with gasoline, diesel or motor oil like you would find at fuel depot", "subtype": "distribution", "entries": [ - { "item": "gasoline", "charges": [ 0, 80 ], "container-item": "30gal_drum", "prob": 30 }, - { "item": "diesel", "charges": [ 0, 80 ], "container-item": "30gal_drum", "prob": 10 }, - { "item": "motor_oil", "charges": [ 0, 30 ], "container-item": "jerrycan", "prob": 5 } + { "item": "gasoline", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 30 }, + { "item": "diesel", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 10 }, + { "item": "motor_oil", "charges": [ 0, 10000 ], "container-item": "jerrycan", "prob": 5 } ] } ] diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json index 0156725172707..245af01f8158a 100644 --- a/data/json/mapgen/helipad.json +++ b/data/json/mapgen/helipad.json @@ -20,18 +20,18 @@ ".F..pppppyppppyppp...|____C___B____________|..F.", ".F..pppppyppppypppooom___________B______%__|..F.", ".F..pppppyppppyppp...||||||||m|MMMMMMMMM||||..F.", - ".F..pppppyppppyppp...|_rrrr|y___________%__|..F.", - ".F..............oo...|_____|_______________|..F.", - "FFF.............oo...|_rrrr|_____________RR|.FFF", - "FTG.WwWWwWwwWwwW++WwW|M|||||_____________sR|.GTF", - "FFF.W----+-----+-----m_____m___IIIIIIIII_75|.FFF", + ".F..pppppyppppyppp...|_rrrr|____________%__|..F.", + ".F..oooooooooooooo...|_____|_______________|..F.", + "FFF.............oo...|_rrrr|___IIIIIIIII_RR|.FFF", + "FTG.WwWWwWwwWwwW++WwW|M|||||___IUUUUUUUI_sR|.GTF", + "FFF.W----+-----+-----m_____m___IUUUUUUUI_75|.FFF", ".F..W-?ddWdc--dW--WWW|||||||___IUUUUUUUI___|..F.", - ".F..Wy-cfWd?f?dW--W&W|_____m___IUUUUUUUI_RR|..F.", - ".F..WWWWWWWWWWWWy-+-W|ggggg|___IUUUUUUUI_sR|..F.", + ".F..Wz-cfWd?f?dW--W&W|_____m___IUUUUUUUI_RR|..F.", + ".F..WWWWWWWWWWWWz-+-W|ggggg|___IUUUUUUUI_sR|..F.", ".F..W[[[HH##O#SW--WSW|||||||___IUUUUUUUI_85|..F.", ".F..W----------+--WWW|lllll|___IUUUUUUUI___|..F.", ".F..W-cttc---1WW--+-W|_____M___IUUUUUUUI___|..F.", - ".F..W-cttc-y-2W<--WhW|lllll|___IUUUUUUUI%__|..F.", + ".F..W-cttc-z-2W<--WhW|lllll|___IUUUUUUUI%__|..F.", ".F..WWwwwWwwwWWW++WWW||||||||m|MMMMMMMMM||||..F.", ".F.......3P.....oo...........o.=========6666..F.", ".F..========================================..F.", @@ -71,16 +71,15 @@ "item": { "subtype": "distribution", "entries": [ - { "group": "military_patrol_food", "prob": 50 }, - { "group": "infantry_common_gear", "prob": 5 }, - { "group": "mil_food", "prob": 40 }, - { "group": "infantry_medical_gear", "prob": 5 }, - { "group": "supplies_metal", "prob": 150 }, - { "group": "supplies_mechanics", "prob": 50 } + { "group": "military_patrol_food", "prob": 50, "count": [ 3, 5 ] }, + { "group": "infantry_common_gear", "prob": 5, "count": [ 1, 2 ] }, + { "group": "mil_food", "prob": 40, "count": [ 1, 5 ] }, + { "group": "infantry_medical_gear", "prob": 5, "count": [ 1, 2 ] }, + { "group": "supplies_metal", "prob": 150, "count": [ 2, 6 ] }, + { "group": "supplies_mechanics", "prob": 50, "count": [ 0, 3 ] } ] }, - "chance": 75, - "repeat": [ 3, 5 ] + "chance": 50 }, "r": { "item": { @@ -93,33 +92,38 @@ "item": { "subtype": "distribution", "entries": [ - { "group": "army_personal_locker", "prob": 50 }, - { "group": "military_patrol_food", "prob": 25 }, - { "group": "supplies_plumbing", "prob": 50 } + { "group": "army_personal_locker", "prob": 150 }, + { "group": "military_patrol_food", "prob": 50 }, + { "group": "supplies_plumbing", "prob": 20 }, + { "group": "supplies_electronics", "prob": 20 }, + { "group": "supplies_metal", "prob": 20 }, + { "group": "supplies_mechanics", "prob": 20 }, + { "group": "hardware", "prob": 20 } ] }, - "chance": 33, - "repeat": [ 1, 5 ] + "chance": 50, + "repeat": [ 2, 6 ] }, - "L": { "item": "army_personal_locker", "repeat": [ 0, 4 ] }, - "d": { "item": "SUS_office_desk" }, - "f": { "item": "SUS_office_filing_cabinet" }, + "L": { "item": "army_personal_locker", "chance": 50, "repeat": [ 0, 4 ] }, + "d": { "item": "SUS_office_desk", "chance": 50 }, + "f": { "item": "SUS_office_filing_cabinet", "chance": 90 }, "4": { "item": "military_standard_shotguns", "chance": 50 }, "#": { "item": "SUS_utensils", "chance": 25, "repeat": [ 1, 3 ] }, "t": { "item": "SUS_dishes", "chance": 50, "repeat": [ 1, 2 ] }, - "[": { "item": "SUS_fridge" }, - "O": { "item": "SUS_oven" }, - "H": { "item": "SUS_spice_collection" } + "[": { "item": "SUS_fridge", "chance": 50 }, + "O": { "item": "SUS_oven", "chance": 75, "repeat": [ 0, 2 ] }, + "H": { "item": "SUS_spice_collection", "chance": 75 }, + "&": { "item": "SUS_toilet", "chance": 50 } }, - "place_monsters": [ { "monster": "GROUP_MIL_STRONG", "x": 32, "y": 15 }, { "monster": "GROUP_MIL_WEAK", "x": 24, "y": 30, "density": 2 } ], + "place_monsters": [ { "monster": "GROUP_MIL_STRONG", "x": 36, "y": 15 }, { "monster": "GROUP_MIL_WEAK", "x": 24, "y": 30, "density": 2 } ], "monster": { "T": { "monster": "mon_turret_rifle" } }, "place_vehicles": [ - { "vehicle": "forklift", "x": 29, "y": 6, "rotation": 180, "status": 1 }, + { "vehicle": "forklift", "x": 29, "y": 6, "chance": 95, "rotation": 180, "status": 1 }, { "vehicle": "parkinglotbasic", "x": 4, "y": 9, "chance": 75, "rotation": 270, "status": -1 }, - { "vehicle": "flatbed_truck", "x": 11, "y": 4, "chance": 25, "rotation": 90, "status": -1 }, - { "vehicle": "helicopter_wreck_3a", "x": 5, "y": 34, "chance": 50, "rotation": 90, "status": -1 }, - { "vehicle": "helicopter_wreck_1a", "x": 18, "y": 34, "chance": 25, "rotation": 270, "status": -1 }, - { "vehicle": "helicopter_wreck_3a", "x": 32, "y": 34, "chance": 75, "rotation": 90, "status": -1 } + { "vehicle": "flatbed_truck", "x": 11, "y": 4, "chance": 25, "rotation": 270, "status": -1 }, + { "vehicle": "helicopter_wreck_3a", "x": 9, "y": 42, "chance": 10, "rotation": 90, "status": -1 }, + { "vehicle": "helicopter_wreck_1a", "x": 18, "y": 34, "chance": 10, "rotation": 270, "status": -1 }, + { "vehicle": "helicopter_wreck_3a", "x": 39, "y": 42, "chance": 10, "rotation": 90, "status": -1 } ] } }, @@ -184,13 +188,14 @@ "toilets": { "&": { } }, "items": { "t": { "item": "bedroom", "chance": 50, "repeat": [ 0, 4 ] }, - "b": { "item": "bed", "repeat": [ 0, 3 ] }, - "h": { "item": "SUS_bathroom_sink" }, - "L": { "item": "army_personal_locker" }, + "b": { "item": "bed", "repeat": [ 0, 3 ], "chance": 90 }, + "h": { "item": "SUS_bathroom_sink", "chance": 50 }, + "S": { "item": "SUS_bathroom_sink", "chance": 90 }, + "L": { "item": "army_personal_locker", "repeat": [ 0, 4 ], "chance": 50 }, "=": { "item": "roof_trash", "chance": 2 }, - "&": { "item": "SUS_toilet" } + "&": { "item": "SUS_toilet", "chance": 50 } }, - "place_monsters": [ { "monster": "GROUP_MIL_WEAK", "x": 10, "y": 20, "density": 1.2 } ], + "place_monsters": [ { "monster": "GROUP_MIL_WEAK", "x": 10, "y": 20, "density": 0.5 } ], "place_nested": [ { "chunks": [ [ "roof_2x2_infrastructure", 40 ], [ "roof_2x2_infrastructure_2", 30 ], [ "roof_2x2_utilities", 30 ] ], diff --git a/data/json/mapgen_palettes/helipad.json b/data/json/mapgen_palettes/helipad.json index a4fd7eb74ceb7..5fd5e057155cb 100644 --- a/data/json/mapgen_palettes/helipad.json +++ b/data/json/mapgen_palettes/helipad.json @@ -7,9 +7,9 @@ "W": "t_wall_w", "-": "t_floor", "w": "t_window", - "G": "t_chaingate_l", + "G": "t_chaingate_c", "|": "t_concrete_wall", - "F": "t_fence_barbed", + "F": "t_chainfence", "!": "t_guardrail", "p": "t_pavement", "m": "t_door_metal_c", @@ -26,6 +26,8 @@ "R": "t_thconc_floor", "s": "t_thconc_floor", "*": "t_thconc_floor", + "7": "t_thconc_floor", + "8": "t_thconc_floor", "M": "t_door_metal_locked", ",": "t_concrete_y", "o": "t_sidewalk", @@ -35,12 +37,13 @@ "5": "t_machinery_light", "6": "t_bulk_tank", "I": "t_thconc_y", - "U": "t_metal_floor" + "U": "t_metal_floor", + "<": "t_stairs_up" }, "furniture": { "C": "f_crate_c", "r": "f_rack", - "y": [ "f_indoor_plant_y", "f_indoor_plant" ], + "z": [ "f_indoor_plant_y", "f_indoor_plant" ], "L": "f_locker", "4": "f_locker", "c": "f_chair", @@ -56,7 +59,9 @@ "3": "f_standing_tank", "H": "f_cupboard", "7": "f_drill_press", - "8": "f_router" + "8": "f_router", + "h": "f_shower", + "#": "f_counter" } }, { @@ -69,7 +74,9 @@ "w": "t_window_domestic", "*": "t_open_air", "=": "t_flat_roof", - "R": "t_flat_roof" + "R": "t_flat_roof", + "D": "t_flat_roof", + ">": "t_stairs_down" }, "furniture": { "L": "f_locker", "b": "f_bed", "h": "f_shower", "S": "f_sink", "t": "f_table", "D": "f_small_satelitte_dish" } } diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index 43ffc9dbf0230..48856bce91f8b 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -6443,7 +6443,7 @@ { "point": [ 1, 1, 1 ], "overmap": "helipad2f_se_north" } ], "locations": [ "land" ], - "connections": [ { "point": [ 1, -1, 0 ], "terrain": "road", "connection": "local_road" } ], + "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road", "connection": "local_road" } ], "city_distance": [ 10, 100 ], "city_sizes": [ 3, 12 ], "occurrences": [ 0, 2 ], From b8c0499d4e1ae68bae0b232ac09640509524b19f Mon Sep 17 00:00:00 2001 From: CountSerg Date: Wed, 8 Jan 2020 01:31:56 +0300 Subject: [PATCH 8/8] Reduce number of perimeter turrets to 4. --- data/json/mapgen/helipad.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json index 245af01f8158a..b461d1e3b63d8 100644 --- a/data/json/mapgen/helipad.json +++ b/data/json/mapgen/helipad.json @@ -22,9 +22,9 @@ ".F..pppppyppppyppp...||||||||m|MMMMMMMMM||||..F.", ".F..pppppyppppyppp...|_rrrr|____________%__|..F.", ".F..oooooooooooooo...|_____|_______________|..F.", - "FFF.............oo...|_rrrr|___IIIIIIIII_RR|.FFF", - "FTG.WwWWwWwwWwwW++WwW|M|||||___IUUUUUUUI_sR|.GTF", - "FFF.W----+-----+-----m_____m___IUUUUUUUI_75|.FFF", + ".F..............oo...|_rrrr|___IIIIIIIII_RR|..F.", + ".F..WwWWwWwwWwwW++WwW|M|||||___IUUUUUUUI_sR|..F.", + ".F..W----+-----+-----m_____m___IUUUUUUUI_75|..F.", ".F..W-?ddWdc--dW--WWW|||||||___IUUUUUUUI___|..F.", ".F..Wz-cfWd?f?dW--W&W|_____m___IUUUUUUUI_RR|..F.", ".F..WWWWWWWWWWWWz-+-W|ggggg|___IUUUUUUUI_sR|..F.", @@ -37,9 +37,9 @@ ".F..========================================..F.", ".F..========================================..F.", ".F..========================================..F.", - "FFF.========================================.FFF", - "FTG..o,,,,,o..o,,,,,,,,,,,,,,,,,,o..o,,,,,o..GTF", - "FFF..o=====o..o==================o..o=====o..FFF", + ".F..========================================..F.", + ".F...o,,,,,o..o,,,,,,,,,,,,,,,,,,o..o,,,,,o...F.", + ".F...o=====o..o==================o..o=====o...F.", ".F..$=========o$==,,========,,$==o==========..F.", ".F..==========o===,,========,,===o==========..F.", ".F..=,=====,==o===,,========,,===o=,=====,==..F.", @@ -52,9 +52,9 @@ ".F..=,=====,==o===,,========,,===o=,=====,==..F.", ".F..==========o==================o==========..F.", ".F..==========o==================o==========..F.", - "FFG............FGF............FGF............GFF", - "FTFFFFFFFFFFFFFFTFFFFFFFFFFFFFFTFFFFFFFFFFFFFFTF", - "FFF............FFF............FFF............FFF" + "FFG..........................................GFF", + "FTFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFTF", + "FFF..........................................FFF" ], "palettes": [ "helipad_palette" ], "toilets": { "&": { } },