From edacf6bc33015519e1371025d4ee85889fac5227 Mon Sep 17 00:00:00 2001 From: Volch Date: Wed, 13 Dec 2023 17:04:44 +0300 Subject: [PATCH 01/15] Rename terrain-floors_indoor.json --- .../{terrain-floors_indoor.json => terrain-floors-indoor.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename data/json/furniture_and_terrain/{terrain-floors_indoor.json => terrain-floors-indoor.json} (100%) diff --git a/data/json/furniture_and_terrain/terrain-floors_indoor.json b/data/json/furniture_and_terrain/terrain-floors-indoor.json similarity index 100% rename from data/json/furniture_and_terrain/terrain-floors_indoor.json rename to data/json/furniture_and_terrain/terrain-floors-indoor.json From 7d0499a0ecbc0124de81ad9ecb9b8d990f6c0430 Mon Sep 17 00:00:00 2001 From: GuardianDll <67688115+GuardianDll@users.noreply.github.com> Date: Sat, 21 May 2022 20:24:40 +0200 Subject: [PATCH 02/15] New map: Aircraft carrier (#54711) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * initial aircraft commit - overmap * adding terrain mechanisms * adding few terrains for carrier * adding few new loot table * adding a carrier palette * adding some nested maps for carrier * adding OMspecial for carrier * 0 level of carrier * -1 level of carrier * first floor of carrier * second floor of the carrier (flight deck) * rename the folder so it has no spaces * adding triple bunkbed * making officers berths, kinda * delete unque flag for test purposes * adding 3 floor (bridge) * Lint * add some zeds to spawn * some turrets on the bridge (bc thats fun) * split OM terrain on two to make different mob spawns * remade z1 vehicle spawn * fix z1 vehicle spawn * fixing z2 transport spawn * burning the random vehicle spawn in fire * added nuclear reactor * disabling the elevators * lint * fixes * 123 * some stairs fix * real some stairs fix * adding loot to driers and washers * some stuff * remade offices, fix clothes * office supplies tweaks, some computer stuff replacing * replacing computers with wooden one, changing the book loot * replacing computers with wooden one, changing the book loot * delete office mess, add loot for entertainment center * TVs FOR EVERYBODY, YEEEEEAH * small bunkbed changes * ( -> ) * fix the metal gates * add some heavy engines to mechanic supplies * lint * spawn only on lake (doesnt work) * fixing the spawn issues * replacing unpickable doors with pickable one * adding water belt around the ship * tweaking the overmap special * ¯\_(ツ)_/¯ * Beds * moved entertainment_center_loot to a better place * fck u inheritance * typo * Update data/json/mapgen_palettes/aircraft_carrier_palette.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- .../furniture-sleep.json | 35 ++ .../furniture-tools.json | 95 +++++ .../furniture_and_terrain/terrain-doors.json | 16 + .../terrain-floors-outdoors.json | 66 ++++ .../terrain-mechanisms.json | 29 ++ .../itemgroups/Clothing_Gear/clothing.json | 44 +++ data/json/itemgroups/furniture.json | 23 ++ data/json/itemgroups/military.json | 82 ++++ .../aircraft_carrier_nested_maps.json | 20 + .../aircraft_carrier_z-1.json | 341 ++++++++++++++++ .../aircraft_carrier/aircraft_carrier_z0.json | 349 ++++++++++++++++ .../aircraft_carrier/aircraft_carrier_z1.json | 374 ++++++++++++++++++ .../aircraft_carrier/aircraft_carrier_z2.json | 363 +++++++++++++++++ .../aircraft_carrier/aircraft_carrier_z3.json | 66 ++++ .../aircraft_carrier_palette.json | 328 +++++++++++++++ data/json/monstergroups/military.json | 49 +++ .../overmap_special/aircraft_carrier.json | 206 ++++++++++ .../overmap_terrain_aircraft_carrier.json | 182 +++++++++ 18 files changed, 2668 insertions(+) create mode 100644 data/json/mapgen/aircraft_carrier/aircraft_carrier_nested_maps.json create mode 100644 data/json/mapgen/aircraft_carrier/aircraft_carrier_z-1.json create mode 100644 data/json/mapgen/aircraft_carrier/aircraft_carrier_z0.json create mode 100644 data/json/mapgen/aircraft_carrier/aircraft_carrier_z1.json create mode 100644 data/json/mapgen/aircraft_carrier/aircraft_carrier_z2.json create mode 100644 data/json/mapgen/aircraft_carrier/aircraft_carrier_z3.json create mode 100644 data/json/mapgen_palettes/aircraft_carrier_palette.json create mode 100644 data/json/overmap/overmap_special/aircraft_carrier.json create mode 100644 data/json/overmap/overmap_terrain/overmap_terrain_aircraft_carrier.json diff --git a/data/json/furniture_and_terrain/furniture-sleep.json b/data/json/furniture_and_terrain/furniture-sleep.json index d149d08be8e9..f224a0c7ffce 100644 --- a/data/json/furniture_and_terrain/furniture-sleep.json +++ b/data/json/furniture_and_terrain/furniture-sleep.json @@ -56,6 +56,41 @@ ] } }, + { + "type": "furniture", + "id": "f_triple_bunkbed", + "name": "triple berth", + "symbol": "#", + "description": "This bunk bed can hold 3 person at once - perfect solution for places with lack of free space.", + "looks_like": "f_bed", + "color": "magenta", + "move_cost_mod": 8, + "coverage": 40, + "comfort": 5, + "floor_bedding_warmth": 1000, + "required_str": -1, + "deconstruct": { + "items": [ + { "item": "mattress", "count": 3 }, + { "item": "pipe", "count": 28 }, + { "item": "sheet_metal", "count": 3 }, + { "item": "sheet_metal_small", "count": 12 } + ] + }, + "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "CAN_SIT" ], + "bash": { + "str_min": 25, + "str_max": 60, + "sound": "crunch!", + "sound_fail": "whump.", + "items": [ + { "item": "pipe", "count": [ 8, 15 ] }, + { "item": "sheet_metal_small", "count": [ 0, 2 ] }, + { "item": "rag", "count": [ 120, 160 ] }, + { "item": "scrap", "count": [ 60, 100 ] } + ] + } + }, { "type": "furniture", "id": "f_bed_frame", diff --git a/data/json/furniture_and_terrain/furniture-tools.json b/data/json/furniture_and_terrain/furniture-tools.json index d4fc64940564..494cffa82410 100644 --- a/data/json/furniture_and_terrain/furniture-tools.json +++ b/data/json/furniture_and_terrain/furniture-tools.json @@ -1,4 +1,99 @@ [ + { + "type": "furniture", + "id": "f_console_broken_table", + "name": "broken console", + "looks_like": "t_console_broken", + "description": "This is a standalone computer terminal. It doesn't seem to be working. It's the broken screen and shattered circuit boards that's telling you that.", + "symbol": "6", + "color": "light_gray", + "move_cost_mod": -1, + "coverage": 50, + "required_str": -1, + "flags": [ "TRANSPARENT", "NOITEM", "INDOORS", "SHORT", "PERMEABLE" ], + "deconstruct": { + "furn_set": "f_table", + "items": [ + { "item": "processor", "count": [ 1, 2 ] }, + { "item": "RAM", "count": [ 4, 8 ] }, + { "item": "cable", "charges": [ 4, 6 ] }, + { "item": "large_lcd_screen", "count": 1 }, + { "item": "e_scrap", "count": [ 10, 16 ] }, + { "item": "circuit", "count": [ 6, 10 ] }, + { "item": "power_supply", "count": [ 2, 4 ] }, + { "item": "amplifier", "count": [ 2, 4 ] }, + { "item": "plastic_chunk", "count": [ 10, 12 ] }, + { "item": "scrap", "count": [ 6, 8 ] } + ] + }, + "bash": { + "str_min": 16, + "str_max": 150, + "sound": "crunch!", + "sound_fail": "whack!", + "furn_set": "f_table", + "items": [ + { "item": "processor", "prob": 25 }, + { "item": "RAM", "count": [ 0, 2 ], "prob": 50 }, + { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }, + { "item": "large_lcd_screen", "prob": 25 }, + { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, + { "item": "circuit", "count": [ 0, 2 ], "prob": 50 }, + { "item": "power_supply", "prob": 25 }, + { "item": "amplifier", "prob": 25 }, + { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, + { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } + ] + } + }, + { + "type": "furniture", + "id": "f_console_table", + "name": "computer console", + "looks_like": "t_console", + "description": "This is a standalone computer terminal. It can be used to view contents and perform any allowed functions. It might even be possible to hack it, given the skills.", + "symbol": "6", + "color": "blue", + "move_cost_mod": -1, + "coverage": 50, + "required_str": -1, + "light_emitted": 10, + "flags": [ "TRANSPARENT", "CONSOLE", "NOITEM", "INDOORS", "SHORT", "PERMEABLE" ], + "deconstruct": { + "furn_set": "f_table", + "items": [ + { "item": "processor", "count": [ 1, 2 ] }, + { "item": "RAM", "count": [ 4, 8 ] }, + { "item": "cable", "charges": [ 4, 6 ] }, + { "item": "large_lcd_screen", "count": 1 }, + { "item": "e_scrap", "count": [ 10, 16 ] }, + { "item": "circuit", "count": [ 6, 10 ] }, + { "item": "power_supply", "count": [ 2, 4 ] }, + { "item": "amplifier", "count": [ 2, 4 ] }, + { "item": "plastic_chunk", "count": [ 10, 12 ] }, + { "item": "scrap", "count": [ 6, 8 ] } + ] + }, + "bash": { + "str_min": 8, + "str_max": 150, + "sound": "crunch!", + "sound_fail": "whack!", + "furn_set": "f_console_broken_table", + "items": [ + { "item": "processor", "prob": 25 }, + { "item": "RAM", "count": [ 0, 2 ], "prob": 50 }, + { "item": "cable", "charges": [ 1, 2 ], "prob": 50 }, + { "item": "large_lcd_screen", "prob": 25 }, + { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 }, + { "item": "circuit", "count": [ 0, 2 ], "prob": 50 }, + { "item": "power_supply", "prob": 25 }, + { "item": "amplifier", "prob": 25 }, + { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 }, + { "item": "scrap", "count": [ 2, 6 ], "prob": 50 } + ] + } + }, { "type": "furniture", "id": "f_forge", diff --git a/data/json/furniture_and_terrain/terrain-doors.json b/data/json/furniture_and_terrain/terrain-doors.json index e9e4ba096ef7..8ece90d1c309 100644 --- a/data/json/furniture_and_terrain/terrain-doors.json +++ b/data/json/furniture_and_terrain/terrain-doors.json @@ -2240,6 +2240,22 @@ ] } }, + { + "type": "terrain", + "id": "t_door_metal_interior_locked", + "copy-from": "t_door_metal_locked", + "looks_like": "t_door_metal_pickable", + "//": "Same as t_door_metal_pickable, but without OPENCLOSE_INSIDE. Due the inheritance issues cannot copy from the t_door_metal_pickable, delete doesn't work with flags", + "lockpick_result": "t_door_metal_c", + "oxytorch": { + "result": "t_mdoor_frame", + "duration": "14 seconds", + "byproducts": [ { "item": "steel_plate", "count": [ 0, 1 ] }, { "item": "steel_chunk", "count": [ 3, 8 ] } ] + }, + "symbol": "+", + "color": "cyan", + "flags": [ "NOITEM", "REDUCE_SCENT", "CONNECT_TO_WALL", "LOCKED", "BLOCK_WIND", "PICKABLE" ] + }, { "type": "terrain", "id": "t_door_metal_pickable", diff --git a/data/json/furniture_and_terrain/terrain-floors-outdoors.json b/data/json/furniture_and_terrain/terrain-floors-outdoors.json index 8fbb13646a7c..2e84938b5d32 100644 --- a/data/json/furniture_and_terrain/terrain-floors-outdoors.json +++ b/data/json/furniture_and_terrain/terrain-floors-outdoors.json @@ -414,5 +414,71 @@ "move_cost": 0, "roof": "t_rock_floor_no_roof", "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL" ] + }, + { + "type": "terrain", + "id": "t_elevator_no_roof", + "roof": "t_null", + "symbol": ".", + "color": "dark_gray", + "flags": [ "TRANSPARENT", "FLAT" ], + "copy-from": "t_elevator" + }, + { + "type": "terrain", + "id": "t_deck_coating_no_roof", + "name": "deck coating", + "description": "Thick metal coating of a hull, covered with a military grade epoxy mix. Used for runways, and can't be melted by jet engine nozzles.", + "symbol": ".", + "looks_like": "t_pavement", + "color": "dark_gray", + "connects_to": "METALFLOOR", + "move_cost": 2, + "flags": [ "FLAT", "ROAD", "TRANSPARENT" ], + "bash": { + "sound": "thump", + "ter_set": "t_null", + "str_min": 500, + "str_max": 1000, + "str_min_supported": 200, + "items": [ + { "item": "steel_lump", "count": [ 1, 4 ] }, + { "item": "steel_chunk", "count": [ 3, 12 ] }, + { "item": "scrap", "count": [ 9, 36 ] } + ] + } + }, + { + "type": "terrain", + "id": "t_deck_coating_no_roof_y", + "name": "yellow deck coating", + "description": "Thick metal covering of a hull, covered with a military grade epoxy mix, and painted in yellow color.", + "copy-from": "t_deck_coating_no_roof", + "looks_like": "t_pavement_y", + "flags": [ "FLAT", "ROAD", "TRANSPARENT" ], + "symbol": ".", + "color": "yellow" + }, + { + "type": "terrain", + "id": "t_deck_coating_no_roof_r", + "name": "red deck coating", + "description": "Thick metal covering of a hull, covered with a military grade epoxy mix, and painted in red color.", + "copy-from": "t_deck_coating_no_roof", + "looks_like": " ", + "flags": [ "FLAT", "ROAD", "TRANSPARENT" ], + "symbol": ".", + "color": "red" + }, + { + "type": "terrain", + "id": "t_deck_coating_no_roof_w", + "name": "white deck coating", + "description": "Thick metal covering of a hull, covered with a military grade epoxy mix, and painted in white color.", + "copy-from": "t_deck_coating_no_roof", + "looks_like": " ", + "flags": [ "FLAT", "ROAD", "TRANSPARENT" ], + "symbol": ".", + "color": "white" } ] diff --git a/data/json/furniture_and_terrain/terrain-mechanisms.json b/data/json/furniture_and_terrain/terrain-mechanisms.json index 083e95390372..528a9b645269 100644 --- a/data/json/furniture_and_terrain/terrain-mechanisms.json +++ b/data/json/furniture_and_terrain/terrain-mechanisms.json @@ -473,6 +473,15 @@ ] } }, + { + "copy-from": "t_elevator_control", + "type": "terrain", + "symbol": ".", + "color": "dark_gray", + "id": "t_elevator_control_no_roof", + "roof": "t_null", + "flags": [ "NOITEM" ] + }, { "type": "terrain", "id": "t_elevator_control_off", @@ -504,6 +513,15 @@ ] } }, + { + "copy-from": "t_elevator_control_off", + "type": "terrain", + "symbol": ".", + "color": "dark_gray", + "id": "t_elevator_control_off_no_roof", + "roof": "t_null", + "flags": [ "NOITEM" ] + }, { "type": "terrain", "id": "t_pedestal_wyrm", @@ -587,5 +605,16 @@ "move_cost": 0, "flags": [ "TRANSPARENT", "PERMEABLE" ], "examine_action": "fswitch" + }, + { + "id": "t_nuclear_reactor", + "type": "terrain", + "name": "nuclear reactor core", + "//": "just a copy of aftershock nuclear reactor", + "description": "Naval A1B reactor, used in Gerald R. Ford–class aircraft carriers, and can produce enough steam to generate 125 megawatts of energy.", + "symbol": "R", + "color": "light_green", + "move_cost": 0, + "flags": [ "TRANSPARENT", "CONTAINER", "REDUCE_SCENT", "PERMEABLE", "PLACE_ITEM" ] } ] diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 3313973d2f8c..276509ab45d1 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -109,6 +109,26 @@ } ] }, + { + "id": "clothing_military_distribution", + "type": "item_group", + "subtype": "distribution", + "//": "todo: when #57228 would be closed, change this one to copy-from `clothing_military`", + "items": [ + { "group": "clothing_soldier_shirt" }, + { "distribution": [ { "item": "jacket_army_modern", "prob": 50 }, { "item": "combat_shirt", "prob": 50 } ] }, + { "item": "pants_army" }, + { "item": "webbing_belt" }, + { "distribution": [ { "item": "socks", "prob": 95 }, { "item": "socks_wool", "prob": 5 } ] }, + { "item": "boots_combat" }, + { + "distribution": [ + { "collection": [ { "item": "sports_bra" }, { "item": "boy_shorts" } ] }, + { "distribution": [ { "item": "briefs" }, { "item": "boxer_briefs" }, { "item": "boxer_shorts" } ] } + ] + } + ] + }, { "id": "clothing_military_winter", "type": "item_group", @@ -212,6 +232,30 @@ { "item": "goggles_ir", "prob": 10 } ] }, + { + "id": "clothing_military_pilot_distribution", + "type": "item_group", + "subtype": "distribution", + "//": "todo: when #57228 would be closed, change this one to copy-from `clothing_military`", + "items": [ + { "item": "chestrig", "prob": 40 }, + { "item": "flight_helmet", "ammo-item": "light_plus_battery_cell", "charges": [ 0, 150 ] }, + { "item": "mil_flight_suit", "prob": 80 }, + { "item": "nomex_gloves" }, + { "item": "webbing_belt" }, + { "distribution": [ { "item": "socks", "prob": 30 }, { "item": "nomex_socks", "prob": 70 } ] }, + { "item": "gloves_tactical", "prob": 60 }, + { "item": "boots_combat" }, + { + "distribution": [ + { "collection": [ { "item": "sports_bra" }, { "item": "boy_shorts" } ] }, + { "distribution": [ { "item": "briefs" }, { "item": "boxer_briefs" }, { "item": "boxer_shorts" } ] } + ] + }, + { "group": "clothing_watch", "prob": 85 }, + { "item": "goggles_ir", "prob": 10, "charges": [ 0, 100 ] } + ] + }, { "id": "clothing_soldier_shirt", "type": "item_group", diff --git a/data/json/itemgroups/furniture.json b/data/json/itemgroups/furniture.json index 96170e211407..26103dc2fb53 100644 --- a/data/json/itemgroups/furniture.json +++ b/data/json/itemgroups/furniture.json @@ -68,5 +68,28 @@ { "item": "ceramic_shard", "prob": 65, "count-min": 2, "count-max": 5 }, { "item": "plastic_chunk", "prob": 100, "count-min": 2, "count-max": 5 } ] + }, + { + "type": "item_group", + "id": "entertainment_center_loot", + "//": "something you can find in entertainment center, except the tv", + "subtype": "distribution", + "entries": [ + { "group": "games", "prob": 40, "count-min": 0, "count-max": 3 }, + { "group": "magazines", "prob": 40, "count-min": 0, "count-max": 6 }, + { "group": "newspaper", "prob": 40, "count-min": 1, "count-max": 2 }, + { "group": "homebooks", "prob": 40, "count-min": 0, "count-max": 4 }, + { "group": "novels", "prob": 40, "count-min": 0, "count-max": 8 }, + { "group": "religious_books", "prob": 40, "count-min": 0, "count-max": 8 }, + { "item": "stereo", "prob": 30 }, + { "item": "portable_game", "prob": 30 }, + { "item": "battery_charger", "prob": 40 }, + { "item": "extension_cable", "prob": 30 }, + { "item": "microphone_xlr_generic", "prob": 20 }, + { "item": "cable_xlr", "prob": 40 }, + { "item": "cable_speaker", "prob": 20 }, + { "item": "headphones_circumaural", "prob": 10 }, + { "item": "cable_instrument", "prob": 5 } + ] } ] diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index 5c64688e0739..6d713018c29b 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -575,5 +575,87 @@ { "item": "robot_controls", "prob": 3 }, { "item": "solarpack", "prob": 1 } ] + }, + { + "id": "inactive_bots_milspec", + "type": "item_group", + "items": [ + [ "bot_EMP_hack", 100 ], + [ "bot_c4_hack", 25 ], + [ "bot_flashbang_hack", 50 ], + [ "bot_gasbomb_hack", 50 ], + [ "bot_grenade_hack", 50 ], + [ "bot_antimateriel", 5 ], + [ "bot_manhack", 100 ], + [ "bot_mininuke_hack", 2 ], + [ "bot_rifleturret", 10 ], + [ "bot_crows_m240", 10 ], + [ "bot_talon_m202a1", 10 ], + [ "bot_dispatch_military", 15 ], + [ "bot_turret_searchlight", 75 ] + ] + }, + { + "id": "maps_milspec", + "type": "item_group", + "items": [ [ "militarymap", 100 ], [ "satellitemap", 100 ] ] + }, + { + "id": "supplies_mechanics_milspec", + "type": "item_group", + "//": "same as supplies_mechanics, but mostly for heavy vehicle", + "items": [ + [ "v_airjack_item", 20 ], + [ "jumper_cable", 15 ], + [ "jumper_cable_heavy", 5 ], + [ "frame", 10 ], + [ "hd_tow_cable", 5 ], + [ "hdframe", 20 ], + [ "motor", 2 ], + [ "wheel", 10 ], + { "item": "polycarbonate_sheet", "prob": 4, "count": [ 1, 3 ] }, + { "item": "rubber_cement", "prob": 15, "count": [ 3, 9 ] }, + [ "vac_mold", 1 ], + [ "wheel_wide", 10 ], + [ "wheel_small", 10 ], + [ "wheel_wide_or", 5 ], + [ "tire_medium", 10 ], + [ "tire_wide", 5 ], + [ "tire_wide_or", 5 ], + [ "deflated_wheel", 10 ], + [ "deflated_wheel_wide_or", 5 ], + [ "wheel_rim_medium", 5 ], + [ "wheel_rim_wide", 5 ], + [ "1cyl_combustion", 1 ], + [ "v2_combustion", 2 ], + [ "i4_combustion", 2 ], + [ "v6_combustion", 10 ], + [ "v6_diesel", 10 ], + { "item": "aero_engine_light", "prob": 1 }, + [ "vehicle_controls", 3 ], + [ "horn_car", 1 ], + [ "horn_big", 1 ], + [ "v8_combustion", 7 ], + [ "v8_diesel", 7 ], + [ "v12_combustion", 5 ], + [ "v12_diesel", 5 ], + [ "small_turbine_engine", 7 ], + [ "medium_turbine_engine", 5 ], + [ "large_turbine_engine", 3 ], + [ "weldrig", 1 ], + [ "solar_cell", 1 ], + [ "bearing", 1 ], + [ "headlight_reinforced", 10 ], + [ "motor_large", 1 ], + [ "battery_car", 6 ], + [ "alternator_car", 6 ], + [ "alternator_truck", 6 ], + [ "hd_tow_cable", 1 ], + [ "generator_7500w", 3 ], + [ "storage_battery", 6 ], + [ "motor_oil", 100 ], + [ "solar_panel", 3 ], + [ "recharge_station", 8 ] + ] } ] diff --git a/data/json/mapgen/aircraft_carrier/aircraft_carrier_nested_maps.json b/data/json/mapgen/aircraft_carrier/aircraft_carrier_nested_maps.json new file mode 100644 index 000000000000..f482f1b4750a --- /dev/null +++ b/data/json/mapgen/aircraft_carrier/aircraft_carrier_nested_maps.json @@ -0,0 +1,20 @@ +[ + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "crates_supplies_mechanics", + "object": { "mapgensize": [ 1, 1 ], "rows": [ "Ж" ], "palettes": [ "aircraft_carrier_palette" ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "crates_armament_milspec", + "object": { "mapgensize": [ 1, 1 ], "rows": [ "ж" ], "palettes": [ "aircraft_carrier_palette" ] } + }, + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "crates_random_supply", + "object": { "mapgensize": [ 1, 1 ], "rows": [ "Ω" ], "palettes": [ "aircraft_carrier_palette" ] } + } +] diff --git a/data/json/mapgen/aircraft_carrier/aircraft_carrier_z-1.json b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z-1.json new file mode 100644 index 000000000000..84fd14314ff0 --- /dev/null +++ b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z-1.json @@ -0,0 +1,341 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ + [ "aircraft_carrier_1a_-1", "aircraft_carrier_1b_-1", "aircraft_carrier_1c_-1" ], + [ "aircraft_carrier_2a_-1", "aircraft_carrier_2b_-1", "aircraft_carrier_2c_-1" ], + [ "aircraft_carrier_3a_-1", "aircraft_carrier_3b_-1", "aircraft_carrier_3c_-1" ], + [ "aircraft_carrier_4a_-1", "aircraft_carrier_4b_-1", "aircraft_carrier_4c_-1" ], + [ "aircraft_carrier_5a_-1", "aircraft_carrier_5b_-1", "aircraft_carrier_5c_-1" ], + [ "aircraft_carrier_6a_-1", "aircraft_carrier_6b_-1", "aircraft_carrier_6c_-1" ], + [ "aircraft_carrier_7a_-1", "aircraft_carrier_7b_-1", "aircraft_carrier_7c_-1" ], + [ "aircraft_carrier_8a_-1", "aircraft_carrier_8b_-1", "aircraft_carrier_8c_-1" ], + [ "aircraft_carrier_9a_-1", "aircraft_carrier_9b_-1", "aircraft_carrier_9c_-1" ], + [ "aircraft_carrier_10a_-1", "aircraft_carrier_10b_-1", "aircraft_carrier_10c_-1" ], + [ "aircraft_carrier_11a_-1", "aircraft_carrier_11b_-1", "aircraft_carrier_11c_-1" ], + [ "aircraft_carrier_12a_-1", "aircraft_carrier_12b_-1", "aircraft_carrier_12c_-1" ], + [ "aircraft_carrier_13a_-1", "aircraft_carrier_13b_-1", "aircraft_carrier_13c_-1" ] + ], + "object": { + "fill_ter": "t_metal_floor", + "rows": [ + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~55555555555555555555555555555555555~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~55;δ;δδ;δδ;δδδδδ;;;;δδδ;δδ;δδδδδδδ;55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5δ;δδδ;;;;;;;;;;;;;;;;;;;;δ;;;δ;;δδδ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5δδδδδ;δδδ;δδδδδ;>>;δδ;δδ;δδδ;δ;δδ;δ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~555555+555555555555555555+55555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;;;5;5εεεεεεεεεεεεεεεε5;5GGGGGGGGG5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;5;5;;;;;;;;;;;;;;;;5;?;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;5;5;εεεεεεεεεεεεεε;5;5GGGGGGGGG5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;5+5;εεεεεεεεεεεεεε;5+55555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;5;5;;;;;;;;;;;;;;;;5;5;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;?;?;εεεεεεεεεεεεεε;?;5;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;5;5;εεεεεεεεεεεεεε;5;5;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;5;5;;;;;;;;;;;;;;;;5;?;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;5;5εεεεεεεεεεεεεεεM5;5;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;5+555555555555555555+5;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;5;5;;;;;;;;5&5&5&5&5;5;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;5;5;δδδδδδ;5+5+5+5+5;5;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;5;?;δδδδδδ;5;;;;;;;+;5;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;5;5;;;;;;;;5dffffD;5;5;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5я;я;5+555555555555555555+55555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~55я;я;5;5θθθθθθθθθθθθθθθθ5;5ЛЛЛЛЛЛЛЛЛ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~55я;;;+;5;;;;;;;;;;;;;;;;5;5;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555;5;θθθθθθ;θθθθθθθ;+;5;ЛЛЛЛЛЛЛ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;>;;;;;+;θθθθθθ;θθθθθθθ;5;?;ллллллл;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;>;;;;;5;;;;;;;;;;;;;;;;5;5;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;5θθθθθθθθθθθθθθθM5;5ллллллллл5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+555555555555555555+55555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5S5К;;+;5v;FFFFF;;;;;;;;M5;55555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5+5К;;5;5;;;;;;;;;t__tt;;+;555;;;;YYT5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;5;+;hh;hh;hhhhhhh_h5;+++;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5TTTYY5;5;CCCCCCCCCCCCCCC5;55555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+555555555555555555+55555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;__t;;;;;;;;;;;;;;;;;;;;;;t__;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yyyyyyyyyyyyyyyyy?yyyyyyyyyyyyyyyyyy5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ээээээээээyyyyyyy?yyyyyyyэээээээээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^^^^^^^yyyyy5555?5555yyyyy^^^^^^^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5эээээээyyyy55э~~y,y~~э55yyyyээээээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^^^^^yyy55э~э~~y,y~~э~э55yyy^^^^^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5эээээyyy5э~э~э~~?,?~~э~э~э5yyyээээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^^^yyy5~э~э~эyyy?yyyэ~э~э~5yyy^^^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5эээyyy5э~э~эyy555?555yyэ~э~э5yyyээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^yyy5~э~эyy55~~5,5~~55yyэ~э~5yyy^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ээyy5~~э~yy5~эю~5,5~юэ~5yy~э~~5yyэээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5юyyy5~~эyy5эю~~55,55~~юэ5yyэ~~5yyy^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~55yy5эээyy5~~~~55,,,55~~~~5yyэээ5yyээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~55yy5~~~y5эю~~55,,y,,55~~юэ5y~~~5yyю55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5эээy5~~~~55,,yyy,,55~~~~5yэээ5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~~y5~~~55,,yy/yy,,55~~~5y~~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5эю~55,,yy///yy,,55~юэ5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5~~55,,yy/////yy,,55~~5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5~~5,,yy///////yy,,5~~5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5~~5,yy/////////yy,5~~5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5~~5,,yy///////yy,,5~~5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5~~55,,yy/////yy,,55~~5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5эю~55,,yy///yy,,55~юэ5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~~y5~~~55,,yy/yy,,55~~~5y~~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5эээy5~~~~55,,yyy,,55~~~~5yэээ5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~55yy5~~~y5эю~~55,,y,,55~~юэ5y~~~5yyю55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~55yy5эээyy5~~~~55,,,55~~~~5yyэээ5yyээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5юyyy5~~эyy5эю~~55,55~~юэ5yyэ~~5yyy^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ээyy5~~э~yy5~эю~5,5~юэ~5yy~э~~5yyэээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^yyy5~э~эyy55~~5,5~~55yyэ~э~5yyy^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5эээyyy5э~э~эyy555?555yyэ~э~э5yyyээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^^^yyy5~э~э~эyyy?yyyэ~э~э~5yyy^^^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5эээээyyy5э~э~э~~?,?~~э~э~э5yyyээээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^^^^^yyy55э~э~~y,y~~э~э55yyy^^^^^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5эээээээyyyy55э~~y,y~~э55yyyyээээээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^^^^^^^yyyyy5555?5555yyyyy^^^^^^^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ээээээээээyyyyyyy?yyyyyyyэээээээээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yyyyyyyyyyyyyyyyy?yyyyyyyyyyyyyyyyyy5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;t__t;;;;;;;;;;;;;;;;;t__;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+55555555555555555+555555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5S5К;;5;5CCCCCCCCCCCCCCM5;5;δδδδδδδδδ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5+5К;;+;5hh;hh;hhhhhhh__5;5;δδδδδδδδδ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;5;5;;;;;;;;;;;;;;_5;+;;δδδδδδδδ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5TTTYY5;+;FFFFF;;t__tt_;+;5;δδδδδδδδδ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+55555555555555555+555555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;λλλλλλλλλλλλλλ;;;;;λλλλλλλλλλλλλ;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λλ^^^^^^^^^^^^λλ;;;λλ^^^^^^^^^^^λλ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λ^^^^^^^^^^^^^^λM;;λ^^^^^^^^^^^^^λ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λ^^^^^^^^^^^^^^λ;;;λ^^^^^^^^^^^^^λ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λэ^^^^^^^^^^^^^λ;;;λ^^^^^^^^^^^^эλ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λэ^^^^^^^^^^^^^λ;;;λ^^^^^^^^^^^^эλ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λ^^^^^^^^^^^^^^λ;;;λ^^^^^^^^^^^^^λ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λ^^^^^^^^^^^^^^λ;;;λ^^^^^^^^^^^^^λ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λλ^^^^^^^^^^^^λλ;;;λλ^^^^^^^^^^^λλ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;λλλλλλλλλλλλλλ;;;;;λλλλλλλλλλλλλ;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+55555555555555555+555555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeeee5;5}}}}}}}}}}}}}}}5;>5ппппппппп5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;5;5;;;;;;;;;;;;;;;5;>5;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeee;5;?;}}}}}};}}}}}};?;;5;пппппппп5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeee;5;5;}}}}}};}}}}}};5;;5;пппппппп5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;5;5;;;;;;;;;;;;;;;5;55;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeee;5+5}}}}}}}}}}}}}}}5+5;;пппппппп5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeee;?;55555555555555555;5;ппппппппп5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;5;5μμμμμμμμμμμμooo5;?;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeee;5;5;;;;;;;;;;;;;;;5;5;ппппппппп5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeee;5;?;eeeeee;eeeeee;?;5;ппппппппп5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;5;5;;;;;;;;;;;;;;;5;5;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeee;5;5oooeeeeeeeeeeee5;5;ппппппппп5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+55555555555555555+555555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;;;;5;5;δδδδδδδδδδδδδ;5;5&5&5&5&5&55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;ee;5;5;;;;;;;;;;;;;;;5;5+5+5+5+5+55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;ee;5;5;δδδδδδδδδδδδδ;5;+;;;;;;;;;55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;ee;5;5;δδδδδδδδδδδδδ;5;5;Rdfffffd55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;ee;5+5;;;;;;;;;;;;;;;5+555555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;ee;?;5;δδδδδδδδδδδδδ;5;5εεεεεεεεεε5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;ee;5;5;δδδδδδδδδδδδδ;5;5;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;ee;5+5;;;;;;;;;;;;;;;5+5;εεεεεεεεε5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;ee;5;5;δδδδδδδδδδδδδ;5;5;εεεεεεεεε5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;ee;5;?;δδδδδδδδδδδδδ;?;5;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;ee;5;5;;;;;;;;;;;;;;;5;5;εεεεεεεεε5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;ee;5;5;δδδδδδδδδδδδδ;5;?;εεεεεεεεε5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;ee;5;5;δδδδδδδδδδδδδ;5;5;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5e;;;;5;5;;;;;;;;;;;;;;;5;5εεεεεεεεεε5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+55555555555555555+555555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeeee5;5QQQQQQQQQQQQQQQ5;5qqqqqqqqqq5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;5;5;;;;;;;;;;;;;;;5;5;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeee;5;?;;;;;;;;;;;;;;;?;5;qqqqqqqqq5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeee;?;5QQQQQQQQQQQQQQQ5;5;qqqqqqqqq5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;5+55555555555555555+5;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;5;+FFFFFFFFt__tt;M5;?;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeee;5;5;;;;;;;;;;;;;;;5;5;qqqqqqqqq5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeee;5;5v;;;;;;;;;;;;;_5;5;qqqqqqqqq5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;5;5;hh;hh;h;hh;hhh+;5;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5eeeee5;5;CCCCCCCCCCCCCC5;5qqqqqqqqqq5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+55555555555555555+555555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;__t;;;;;;;;;;;;;;;;;;;;;;t__;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yyyyyyyyyyyyyyyyy?yyyyyyyyyyyyyyyyyy5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ээээээээээyyyyyyy?yyyyyyyэээээээээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^^^^^^^yyyyy5555?5555yyyyy^^^^^^^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5эээээээyyyy55э~~y,y~~э55yyyyээээээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^^^^^yyy55э~э~~y,y~~э~э55yyy^^^^^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5эээээyyy5э~э~э~~y,y~~э~э~э5yyyээээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^^^yyy5~э~э~эyyy?yyyэ~э~э~5yyy^^^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5эээyyy5э~э~эyy555?555yyэ~э~э5yyyээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^yyy5~э~эyy55~~5,5~~55yyэ~э~5yyy^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ээyy5~~э~yy5~эю~?,?~юэ~5yy~э~~5yyэээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5юyyy5~~эyy5эю~~55,55~~юэ5yyэ~~5yyy^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~55yy5эээyy5~~~~55,,,55~~~~5yyэээ5yyээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~55yy5~~~y5эю~~55,,y,,55~~юэ5y~~~5yyю55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5эээy5~~~~55,,yyy,,55~~~~5yэээ5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~~y5~~~55,,yy/yy,,55~~~5y~~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5эю~55,,yy///yy,,55~юэ5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5~~55,,yy/////yy,,55~~5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5~~5,,yy///////yy,,5~~5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5~~5,yy/////////yy,5~~5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5~~5,,yy///////yy,,5~~5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5~~55,,yy/////yy,,55~~5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~y5эю~55,,yy///yy,,55~юэ5y~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5~~~y5~~~55,,yy/yy,,55~~~5y~~~5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yy5эээy5~~~~55,,yyy,,55~~~~5yэээ5yy55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~55yy5~~~y5эю~~55,,y,,55~~юэ5y~~~5yyю55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~55yy5эээyy5~~~~55,,,55~~~~5yyэээ5yyээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5юyyy5~~эyy5эю~~55,55~~юэ5yyэ~~5yyy^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ээyy5~~э~yy5~эю~5,5~юэ~5yy~э~~5yyэээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^yyy5~э~эyy55~~5,5~~55yyэ~э~5yyy^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5эээyyy5э~э~эyy555?555yyэ~э~э5yyyээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^^^yyy5~э~э~эyyy?yyyэ~э~э~5yyy^^^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5эээээyyy5э~э~э~~?,?~~э~э~э5yyyээээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^^^^^yyy55э~э~~y,y~~э~э55yyy^^^^^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5эээээээyyyy55э~~y,y~~э55yyyyээээээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ю^^^^^^^yyyyy5555?5555yyyyy^^^^^^^^ю5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5ээээээээээyyyyyyy?yyyyyyyэээээээээээ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5yyyyyyyyyyyyyyyyy?yyyyyyyyyyyyyyyyyy5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;t__t;;;;;;;;;;;;;;;;;t__;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+55555555555555555+555555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5S5К;5;;5CCCCCCCCCCCCCCC5;;55555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5+5К;5;;5hhhh;hhhhh;hhh;5;;+++;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;+;;5;;;;;;;;t__tt__+;;555;;;;YYT5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;5>;+;;;;;;;;;;;;;;;5;>55555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5TTYY5>;5v;FFFFF;;FFFF;M5;>55555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+55555555555555555+555555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;tλλλλλλλλλλλλλλt;;;tλλλλλλλλλλλλλt;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λλ^^^^^^^^^^^^λλ;;;λλ^^^^^^^^^^^λλ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λ^^^^^^^^^^^^^^λM;;λ^^^^^^^^^^^^^λ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λ^^^^^^^^^^^^^^λ;;;λ^^^^^^^^^^^^^λ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λэ^^^^^^^^^^^^^λ;;;λ^^^^^^^^^^^^эλ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λэ^^^^^^^^^^^^^λ;;;λ^^^^^^^^^^^^эλ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λ^^^^^^^^^^^^^^λ;;;λ^^^^^^^^^^^^^λ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λ^^^^^^^^^^^^^^λ;;;λ^^^^^^^^^^^^^λ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;λλ^^^^^^^^^^^^λλ;;;λλ^^^^^^^^^^^λλ;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;gλλλλλλλλλλλλλλg;;;gλλλλλλλλλλλλλg;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+55555555555555555+555555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5P;;;;5;5яяяяяяяяяяяяяяя5;5pppppppppp5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5P;PP;5;5;;;;;;;;;;;;;;;5;5;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5P;PP;5;5;яяяяяяяяяяяяя;5;5;pppppppp;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5P;PP;5;5;яяяяяяяяяяяяя;5;?;pppppppp;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5P;PP;5+5;;;;;;;;;;;;;;;5+5;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5P;PP;5;5;;;;;;;;;;;;;;;5;5;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5P;PP;?;5;яяяяяяяяяяяяя;?;5;pppppppp;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5P;PP;5;?;яяяяяяяяяяяяя;5;5;pppppppp;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5P;PM;5;5;;;;;;;;;;;;;;;5;5;;;;;;;;;;5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5P;;;;5;5Mяяяяяяяяяяяяяя5;5Mppppppppp5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+55555555555555555+555555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5}}}}}5;5ЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯ5;;5;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;5;5;;;;;;;;;;;;;;;55;?;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5}}}};?;?;ЯЯЯЯЯЯ;ЯЯЯЯЯЯ;;?;5;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;;5;5;;;;;;;;;;;;;;;;5;5;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5}}}}}5;5MЯЯЯЯЯЯЯЯЯЯЯЯЯЯЯ5;5;ζζζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+555555555555555555+55555555555~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;>;;;5;5θθθθθθθθθθθθθθθθ5;;;5;ζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;>;;;?;5;;;;;;;;;;;;;;;;5;;;5;ζζζζζζ5~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5;;;;M5;5;θθθθθθθθθθθθθθ;?;;;?;ζζζζζ55~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555;?;θθθθθθθθθθθθθθ;5>;;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5444444;5;;;;;;;;;;;;;;;;5>;;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5444444;5;θθθθθθθθθθθθθθ;555+55555555~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5444444;5;;;;;;;;;;;;;;;;;M5;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5444444;5;θθθθθθθθθθθθθθθ;;5;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5444444;5;θθθθθθθθθθθθθθθ;;?;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5444444;5;;;;;;;;;;;;;;;;;;5;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~54444α4;5;θθθθθθθθθθθθθθθθ;5;?;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5555555+55555555555555555555+55555555~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5εεεεε5;5яяяяяяяяяяяяяяяяяя5;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5εεεεε5;5;;;;;;;;;;;;;;;;;;5;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5εεεε;?;5;яяяяяяяяяяяяяяяя;5;?;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5εεεεε5;5;яяяяяяяяяяяяяяяя;5;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5εεεεε5;+;;;;;;;;;;;;;;;;;;5;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5εεεεε5+5;яяяяяяяяяяяяяяяя;5+55555555~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5εεεεε5;5;;;;;;;;;;;;;;;;;;5;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~5εεεεε5;5;яяяяяяяяяяяяяяяя;?;?;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~55εεεε5;5;яяяяяяяяяяяяяяяя;5;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5εεεε5;5;;;;;;;;;;;;;;;;;;5;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5εεεε5;5Mяяяяяяяяяяяяяяяяя5;5;ζζζζζ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5εεεε5+55555555555555555555+55555555~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5εεεε5;5Mμμμμμμμμμμμμμooo5;;5;δδδδδ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5εεε;?;5;;;;;;;;;;;;;;;;;5;;5;δδδδδ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5εεεε5;?;μμμμμμμ;eeeeeee;?;;?;δδδδδ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5εεεε5;5;;;;;;;;;;;;;;;;;5;>5;δδδδδ5~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5εεεε5;5oooeeeeeeeeeeeeee5;>5;δδδδ55~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~555555+5555555555555555555+55555555~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5P;P5;;5Mяяяяяяяяяяяяяяяя5;5яяяяяя5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5P;P5;;5;;;;;;;;;;;;;;;;;5;?;;;;;;5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5P;P5;;5;яяяяяяяяяяяяяяя;5;5;яяяяя5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5P;P55;5;яяяяяяяяяяяяяяя;?;55555555~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~5P;;P5;5;;;;;;;;;;;;;;;;;5;5;εεεεε5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~55P;P5;5;яяяяяяяяяяяяяяя;5;5;εεεεε5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;?;яяяяяяяяяяяяяяя;5;?;εεεεε5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;;?;5;;;;;;;;;;;;;;;;;5;5;εεεεε5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;5яяяяяяяяяяяяяяяяя5;5;εεεεε5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5+5555555555555555555+55555555~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;5;;;;;;;;;;;;;;;;;+;5;εεεεε5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;5555555555?55555555;5;εεεεε5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;5εεεεεεεεε;εεεεεεε5;?;εεεεε5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;5εεεεεεεεεεεεεεεεε5;5;εεεεε5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;5εεεεεεεεεεεεεεεεε5;5;εεεεε5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5+5555555555555555555+55555555~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;5θθθθθθθθθθθθθθθθ5;;5ЛЛЛЛЛЛ5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;?;;;;;;;;;;;;;;;;5;;5;;;;;;5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;5;θθθθθθθθθθθθθθ;?;;?;ЛЛЛЛЛ5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;5;θθθθθθθθθθθθθθ;5;55;ллллл5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;5;;;;;;;;;;;;;;;;5;5;;;;;;;5~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;5M;θθθθθθθθθθθθθ;5;5лллллл55~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5+55;;;;;;;;;;;;;;;5+55555555~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;;5;θθθθθθθθθθθθθ;5;+;;;;;;5~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;;?;θθθθθθθθθθθθθ;?;5;;;;;;5~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;;5;;;;;;;;;;;;;;;5;5T;;>;55~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~5P;P5;;5θθθθθθθθθθθθθθθ5;5M;;>;5~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~555555+55555555555555555+5555555~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5;;;5;5ЛЛЛЛЛЛЛЛЛЛЛЛЛЛЛ5;5M;;}5~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5>>;+;5;;;;;;;;;;;;;;;5;?;;}55~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~55555;5;ЛЛЛЛЛЛЛ;ЛЛЛЛЛ;?;5};}5~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5;?;ллллллл;ллллл;5;5};}5~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5;5;;;;;;;;;;;;;;;5;5};}5~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5;5ллллллллллллллл5;5};}5~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~55555+55555555555555555+55555~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5;5M}}}}}}}}}}}}}}5;5~~~5~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~+;?;;;;;;;;;;;;;;;5;5~~~5~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5;5;;;;;;;;;;;;;;;?;5~~~5~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5;5}}}}}}}}}}}}}}}5;5~~~5~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~55555+55555555555555555+55555~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5;5oooμμμμμμμμμμμ5;;+~~~5~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5;?;;;;;;;;;;;;;;?;;5~~~5~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5;5;;μμμμμμμμμμμ;5;;5~~~5~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5+55;μμμμμμμμμμμ;5+55~~~5~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5;;5;;;;;;;;;;;;;5;5~~~~5~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5;;5;eeeeeeeeeee;5;555555~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5;;5;eeeeeeeeeee;5;5~~55~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~5~~~5;;5;;;;;;;;;;;;;5;5~~5~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~555555+555555555555555+5~~5~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~55~~~5;5oooeeeeeeeeee5;5~~5~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~5~~~5;?;;;;;;;;;;;;;5;+~~5~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~5~~~+;5;eeeeeeeeeee;5;5~~5~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~5~~~5;5;eeeeeeeeeee;5;5~~5~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~5~~~5;5;;;;;;;;;;;;;?;5~~5~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~5~~~5;5;eeeeeeeeeee;5;5~~5~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~55^^5;5;eeeeeeeeeee;5;5^55~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~5^^5+5;;;;;;;;;;;;;5+5^5~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~5555;5eeeeeeeeeeeee5;5^5~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~5^^^^555555555555555;555~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~55^^^5^^^^^^^^^^^^^+;^55~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~~555^5^^^^^^^^^^^^^5555~~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~~~~555^^^^^^^^^^^^^5~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~~~~~~5^^^^^^^^^^^^55~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~~~~~~555^^^^^^^^555~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~", + "~~~~~~~~~~~~~~~~~~~~~~~~~~~~5555555555~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" + ], + "palettes": [ "aircraft_carrier_palette" ], + "gaspumps": { }, + "signs": { } + } + } +] diff --git a/data/json/mapgen/aircraft_carrier/aircraft_carrier_z0.json b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z0.json new file mode 100644 index 000000000000..0d5e2127b19b --- /dev/null +++ b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z0.json @@ -0,0 +1,349 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ + [ "aircraft_carrier_1a", "aircraft_carrier_1b", "aircraft_carrier_1c" ], + [ "aircraft_carrier_2a", "aircraft_carrier_2b", "aircraft_carrier_2c" ], + [ "aircraft_carrier_3a", "aircraft_carrier_3b", "aircraft_carrier_3c" ], + [ "aircraft_carrier_4a", "aircraft_carrier_4b", "aircraft_carrier_4c" ], + [ "aircraft_carrier_5a", "aircraft_carrier_5b", "aircraft_carrier_5c" ], + [ "aircraft_carrier_6a", "aircraft_carrier_6b", "aircraft_carrier_6c" ], + [ "aircraft_carrier_7a", "aircraft_carrier_7b", "aircraft_carrier_7c" ], + [ "aircraft_carrier_8a", "aircraft_carrier_8b", "aircraft_carrier_8c" ], + [ "aircraft_carrier_9a", "aircraft_carrier_9b", "aircraft_carrier_9c" ], + [ "aircraft_carrier_10a", "aircraft_carrier_10b", "aircraft_carrier_10c" ], + [ "aircraft_carrier_11a", "aircraft_carrier_11b", "aircraft_carrier_11c" ], + [ "aircraft_carrier_12a", "aircraft_carrier_12b", "aircraft_carrier_12c" ], + [ "aircraft_carrier_13a", "aircraft_carrier_13b", "aircraft_carrier_13c" ] + ], + "object": { + "fill_ter": "t_metal_floor", + "rows": [ + " ", + " ", + " ", + " 55555555555555555555555555555555555 ", + " 55;δ;δδ;δδ;δδδδδ;;;;δδδ;δδ;δδδδδδδ;55 ", + " 5δ;δδδ;;;;;;;;;;;>>;;;;;;;δ;;;δ;;δδδ5 ", + " 5δδδδδ;δδδ;δδδδδ;<<;δδ;δδ;δδδ;δ;δδ;δ5 ", + " 555555+555555555555555555+55555555555 ", + " 5CCFF5;5BLBBLBBLBBLBBLBL5;5LBBLBBLBL5 ", + " 5Ch;;+;+;;;;;;;;;;;;;;;;+;+;;;;;;;;;5 ", + " 5))h;5;5BLBBLBBLBBLBBLBL5;5LBBLBBLBL5 ", + " 555555+555555555555555555+55555555555 ", + " 5BBLB5;5BLBBLBBLBBLBBLBM5;5hцЦ;;;sss5 ", + " 5;;;;5;5;;;;;;;;;;;;;;;;5;5;hh;x;[[s5 ", + " 5BBL;+;+;;BLBBLBBLBBLB;;+;+;;;;x;[[s5 ", + " 5;;;;5;5;;;;;;;;;;;;;;;;5;5;;;;x;[[s5 ", + " 5BBLL5;5MBLBBLBBLBBLBBLB5;5DRR;;;sss5 ", + " 555555+555555555555555555+55555555555 ", + " 5&+;d5;5B;BB;BB;;BB;BB;B5;5;=;%;%;%;5 ", + " 555;f5;5L;LL;LL;;LL;LL;L5;5;;;;;;;;;5 ", + " 5&+;f5;5B;BB;BB;;BB;BB;B5;+;;;;;;;;;5 ", + " 555;f5;+;;;;;;;;;;;;;;;;+;5=;$;$;!;!5 ", + " 5&+;D5+555555555555555555+55555555555 ", + " 555;;5;5MBLBBLBBLBBLBBLB5;5vFFFFF;;)5 ", + " 5&+;;+;5;;;;;;;;;;;;;;;;5;5;;;;;;;hC5 ", + " 5555555;5;BLBBLB;;BLBBLB;+;5;;;;;;;;)5 ", + " 5><;;;5;5;;;;;;;;;;;;;;;;5;5h)h;Ch;h;5 ", + " 5;;;;;+;5BLBBLBBLBBLBBLBM5;5;h;;);)C)5 ", + " 5555555+555555555555555555+55555555555 ", + " 5::^:;+;5S5S5S5S5S5S5S5S55;5&5&5&5&5&5 ", + " 5:::;;5;5+5+5+5+5+5+5+5+55;5+5+5+5+5+5 ", + " 5::^^:5;+;;;;;;;;;;;;;;;;+;+;;;;;;;;;5 ", + " 5:^::^5;5D;;;;ddddddd;;;D5;5D;fffffdd5 ", + " 5555555+555555555555555555+55555555555 ", + " 5GGGGG5;5;BLBBLBBLBBLBBLB5;5BLBBLBBLB5 ", + " 5G;;;;?;+;;;;;;;;;;;;;;;;5;5;;;;;;;;;5 ", + " 5G;εε;5;5;BLBBLB;;BLBBLB;+;55;BLBBLB;5 ", + " 5P;εε;5;5;BLBBLB;;BLBBLB;5;;+;BLBBLB;5 ", + " 5P;;;л5;5;;;;;;;;;;;;;;;;5;;5;;;;;;;;5 ", + " 55PPPлл5;5BLBBLBBLBBLBBLB;5M;5BLBBLBBL5 ", + " 55555555;5555555555555555555+5555555555 ", + " 5&5&5&5M;+;;;;;;;;;;;;;;+;;5;5;;;;;;;M5 ", + " 55+5+5+55;5;λλλλλλλλλλλλ;5C;5;+;BB;BB;B5 ", + " 555;;;;;;+;5λλ^^^^^^^^^^λλ5g;+;5;LL;LL;B5 ", + " 5&+;fff;f5;5^^^^^^^^^^^^^^5gT5;5;BB;BB;L5 ", + " 5555555+55+5^^^^^^^^^^^^^э5555+5555555555 ", + " 5;;;;;;;T5;5^^^^^^^^^^^^^э5gT5;+;;;;;;;;5 ", + " 5^^^^;;;T5;5^^^^^^^^^^^^^^5g;5;5_t::^::^5 ", + " 5^^^^^;;;5;5λλ^^^^^^^^^^λλ5C;+;5^^^:^::^5 ", + " 5^^^^^^;;+;+;λλλλλλλλλλλλ;+;;5;5^^^::^^^5 ", + " 55^^^^^^^;5;5;;;;;;;;;;;;;;5TT5;5^^^::::^5 ", + " 555^^^^^^^^5+5555555555555555555+5555555555 ", + " 555#555^^^^^^5;5BLBBLBBLBBLBBLB5T;;+;;;;;;;M5 ", + " 5###5Q5;^^^^^5;5;;;;;;;;;;;;;;;+;;;5;BB;BB;B5 ", + " 55###+;+;;^^^^5;+;BLBBL;;BLBBLB;5;;;5;LL;LL;L5 ", + " 55####5q5;;;;;;+;5;BLBBL;;BLBBLB;5;;;5;BB;BB;B5 ", + " 555+555555555555+5;;;;;;;;;;;;;;;5+5555555555555 ", + " 5#5;____5;;;;;;5;5BLBBLBBLBBLBBLB5;5______:_::;5 ", + " 55#5;____5^^^^;^5;55555555555555555;5_____:_:_::5 ", + " 5##5;__t_5^^^^;^5;5;;;;;;;;;;;;;;;5;5tt__:::::555555555 ", + " 55##5;;;;_5^^^^;^5;+;λλλλλλλλλλλλλ;+;+;;__:::::54(44444444444444444", + " 5###5555+55;;;;;;+;5λλ^^^^^^^^^^^λλ5;5gg___:_:_54444444444444444444", + " 5;;;+;;;;;+;;;;;;5;5^^^^^^^^^^^^^^^5;5_:::___::54444444444444444444", + " 55555+55+555555555+5^^^^^^^^^^^^^^^5;555555555554444444444444444444", + " 55#5Q;;5F;F5BLBBLB5;5^^^^^^^^^^^^^^э5;5_________54444444444444444444", + " 5##5q;;5;;;5;;;;;;5;5^^^^^^^^^^^^^^э5;5tt;QQQ___54444444444444444444", + " 55##5_;;5M;;5BBLBB;+;5^^^^^^^^^^^^^^^5;+;;;;;;___54444444444444444444", + " 55###5gt;5M;h5BBLBB;5;5λλ^^^^^^^^^^^λλ5;5;;_______54444444444444444444", + " 5####5_;;5;;)5;;;;;;5;+;λλλλλλλλλλλλλ;+;5;;;;;;___54444444444444444444", + " 5;;;;+;;;5;hC5BLBBLB5;5;;;;;;;;;;;;;;;5;5gggggg___54444444444444444444", + " 55555555+555555555555+55555555555555555+555555555554444444444444444444", + " 55#5t_5FF;vFFF5^^^^:5;;5BLBBLBBLBBLBBLB5;<5&5&5&5&554444444444444444444", + " 5##5;_5;;;;;;;5^::::5;;5;;;;;;;;;;;;;;;5;<5+5+5+5+554444444444444444444", + " 5##5+55;;;;;;;+;;;;;+;;+;BLBBL;;BLBBLB;+;;+;;;;;;;;54444444444444444444", + "55##5;;+;h;;h);5^::::5;;5;;;;;;;;;;;;;;;5;;5D;;;;;;;54444444444444444444", + "5;;;+;T5)C))C)F5^^^^:5Q;5BLBBLBBLBBLBBLB5;T5Dffffddd54444444444444444444", + "5555555555+555555555555+55555555555555555+555555555554444444444444444444", + "5FFF5T5;;;;;;;;;;;;;;;5;5L;BB;BB;BB;BB;B5;5S5S5S5S5S54444444444444444444", + "5);;+;+;^^;::::^:::^;;+;5B;LL;LL;LL;LL;L5;5+5+5+5+5+54444444444444444444", + "5Ch;5;5:::;::^^^;:::;:5;5B;BB;BB;BB;BB;B5;+;;;;;;;;;55555555555555555555", + "5))F5T5;;;;;;;;;;;;;;;5;+;;;;;;;;;;;;;;;+;5D;ddddd;;5T;;;5;OOэ;t::;5;;;-", + "555555555+5555555555555+55555555555555555+55555555555OOэ;+;O^w;:::;5;;;-", + "5ййййййй5;=;=;=;=;=;=;5;5BLBBLBBLBBLBBLB5;5v;MFFFFFF5O^w;5;;;;;;;;;5;;;-", + "5Ййййййй5;;;;;;;;;;;;;+;+;;;;;;;;;;;;;;;5;+;;;;;;;;;+;;;;5;OOэ;t::;5;;;-", + "5ййййййй+;!;!;!;!;!;!;5;5;BLBBL;;BLBBLB;+;5;;;;)C;h)5OOэ;5;O^w;:::;5;;;-", + "5Ййййййй5;;;;;;;;;;;;;5;5;BLBBL;;BLBBLB;5;5;;;;;h;;h5O^w;5;;;;;;;;;+;;;-", + "5ййййййй5;%;%;%;%;%;%;5;5;;;;;;;;;;;;;;;5;5h;));;;;;5OOэ;5;OOэ;t::;5;;;-", + "5Ййййййй5;;;;;;;;;;;;;5;5BLBBLBBLBBLBBLB5;5C)Ch;FFFF5O^w;5;O^w;:::;5;;;-", + "5ййййййй5555;КК;КК;КК;5+55555555555555555+5555555555555555+555555555;;;-", + "5Ййййййй5>;5;;;;;;;;;;5;5BLBBLBBLBBLBBLB5;5;;;;;;;;;;;;;;5;;;T5;qQT5;;;-", + "5ййййййй5>;5;;$;$;$;$;5;5;;;;;;;;;;;;;;;5;+;::::::::;;__;+;;;;+;;;;+;;;-", + "5Ййййййй5;;5;;;;;;;;;;5;+;BLBBL;;BLBBLB;+;5;C::::::::;;g;5:tt:5:__t5;;;-", + "5ййййййй5;;5+5555555555;5;;;;;;;;;;;;;;;5+5;::::::::::;;;5::::5::::5>;;-", + "5ййййййй+;;+;;;;;;;;;;+;5BLBBLBBLBBLBBLB5;5;;;;;;;;;;;;;;5::::5::::5>;;-", + "5555+5555555+5555+55555+55555555555555555;555555555555+55555555555555+55", + "5^^^;T5XX;;;;;Q5T;ээюЭ5;5BLBBLBBLBBLBBLB5;<55&5&5&5&5F;FFC)F)C)F;;D5;;^5", + "5^^^;;5XX;qq;;Q5;;эююЭ5;5;;;;;;;;;;;;;;;5;<55+5+5+5+5F;;;h);)h);;))5;^^5", + "5^^^;;5XX;qq;;;+;;;;;;+;+;BLBBL;;BLBBLB;+;;5;;;;;;;;5v;;;;;;;;;;;hC5;_:5", + "5^^^;;5;;;qq;;Q5;ээ;;;5;5;;;;;;;;;;;;;;;5;;+;;;;;;;;+;;;;;;;;;;;;;)5;tg5", + "5^^^;;5;;;qq;;Q5;;э;юэ5;5BLBBLBBLBBLBBLB5;M5DDffffdd5;;;;;;;;;;;;;F5;;;5", + "5^^^;;5q;;qq;;Q5;ээ;Ээ5+55555555555555555+55555555555)h))h))h))h);;5;;;5", + "5^^^;T5q;;qq;;Q5;ээ;ээ5;5ssss;BB;BB;BB;B5;5Ddddfffff5)C))C))C))C);;+;;;5", + "5^^^;;5q;;qq;;Q5;юю;;;+;5s[[h;BB;BB;BB;B5;+;;;;;;;;;55555555555555555555", + "5^^^;;5q;;qq;;Q5;эЭ^;;5;5s[[h;LL;LL;LL;L5;5+5+5+5+5+54(44444444444444444", + "5^^^;;5q;;qq;;;+;эЭ^^;5;5s[[h;BB;BB;BB;;5;5&5&5&5&5&54444444444444444444", + "5^^^;;5;;;qq;;Q5;юЭ^^^5;+;;;;;BB;BB;BB;;+;555555555554444444444444444444", + "5;;;;;+;;;;;;;Q5^юЭ^^^5;5;;;;;LL;LL;LL;L5;+^^^^^^^^^54444444444444444444", + "5555+55555+555555555555+5;;;;;;;;;;;;;;B5+555555555554444444444444444444", + "-;;;;5;;TT;;5S5S5S5S5S5;5;;;;;;;;;;;;;;B5;5S5S5S5S5S54444444444444444444", + "-;;;;5;;;;;;5+5+5+5+5+5;5L;LL;LL;LL;LL;L5;5+5+5+5+5+54444444444444444444", + "-;;;;5;^^^;;+;;;;;;;;;+;5B;BB;BB;BB;BB;B5;+;;;;;;;;;54444444444444444444", + "-;;;;+;^^^;;5D;ddd;dd;5;5B;BB;BB;BB;BB;B5;5D;ddddd;;54444444444444444444", + "-;;;;5;^^^;;55555555555+55555555555555555+555555555554444444444444444444", + "-;;;>5;^^^;;+;;;;;;;;T5;5B;5B;5B;5B;5B;C5;5v;FFFFFFF54444444444444444444", + "-;;;>5;^^^;;5NNNNNgt;;+;5L;5L;5L;5L;5L;h5;5;;;;;;;;;54444444444444444444", + "555555;^^^;;5555NNNNNN5+5L;5L;5L;5L;5L;F5+5;;h;;{h;;54444444444444444444", + "5Dbbb5;^^^;;;5>5oooooo5;55+55+55+55+55+55;5;){;h{{;h54444444444444444444", + "5b;;;+;^^^;;;5>5oooooo5;+;;;;;;;;;;;;;;;+;5;{{;h{;;)54444444444444444444", + "5;;;;5;^^^;;;5;+;;;;;;+;55+55+55+55+55+55;5;h;;;hh;h54444444444444444444", + "5b;;f5;^^^;;;+;5+555555;5L;5L;5L;5L;5L;F5;+;;;;;;;;;54444444444444444444", + "5AAAA5;^^^;;;5;5;;;;;;+;5L;5L;5L;5L;5L;h5;5Ch;h{;;h)54444444444444444444", + "555555;^^^;;;5;5;hhhh;5;5Λ;5Λ;5Λ;5Λ;5Λ;C5;5{;;C);;C)54444444444444444444", + "5####5;^^^;;;555;hhhh;5+55555555555555555+555555555555555555555555555555", + "5####5;^^^;;;;;+;hhhh;5;5Λ;5B;BB;BB;B5;Λ5;5Ch;hC;Ch;hC5Ch;hC5Ch;hCCh;hC5", + "5####5;^^^;^^^;5;hhhh;+;5L;5B;BB;BB;B5;L5;5Ch;hC;Ch;hC5Ch;hC5Ch;hCCh;hC5", + "5####5;^^^;^^^;5;hhhh;5;5L;5L;LL;LL;L5;L5;5Ch;hC;Ch;hC5Ch;hC5Ch;hCCh;hC5", + "5##;;5;^^^;^^^;5;hhhh;5;55+5;;;;;;;;;5+55;5Ch;;;;;;;hC5Ch;hC5Ch;;;;;;hC5", + "5555+5;^^^;^^^;5;hhhh;+;+;;+;;LL;LL;;+;;+;555555555+55555+555555555+5555", + "5::_;5;^^^;^^^;+;hhhh;5+55+5;;BB;BB;;5+55+5;;ssssss;;ssss;;;+;sssss;sss5", + "5::_;5;^^^;^^^;5;hhhh;5;5C;5;;BB;BB;M5;h5;+;;[[[[[[;;[[[[;;s5;[[[[[;[[[5", + "5^:g;5;^^^;^^^;5;;;;;;5;5h;5L;LL;LL;L5;C5;5D;hhhhhh;;hhhh;;s5;hhh;h;hhh5", + "5^:t;5;;;;;^^^;5;;;;)h5;5L;5B;BB;BB;B5;L5;5;;;;;;;;;;;;;;;;s5;;;;;;;;;;5", + "5;;;;+;;;;;^^^;5;;xx)C5;5Λ;5B;BB;BB;B5;Λ5;5RRRRRRRRRRRRRRR;s5RRRRRRRRRR5", + "555555555;;^^^;55555555+55555555555555555+5555555555555555+5555555555555", + "5sssssss5;;^^^;T5S5S5S5;5B;5B;BB;BB;B5;B5;5;BB;BB;BB;BB5t;;5&5&5&5&5&5&5", + "5s[[[[[s5;;^^^;;5+5+5+5;5L;5B;BB;BB;B5;L5;5;LL;LL;LL;LL5M;;5+5+5+5+5+5+5", + "5s[[[[[s5;;^^^;;+;;;;;+;55+5L;LL;LL;L5+55;+;BB;BB;BB;BB5;;;+;;;;;;;;;;;5", + "5s;;;;;s5;;^^^;;5DdddD5;+;;+;;;;;;;;;+;;+;5;;;;;;;;;;;;5>>;5DddffffddDD5", + "5s;;;;;s5;;^^^;Q5555555+55+5B;BB;BB;B5+55+5555555555555555+5555555555555", + "5h;;;;hC5;;^^^;;5DdddD5;5C;5B;BB;BB;B5;C5;5;;;;;;;;;;;;;;+;5DddffffddDD5", + "5h;;;;;;+;;^^^;;+;;;;;+;5h;5L;LL;LL;L5;h5;+;BB;BB;BB;BB;B5;+;;;;;;;;;;;5", + "5h;xxx;D5;;^^^;;5+5+5+5;5L;5B;BB;BB;B5;L5;5;LL;LL;LL;LL;L5;5+5+5+5+5+5+5", + "5;;;;;hC5;;^^^;T5S5S5S5;5Λ;5B;BB;BB;B5;Λ5;5;BB;BB;BB;BB;B5;5&5&5&5&5&5&5", + "5;;;;;hC5;;^^^;55555555+55555555555555555+5555555555555555+5555555555555", + "5RRRR;hC5;;^^^;5F;;;hC5;5;BLBBLBBLB5C)C)5;5BLBBLBBLBBLBBL5;5;BLBBLBBLBL5", + "555555555T;^^^;5F;;)))5;5;;;;;;;;;;5h)h)5;5;;;;;;;;;;;;;;5;5;;;;;;;;;;;5", + "5&5&5&5&5;;;;;;5;;;;hC5;+;BLBBLBBLB5;;;;+;+;BLBBLB;BLBBL;+;5;LBBLB;BLBB5", + "5+5+5+5+5555+5555+55555;5;BLBBLBBLB5;;)C5;5;BLBBLB;BLBBL;5;+;LBBLB;BLBB5", + "5;;;;;;;;+;;;;>>;;;;M;;;5;;;;;;;;;;5;;;h5;5;;;;;;;;;;;;;;5;5;;;;;;;;;;;5", + "5ddffffDD5;;;;;;;;;;;;;;5;BLBBLBBLB5;vFF5;5BLBBLBBLBBLBBL5;5;BLBBLBBLBL5", + "55555555555+55555555555+555555555555+5555+5555555555555555+5555555555555", + "5B;BB;BB;BB;BB;BB;BB;B5;+;;;;;;;;;;;;;;;+;5;BB;BB;BB;BB;B5;5S5S5S5S5S5S5", + "5L;LL;LL;LL;LL;LL;LL;L5;5+55+55+55+555+55;5;LL;LL;LL;LL;L5;5+5+5+5+5+5+5", + "5B;BB;BB;BB;BB;BB;BB;B+;5;Λ5;Λ5;Λ5;Λ5Λ;Λ5;5;BB;BB;BB;BB;B5;+;;;;;;;;;;;5", + "5;;;;;;;;;;;;;;;;;;;;;5;5;L5;L5;L5;L5L;L5;+;;;;;;;;;;;;;;+;5D;dddddddd;5", + "5555555555+555555555555+5hC5hC5hC5hC5{hC5+5555555555555555+5555555555555", + "5;BB;BB;BB;B5B;BB;BB;B5;55555555555555555;5;BB;BB;BB;BB;B5;5D;dddddddd;5", + "5;BB;BB;BB;B5B;BB;BB;B5;+;;Λ5))C5))C5))C5;5;LL;LL;LL;LL;L5;+;;;;;;;;;;;5", + "5;LL;LL;LL;L5L;LL;LL;L5;5;;L5{hC5{hC5{hC5;+;BB;BB;BB;BB;B5;5+5+5+5+5+5+5", + "5;BB;BB;BB;B5B;BB;BB;B5;5RhC5F;M5F;M5F;M5;5;;;;;;;;;;;;;;+;5S5S5S5S5S5S5", + "5;BB;BB;BB;B5B;BB;BB;B5+555555+555+555+55+5555555555555555+5555555555555", + "5;LL;LL;LL;L5L;LL;LL;L5;5M)C)C;)C);)CC;F5;5T;;;;;;;;;;;;;5;B;BB;BB;BB;B5", + "5;;;;;;;;;;;+;;;;;;;;;+;+;)h)h;)h);)h);;+;5;;:::::::;;::;5;L;LL;LL;LL;L5", + "5;LL;LL;LL;L5L;LL;LL;L5;5F;;;;;;;;;;;;;;5;5;:::^^^^:::::;5;B;BB;BB;BB;B5", + "5;BB;BB;BB;B5B;BB;BB;B5;5F;;)h)h)h)h)h)h5;+;:::::::::::;;+;;;;;;;;;;;;;5", + "5;BB;BB;BB;B5B;BB;BB;B5;5FFF)C)C)C)C)C)C5;5;;;;;;;;;;;;;;5;BLBBLBBLBBLB5", + "5+555555555555555555555+55555555555555555+5555555555555555+5555555555555", + "-;;;>5;;;;К;К;К5)CCChC5;5FFFFFF;v;FF5FFF5;5ChFFF5________5;QQQQQQQ;5;;;-", + "-;;;>5Δ;;;К;К;К5)hhh;;+;+;;;;;;;;;;;+;;;+;?;;;;;5________5;;;;;;;;;5;;;-", + "-;;;;5Δ;Δ;;;;;;5)h;;;v5;5;);;;;;;;hh5;;;5;5v;;{{5________5;qqqqqqq;+;;;-", + "-;;;;5Δ;Δ;К;К;К5);;;;;5;5h);h;hC;h{{5;h;5;5F;;hh5;CCCtgg_5;qqqqqqq;5;;;-", + "-;;;;5;;;;К;К;К5FFFFFF5;5;;;C;hC;h{{5h{h5;5F;;;;5;hhh;;;;+;;;;;;;;;5;;;-", + "-;;;;5;;;;К;К;К55555555+55555555555555555+5555555;;;;;hhh5XXX;;;;;;5>;;-", + "-;;;;55555555+55;;qQT;5;5FFFFFFFFFFFFFv;5;5TTTT;+;FFChCCC5XXX;;;;;;5>;;-", + "5555+5δ;pp;pp;;+;;;;;;+;+;;;;;;;;;;;;;;;+;5T;;;;555555555555555555555555", + "5δδδ;δδ;pp;pp;p5gggg;t5;5hCh)hCh);hCh)hC5;+;;T;M5rrr54(44444444444444444", + "5δδδ;δδ;pp;;;;p5______5;5))C)))C);))C)))5;5;;T;M5;;r54444444444444444444", + "5δδδ;δδ;pp;;p;p5______5;5;;;;;;;;;;;;;;;5;5;;;;;+;;r54444444444444444444", + "5δδδ;δδ;pp;;p;p5::::::5;5FFFFFFFFFFFFFFF5;5MMM;M5rrr54444444444444444444", + "5;;;;;;;;;;;55555555555+55555555555555555+555555555554444444444444444444", + "5;pp;pp;pp;;5ΔppθθQQM5;;5CC))C))C5FFFFFF5;Q5GGGGGGGG54444444444444444444", + "5;pp;pp;pp;;5Δ;;;;;;;5;;5Ch))h))h5;;;;;;5;;5;;;;;;;;54444444444444444444", + "5;pp;pp;pp;;?;;TTT;;;+;;5);;;;;;;+;h{{;;+;;?;GGGGGGG54444444444444444444", + "5;pp;pp;pp;;5;;TTT;;;5<;+;;));;;;5;h{{h;5;<5;;;;;;;;54444444444444444444", + "5;pp;pp;pp;;5;;;;;;;;5<;5;;Ch;FFF5;;hh;;5;<5PPPPPPPP54444444444444444444", + "5;pp;pp;pp;;5rΔΔккΔΔΔ55+55555555555555555+555555555554444444444444444444", + "5555555555++55555555555;5DDfffffdd5FFFF;5;+;;;FFF;hC54444444444444444444", + "44444444444444444445^_5;+;;;;;;;;;+;;;;;+;5;;;;;;;;)54444444444444444444", + "44444444444444444445^_5;5+5+5+5+5+5h)h)h5;5r;h){h)h)54444444444444444444", + "44444444444444444445^_5;5&5&5&5&5&5C)C)C5;5D;C){C)C)54444444444444444444", + "44444444444444444445^t5+55555555555555555+555555555554444444444444444444", + "44444444444444444445^;5;5F{C{)){5ChCh;hC5;5&5&5&5&5&54444444444444444444", + "44444444444444444445^;+;+;)h))hC5);));))5;5+5+5+5+5+54444444444444444444", + "44444444444444444445^t5;5;;;;;;;+;;;;;;;+;+;;;;;;;;;54444444444444444444", + "44444444444444444445^_5;5;;;;;;;5;;;;;;F5;5DDffffdd;55555555555555555555", + "44444444444444444445^_5;5h);Ch)h5hCh);;F5;555555555+5;rrrrrrrrrrrrrrr;r5", + "44444444444444444445^_5;5C);)))C5))C)FFF5;+;;;;;;;;;+;;;;;;;;;;;;;;;;;r5", + "44444444444444444445555+55555555555555555+555555+5555;WWWWWWW;ZZZZZZZ;r5", + "44444444444444444445Q;5;5βcβfa5;h;;K;;h;5;5vFF;+;;;;;;;;;;;;;;;;;;;;;;r5", + "44444444444444444445T;5;5;;;;;5h[h;;;h[h5;5;;;;5;WWWW;WWWWWWW;ZZZZZZ;;r5", + "44444444444444444445q;5;+;βbβ;+;h;;h;;h;5;+;;)C5;WWWW;WWWWWWW;ZZZZZ;;I55", + "44444444444444444445q;5;5;;;;;5;;;h[h;;;+;5r;)h5;;;;;;;;;;;;;;;;;;;;I55 ", + "44444444444444444445q;5;5DrAAA5;h;;h;;h;5;5r;;;5;rrrrrrrrrrrrr;II;;I55 ", + "44444444444444444445q;5+5555555h[h;;;h[h5+5r;)h5+5555555555555;I;;I55 ", + "44444444444444444445q;5;5cc;cc5;h;;h;;h;5;5r;)C5;5S5S5S5S5S5S5;;;I55 ", + "444444444444444444(5q;5;5;;;;;5;;;h[h;;;+;5r;;;+;5+5+5+5+5+5+5;;I55 ", + " 555555;;5;+;eeee5;h;;h;;h;5;555555;5;;;;;;;;;;;5;I55 ", + " 5XXX;;;;+;5;;;;;5h[h;;;h[h5;+;;;;+;+;;;;;;;;;;;5I55 ", + " 5XXX;;;;5;5eeeee5;h;;J;;h;5;55+555;5D;dddddd;;;555 ", + " 555555555+55555555555555555+55;_^5+55555555555555 ", + " 5M;rrrrr5;5;;j;;j;;jm;jm;j5;;5;;^5;Dddfffff;+&55 ", + " 55M;;;;;+;5iljiljilj;nj;nj55;+;;;+;;;;;;;;;;555 ", + " 5M;;;;;5;5H;jH;jH;jl;jl;j}5;5_;;5+5+5+5+5+555 ", + " 55hC;))5;5jkjjkjjkjjkjjkj;5;5^t;5&5&5&5&5&55 ", + " 5));hC5;+;;;;;;;;;;;;;;;;+;5^^;55555555555 ", + " 5555555+5555555555+5555555+555+5v;FF;;F55 ", + " 5><;;;+;5;;j;;j;;j;;;j;;j5;;;;;+;;;;F55 ", + " 5;;;;;5;+;;;;;;;;;;;;;;;;+;;;;;5;;;C55 ", + " 5555555;5;Θj;Θj;Θj;;Θj;Θj5<;;;;5F;hC5 ", + " 5444444;5m;jm;jm;j;m;jm;j5<;;;;5F;;C5 ", + " 5444444;5555555555+555555555+555F;;C5 ", + " 5444444;5lΘjΘjΘjΘj;jΘjΘjΘjΘ5;5F;;;hC5 ", + " 5444444;5;;j;j;j;j;j;j;j;j;5;5F;;;;C5 ", + " 5444444;+;;;;;;;;;;;;;;;;;;+;5F;;;;D5 ", + " 5444444;5jΘjΘjΘjΘjΘjΘjΘjΘjΘ5;5555+555 ", + " 54444(4;5j;j;j;j;j;j;j;j;j;5;+;;;;;;5 ", + " 555+555+55555555555555555555+55555555 ", + " 5AA;;c5;5;h;;K;;h;;K;;h;;K;5;5}}}}}}5 ", + " 5b;;;c5;5h[h;;;h[h;;;h[h;;;+;5;;;;;;5 ", + " 5b;β;c5;5;h;;h;;h;;h;;h;;h;5;?;}}}}}5 ", + " 5β;b;;+;+;;;h[h;;;h[h;;;h[h5;5;;;;;;5 ", + " 5β;b;;5;5;h;;h;;h;;h;;h;;h;5;5}}}}}}5 ", + " 5β;β;A5+5h[h;;;h[h;;;h[h;;;5+55555555 ", + " 5f;b;A5;5;h;;h;;h;;h;;h;;h;5;5BLBBLB5 ", + " 5f;β;A5;+;;;h[h;;;h[h;;;h[h5;+;;;;;;5 ", + " 55;;;A5;5;h;;h;;h;;h;;h;;h;5;5;BLBBL5 ", + " 5D;;A5;5h[h;;;h[h;;;h[h;;;+;5;;;;;;5 ", + " 5aa;A5;5;h;;J;;h;;J;;h;;J;5;5BLBBLB5 ", + " 555555+55555555555555555555+55555555 ", + " 5x;ss5;5Λ;5Λ;5Λ;5Λ;5Λ;5Λ;5>;5BLBBLB5 ", + " 5x;[s5;5L;5L;5L;5L;5L;5L;5>;5;;;;;;5 ", + " 5x;[s5;5L;5C;5C;5C;5C;5C;5;;+;BLBBL5 ", + " 5x;[s5;5h;5h;5h;5h;5h;5h;5;<5;;;;;;5 ", + " 5x;ss5;5[;5[;5[;5[;5[;5[;5;<5BLBBL55 ", + " 55+555;55+55+55+55+55+55+5+55555555 ", + " 5M;;+;;+;;;;;;;;;;;;;;;;;+;5BLBBLB5 ", + " 55555;;55+55+55+55+55+55+5;+;;;;;;5 ", + " 5c;e5;;5Λ;5Λ;5Λ;5Λ;5Λ;5Λ;5;5;BLBBL5 ", + " 5c;e5;;5L;5L;5L;5L;5L;5L;5;5;;;;;;5 ", + " 5c;e5T;5L;5L;5L;5L;5L;5L;5;5BLBBLB5 ", + " 5c;e55+5555555555555555555+55555555 ", + " 5c;;e5;5Λ;5Λ;5Λ;5Λ;5Λ;5Λ;5;5BLBBLB5 ", + " 55e;;+;5L;5L;5L;5L;5L;5L;5;5;;;;;;5 ", + " 5e;e5;5L;5L;5L;5L;5L;5L;5;+;BLBBL5 ", + " 5e;e5;5h;5h;5h;5h;5h;5h;5;5;;;;;;5 ", + " 55555+55+55+55+55+55+55+5+55555555 ", + " 5M;;+;+;;;;;;;;;;;;;;;;;+;5B;BB;B5 ", + " 55555;55+55+55+55+55+55+5;5L;LL;L5 ", + " 5CLΛ5;5Λ;5Λ;5Λ;5Λ;5Λ;5Λ;5;5B;BB;B5 ", + " 5h;;+;5Lh5Lh5Lh5Lh5Lh5Lh5;+;;;;;;5 ", + " 55555+5555555555555555555+55555555 ", + " 5dfd5;5BLBBLBBLBBLB5)CC5;;5BLBBLB5 ", + " 5d;;5;+;;;;;;;;;;;;5)h)5;;5;;;;;;5 ", + " 5f;;+;5;BLBB;LBBLB;+;;;+;;+;BLBBL5 ", + " 555;5;5;BLBB;LBBLB;5;;;5;55;BLBBL5 ", + " 5&+;5;5;;;;;;;;;;;;5)h)5;5;;;;;;;5 ", + " 555;5;5BLBBLBBLBBLB5CCC5;5BLBBLB55 ", + " 5&+;5+555555555555555555+55555555 ", + " 555;5;;5;h[h;h[h;h[h;h[5;+;;M;;T5 ", + " 5&+;5;;+;;h;;;h;;;h;;;;+;5Q;;;;T5 ", + " 555;+;;5J;;;h;;;h;;;h;;5;55+5<>55 ", + " 5&+;5;;5K;;h[h;h[h;h[h;5;5d;5<>5 ", + " 555555+55555555555555555+5d;5555 ", + " 5>>;5;5BLBBLBBLBBLBBLB5;5d;;d5 ", + " 5<<;+;5;;;;;;;;;;;;;;;5;+;;dd5 ", + " 55555;5;BLBBLB;BLBBLB;+;5;dd55 ", + " 5&+;5;+;BLBBLB;BLBBLB;5;5;555 ", + " 555;+;5;;;;;;;;;;;;;;;5;5;+S5 ", + " 5&+;5;5BLBBLBBLBBLBBLB5;5;555 ", + " 555;5+55555555555555555+5;+S5 ", + " 5&+;5;5B;BB;BB;BB;BB;B5;5;555 ", + " 555;+;5L;LL;LL;LL;LL;L5;5;+S5 ", + " 5&+;5;5B;BB;BB;BB;BB;B5;5;555 ", + " 555;5;+;;;;;;;;;;;;;;;+;5;+S5 ", + " 5&+;5+55555555555555555+5;555 ", + " 555;5;5B;BB;BB;BB;BB;5;;+;+S5 ", + " 5f;;+;5B;BB;BB;BB;BB;5;;5;555 ", + " 5f;;5;5L;LL;LL;LL;LL;5;;5;+S5 ", + " 5f;;5+55;BB;BB;BB;BB;5+55;555 ", + " 5ddd5;;5;BB;BB;BB;BB;5;5;;+S5 ", + " 55555;;5;LL;LL;LL;LL;5;555555 ", + " 5^^^5;;+;;;;;;;;;;;;;+;5^^55 ", + " 5^^^5;;5BLBBLB;BLBBLB5;5^^5 ", + " 5^^^55+5555555+5555555+5^^5 ", + " 55^^^5;5R;h[[h;;sss;R5;5^^5 ", + " 5^^^5;+;;;;;;;;;[[;R5;+;^5 ", + " 5^^;+;5x;;ss;;;;hh;Ц5;5^^5 ", + " 5^^^5;5x;;[s;;;;;;;Ц5;5^^5 ", + " 5^^^5;5x;;[s;sss;;;;+;5^^5 ", + " 5^^^5;5x;;ss;s[s;;;v5;5^^5 ", + " 55^^5;5;;;;;;h[h;;;;5;5^55 ", + " 5^^5+5;;;;;;hhh;hhh5+5^5 ", + " 5555;5RRRRRR;;;;ццц5;5^5 ", + " 5^^^;555555555555555;555 ", + " 55^^^5~~~~~~~~~~~~~+;^55 ", + " 555^5~~~~~~~~~~~~~5555 ", + " 555~~~~~~~~~~~~~5 ", + " 5~~~~~~~~~~~~55 ", + " 555~~~~~~~~555 ", + " 5555555555 " + ], + "palettes": [ "aircraft_carrier_palette" ], + "gaspumps": { }, + "place_loot": [ + { "item": "television", "chance": 100, "x": 48, "y": 14 }, + { "item": "television", "chance": 100, "x": 18, "y": 133 }, + { "item": "television", "chance": 100, "x": 4, "y": 142 }, + { "item": "television", "chance": 100, "x": 18, "y": 243 }, + { "item": "television", "chance": 100, "x": 27, "y": 299 } + ], + "liquids": { "O": { "liquid": "water_clean", "amount": [ 0, 100 ] }, "#": { "liquid": "jp8", "amount": [ 0, 100 ] } }, + "signs": { } + } + } +] diff --git a/data/json/mapgen/aircraft_carrier/aircraft_carrier_z1.json b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z1.json new file mode 100644 index 000000000000..588f642adf1b --- /dev/null +++ b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z1.json @@ -0,0 +1,374 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ + [ "aircraft_carrier_1a_1", "aircraft_carrier_1b_1", "aircraft_carrier_1c_1" ], + [ "aircraft_carrier_2a_1", "aircraft_carrier_2b_1", "aircraft_carrier_2c_1" ], + [ "aircraft_carrier_3a_1", "aircraft_carrier_3b_1", "aircraft_carrier_3c_1" ], + [ "aircraft_carrier_4a_1", "aircraft_carrier_4b_1", "aircraft_carrier_4c_1" ], + [ "aircraft_carrier_5a_1", "aircraft_carrier_5b_1", "aircraft_carrier_5c_1" ], + [ "aircraft_carrier_6a_1", "aircraft_carrier_6b_1", "aircraft_carrier_6c_1" ], + [ "aircraft_carrier_7a_1", "aircraft_carrier_7b_1", "aircraft_carrier_7c_1" ], + [ "aircraft_carrier_8a_1", "aircraft_carrier_8b_1", "aircraft_carrier_8c_1" ], + [ "aircraft_carrier_9a_1", "aircraft_carrier_9b_1", "aircraft_carrier_9c_1" ], + [ "aircraft_carrier_10a_1", "aircraft_carrier_10b_1", "aircraft_carrier_10c_1" ], + [ "aircraft_carrier_11a_1", "aircraft_carrier_11b_1", "aircraft_carrier_11c_1" ], + [ "aircraft_carrier_12a_1", "aircraft_carrier_12b_1", "aircraft_carrier_12c_1" ], + [ "aircraft_carrier_13a_1", "aircraft_carrier_13b_1", "aircraft_carrier_13c_1" ] + ], + "object": { + "fill_ter": "t_metal_floor", + "rows": [ + "ππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππ", + "ππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππ", + "ππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππ", + "πππππππππππππππ---55555555555555555555555555555555555---ππππππππππππππππ", + "πππππππππππππππ-;55;;;;;;δδ;δδδδδ;;;;δδδ;δδ;δδδδδδδ;55;-ππππππππππππππππ", + "πππππππππππππππ-;+;;δδδ;;;;;;;;;;;<<;;;;;;;δ;;;δ;;;;δ5;-ππππππππππππππππ", + "πππππππππππππππ-;5δδδδδ;δδδ;δδδδδ;;;;δδ;δδ;δδδ;δ;δδ;;+;-ππππππππππππππππ", + "πππππππππππππππ-;555555+555555555555555555+55555555555;-ππππππππππππππππ", + "πππππππππππππππ-;5BLBL5;5BLBBLBBLBBLBBLBL5;5BLBBLBBLB5;-ππππππππππππππππ", + "πππππππππππππππ-;5;;;;+;+;;;;;;;;;;;;;;;;+;+;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππππππ-;5BLBB5;5BLBBLBBLBBLBBLBL5;5BLBBLBBLB5;-ππππππππππππππππ", + "πππππππππππππππ-;555555+555555555555555555+55555555555;-ππππππππππππππππ", + "πππππππππππππππ-;5BBLB5;5BLBBLBBLBBLBBLBM5;5BLBBLBBLB5;-ππππππππππππππππ", + "πππππππππππππππ-;5;;;;5;5;;;;;;;;;;;;;;;;5;+;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππππππ-;5BBL;+;+;;BLBBLBBLBBLB;;+;5B;BB;BB;B5;-ππππππππππππππππ", + "πππππππππππππππ-;5;;;;5;5;;;;;;;;;;;;;;;;5;5L;LL;LL;L5;-ππππππππππππππππ", + "πππππππππππππππ-;5BBLL5;5MBLBBLBBLBBLBBLB5;5B;BB;BB;B5;-ππππππππππππππππ", + "πππππππππππππππ-;555555+555555555555555555+55555555555;-ππππππππππππππππ", + "πππππππππππππππ-;5&+;d5;+;;;;;;;;;;;;;;;;+;5S5S5S5S5S5;-ππππππππππππππππ", + "πππππππππππππππ-;555;f5;5B;BB;BB;;BB;BB;B5;5+5+5+5+5+5;-ππππππππππππππππ", + "πππππππππππππππ-;5&+;f5;5L;LL;LL;;LL;LL;L5;+;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππππππ-;555;f5;5B;BB;BB;;BB;BB;B5;5D;ddd;dd;5;-ππππππππππππππππ", + "πππππππππππππππ-;5&+;D5+555555555555555555+55555555555;-ππππππππππππππππ", + "ππππππππππππππ-->555;;5;5MBLBBLBBLBBLBBLB5;5BLBBLBBLB5;-ππππππππππππππππ", + "ππππππππππππππ-;>5&+;;+;5;;;;;;;;;;;;;;;;5;5;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;5555555;5;BLBBLB;;BLBBLB;+;+;BLB;BLB;5;-ππππππππππππππππ", + "ππππππππππππππ-;5<;;;TM;+;BLBBLB;;BLBBLB;5;5;BLB;BLB;5;-ππππππππππππππππ", + "ππππππππππππππ-;5<;;;;;;5;;;;;;;;;;;;;;;;5;5;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;+;;;;;;;5BLBBLBBLBBLBBLBM5;5BLBBLBBLB5;-ππππππππππππππππ", + "ππππππππππππππ-;5555555+555555555555555555+55555555555;-ππππππππππππππππ", + "ππππππππππππππ-;5δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;5δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;-ππππππππππππππππ", + "ππππππππππππππ-;5δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;--πππππππππππππππ", + "ππππππππππππππ-;5δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;>-πππππππππππππππ", + "ππππππππππππππ-;5δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;>-πππππππππππππππ", + "ππππππππππππππ-;5δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;--πππππππππππππππ", + "ππππππππππππππ-;5δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππππ--;5δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππππ-;;5δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππππ-;55δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππ--;55;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππ--;;5δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππ-;;55δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππ-;555δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππ-;5δδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππ-;5δδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππ-;5δδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππ-;5δδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππ--;5δδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππ--;;5δδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππ--;;55δδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππ--;;555δδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππ-;;55Y555δδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;-ππππππππππππππππ", + "πππππ--;;55Y;КY5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππ-;;55К;;;;+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;--πππππππππππππππ", + "πππππ-;55Y;;КYY5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;-πππππππππππππππ", + "ππππ--;55555555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;55;-πππππππππππππππ", + "ππππ-;;555{{;xxx;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;t5;-----πππππππππππ", + "πππ--;5555Ch;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;t5;;;;;-πππππππππππ", + "πππ-;;5C{5{h;{{{;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;55555555πππππππππππ", + "πππ-;55h{5Ch;{{{;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4(44444444444444444", + "πππ-;5{;;+;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "ππ-->5Ch;5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "ππ-;>5{;;5;;;;;;;?;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "π--;55Ch;5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "--;;5{;;;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "-;;55Ch;;5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "-;55{{;;F5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "-;5Ch;;;T5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "-;5{{;;;M5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "-;55555+5555555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "-55θθθ;;;;θθθθθ5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "-+;;;;;;;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "-5;θθθθθ;;θθθθ;+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "55;;;;;;;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5M;TTTTT;;;TTT;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "555555555+5555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5fffffddD;5εεεεε5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5;;;;;;;;;5εεεε;+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5+5+5+5+5+5εεεεε5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5555555555555555555", + "5&5&5&5&5&5εεεεε5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;*5*DMTTTTMδδδ;D5T;θ5", + "55555555555555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ς;;;;;;;;;δδ;D5T;θ5", + "5C{;xxx;5{C{C{C{5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ς;;;;;;;;;;;;q5T;θ5", + "5Ch;;;;;5;h{h{h;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ς;;;№№№№№№№;;q5T;θ5", + "5{h;{{{;+;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ς;;;;;;;;;;;;q5T;θ5", + "5;;;;;;;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ς;;;№№№№№№№;;Q5T;θ5", + "5;hh;hh;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ς;;;;;;;;;;;;Q5T;θ5", + "5;;;;;;;5ssss;{;?;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;;;;;;;;;;Q5T;θ5", + "5;hh;hh;5555s;{;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ς;;;;;;;;;;;;;5;;θ5", + "5;;;;;;;5<;5s;{;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ς;;;№№№№№№№;;;+;;θ5", + "5;hh;hh;5<;5s;{;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ς;;;;;;;;;;;;;555+5", + "5;;;;;;;5;;5s;{;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ς;;;№№№№№№№;;;+;;;5", + "5;hh;hh;5;;5;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ς;;;;;;;;;;;;;5<;;5", + "5;;;;;;;5M;+;;ss5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;*5*;;;;;;;;;;;D5<;;5", + "5555555555+5+5555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;;;;;;;;;;P555+5", + "5GGGGG5F;;;;;;;F5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;;;;;;;;;;P5{{;5", + "5;;;;;5F;h;h;;;;+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;;;;;;;;;;P5Ch;5", + "5GGGG;5F;{{{h;{{5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;;;;;;;;;;p5Ch;5", + "5;;;;;+;;{{{;;hC5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;;;;;;;;;;;;p5{{;5", + "5PPPP;5;;;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;;;;;;;;;;;5;;;5", + "5;;;;;5{h{h{h{h{5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;;;;;;;;;;;+;h{5", + "5PPPPP5{C{C{C{C{5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5Dθθθθθθθθθ;;D5{C{5", + "5555555555555555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5555555555555555555", + "5C{;xxx;;;5C{;xxx;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4(44444444444444444", + "5Ch;;;;;;;5Ch;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5{h;{{{;;;5{h;{{{;+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5;;;;;;;;;+;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5;hh;hh;hh5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5;;;;;;;;;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5;hh;hh;hh5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5;;;;;;;;;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "55555555+55;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5T;;;;;;;;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5T;;<;;;;;5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5Q;;<;M;;;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "555555555+55+555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5C{;xxx;5;;;;5<5M;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5Ch;;;;;5;;;;5<5Q;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5{h;{{{;?;;;;5;5T;+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5;;;;;;;5;;;;5+5;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5;hh;hh;5R;;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5;;;;;;;5R;;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5;hh;hh;5R;;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5555555555555555555", + "5;;;;;;;5R;hhhhhh;+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5QQθθθк_Чкч_кppppd5", + "5;hh;hh;5;;CCCCCC;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;;;;;;;;;;;;;;D5", + "5;;;;;;;5;;[[[[[[;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;;;;;;;;;;;;;;;;D5", + "5;hh;hh;5;ssssssss5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;;;;;;;;;;;;;;к5", + "5;;;;;;;+;555555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5M;;;TTTTTTTT;;;;D5", + "5555+5555+5C{;xxx;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5θ;;;TTTTTTTT;;;;D5", + "5F;;;5MT;;5Ch;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5θ;δ;;;;;;;;;;;;;к5", + "5F;F;5;;;;5{h;{{{;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5θ;δ;;;;;;;;;;;;;D5", + "5F;F;5;;;;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5θ;δ;;;;;;;;;;;;;D5", + "5F;;;+;;;;5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5θ;δ;;;θ_чкθθк_ЧθD5", + "555555555;5;;;;;;;+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;55555+5555555555555", + "5oooNNTT5;5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;M5;;;5;;;;;;;;XXX5", + "5OO;;;;T5;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;;;5;;;;;;;;XXX5", + "5oooNN;;5;5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5>>;+;;;;;;;;;;;5", + "5OO;;;;;5;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5<<;5;;;;;;;;;;;5", + "5oooNN;;5;5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;555+5;qqqqqqqqq;5", + "5OO;;;;;+;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;5;qqqqqqqqq;5", + "5oooNN;;5+5555+5555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;+;;;;;;;;;;;5", + "5OO;;;;;5;;CC;;CCC5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δ5;5;;;;;;;;;;;5", + "5oooNN;;5R;hh;;hhh5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δδ5;5MQQQQQQQQQ;5", + "5OO;;;;;5R;;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δδ5+5555555555555", + "5oooNN;;5;;;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δ5;5oOoOoOoOoOo5", + "555555555;[[;;))[[5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;5oOoOoOoOoOo5", + "5&5&5&5&5sss;sssss5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;5N;N;N;N;N;N5", + "5+5+5+5+5555+555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;5N;N;N;N;N;N5", + "5;;;;;;;;+;;;;<<;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δ5;+;;;;;;;;;;;5", + "5dffffd;D5;;;;;;;;+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δδ5;5;MTTT;;;;;;5", + "5555555555555555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δδδ5+5555555555555", + "5C{;xxx;5CCC;))FCh5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δδδδ5;5&5&5&5&5&5&5", + "5Ch;;;;;5hhh;h;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δδδδ5;5+5+5+5+5+5+5", + "5{h;{{{;?;;;;;;;;;+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δδδδ5;+;;;;;;;;;;;5", + "5;;;;;;;5v;FFFF;Ch5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δδδ5;5D;dfffffd;;5", + "5;hh;hh;55555555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δδ5+5555555555555", + "5;;;;;;;5C{C{C{{CC5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δ5;^^^^^^^^^^^^5", + "5;hh;hh;5h{h{h{{h{5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δδ5;^^^^^^^^^^^^5", + "5;;;;;;;5;;;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δ5;^^^^^^^^^^^^5", + "5;hh;hh;5Ch{h;Ch{h5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δ5;^^^^^^^^^^^^5", + "5;;;;;;;5{{{C;{{{C5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δ5;^^^^^^^^^^^^5", + "5;hh;hh;5;;;;;;;;F5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δδ5;^^^^^^^^^^^^5", + "5;;;;;;;+;;Ch{h{;F5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δ5;;;^^^^^^^^^^5", + "5555+5555;;{{{C{;F5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;tg^^^^^^^^5", + "5;;;;;;;;;;;;;;;;;+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;;;;;;^^^^^^^5", + "5FFFFF;;;;FFFFF;v;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;TQ;;;;^^^^^5", + "5555555+55555555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δ5+555555555^^^5", + "5;;;<5;;;;5C{;xxx;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δδ5;::::::::;;^^5", + "5;;;<5;;h;5Ch;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δδ5;;:::::;;;;;^5", + "5;;;;5;h[h5{h;{{{;?;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;δ5;;;::tg;;;;;^5", + "5+5555;;h;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;;:;;;;;;;;5", + "5;;;JK;;;;+;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;;;;;;;;;;;;;5", + "5;h;;;;;h;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5:t::g:::t;<;;5", + "5h[h;;;h[h5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5^^^^^^^^^;<;;5", + "5;h;;h;;h;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5555555555555555555", + "5;;;h[h;;;5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4(44444444444444444", + "5;h;;h;;h;5;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5h[h;;;h[h5;hh;hh;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5;h;;;;;h;5;;;;;;;?;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "55555555555555+5555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5δδδδδδδδδδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5δδδδδδδδδδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5δδδδδδδδδδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5δδδδδδδδδδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5δδδδδδδδδδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5δδδδδδδδδδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "5555555555555555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5555555555555555555", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;θθθθθθθθθθθθθθ;T5", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;;;;;;;;;;;;;;T5", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;θθθθθθθθθθθθθθ;T5", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;θθθθθθθθθθθθθθ;T5", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;;;;;;;;;;;;;;;;T5", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;θθθθθθθθθθθθ;;T55", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;θθθθθθθθθθθ;;T55-", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;;;;;;;;;;;T55;-", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;555555555Q;;;T55;;-", + "4444444444444444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5&5&5&5&5Q;;T55;;--", + "444444444444444444(;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5+5+5+5+5;;T55;;--π", + "ππππππππππππ-;55555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;;;;;;5;T55;;--ππ", + "ππππππππππππ-;5YКY5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;;;;;555T55;;--πππ", + "ππππππππππππ-;5;;;+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5dfff;+&555;;--ππππ", + "ππππππππππππ-;5Y;К5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5555555555;;--πππππ", + "ππππππππππππ-;5К;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5dff;+&55;;--ππππππ", + "ππππππππππππ-;55Y;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;;;;555;;--πππππππ", + "ππππππππππππ-;;5К;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5+5+555;;--ππππππππ", + "ππππππππππππ--;55;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5&5&55;;--πππππππππ", + "πππππππππππππ-;;5Y5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;55555;;--ππππππππππ", + "πππππππππππππ--;555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;t_55;;--πππππππππππ", + "ππππππππππππππ->5<;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;_55;;--ππππππππππππ", + "ππππππππππππππ->5<;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;55;;--πππππππππππππ", + "ππππππππππππππ-;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;--ππππππππππππππ", + "ππππππππππππππ-;5555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;--πππππππππππππππ", + "ππππππππππππππ-;5444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;5444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;5444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;5444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;5444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;-ππππππππππππππππ", + "ππππππππππππππ-;5444444;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;54444α4;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;--πππππππππππππππ", + "ππππππππππππππ-;5555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;>-πππππππππππππππ", + "ππππππππππππππ-;5δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;>-πππππππππππππππ", + "ππππππππππππππ-;5δ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;--πππππππππππππππ", + "ππππππππππππππ-;5δδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;5δδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;5δδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;5δδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;5δδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;5δδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;55δδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ-;;5δδδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "ππππππππππππππ--;5δδδδδ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;-ππππππππππππππππ", + "πππππππππππππππ-;555555+55555555555555555555+555555555;-ππππππππππππππππ", + "πππππππππππππππ-;5x;ss5;5Λ;5Λ;5Λ;5Λ;5Λ;5Λ;5<;5BLBBLB5;;-ππππππππππππππππ", + "πππππππππππππππ-;5x;[s5;5L;5L;5L;5L;5L;5L;5<;5;;;;;;5;--ππππππππππππππππ", + "πππππππππππππππ-;5x;[s5;5L;5C;5C;5C;5C;5C;5;;+;BLBBL5;-πππππππππππππππππ", + "πππππππππππππππ-;5x;[s5;5h;5h;5h;5h;5h;5h;5;;5;;;;;;5;-πππππππππππππππππ", + "πππππππππππππππ-;5x;ss5;5[;5[;5};5[;5[;5[;5;;5BLBBL55;-πππππππππππππππππ", + "πππππππππππππππ-;55+555;55+55+55+55+55+55+5+55555555;;-πππππππππππππππππ", + "πππππππππππππππ-;5M;;+;;+;;;;;;;;;;;;;;;;;+;5;;NNoo5;--πππππππππππππππππ", + "πππππππππππππππ-;55555;;55+55+55+55+55+55+5;+;;;;OO5;-ππππππππππππππππππ", + "πππππππππππππππ-;5Λ;L5;;5Λ;5Λ;5Λ;5Λ;5Λ;5Λ;5;5;;NNoo5;-ππππππππππππππππππ", + "πππππππππππππππ-;5L;;+;;5L;5L;5L;5L;5L;5L;5;5;;;;OO5;-ππππππππππππππππππ", + "πππππππππππππππ-;5;h)5T;5L;5L;5L;5L;5L;5L;5;5;;NNoo5;-ππππππππππππππππππ", + "πππππππππππππππ-;555555+5555555555555555555+5;;;;OO5;-ππππππππππππππππππ", + "πππππππππππππππ-;5Ch;Λ5;5Λ;5Λ;5Λ;5Λ;5Λ;5Λ;5;5;;NNoo5;-ππππππππππππππππππ", + "πππππππππππππππ-;55L;;+;5L;5L;5L;5L;5L;5L;5;5;;;;OO5;-ππππππππππππππππππ", + "πππππππππππππππ-;;55555;+L;5L;5L;5L;5L;5L;5;+;;NNoo5;-ππππππππππππππππππ", + "πππππππππππππππ--;+;;;+;5h;5h;5h;5h;5h;5h;5;5;;;;OO5;-ππππππππππππππππππ", + "ππππππππππππππππ-;55555+55+55+55+55+55+55+5+55555555;-ππππππππππππππππππ", + "ππππππππππππππππ-;5CLΛ5;+;;;;;;;;;;;;;;;;;+;5BLBBLB5;-ππππππππππππππππππ", + "ππππππππππππππππ-;5h;;+;55+55+55+55+55+55+5;5;;;;;;5;-ππππππππππππππππππ", + "ππππππππππππππππ-;5h;;5;5B;5B;5B;5B;5B;5B;5;+;BLBBL5;-ππππππππππππππππππ", + "ππππππππππππππππ-;5CLΛ5;5Lh5Lh5Lh5Lh5Lh5Lh5;5;;;;;;5;-ππππππππππππππππππ", + "ππππππππππππππππ-;55555+5555555555555555555+55555555;-ππππππππππππππππππ", + "ππππππππππππππππ-;5dfd5;5BLBBLBBLBBLB5)CC5;;5BLBBLB5;-ππππππππππππππππππ", + "ππππππππππππππππ-;5d;;5;+;;;;;;;;;;;;5)h)5;;5;;;;;;5;-ππππππππππππππππππ", + "ππππππππππππππππ-;5f;;+;5;BLBB;LBBLB;+;;;+;;+;BLBBL5;-ππππππππππππππππππ", + "ππππππππππππππππ-;555;5;5;BLBB;LBBLB;5F;F5;55;BLBBL5;-ππππππππππππππππππ", + "ππππππππππππππππ-;5&+;5;5;;;;;;;;;;;;5)h)5;5;;;;;;;5;-ππππππππππππππππππ", + "ππππππππππππππππ-;555;5;5BLBBLBBLBBLB5)CC5;5BLBBLB55;-ππππππππππππππππππ", + "ππππππππππππππππ-;5&+;5+555555555555555555+55555555;;-ππππππππππππππππππ", + "ππππππππππππππππ-;555;5;;5;h[h;h[h;h[h;h[5;+;;M;;;+;--ππππππππππππππππππ", + "ππππππππππππππππ-;5&+;5;;+;;h;;;h;;;h;;;;+;5Q;;;;T5;-πππππππππππππππππππ", + "ππππππππππππππππ-;555;5;;5J;;;h;;;h;;;h;;5;55+5;<55;-πππππππππππππππππππ", + "ππππππππππππππππ-;5&+;5;;5K;;h[h;h[h;h[h;5;5d;5;<5;;-πππππππππππππππππππ", + "ππππππππππππππππ-;555555+55555555555555555+5d;5555;--πππππππππππππππππππ", + "ππππππππππππππππ-;;5<<;5;5BLBBLBBLBBLBBLB5;+d;;d5;;-ππππππππππππππππππππ", + "ππππππππππππππππ--;5;;;+;5;;;;;;;;;;;;;;;5;5;;d55;--ππππππππππππππππππππ", + "πππππππππππππππππ-;555+5;5;BLBBLB;BLBBLB;+;5;dd5;;-πππππππππππππππππππππ", + "πππππππππππππππππ-;5^T;+;+;BLBBLB;BLBBLB;5;+;555;--πππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;5;5;;;;;;;;;;;;;;;5;5;+S5;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;5;5BLBBLBBLBBLBBLB5;5;555;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;5+55555555555555555;5;+S5;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;5;5B;BB;BB;BB;BB;B5;5;555;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;+;5L;LL;LL;LL;LL;L5;+;+S5;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;5;5B;BB;BB;BB;BB;B5;5;555;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;5;+;;;;;;;;;;;;;;;+;5;+S5;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;5+55555555555555555;5;555;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;5;5;R;h[[hsssss;R5;;+;+S5;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;+;+;;;;;;;;;;[[;R5;;5;555;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^T;5;5vx;hhss;;;hh;Ц5;;5;+S5;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;5+55x;h[[s;;;;;;;5+55;555;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;5;M5x;hhss;;;;;;;5;5;;+S5;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;5;;5;;;;;;;ss;;;;+;+55555;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;5;;5;;;;;;;[s;hhh5;5^^55;;-ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;5;;5RRRRRR;ss;ццц5;5^^5;;--ππππππππππππππππππππππ", + "πππππππππππππππππ-;5^^;55+555555555555555+5^^5;--πππππππππππππππππππππππ", + "πππππππππππππππππ-;55^;;5;5T;;^^^^^^^^;T5;5^^5;-ππππππππππππππππππππππππ", + "πππππππππππππππππ-;;5^^;5;5;;^^^^^^^^^;;5;+;^5;-ππππππππππππππππππππππππ", + "πππππππππππππππππ--;5^^;5;+;;^^^^;^^^^^;+;5^^5;-ππππππππππππππππππππππππ", + "ππππππππππππππππππ-;5^T;5;5;;^^^;;;^^^^;5;5^^5;-ππππππππππππππππππππππππ", + "ππππππππππππππππππ--55555+5555555+5555555+5555;-ππππππππππππππππππππππππ", + "ππππππππππππππππππππ5;;;;;;;E;;;;;;;;;;E;;;;;5--ππππππππππππππππππππππππ", + "ππππππππππππππππππππ;;;;E;;;;;;^^^^^;;;;;;;E;;ππππππππππππππππππππππππππ", + "πππππππππππππππππππππ5;;;^E;;E;^^^^^;;E;;E^;;5ππππππππππππππππππππππππππ", + "πππππππππππππππππππππ5;;;;;;;;;;;;;;;;;;;;;;;5ππππππππππππππππππππππππππ", + "πππππππππππππππππππππ;;;E;;;^;;;;;;;;;;^;;;E;;ππππππππππππππππππππππππππ", + "πππππππππππππππππππππ55;;;E;;E;^^^^^;;E;;E;;;5ππππππππππππππππππππππππππ", + "ππππππππππππππππππππππ55;;;;;;;^^^^^;;;;;;;;;5ππππππππππππππππππππππππππ", + "πππππππππππππππππππππππ55;;E;;;;;;;;;;;;E;;;55ππππππππππππππππππππππππππ", + "ππππππππππππππππππππππππ555555555555555555555πππππππππππππππππππππππππππ", + "ππππππππππππππππππππππππππ55555555555555ππππππππππππππππππππππππππππππππ", + "πππππππππππππππππππππππππππ5555555555πππππππππππππππππππππππππππππππππππ" + ], + "palettes": [ "aircraft_carrier_palette" ], + "gaspumps": { }, + "signs": { }, + "place_loot": [ + { "item": "television", "chance": 100, "x": 14, "y": 58 }, + { "item": "television", "chance": 100, "x": 5, "y": 83 }, + { "item": "television", "chance": 100, "x": 5, "y": 104 }, + { "item": "television", "chance": 100, "x": 15, "y": 104 }, + { "item": "television", "chance": 100, "x": 5, "y": 117 }, + { "item": "television", "chance": 100, "x": 15, "y": 129 }, + { "item": "television", "chance": 100, "x": 5, "y": 152 }, + { "item": "television", "chance": 100, "x": 15, "y": 168 }, + { "item": "television", "chance": 100, "x": 18, "y": 243 }, + { "item": "television", "chance": 100, "x": 27, "y": 290 } + ], + "place_vehicles": [ + { "vehicle": "helicopter_apache_1a", "x": 44, "y": 34, "chance": 100, "rotation": 270, "status": 1 }, + { "vehicle": "helicopter_apache_1b", "x": 44, "y": 79, "chance": 100, "rotation": 270, "status": 1 }, + { "vehicle": "helicopter_apache_1c", "x": 44, "y": 124, "chance": 100, "rotation": 270, "status": 1 }, + { "vehicle": "helicopter_apache_1b", "x": 44, "y": 184, "chance": 100, "rotation": 270, "status": 1 }, + { "vehicle": "helicopter_apache_1b", "x": 44, "y": 229, "chance": 100, "rotation": 270, "status": 1 }, + { "vehicle": "helicopter_osprey_2c", "x": 33, "y": 77, "chance": 100, "status": 1, "rotation": 270 }, + { "vehicle": "helicopter_osprey_2b", "x": 33, "y": 172, "chance": 100, "status": 1, "rotation": 270 }, + { "vehicle": "engine_crane", "x": 25, "y": [ 14, 16 ], "chance": 100 }, + { "vehicle": "welding_cart", "x": 25, "y": [ 66, 68 ], "chance": 100 }, + { "vehicle": "handjack", "x": 25, "y": [ 85, 87 ], "chance": 100 }, + { "vehicle": "forklift", "x": 25, "y": [ 104, 106 ], "chance": 100 }, + { "vehicle": "engine_crane", "x": 25, "y": [ 123, 125 ], "chance": 100 }, + { "vehicle": "welding_cart", "x": 25, "y": [ 142, 143 ], "chance": 100 }, + { "vehicle": "handjack", "x": 25, "y": [ 161, 163 ], "chance": 100 }, + { "vehicle": "engine_crane", "x": 25, "y": [ 180, 182 ], "chance": 100 }, + { "vehicle": "engine_crane", "x": 25, "y": [ 199, 201 ], "chance": 100 }, + { "vehicle": "welding_cart", "x": [ 26, 28 ], "y": [ 218, 220 ], "chance": 100 }, + { "vehicle": "handjack", "x": [ 18, 20 ], "y": [ 223, 225 ], "chance": 100 }, + { "vehicle": "forklift", "x": [ 25, 27 ], "y": [ 236, 238 ], "chance": 100 } + ] + } + } +] diff --git a/data/json/mapgen/aircraft_carrier/aircraft_carrier_z2.json b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z2.json new file mode 100644 index 000000000000..f1ac2b23aacf --- /dev/null +++ b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z2.json @@ -0,0 +1,363 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ + [ "aircraft_carrier_1a_2", "aircraft_carrier_1b_2", "aircraft_carrier_1c_2" ], + [ "aircraft_carrier_2a_2", "aircraft_carrier_2b_2", "aircraft_carrier_2c_2" ], + [ "aircraft_carrier_3a_2", "aircraft_carrier_3b_2", "aircraft_carrier_3c_2" ], + [ "aircraft_carrier_4a_2", "aircraft_carrier_4b_2", "aircraft_carrier_4c_2" ], + [ "aircraft_carrier_5a_2", "aircraft_carrier_5b_2", "aircraft_carrier_5c_2" ], + [ "aircraft_carrier_6a_2", "aircraft_carrier_6b_2", "aircraft_carrier_6c_2" ], + [ "aircraft_carrier_7a_2", "aircraft_carrier_7b_2", "aircraft_carrier_7c_2" ], + [ "aircraft_carrier_8a_2", "aircraft_carrier_8b_2", "aircraft_carrier_8c_2" ], + [ "aircraft_carrier_9a_2", "aircraft_carrier_9b_2", "aircraft_carrier_9c_2" ], + [ "aircraft_carrier_10a_2", "aircraft_carrier_10b_2", "aircraft_carrier_10c_2" ], + [ "aircraft_carrier_11a_2", "aircraft_carrier_11b_2", "aircraft_carrier_11c_2" ], + [ "aircraft_carrier_12a_2", "aircraft_carrier_12b_2", "aircraft_carrier_12c_2" ], + [ "aircraft_carrier_13a_2", "aircraft_carrier_13b_2", "aircraft_carrier_13c_2" ] + ], + "object": { + "fill_ter": "t_metal_floor", + "rows": [ + "ππππππππππππππππ-11111ππππππππππππππππππππππππππππππππππππππππππππππππππ", + "ππππππππππππππππ-11111111113811111ππππππππππππππππππππππππππππππππππππππ", + "ππππππππππππππππ-1111111111381111111811111111183ππππππππππππππππππππππππ", + "ππππππππππππππππ-1111111111381111111811111111183111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111111381111111211111111183111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111111381111111211111111183111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111111381111111811111111183111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111111381111111811111111183111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111113811111112111111111183111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111113811111112111111111183111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111113811111118111111111831111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111113811111118111111111831111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111113811111112111111111831111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111113811111112111111111831111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111113811111118111111111831111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111138111111181111111111831111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111138111111121111111111831111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111138111111121111111118311111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111138111111181111111118311111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111138111111181111111118311111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111138111111121111111118311111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111138111111121111111118311111111-πππππππππππππππππ", + "πππππππππππππππ--1111111381111111811111111118311111111-πππππππππππππππππ", + "πππππππππππππππ-<1111111381111111811111111118311111111-πππππππππππππππππ", + "πππππππππππππππ-<1111111381111111211111111183111111111-πππππππππππππππππ", + "πππππππππππππππ-11111111381111111211111111183111111111-πππππππππππππππππ", + "πππππππππππππππ-11111111381111111811111111183111111111-πππππππππππππππππ", + "πππππππππππππππ-11111111381111111811111111183111111111-πππππππππππππππππ", + "πππππππππππππππ-11111113811111112111111111183111111111-πππππππππππππππππ", + "πππππππππππππππ-11111113811111112111111111183111111111-πππππππππππππππππ", + "πππππππππππππππ-11111113811111118111111111831111111111-πππππππππππππππππ", + "πππππππππππππππ-11111113811111118111111111831111111111-πππππππππππππππππ", + "πππππππππππππππ-11111113811111112111111111831111111111-πππππππππππππππππ", + "πππππππππππππππ-11111113811111112111111111831111111111---πππππππππππππππ", + "πππππππππππππππ-111111138111111181111111118311111111111<-πππππππππππππππ", + "πππππππππππππππ-111111381111111811111111118311111111111<-πππππππππππππππ", + "πππππππππππππππ-11111138111111121111111111831111111111---πππππππππππππππ", + "πππππππππππππππ-11111138111111121111111118311111111111-πππππππππππππππππ", + "πππππππππππππππ-11111138111111181111111118311111111111-πππππππππππππππππ", + "ππππππππππππππ--11111138111111181111111118311111111111-πππππππππππππππππ", + "ππππππππππππππ-111111138111111121111111118311111111111-πππππππππππππππππ", + "ππππππππππππππ-111111138111111121111111118311111111111-πππππππππππππππππ", + "πππππππππππππ--111111381111111811111111118311111111111-πππππππππππππππππ", + "ππππππππππππ--1111111381111111811111111118311111111111-πππππππππππππππππ", + "ππππππππππππ-11111111381111111211111111183111111111111-πππππππππππππππππ", + "ππππππππππππ-11111111381111111211111111183111111111111-πππππππππππππππππ", + "ππππππππππππ-11111111381111111811111111183111111111111-πππππππππππππππππ", + "ππππππππππππ-11111111381111111811111111183111111111111-πππππππππππππππππ", + "ππππππππππππ-11111113811111112111111111183111111111111-πππππππππππππππππ", + "ππππππππππππ-11111113811111112111111111183111111111111-πππππππππππππππππ", + "πππππππππππ--11111113811111118111111111183111111111111-πππππππππππππππππ", + "ππππππππππ--111111113811111118111111111831111111111111-πππππππππππππππππ", + "ππππππππ---1111111113811111112111111111831111111111111-πππππππππππππππππ", + "ππππππππ-111111111113811111112111111111831111111111111-πππππππππππππππππ", + "πππππππ--111111111113811111118111111111831111111111111-πππππππππππππππππ", + "ππππππ--1111111111138111111181111111111831111111111111-πππππππππππππππππ", + "ππππππ-11111111111138111111121111111111831111111111111--ππππππππππππππππ", + "ππππππ-111111111111381111111211111111183111111111111111-ππππππππππππππππ", + "πππππ--111111111111381111111811111111183111111111111111-ππππππππππππππππ", + "πππππ-1111111111111381111111811111111183111111111111111-------ππππππππππ", + "ππππ--1111111111111381111111211111111183111111111111222222222-ππππππππππ", + "ππππ-1111111111111138111111121111111118311111111111124(44444444444444444", + "πππ--1111111111111381111111811111111118311111111111124444444444444444444", + "πππ-<1111111111111381111111811111111118311111111111124444444444444444444", + "πππ-<1111111111111381111111211111111183111111111111124444444444444444444", + "πππ-11111111111111381111111211111111183111111111111124444444444444444444", + "ππ--11111111111111381111111811111111183111111111111124444444444444444444", + "π--111111111111111381111111811111111183111111111111124444444444444444444", + "π-1111111111111111381111111211111111183111111111111124444444444444444444", + "π-1111111111111113811111112111111111183111111111111124444444444444444444", + "π-1111111111111113811111118111111111183111111111111124444444444444444444", + "--1111111111111113811111118111111111831111111111111124444444444444444444", + "-11111111111111113811111112111111111831111111111111124444444444444444444", + "-11111111111111113811111112111111111831111111111111124444444444444444444", + "-11111111111111113811111118111111111831111111111111124444444444444444444", + "-11111111111111138111111118111111111831111111111111124444444444444444444", + "-11111111111111138111111121111111111831111111111111124444444444444444444", + "-11111111111111138111111121111111118311111111111111124444444444444444444", + "-11111111111111138111111181111111118311111111111111124444444444444444444", + "-11111111111111138111111181111111118311111111111111124444444444444444444", + "-1111111111111113811111112111111111831111111111111112222222222222222222-", + "-1111111111111113811111112111111111831111111111111111111111111111111111-", + "-1111111111111138111111181111111111831111111111111111111111111111111111-", + "-1111111111111138111111181111111111831111111111111111111111111111111111-", + "-1111111111111138111111121111111118311111111111111111111111111111111111-", + "-1111111111111138111111121111111118311111111111111111111111111111111111-", + "-1111111111111138111111181111111118311111111111111111111111111111111111-", + "-1111111111111138111111181111111118311111111111111111111111111111111111-", + "-1111111111111138111111121111111118311111111111111111111111111111111111-", + "-1111111111111381111111211111111118311111111111111111111111111111111111-", + "-1111111111111381111111811111111118311111111111111111111111111111111111-", + "-1111111111111381111111811111111183111111111111111111111111111111111111-", + "-1111111111111381111111211111111183111111111111111111111111111111111111-", + "-1111111111111381111111211111111183111111111111111111111111111111111111-", + "-1111111111111381111111811111111183111111111111111111111111111111111111-", + "-1111111111113811111111811111111183111111111111111111111111111111111111-", + "-1111111111113811111112111111111183111111111111111111111111111111111111-", + "-1111111111113811111112111111111831111111111111111111111111111111111111-", + "-1111111111113811111118111111111831111111111111111111111111111111111111-", + "-1111111111113811111118111111111831111111111111111111111111111111111111-", + "-1111111111113811111112111111111831111111111111111111111111111111111111-", + "-1111111111113811111112111111111831111111111111111111111111111111111111-", + "-1111111111138111111181111111111831111111111111111111111111111111111111-", + "-1111111111138111111181111111111831111111111111111112222222222222222222-", + "-11111111111381111111211111111183111111111111111111124(44444444444444444", + "-11111111111381111111211111111183111111111111111111124444444444444444444", + "-11111111111381111111811111111183111111111111111111124444444444444444444", + "-11111111111381111111811111111183111111111111111111124444444444444444444", + "-11111111111381111111211111111831111111111111111111124444444444444444444", + "-11111111113811111112111111111831111111111111111111124444444444444444444", + "-11111111113811111118111111111831111111111111111111124444444444444444444", + "-11111111113811111118111111111831111111111111111111124444444444444444444", + "-11111111113811111112111111111831111111111111111111124444444444444444444", + "-11111111113811111112111111111831111111111111111111124444444444444444444", + "-11111111113811111118111111111831111111111111111111124444444444444444444", + "-11111111113811111118111111111831111111111111111111124444444444444444444", + "-11111111138111111121111111111831111111111111111111124444444444444444444", + "-11111111138111111121111111118311111111111111111111124444444444444444444", + "-11111111138111111181111111118311111111111111111111124444444444444444444", + "-11111111138111111121111111118311111111111111111111124444444444444444444", + "-11111111138111111121111111118311111111111111111111124444444444444444444", + "-11111111138111111181111111118311111111111111111111124444444444444444444", + "-11111111381111111181111111118311111111111111111111124444444444444444444", + "-1111111138111111121111111111831111111111111111111112222222222222222222-", + "-1111111138111111121111111118311111111111111111111111111111111111111111-", + "-1111111138111111181111111118311111111111111111111111111111111111111111-", + "-1111111138111111181111111118311111111111111111111111111111111111111111-", + "-1111111138111111121111111118311111111111111111111111111111111111111111-", + "-1111111138111111121111111118311111111111111111111111111111111111111111-", + "-1111111381111111181111111118311111111111111111111111111111111111111111-", + "-1111111381111111811111111118311111111111111111111111111111111111111111-", + "-1111111381111111211111111183111111111111111111111111111111555555111111-", + "-11111113811111112111111111831111111111111111111111111111115<<;;5111111-", + "-11111113811111118111111111831111111111111111111111111111155>>;;5111111-", + "-1111111381111111811111111183111111111111111111111111111115;;;;;5111111-", + "-111111138111111121111111118311111111111111111111111111111+;;;;;5111111-", + "-1111113811111112111111111831111111111111111111111111111115;;;ht5111111-", + "-1111113811111118111111111831111111111111111111111111111115M;;;t5111111-", + "-1111113811111118111111111831111111111111111111111111111115F;;ht5111111-", + "-1111113811111112111111111831111111111111111111111111111115F;;;t5111111-", + "-1111113811111112111111111831111111111111111111111111111155F;;ht5111111-", + "-111111381111111811111111183111111111111111111111111111115th;;;t5111111-", + "-111113811111111811111111183111111111111111111111111111115th;;ht5111111-", + "-111113811111112111111111183111111111111111111111111111115t;;;;t5111111-", + "-111113811111112111111111831111111111111111111111111111115t;;;ht5111111-", + "-111113811111118111111111831111111111111111111111111111115th;;;t5111111-", + "-111113811111118111111111831111111111111111111111111111115th;;ht5111111-", + "-111113811111112111111111831111111111111111111111111111115thh;;t5111111-", + "-111113811111112111111111831111111111111111111111111111115ttt;tt5111111-", + "-111138111111118111111111831111111111111111111111111111155555+555111111-", + "-11113811111118111111111831111111111111111111111111111115tttt;tt5111111-", + "-11113811111112111111111831111111111111111111111111111115t;h;;ht5111111-", + "-11113811111112111111111831111111111111111111111111111115th;;;;t5111111-", + "-11113811111118111111111831111111111111111111111111111115t;;;;ht5111111-", + "-11113811111118111111111831111111111111111111111111111115th;{;;t5111111-", + "-11113811111112111111111831111111111111111111111111111115t;;{;ht5111111-", + "-11138111111112111111111831111111111111111111111111111115th;{;;t5111111-", + "-11138111111181111111118311111111111111111111111111111115t;;{;ht5111111-", + "-11138111111181111111118311111111111111111111111111111115th;;;;t5111111-", + "-11138111111121111111118311111111111111111111111111111115t;;;;ht5111111-", + "-11138111111121111111118311111111111111111111111111111115th;;;;t5111111-", + "-11138111111181111111118311111111111111111111111111111115ttt;;ht5111111-", + "-11138111111181111111118311111111111111111111111111115555555;;;t5111111-", + "-11381111111211111111118311111111111111111111111111115Dfffd5;;ht5111111-", + "-1138111111121111111118311111111111111111111111111111+;;;;;+;;;t5111111-", + "-1138111111181111111118311111111111111111111111111111555+5+5{h{55111111-", + "-1138111111181111111118311111111111111111111111111111155&5&5{CC55111111-", + "-1138111111121111111118311111111111111111111111111111115555555551111111-", + "-1138111111121111111118311111111111111111111111111111111111111111111111-", + "-1138111111181111111118311111111111111111111111111111111111111111111111-", + "-1381111111811111111118311111111111111111111111111111111111111111111111-", + "-1381111111211111111183111111111111111111111111111111111111111111111111-", + "-1381111111211111111183111111111111111111111111111111111111111111111111-", + "-1381111111811111111183111111111111111111111111111111111111111111111111-", + "-1381111111811111111183111111111111111111111111111111111111111111111111-", + "-1381111111211111111183111111111111111111111111111111111111111111111111-", + "-13811111112111111111831111111111111111111111111111114(44444444444444444", + "-38111111181111111118311111111111111111111111111111114444444444444444444", + "-38111111181111111118311111111111111111111111111111114444444444444444444", + "-38111111121111111118311111111111111111111111111111114444444444444444444", + "-38111111121111111118311111111111111111111111111111114444444444444444444", + "-38111111181111111118311111111111111111111111111111114444444444444444444", + "-38111111181111111118311111111111111111111111111111114444444444444444444", + "-38111111121111111118311111111111111111111111111111114444444444444444444", + "381111111211111111183111111111111111111111111111111114444444444444444444", + "381111111811111111183111111111111111111111111111111114444444444444444444", + "381111111811111111183111111111111111111111111111111114444444444444444444", + "381111111811111111183111111111111111111111111111111114444444444444444444", + "444444444444444444411111111111111111111111111111111114444444444444444444", + "444444444444444444411111111111111111111111111111111114444444444444444444", + "444444444444444444411111111111111111111111111111111114444444444444444444", + "444444444444444444411111111111111111111111111111111114444444444444444444", + "444444444444444444411111111111111111111111111111111114444444444444444444", + "444444444444444444411111111111111111111111111111111114444444444444444444", + "444444444444444444411111111111111111111111111111111114444444444444444444", + "44444444444444444441111111111111111111111111111111111111111111111111111-", + "44444444444444444441111111111111111111111111111111111111111111111111111-", + "44444444444444444441111111111111111111111111111111111111111111111111111-", + "44444444444444444441111111111111111111111111111111111111111111111111111-", + "44444444444444444441111111111111111111111111111111111111111111111111111-", + "44444444444444444441111111111111111111111111111111111111111111111111111-", + "44444444444444444441111111111111111111111111111111111111111111111111111-", + "44444444444444444441111111111111111111111111111111111111111111111111111-", + "4444444444444444444111111111111111111111111111111111111111111111111111--", + "444444444444444444411111111111111111111111111111111111111111111111111--π", + "44444444444444444441111111111111111111111111111111111111111111111111--ππ", + "444444444444444444(111111111111111111111111111111111111111111111111--πππ", + "πππππππππππππ-1111111111111111111111111111111111111111111111111111--ππππ", + "πππππππππππππ-111111111111111111111111111111111111111111111111111--πππππ", + "πππππππππππππ-11111111111111111111111111111111111111111111111111--ππππππ", + "πππππππππππππ-1111111111111111111111111111111111111111111111111--πππππππ", + "πππππππππππππ-111111111111111111111111111111111111111111111111--ππππππππ", + "πππππππππππππ-11111111111111111111111111111111111111111111111--πππππππππ", + "πππππππππππππ--111111111111111111111111111111111111111111111--ππππππππππ", + "ππππππππππππππ-11111111111111111111111111111111111111111111--πππππππππππ", + "ππππππππππππππ-1111111111111111111111111111111111111111111--ππππππππππππ", + "ππππππππππππππ-111111111111111111111111111111111111111111--πππππππππππππ", + "ππππππππππππππ-<1111111111111111111111111111111111111111--ππππππππππππππ", + "ππππππππππππππ-<111111111111111111111111111111111111111--πππππππππππππππ", + "ππππππππππππππ--111111111111111111111111111111111111111-ππππππππππππππππ", + "πππππππππππππππ-111111111111111111111111111111111111111-ππππππππππππππππ", + "πππππππππππππππ-111111111111111111111111111111111111111-ππππππππππππππππ", + "πππππππππππππππ-111111111111111111111111111111111111111-ππππππππππππππππ", + "πππππππππππππππ-111111111111111131113111111111111111111-ππππππππππππππππ", + "πππππππππππππππ-111111111111111131118111111111111111111-ππππππππππππππππ", + "πππππππππππππππ-111111111111111181118111111111111111111-ππππππππππππππππ", + "πππππππππππππππ-111111111111111181113111111111111111111-ππππππππππππππππ", + "πππππππππππππππ-111111111111111131113111111111111111111--πππππππππππππππ", + "πππππππππππππππ-111111111111111131118111111111111111111<-πππππππππππππππ", + "πππππππππππππππ-111111111111111181118111111111111111111<-πππππππππππππππ", + "πππππππππππππππ-111111111111111181113111111111111111111--πππππππππππππππ", + "πππππππππππππππ-111111111111111131113111111111111111111-ππππππππππππππππ", + "πππππππππππππππ-111111111111111131118111111111111111111-ππππππππππππππππ", + "πππππππππππππππ-11111111111111181111811111111111111111--ππππππππππππππππ", + "πππππππππππππππ-11111111111111181111311111111111111111-πππππππππππππππππ", + "πππππππππππππππ-11111111111111131111311111111111111111-πππππππππππππππππ", + "πππππππππππππππ-11111111111111131111811111111111111111-πππππππππππππππππ", + "πππππππππππππππ-11111111111111181111811111111111111111-πππππππππππππππππ", + "πππππππππππππππ--1111111111111181111311111111111111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111111111131111311111111111111111-πππππππππππππππππ", + "ππππππππππππππππ-1111111111111131111811111111111111111-πππππππππππππππππ", + "ππππππππππππππππ-111111111111118111181111111111111111--πππππππππππππππππ", + "ππππππππππππππππ-111111111111118111131111111111111111-ππππππππππππππππππ", + "ππππππππππππππππ-111111111111113111131111111111111111-ππππππππππππππππππ", + "ππππππππππππππππ-111111111111113111181111111111111111-ππππππππππππππππππ", + "ππππππππππππππππ-111111111111118111181111111111111111-ππππππππππππππππππ", + "ππππππππππππππππ-11111111111111811113111111111111111--ππππππππππππππππππ", + "ππππππππππππππππ-11111111111111311113111111111111111-πππππππππππππππππππ", + "ππππππππππππππππ-11111111111111311118111111111111111-πππππππππππππππππππ", + "ππππππππππππππππ-11111111111111811118111111111111111-πππππππππππππππππππ", + "ππππππππππππππππ-11111111111111811113111111111111111-πππππππππππππππππππ", + "ππππππππππππππππ-11111111111111311113111111111111111-πππππππππππππππππππ", + "ππππππππππππππππ-11111111111113111118111111111111111-πππππππππππππππππππ", + "ππππππππππππππππ-11111111111118111118111111111111111-πππππππππππππππππππ", + "ππππππππππππππππ-11111111111118111113111111111111111-πππππππππππππππππππ", + "ππππππππππππππππ--1111111111113111113111111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111113111118111111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111118111118111111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111118111111311111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111113111111311111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111113111111811111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111118111111811111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111118111111311111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111113111111311111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111113111111811111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111118111111811111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111118111111311111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111113111111311111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111113111111811111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-1111111111118111111811111111111111-πππππππππππππππππππ", + "πππππππππππππππππ-111111111118111111131111111111111-ππππππππππππππππππππ", + "πππππππππππππππππ-111111111113111111131111111111111-ππππππππππππππππππππ", + "πππππππππππππππππ-111111111113111111181111111111111-ππππππππππππππππππππ", + "πππππππππππππππππ-11111111111811111118111111111111--ππππππππππππππππππππ", + "πππππππππππππππππ-11111111111811111113111111111111-πππππππππππππππππππππ", + "πππππππππππππππππ--111111111131111111311111111111--πππππππππππππππππππππ", + "ππππππππππππππππππ-111111111131111111811111111111-ππππππππππππππππππππππ", + "ππππππππππππππππππ-11111111118111111181111111111--ππππππππππππππππππππππ", + "ππππππππππππππππππ-11111111118111111131111111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111111113111111131111111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111111113111111181111111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111111118111111181111111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111111118111111131111111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111111113111111131111111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111111113111111181111111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111111118111111181111111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111111118111111131111111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111188888881111138811111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111881113188111188811111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111881118188111188811111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111881118188111138811111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111881113111111138811111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-11111881113111111188811111111-πππππππππππππππππππππππ", + "ππππππππππππππππππ-1111188111811111118881111111--πππππππππππππππππππππππ", + "ππππππππππππππππππ-111118811181111111388111111--ππππππππππππππππππππππππ", + "ππππππππππππππππππ-111118811131111111388111111-πππππππππππππππππππππππππ", + "ππππππππππππππππππ-111118888888811111881111111-πππππππππππππππππππππππππ", + "ππππππππππππππππππ--11118811181881111881111111-πππππππππππππππππππππππππ", + "πππππππππππππππππππ-11118811181881111381111111-πππππππππππππππππππππππππ", + "πππππππππππππππππππ-11118811131881118311111111-πππππππππππππππππππππππππ", + "πππππππππππππππππππ-11118811131881118811111111-πππππππππππππππππππππππππ", + "πππππππππππππππππππ-11118811181881188811111111-πππππππππππππππππππππππππ", + "πππππππππππππππππππ-11118811181881881311881111-πππππππππππππππππππππππππ", + "πππππππππππππππππππ-11118811131881881311881111-πππππππππππππππππππππππππ", + "πππππππππππππππππππ-11118811131881881811881111-πππππππππππππππππππππππππ", + "πππππππππππππππππππ-11111888888811888888881111-πππππππππππππππππππππππππ", + "πππππππππππππππππππ-11111111111111111111111111-πππππππππππππππππππππππππ", + "πππππππππππππππππππ-11111111111111111111111111-πππππππππππππππππππππππππ", + "πππππππππππππππππππ--111111111111111111111111--πππππππππππππππππππππππππ", + "ππππππππππππππππππππ-111111111111111111111111-ππππππππππππππππππππππππππ", + "πππππππππππππππππππππ111111111111111111111111πππππππππππππππππππππππππππ", + "ππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππππ" + ], + "palettes": [ "aircraft_carrier_palette" ], + "gaspumps": { }, + "signs": { }, + "place_vehicles": [ + { "vehicle": "helicopter_apache_1a", "x": 64, "y": 66, "chance": 100, "rotation": 90, "status": 0 }, + { "vehicle": "helicopter_apache_1b", "x": 64, "y": 113, "chance": 100, "rotation": 270, "status": 0 }, + { "vehicle": "helicopter_apache_1c", "x": 19, "y": 84, "chance": 100, "status": 1 }, + { "vehicle": "helicopter_apache_1b", "x": 19, "y": 108, "chance": 100, "status": 1 }, + { "vehicle": "helicopter_apache_1b", "x": 19, "y": 132, "chance": 100, "status": 1 }, + { "vehicle": "helicopter_osprey_2c", "x": 19, "y": 156, "chance": 100, "status": 1 }, + { "vehicle": "helicopter_osprey_2b", "x": 19, "y": 180, "chance": 100, "status": 1 }, + { "vehicle": "inflatable_boat", "x": 14, "y": 61, "chance": 100, "rotation": 270 }, + { "vehicle": "inflatable_boat", "x": 24, "y": 250, "chance": 100, "rotation": 90 }, + { "vehicle": "engine_crane", "x": 66, "y": 91, "chance": 100, "rotation": 0 }, + { "vehicle": "welding_cart", "x": [ 56, 65 ], "y": [ 31, 47 ], "chance": 100 }, + { "vehicle": "engine_crane", "x": [ 25, 33 ], "y": [ 31, 47 ], "chance": 100 }, + { "vehicle": "handjack", "x": [ 25, 33 ], "y": [ 49, 71 ], "chance": 100 }, + { "vehicle": "inflatable_boat", "x": [ 25, 33 ], "y": [ 73, 95 ], "chance": 100, "rotation": 90 }, + { "vehicle": "engine_crane", "x": [ 25, 33 ], "y": [ 97, 119 ], "chance": 100 }, + { "vehicle": "welding_cart", "x": [ 25, 33 ], "y": [ 121, 143 ], "chance": 100 }, + { "vehicle": "welding_cart", "x": [ 25, 33 ], "y": [ 145, 167 ], "chance": 100 }, + { "vehicle": "welding_cart", "x": [ 25, 33 ], "y": [ 169, 191 ], "chance": 100 }, + { "vehicle": "engine_crane", "x": [ 25, 33 ], "y": [ 193, 215 ], "chance": 100 }, + { "vehicle": "handjack", "x": [ 25, 33 ], "y": [ 217, 236 ], "chance": 100 } + ] + } + } +] diff --git a/data/json/mapgen/aircraft_carrier/aircraft_carrier_z3.json b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z3.json new file mode 100644 index 000000000000..479ce3be1a55 --- /dev/null +++ b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z3.json @@ -0,0 +1,66 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": [ [ "aircraft_carrier_1a_3" ], [ "aircraft_carrier_2a_3" ] ], + "object": { + "fill_ter": "t_metal_floor", + "rows": [ + "ππππππππππππππππππππππππ", + "ππππππππππππππππππππππππ", + "ππππππππππππππππππππππππ", + "ππππππππππππππππππππππππ", + "ππππππππππππππππππππππππ", + "ππππππππππππππππππππππππ", + "ππππππππππππππππππππππππ", + "ππππππππππππππππππππππππ", + "ππππππππππππππππππππππππ", + "ππππππππππππππππππππππππ", + "ππππππππππππππππππππππππ", + "ππππππππ55555555ππππππππ", + "πππππππ55MG;;;;55πππππππ", + "ππππππ55F;;;<<;;5πππππππ", + "ππππππ5F;;;;;;;;5πππππππ", + "ππππππ5F;;;;;;;;5πππππππ", + "ππππππ5F;;;;;;;;5πππππππ", + "ππππππ555+555;;;5πππππππ", + "ππππππ5t;;;;5;;;5πππππππ", + "ππππππ5th;;;+;;;5πππππππ", + "ππππππ5t;;ht5;;;5πππππππ", + "ππππππ5th;;t5;;;5πππππππ", + "ππππππ5t;;ht5;;;5πππππππ", + "ππππππ5th;;t5;;M5πππππππ", + "ππππππ5t;;ht5;;;5πππππππ", + "ππππππ5th;ht5;;;5πππππππ", + "ππππππ5F;;ht5;;;5πππππππ", + "ππππππ5F;;;t5;;;5πππππππ", + "ππππππ5F;;;;+;;;5πππππππ", + "ππππππ5F;;;M5;;;5πππππππ", + "ππππππ555+555;;;5πππππππ", + "ππππππ5{{;;F5;;M5πππππππ", + "ππππππ5Ch;;F5;;;5πππππππ", + "ππππππ5{;;;;5;;;5πππππππ", + "πππππ;5{h{;;5;;;5;ππππππ", + "πππ;;;5CC{F;5;;;5;;;ππππ", + "πππ;5555555+55+5555;ππππ", + "πππ;+;;;;;;;;;;;;;+;ππππ", + "ππππλF;;;;;;;;;;;tλ;ππππ", + "ππππλF;;;;;;;;;;;tλπππππ", + "ππππλF;;th;h;ht;;tλπππππ", + "ππππλF;;;ttttt;;;tλπππππ", + "ππππλλ;;;;;;;;;;;λλπππππ", + "πππππλ;;;;;;;;;;;λππππππ", + "πππππλ;;th;h;ht;;λππππππ", + "πππππλλ;;ttttt;;λλππππππ", + "ππππππλλ;;;;;;;;λπππππππ", + "πππππππλλλλλλλλλλπππππππ" + ], + "palettes": [ "aircraft_carrier_palette" ], + "place_monster": [ + { "monster": "mon_turret_rifle", "x": 5, "y": 34 }, + { "monster": "mon_turret_rifle", "x": 3, "y": 35 }, + { "monster": "mon_turret_rifle", "x": 3, "y": 37 } + ] + } + } +] diff --git a/data/json/mapgen_palettes/aircraft_carrier_palette.json b/data/json/mapgen_palettes/aircraft_carrier_palette.json new file mode 100644 index 000000000000..c0a088c3e0a9 --- /dev/null +++ b/data/json/mapgen_palettes/aircraft_carrier_palette.json @@ -0,0 +1,328 @@ +[ + { + "type": "palette", + "id": "aircraft_carrier_palette", + "//": "big elevators are disabled by default due to bugs with elevators itself - they works really weird with such size. same to small one - the game can transport only character, ignoring everything else", + "terrain": { + ",": "t_bridge", + "*": "t_gates_control_metal", + "-": "t_metal_railing", + ";": "t_metal_floor", + "λ": "t_reinforced_glass", + "?": [ "t_door_metal_interior_locked", "t_door_metal_interior_locked", "t_door_metal_interior_locked", "t_door_metal_c" ], + "<": "t_stairs_down", + ">": "t_stairs_up", + "№": "t_grate", + "X": "t_potential_trans", + "y": "t_concrete_wall", + "э": "t_sewage_pipe", + "ю": "t_sewage_pump", + "t": "t_console_broken", + "5": "t_wall_metal", + "4": "t_elevator_no_roof", + "(": "t_elevator_control_off", + "α": "t_elevator_control_off", + "+": [ "t_door_metal_c", "t_door_metal_c", "t_door_metal_c", "t_door_metal_c", "t_door_metal_interior_locked" ], + "1": "t_deck_coating_no_roof", + "2": "t_deck_coating_no_roof_y", + "3": "t_deck_coating_no_roof_r", + "8": "t_deck_coating_no_roof_w", + "~": "t_water_cube", + "/": "t_nuclear_reactor", + "π": "t_open_air", + "ψ": "t_water_dp", + "ς": "t_door_metal_locked", + " ": "t_water_dp", + "g": "t_switchgear_s", + "ω": "t_metal_floor", + "ξ": "t_deck_coating_no_roof" + }, + "furniture": { + "θ": "f_rack", + "A": "f_rack", + "$": [ "f_treadmill", "f_treadmill_mechanical" ], + "%": "f_exercise", + "&": "f_toilet", + "[": "f_table", + "^": "f_machinery_heavy", + "_": "f_machinery_electronic", + ")": "f_table", + "{": "f_table", + "!": [ "f_ergometer", "f_ergometer_mechanical" ], + ":": "f_machinery_light", + "M": "f_locker", + "}": "f_rack", + "a": "f_dishwasher", + "b": "f_oven", + "C": "f_console_broken_table", + "c": "f_fridge", + "d": "f_counter", + "D": "f_trashcan", + "E": "f_cleat", + "e": "f_rack_wood", + "f": "f_sink", + "G": "f_locker", + "H": "f_autodoc", + "h": "f_chair", + "I": "f_locker", + "i": "f_autodoc_couch", + "j": "f_curtain", + "k": "f_curtain_open", + "L": "f_locker", + "l": "f_ventilator", + "m": "f_IV_pole", + "N": "f_air_filter", + "o": "f_air_conditioner", + "O": "f_standing_tank", + "#": "f_standing_tank", + "S": "f_shower", + "s": "f_sofa", + "V": "f_water_heater", + "v": "f_rack_coat", + "w": "f_water_purifier", + "W": "f_washer", + "x": "f_entertainment_center", + "P": "f_rack", + "Q": "f_locker", + "q": "f_rack", + "Л": "f_rack", + "Y": "f_locker", + "Z": "f_dryer", + "Ж": [ "f_crate_c", "f_crate_c", "f_crate_c", "f_crate_o" ], + "ж": [ "f_crate_c", "f_crate_c", "f_crate_c", "f_crate_o" ], + "Ω": [ "f_crate_c", "f_crate_c", "f_crate_c", "f_crate_o" ], + "Й": "f_punching_bag", + "й": "f_tatami", + "К": "f_bench", + "к": "f_workbench", + "ц": "f_arcade_machine", + "Ц": "f_pinball_machine", + "ч": "f_drill_press", + "Ч": "f_heavy_lathe", + "Э": "f_generator_broken", + "я": "f_rack", + "Я": "f_rack", + "п": "f_rack", + "T": "f_locker", + "л": "f_rack", + "F": "f_filing_cabinet", + "r": "f_rack", + "R": "f_bookcase", + "p": "f_rack", + "B": "f_triple_bunkbed", + "Λ": "f_bed", + "μ": "f_rack", + "β": "f_counter", + "Δ": "f_counter" + }, + "items": { + "M": [ + { "item": "fireman_cabinet", "chance": 100, "repeat": [ 2, 4 ] }, + { "item": "used_1st_aid", "chance": 55, "repeat": [ 1, 2 ] }, + { "item": "used_ifak", "chance": 55, "repeat": [ 1, 2 ] } + ], + "θ": [ + { "item": "mechanics", "chance": 80, "repeat": [ 1, 4 ] }, + { "item": "SUS_welding_gear", "chance": 80, "repeat": [ 1, 3 ] } + ], + ")": [ { "item": "office_supplies", "chance": 80, "repeat": [ 2, 11 ] } ], + "{": [ { "item": "maps_milspec", "chance": 15 }, { "item": "office_supplies", "chance": 80, "repeat": [ 2, 11 ] } ], + "x": [ { "item": "entertainment_center_loot", "chance": 100, "repeat": [ 1, 3 ] } ], + "}": [ + { "item": "drugs_emergency", "chance": 30, "repeat": [ 1, 3 ] }, + { "item": "drugs_pharmacy", "chance": 30, "repeat": [ 1, 3 ] }, + { "item": "drugs_rare", "chance": 35, "repeat": [ 1, 2 ] }, + { "item": "SUS_bathroom_medicine", "chance": 35, "repeat": [ 1, 3 ] }, + { "item": "drugs_soldier", "chance": 35, "repeat": [ 2, 5 ] } + ], + "A": [ + { "item": "dry_goods", "chance": 45, "repeat": [ 0, 4 ] }, + { "item": "condiments", "chance": 55, "repeat": [ 0, 4 ] }, + { "item": "foodintincan", "chance": 55, "repeat": [ 0, 7 ] }, + { "item": "produce", "chance": 30, "repeat": [ 0, 7 ] }, + { "item": "pantry_liquids", "chance": 25, "repeat": [ 0, 7 ] }, + { "item": "fresh_produce", "chance": 55, "repeat": [ 0, 1 ] } + ], + "c": [ + { "item": "dessert", "chance": 55, "repeat": [ 0, 4 ] }, + { "item": "produce", "chance": 55, "repeat": [ 0, 4 ] }, + { "item": "fresh_produce", "chance": 55, "repeat": [ 0, 4 ] } + ], + "μ": [ + { "item": "dessert", "chance": 55, "repeat": [ 0, 8 ] }, + { "item": "produce", "chance": 55, "repeat": [ 0, 8 ] }, + { "item": "fresh_produce", "chance": 55, "repeat": [ 0, 8 ] } + ], + "D": [ { "item": "trash_cart", "chance": 55, "repeat": [ 0, 4 ] } ], + "e": [ + { "item": "cannedfood", "chance": 45, "repeat": [ 0, 6 ] }, + { "item": "big_canned_food", "chance": 55, "repeat": [ 0, 7 ] }, + { "item": "pantry_liquids", "chance": 55, "repeat": [ 0, 6 ] }, + { "item": "softdrinks_canned", "chance": 30, "repeat": [ 0, 5 ] }, + { "item": "pantry_liquids", "chance": 25, "repeat": [ 0, 8 ] }, + { "item": "pasta", "chance": 55, "repeat": [ 0, 6 ] } + ], + "G": [ + { "item": "loaded_lbv", "chance": 45, "repeat": [ 0, 2 ] }, + { "item": "military_standard_grenades", "chance": 55, "repeat": [ 1, 2 ] }, + { "item": "infantry_common_gear", "chance": 55 }, + { "item": "infantry_medical_gear", "chance": 30 }, + { "item": "guns_milspec", "chance": 50 }, + { "item": "ammo_milspec", "chance": 50 }, + { "item": "mags_milspec", "chance": 50 } + ], + "H": [ { "item": "autodoc_supplies", "chance": 100 } ], + "p": [ + { "item": "chem_home", "chance": 45, "repeat": [ 2, 4 ] }, + { "item": "tailoring_fabric", "chance": 55, "repeat": [ 1, 4 ] }, + { "item": "supplies_plumbing", "chance": 55, "repeat": [ 0, 2 ] }, + { "item": "SUS_bathroom_sink", "chance": 60, "repeat": [ 1, 4 ] } + ], + "b": [ { "item": "SUS_oven", "chance": 50, "repeat": [ 3, 6 ] } ], + "I": [ { "item": "cleaning", "chance": 50, "repeat": [ 3, 9 ] } ], + "v": [ { "item": "jackets", "chance": 70, "repeat": [ 0, 2 ] } ], + "L": [ + { "item": "army_personal_locker", "chance": 60, "repeat": [ 1, 4 ] }, + { "item": "clothing_work_boots", "chance": 5 }, + { "item": "clothing_work_glasses", "chance": 5 }, + { "item": "clothing_work_gloves", "chance": 5 }, + { "item": "clothing_work_hat", "chance": 5 }, + { "item": "clothing_work_mask", "chance": 5 }, + { "item": "clothing_work_pants", "chance": 5 }, + { "item": "clothing_work_torso", "chance": 5 }, + { "item": "hardware_clothing", "chance": 5 }, + { "item": "pants_male", "chance": 5 }, + { "item": "pants_female", "chance": 2 }, + { "item": "shoes", "chance": 5 }, + { "item": "pants", "chance": 5 }, + { "item": "shirts", "chance": 5 } + ], + "P": [ + { "item": "guns_milspec", "chance": 45, "repeat": [ 0, 3 ] }, + { "item": "ammo_milspec", "chance": 55, "repeat": [ 1, 6 ] }, + { "item": "mags_milspec", "chance": 55, "repeat": [ 1, 3 ] } + ], + "Q": [ + { "item": "batteries", "chance": 45, "repeat": [ 0, 2 ] }, + { "item": "electronics", "chance": 55, "repeat": [ 0, 2 ] }, + { "item": "supplies_electronics", "chance": 45, "repeat": [ 0, 8 ] } + ], + "F": [ { "item": "file_room", "chance": 70, "repeat": [ 5, 12 ] } ], + "Y": [ { "item": "clothing_work_set", "chance": 45, "repeat": [ 2, 11 ] } ], + "r": [ + { "item": "clothing_work_set", "chance": 25, "repeat": [ 0, 2 ] }, + { "item": "clothing_military_distribution", "chance": 20, "repeat": [ 0, 2 ] }, + { "item": "clothing_military_pilot_distribution", "chance": 15, "repeat": [ 0, 2 ] }, + { "item": "gi", "chance": 10, "repeat": [ 0, 2 ] }, + { "item": "allclothes", "chance": 10, "repeat": [ 0, 2 ] } + ], + "Z": [ + { "item": "clothing_work_set", "chance": 25 }, + { "item": "clothing_military_distribution", "chance": 20 }, + { "item": "clothing_military_pilot_distribution", "chance": 15 }, + { "item": "gi", "chance": 10 }, + { "item": "allclothes", "chance": 10 } + ], + "W": [ + { "item": "clothing_military_distribution", "chance": 30, "custom-flags": [ "FILTHY" ] }, + { "item": "clothing_military_pilot_distribution", "chance": 20, "custom-flags": [ "FILTHY" ] }, + { "item": "gi", "chance": 5, "custom-flags": [ "FILTHY" ] }, + { "item": "allclothes", "chance": 15, "custom-flags": [ "FILTHY" ] } + ], + "п": [ { "item": "inactive_bots_milspec", "chance": 20, "repeat": [ 0, 3 ] } ], + "q": [ + { "item": "batteries", "chance": 45, "repeat": [ 0, 8 ] }, + { "item": "supplies_electronics", "chance": 55, "repeat": [ 0, 2 ] } + ], + "B": [ + { "item": "bed", "chance": 50 }, + { "item": "magazines", "chance": 5, "repeat": [ 0, 1 ] }, + { "item": "literature", "chance": 5, "repeat": [ 0, 1 ] }, + { "item": "novels", "chance": 5, "repeat": [ 0, 1 ] }, + { "item": "phones", "chance": 5, "repeat": [ 0, 1 ] } + ], + "ж": [ + { "item": "guns_milspec", "chance": 40, "repeat": [ 1, 3 ] }, + { "item": "ammo_milspec", "chance": 55, "repeat": [ 1, 5 ] }, + { "item": "ammo_casings_milspec", "chance": 55, "repeat": [ 1, 5 ] } + ], + "Ж": [ + { "item": "supplies_mechanics_milspec", "chance": 50, "repeat": [ 1, 6 ] }, + { "item": "supplies_spares_vehicle", "chance": 50, "repeat": [ 1, 4 ] }, + { "item": "supplies_metal", "chance": 30, "repeat": [ 0, 3 ] } + ], + "Ω": [ + { "item": "batteries", "chance": 45, "repeat": [ 0, 2 ] }, + { "item": "supplies_electronics", "chance": 55, "repeat": [ 0, 2 ] }, + { "item": "chem_home", "chance": 60, "repeat": [ 0, 2 ] }, + { "item": "tailoring_fabric", "chance": 30, "repeat": [ 0, 2 ] }, + { "item": "supplies_plumbing", "chance": 50, "repeat": [ 0, 2 ] }, + { "item": "office_supplies", "chance": 50, "repeat": [ 0, 2 ] }, + { "item": "writing_utensils", "chance": 50, "repeat": [ 0, 2 ] }, + { "item": "candy_chocolate", "chance": 50, "repeat": [ 0, 2 ] }, + { "item": "salty_snacks", "chance": 50, "repeat": [ 0, 2 ] }, + { "item": "snacks", "chance": 50, "repeat": [ 0, 2 ] }, + { "item": "softdrinks_canned", "chance": 50, "repeat": [ 0, 2 ] }, + { "item": "snacks_fancy", "chance": 50, "repeat": [ 0, 2 ] }, + { "item": "fridgesnacks", "chance": 50, "repeat": [ 0, 2 ] }, + { "item": "SUS_kitchen_sink", "chance": 50, "repeat": [ 0, 2 ] }, + { "item": "gym_school", "chance": 15, "repeat": [ 0, 1 ] } + ], + "T": [ + { "item": "tools_common", "chance": 45, "repeat": [ 0, 3 ] }, + { "item": "tools_construction", "chance": 55, "repeat": [ 0, 2 ] }, + { "item": "tools_electronics", "chance": 55, "repeat": [ 0, 2 ] }, + { "item": "tools_lighting_industrial", "chance": 30, "repeat": [ 0, 2 ] }, + { "item": "tools_mechanic", "chance": 50, "repeat": [ 0, 1 ] }, + { "item": "tools_gunsmith", "chance": 50, "repeat": [ 0, 1 ] }, + { "item": "tools_robotics", "chance": 50, "repeat": [ 0, 1 ] } + ], + "л": [ + { "item": "tools_common", "chance": 45, "repeat": [ 3, 5 ] }, + { "item": "tools_construction", "chance": 55, "repeat": [ 3, 5 ] }, + { "item": "tools_electronics", "chance": 55, "repeat": [ 2, 5 ] }, + { "item": "tools_lighting_industrial", "chance": 30, "repeat": [ 2, 5 ] }, + { "item": "tools_mechanic", "chance": 50, "repeat": [ 1, 3 ] }, + { "item": "tools_gunsmith", "chance": 50, "repeat": [ 1, 2 ] }, + { "item": "tools_robotics", "chance": 50, "repeat": [ 1, 1 ] } + ], + "R": [ + { "item": "book_military", "chance": 5 }, + { "item": "book_survival", "chance": 5 }, + { "item": "literature", "chance": 5 }, + { "item": "novels", "chance": 75, "repeat": [ 6, 20 ] }, + { "item": "hardware_books", "chance": 5 }, + { "item": "dojo_manuals", "chance": 5 }, + { "item": "exotic_books", "chance": 2 }, + { "item": "carpentrybooks", "chance": 5 }, + { "item": "religious_books", "chance": 75, "repeat": [ 0, 3 ] }, + { "item": "manuals", "chance": 5 }, + { "item": "textbooks", "chance": 5 }, + { "item": "lab_bookshelves", "chance": 5 }, + { "item": "tailorbooks", "chance": 5 }, + { "item": "magazines", "chance": 40, "repeat": [ 1, 3 ] } + ], + "Л": [ { "item": "clothing_work_set", "chance": 70, "repeat": [ 0, 15 ] } ], + "β": [ + { "item": "SUS_cookware", "chance": 100, "repeat": [ 0, 4 ] }, + { "item": "SUS_knife_drawer", "chance": 100, "repeat": [ 0, 4 ] }, + { "item": "SUS_utensils", "chance": 100, "repeat": [ 0, 4 ] }, + { "item": "SUS_dishes", "chance": 100, "repeat": [ 0, 4 ] }, + { "item": "SUS_spice_collection", "chance": 100, "repeat": [ 0, 15 ] } + ], + "d": [ { "item": "SUS_bathroom_sink", "chance": 70, "repeat": [ 0, 3 ] } ] + }, + "toilets": { "&": { } }, + "traps": { "=": "tr_rollmat" }, + "nested": { + "δ": { "chunks": [ [ "null", 2 ], [ "crates_supplies_mechanics", 3 ] ] }, + "ε": { "chunks": [ [ "null", 2 ], [ "crates_armament_milspec", 3 ] ] }, + "ζ": { "chunks": [ [ "null", 2 ], [ "crates_random_supply", 3 ] ] } + }, + "vehicles": { + "n": { "vehicle": "hospital_bed", "chance": 100, "status": 1 }, + "Θ": { "vehicle": "hospital_bed", "chance": 100, "rotation": 270, "status": 1 } + }, + "vendingmachines": { "J": { "item_group": "vending_drink", "lootable": true }, "K": { "item_group": "vending_food", "lootable": true } } + } +] diff --git a/data/json/monstergroups/military.json b/data/json/monstergroups/military.json index 078474fa61fa..e3a4509701ff 100644 --- a/data/json/monstergroups/military.json +++ b/data/json/monstergroups/military.json @@ -118,5 +118,54 @@ { "monster": "mon_zombie_flamer", "freq": 1, "cost_multiplier": 30 }, { "monster": "mon_zombie_scientist", "freq": 100, "cost_multiplier": 1 } ] + }, + { + "name": "GROUP_AIRCRAFT_CARRIER", + "type": "monstergroup", + "//": "no children, 40% tech personel 20% civilian personel (med, fire, cook, clercs etc), 20% uniformed zombie, 10% army pilots, and 10% military zeds", + "monsters": [ + { "monster": "mon_zombie_technician", "weight": 15 }, + { "monster": "mon_feral_human_tool", "weight": 15 }, + { "monster": "mon_zombie_tough", "weight": 6 }, + { "monster": "mon_zombie_static", "weight": 10 }, + { "monster": "mon_zombie_fireman", "weight": 6 }, + { "monster": "mon_zombie_medical", "weight": 6 }, + { "monster": "mon_zombie_fat", "weight": 6 }, + { "monster": "mon_zombie_rot", "weight": 6 }, + { "monster": "mon_zombie_crawler", "weight": 6 }, + { "monster": "mon_zombie_brainless", "weight": 6 }, + { "monster": "mon_zombie_milbase_personnel", "weight": 18 }, + { "monster": "mon_zombie_military_pilot", "weight": 18 }, + { "monster": "mon_zombie_soldier", "weight": 6 }, + { "monster": "mon_zombie_flamer", "weight": 12, "cost_multiplier": 2 }, + { "monster": "mon_zombie_military_pilot", "weight": 6 }, + { "monster": "mon_zombie_soldier", "weight": 15, "cost_multiplier": 5, "pack_size": [ 2, 4 ] }, + { "monster": "mon_zombie_bio_op", "weight": 2, "cost_multiplier": 10 }, + { "monster": "mon_zombie_bio_op2", "weight": 2, "cost_multiplier": 10, "starts": "60 days" }, + { "monster": "mon_feral_human_pipe", "weight": 6 }, + { "monster": "mon_feral_human_crowbar", "weight": 6 }, + { "monster": "mon_feral_human_axe", "weight": 6 }, + { "monster": "mon_feral_sapien_spear", "weight": 6 }, + { "monster": "mon_feral_human_pipe", "weight": 6 }, + { "monster": "mon_feral_soldier", "weight": 6 } + ] + }, + { + "name": "GROUP_AIRCRAFT_CARRIER_TECHNICIANS", + "type": "monstergroup", + "monsters": [ + { "monster": "mon_zombie_technician", "weight": 67 }, + { "monster": "mon_feral_human_tool", "weight": 67 }, + { "monster": "mon_zombie_static", "weight": 12 }, + { "monster": "mon_zombie_fireman", "weight": 6 }, + { "monster": "mon_zombie_medical", "weight": 6 }, + { "monster": "mon_zombie_fat", "weight": 6 }, + { "monster": "mon_feral_human_pipe", "weight": 6 }, + { "monster": "mon_feral_human_crowbar", "weight": 6 }, + { "monster": "mon_feral_human_axe", "weight": 6 }, + { "monster": "mon_feral_sapien_spear", "weight": 6 }, + { "monster": "mon_feral_human_pipe", "weight": 6 }, + { "monster": "mon_feral_soldier", "weight": 6 } + ] } ] diff --git a/data/json/overmap/overmap_special/aircraft_carrier.json b/data/json/overmap/overmap_special/aircraft_carrier.json new file mode 100644 index 000000000000..62aa039e4612 --- /dev/null +++ b/data/json/overmap/overmap_special/aircraft_carrier.json @@ -0,0 +1,206 @@ +[ + { + "type": "overmap_special", + "id": "aircraft_carrier", + "overmaps": [ + { "point": [ -1, -1, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 0, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 1, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 2, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 3, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 4, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 5, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 6, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 7, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 8, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 9, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 10, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 11, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 12, 0 ], "overmap": "lake_surface" }, + { "point": [ -1, 13, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, -1, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 0, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 1, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 2, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 3, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 4, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 5, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 6, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 7, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 8, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 9, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 10, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 11, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 12, 0 ], "overmap": "lake_surface" }, + { "point": [ 3, 13, 0 ], "overmap": "lake_surface" }, + { "point": [ 0, -1, 0 ], "overmap": "lake_surface" }, + { "point": [ 1, -1, 0 ], "overmap": "lake_surface" }, + { "point": [ 2, -1, 0 ], "overmap": "lake_surface" }, + { "point": [ 0, 13, 0 ], "overmap": "lake_surface" }, + { "point": [ 1, 13, 0 ], "overmap": "lake_surface" }, + { "point": [ 2, 13, 0 ], "overmap": "lake_surface" }, + { "point": [ 0, 0, 0 ], "overmap": "aircraft_carrier_1a_north" }, + { "point": [ 1, 0, 0 ], "overmap": "aircraft_carrier_1b_north" }, + { "point": [ 2, 0, 0 ], "overmap": "aircraft_carrier_1c_north" }, + { "point": [ 0, 1, 0 ], "overmap": "aircraft_carrier_2a_north" }, + { "point": [ 1, 1, 0 ], "overmap": "aircraft_carrier_2b_north" }, + { "point": [ 2, 1, 0 ], "overmap": "aircraft_carrier_2c_north" }, + { "point": [ 0, 2, 0 ], "overmap": "aircraft_carrier_3a_north" }, + { "point": [ 1, 2, 0 ], "overmap": "aircraft_carrier_3b_north" }, + { "point": [ 2, 2, 0 ], "overmap": "aircraft_carrier_3c_north" }, + { "point": [ 0, 3, 0 ], "overmap": "aircraft_carrier_4a_north" }, + { "point": [ 1, 3, 0 ], "overmap": "aircraft_carrier_4b_north" }, + { "point": [ 2, 3, 0 ], "overmap": "aircraft_carrier_4c_north" }, + { "point": [ 0, 4, 0 ], "overmap": "aircraft_carrier_5a_north" }, + { "point": [ 1, 4, 0 ], "overmap": "aircraft_carrier_5b_north" }, + { "point": [ 2, 4, 0 ], "overmap": "aircraft_carrier_5c_north" }, + { "point": [ 0, 5, 0 ], "overmap": "aircraft_carrier_6a_north" }, + { "point": [ 1, 5, 0 ], "overmap": "aircraft_carrier_6b_north" }, + { "point": [ 2, 5, 0 ], "overmap": "aircraft_carrier_6c_north" }, + { "point": [ 0, 6, 0 ], "overmap": "aircraft_carrier_7a_north" }, + { "point": [ 1, 6, 0 ], "overmap": "aircraft_carrier_7b_north" }, + { "point": [ 2, 6, 0 ], "overmap": "aircraft_carrier_7c_north" }, + { "point": [ 0, 7, 0 ], "overmap": "aircraft_carrier_8a_north" }, + { "point": [ 1, 7, 0 ], "overmap": "aircraft_carrier_8b_north" }, + { "point": [ 2, 7, 0 ], "overmap": "aircraft_carrier_8c_north" }, + { "point": [ 0, 8, 0 ], "overmap": "aircraft_carrier_9a_north" }, + { "point": [ 1, 8, 0 ], "overmap": "aircraft_carrier_9b_north" }, + { "point": [ 2, 8, 0 ], "overmap": "aircraft_carrier_9c_north" }, + { "point": [ 0, 9, 0 ], "overmap": "aircraft_carrier_10a_north" }, + { "point": [ 1, 9, 0 ], "overmap": "aircraft_carrier_10b_north" }, + { "point": [ 2, 9, 0 ], "overmap": "aircraft_carrier_10c_north" }, + { "point": [ 0, 10, 0 ], "overmap": "aircraft_carrier_11a_north" }, + { "point": [ 1, 10, 0 ], "overmap": "aircraft_carrier_11b_north" }, + { "point": [ 2, 10, 0 ], "overmap": "aircraft_carrier_11c_north" }, + { "point": [ 0, 11, 0 ], "overmap": "aircraft_carrier_12a_north" }, + { "point": [ 1, 11, 0 ], "overmap": "aircraft_carrier_12b_north" }, + { "point": [ 2, 11, 0 ], "overmap": "aircraft_carrier_12c_north" }, + { "point": [ 0, 12, 0 ], "overmap": "aircraft_carrier_13a_north" }, + { "point": [ 1, 12, 0 ], "overmap": "aircraft_carrier_13b_north" }, + { "point": [ 2, 12, 0 ], "overmap": "aircraft_carrier_13c_north" }, + { "point": [ 0, 0, -1 ], "overmap": "aircraft_carrier_1a_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 1, 0, -1 ], "overmap": "aircraft_carrier_1b_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 2, 0, -1 ], "overmap": "aircraft_carrier_1c_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 0, 1, -1 ], "overmap": "aircraft_carrier_2a_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 1, 1, -1 ], "overmap": "aircraft_carrier_2b_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 2, 1, -1 ], "overmap": "aircraft_carrier_2c_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 0, 2, -1 ], "overmap": "aircraft_carrier_3a_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 1, 2, -1 ], "overmap": "aircraft_carrier_3b_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 2, 2, -1 ], "overmap": "aircraft_carrier_3c_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 0, 3, -1 ], "overmap": "aircraft_carrier_4a_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 1, 3, -1 ], "overmap": "aircraft_carrier_4b_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 2, 3, -1 ], "overmap": "aircraft_carrier_4c_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 0, 4, -1 ], "overmap": "aircraft_carrier_5a_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 1, 4, -1 ], "overmap": "aircraft_carrier_5b_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 2, 4, -1 ], "overmap": "aircraft_carrier_5c_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 0, 5, -1 ], "overmap": "aircraft_carrier_6a_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 1, 5, -1 ], "overmap": "aircraft_carrier_6b_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 2, 5, -1 ], "overmap": "aircraft_carrier_6c_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 0, 6, -1 ], "overmap": "aircraft_carrier_7a_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 1, 6, -1 ], "overmap": "aircraft_carrier_7b_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 2, 6, -1 ], "overmap": "aircraft_carrier_7c_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 0, 7, -1 ], "overmap": "aircraft_carrier_8a_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 1, 7, -1 ], "overmap": "aircraft_carrier_8b_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 2, 7, -1 ], "overmap": "aircraft_carrier_8c_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 0, 8, -1 ], "overmap": "aircraft_carrier_9a_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 1, 8, -1 ], "overmap": "aircraft_carrier_9b_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 2, 8, -1 ], "overmap": "aircraft_carrier_9c_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 0, 9, -1 ], "overmap": "aircraft_carrier_10a_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 1, 9, -1 ], "overmap": "aircraft_carrier_10b_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 2, 9, -1 ], "overmap": "aircraft_carrier_10c_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 0, 10, -1 ], "overmap": "aircraft_carrier_11a_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 1, 10, -1 ], "overmap": "aircraft_carrier_11b_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 2, 10, -1 ], "overmap": "aircraft_carrier_11c_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 0, 11, -1 ], "overmap": "aircraft_carrier_12a_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 1, 11, -1 ], "overmap": "aircraft_carrier_12b_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 2, 11, -1 ], "overmap": "aircraft_carrier_12c_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 0, 12, -1 ], "overmap": "aircraft_carrier_13a_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 1, 12, -1 ], "overmap": "aircraft_carrier_13b_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 2, 12, -1 ], "overmap": "aircraft_carrier_13c_-1_north", "locations": [ "lake_water_cube" ] }, + { "point": [ 0, 0, 1 ], "overmap": "aircraft_carrier_1a_1_north" }, + { "point": [ 1, 0, 1 ], "overmap": "aircraft_carrier_1b_1_north" }, + { "point": [ 2, 0, 1 ], "overmap": "aircraft_carrier_1c_1_north" }, + { "point": [ 0, 1, 1 ], "overmap": "aircraft_carrier_2a_1_north" }, + { "point": [ 1, 1, 1 ], "overmap": "aircraft_carrier_2b_1_north" }, + { "point": [ 2, 1, 1 ], "overmap": "aircraft_carrier_2c_1_north" }, + { "point": [ 0, 2, 1 ], "overmap": "aircraft_carrier_3a_1_north" }, + { "point": [ 1, 2, 1 ], "overmap": "aircraft_carrier_3b_1_north" }, + { "point": [ 2, 2, 1 ], "overmap": "aircraft_carrier_3c_1_north" }, + { "point": [ 0, 3, 1 ], "overmap": "aircraft_carrier_4a_1_north" }, + { "point": [ 1, 3, 1 ], "overmap": "aircraft_carrier_4b_1_north" }, + { "point": [ 2, 3, 1 ], "overmap": "aircraft_carrier_4c_1_north" }, + { "point": [ 0, 4, 1 ], "overmap": "aircraft_carrier_5a_1_north" }, + { "point": [ 1, 4, 1 ], "overmap": "aircraft_carrier_5b_1_north" }, + { "point": [ 2, 4, 1 ], "overmap": "aircraft_carrier_5c_1_north" }, + { "point": [ 0, 5, 1 ], "overmap": "aircraft_carrier_6a_1_north" }, + { "point": [ 1, 5, 1 ], "overmap": "aircraft_carrier_6b_1_north" }, + { "point": [ 2, 5, 1 ], "overmap": "aircraft_carrier_6c_1_north" }, + { "point": [ 0, 6, 1 ], "overmap": "aircraft_carrier_7a_1_north" }, + { "point": [ 1, 6, 1 ], "overmap": "aircraft_carrier_7b_1_north" }, + { "point": [ 2, 6, 1 ], "overmap": "aircraft_carrier_7c_1_north" }, + { "point": [ 0, 7, 1 ], "overmap": "aircraft_carrier_8a_1_north" }, + { "point": [ 1, 7, 1 ], "overmap": "aircraft_carrier_8b_1_north" }, + { "point": [ 2, 7, 1 ], "overmap": "aircraft_carrier_8c_1_north" }, + { "point": [ 0, 8, 1 ], "overmap": "aircraft_carrier_9a_1_north" }, + { "point": [ 1, 8, 1 ], "overmap": "aircraft_carrier_9b_1_north" }, + { "point": [ 2, 8, 1 ], "overmap": "aircraft_carrier_9c_1_north" }, + { "point": [ 0, 9, 1 ], "overmap": "aircraft_carrier_10a_1_north" }, + { "point": [ 1, 9, 1 ], "overmap": "aircraft_carrier_10b_1_north" }, + { "point": [ 2, 9, 1 ], "overmap": "aircraft_carrier_10c_1_north" }, + { "point": [ 0, 10, 1 ], "overmap": "aircraft_carrier_11a_1_north" }, + { "point": [ 1, 10, 1 ], "overmap": "aircraft_carrier_11b_1_north" }, + { "point": [ 2, 10, 1 ], "overmap": "aircraft_carrier_11c_1_north" }, + { "point": [ 0, 11, 1 ], "overmap": "aircraft_carrier_12a_1_north" }, + { "point": [ 1, 11, 1 ], "overmap": "aircraft_carrier_12b_1_north" }, + { "point": [ 2, 11, 1 ], "overmap": "aircraft_carrier_12c_1_north" }, + { "point": [ 0, 12, 1 ], "overmap": "aircraft_carrier_13a_1_north" }, + { "point": [ 1, 12, 1 ], "overmap": "aircraft_carrier_13b_1_north" }, + { "point": [ 2, 12, 1 ], "overmap": "aircraft_carrier_13c_1_north" }, + { "point": [ 0, 0, 2 ], "overmap": "aircraft_carrier_1a_2_north" }, + { "point": [ 1, 0, 2 ], "overmap": "aircraft_carrier_1b_2_north" }, + { "point": [ 2, 0, 2 ], "overmap": "aircraft_carrier_1c_2_north" }, + { "point": [ 0, 1, 2 ], "overmap": "aircraft_carrier_2a_2_north" }, + { "point": [ 1, 1, 2 ], "overmap": "aircraft_carrier_2b_2_north" }, + { "point": [ 2, 1, 2 ], "overmap": "aircraft_carrier_2c_2_north" }, + { "point": [ 0, 2, 2 ], "overmap": "aircraft_carrier_3a_2_north" }, + { "point": [ 1, 2, 2 ], "overmap": "aircraft_carrier_3b_2_north" }, + { "point": [ 2, 2, 2 ], "overmap": "aircraft_carrier_3c_2_north" }, + { "point": [ 0, 3, 2 ], "overmap": "aircraft_carrier_4a_2_north" }, + { "point": [ 1, 3, 2 ], "overmap": "aircraft_carrier_4b_2_north" }, + { "point": [ 2, 3, 2 ], "overmap": "aircraft_carrier_4c_2_north" }, + { "point": [ 0, 4, 2 ], "overmap": "aircraft_carrier_5a_2_north" }, + { "point": [ 1, 4, 2 ], "overmap": "aircraft_carrier_5b_2_north" }, + { "point": [ 2, 4, 2 ], "overmap": "aircraft_carrier_5c_2_north" }, + { "point": [ 0, 5, 2 ], "overmap": "aircraft_carrier_6a_2_north" }, + { "point": [ 1, 5, 2 ], "overmap": "aircraft_carrier_6b_2_north" }, + { "point": [ 2, 5, 2 ], "overmap": "aircraft_carrier_6c_2_north" }, + { "point": [ 0, 6, 2 ], "overmap": "aircraft_carrier_7a_2_north" }, + { "point": [ 1, 6, 2 ], "overmap": "aircraft_carrier_7b_2_north" }, + { "point": [ 2, 6, 2 ], "overmap": "aircraft_carrier_7c_2_north" }, + { "point": [ 0, 7, 2 ], "overmap": "aircraft_carrier_8a_2_north" }, + { "point": [ 1, 7, 2 ], "overmap": "aircraft_carrier_8b_2_north" }, + { "point": [ 2, 7, 2 ], "overmap": "aircraft_carrier_8c_2_north" }, + { "point": [ 0, 8, 2 ], "overmap": "aircraft_carrier_9a_2_north" }, + { "point": [ 1, 8, 2 ], "overmap": "aircraft_carrier_9b_2_north" }, + { "point": [ 2, 8, 2 ], "overmap": "aircraft_carrier_9c_2_north" }, + { "point": [ 0, 9, 2 ], "overmap": "aircraft_carrier_10a_2_north" }, + { "point": [ 1, 9, 2 ], "overmap": "aircraft_carrier_10b_2_north" }, + { "point": [ 2, 9, 2 ], "overmap": "aircraft_carrier_10c_2_north" }, + { "point": [ 0, 10, 2 ], "overmap": "aircraft_carrier_11a_2_north" }, + { "point": [ 1, 10, 2 ], "overmap": "aircraft_carrier_11b_2_north" }, + { "point": [ 2, 10, 2 ], "overmap": "aircraft_carrier_11c_2_north" }, + { "point": [ 0, 11, 2 ], "overmap": "aircraft_carrier_12a_2_north" }, + { "point": [ 1, 11, 2 ], "overmap": "aircraft_carrier_12b_2_north" }, + { "point": [ 2, 11, 2 ], "overmap": "aircraft_carrier_12c_2_north" }, + { "point": [ 0, 12, 2 ], "overmap": "aircraft_carrier_13a_2_north" }, + { "point": [ 1, 12, 2 ], "overmap": "aircraft_carrier_13b_2_north" }, + { "point": [ 2, 12, 2 ], "overmap": "aircraft_carrier_13c_2_north" }, + { "point": [ 2, 5, 3 ], "overmap": "aircraft_carrier_1a_3_north" }, + { "point": [ 2, 6, 3 ], "overmap": "aircraft_carrier_2a_3_north" } + ], + "city_distance": [ -1, 1000 ], + "locations": [ "lake_surface" ], + "occurrences": [ 75, 100 ], + "flags": [ "CLASSIC", "LAKE", "MAN_MADE", "UNIQUE", "MILITARY" ] + } +] diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_aircraft_carrier.json b/data/json/overmap/overmap_terrain/overmap_terrain_aircraft_carrier.json new file mode 100644 index 000000000000..a7c8b169045b --- /dev/null +++ b/data/json/overmap/overmap_terrain/overmap_terrain_aircraft_carrier.json @@ -0,0 +1,182 @@ +[ + { + "type": "overmap_terrain", + "id": [ + "aircraft_carrier_1a", + "aircraft_carrier_1b", + "aircraft_carrier_1c", + "aircraft_carrier_2a", + "aircraft_carrier_2b", + "aircraft_carrier_2c", + "aircraft_carrier_3a", + "aircraft_carrier_3b", + "aircraft_carrier_3c", + "aircraft_carrier_4a", + "aircraft_carrier_4b", + "aircraft_carrier_4c", + "aircraft_carrier_5a", + "aircraft_carrier_5b", + "aircraft_carrier_5c", + "aircraft_carrier_6a", + "aircraft_carrier_6b", + "aircraft_carrier_6c", + "aircraft_carrier_7a", + "aircraft_carrier_7b", + "aircraft_carrier_7c", + "aircraft_carrier_8a", + "aircraft_carrier_8b", + "aircraft_carrier_8c", + "aircraft_carrier_9a", + "aircraft_carrier_9b", + "aircraft_carrier_9c", + "aircraft_carrier_10a", + "aircraft_carrier_10b", + "aircraft_carrier_10c", + "aircraft_carrier_11a", + "aircraft_carrier_11b", + "aircraft_carrier_11c", + "aircraft_carrier_12a", + "aircraft_carrier_12b", + "aircraft_carrier_12c", + "aircraft_carrier_13a", + "aircraft_carrier_13b", + "aircraft_carrier_13c", + "aircraft_carrier_1a_1", + "aircraft_carrier_1b_1", + "aircraft_carrier_1c_1", + "aircraft_carrier_2a_1", + "aircraft_carrier_2b_1", + "aircraft_carrier_2c_1", + "aircraft_carrier_3a_1", + "aircraft_carrier_3b_1", + "aircraft_carrier_3c_1", + "aircraft_carrier_4a_1", + "aircraft_carrier_4b_1", + "aircraft_carrier_4c_1", + "aircraft_carrier_5a_1", + "aircraft_carrier_5b_1", + "aircraft_carrier_5c_1", + "aircraft_carrier_6a_1", + "aircraft_carrier_6b_1", + "aircraft_carrier_6c_1", + "aircraft_carrier_7a_1", + "aircraft_carrier_7b_1", + "aircraft_carrier_7c_1", + "aircraft_carrier_8a_1", + "aircraft_carrier_8b_1", + "aircraft_carrier_8c_1", + "aircraft_carrier_9a_1", + "aircraft_carrier_9b_1", + "aircraft_carrier_9c_1", + "aircraft_carrier_10a_1", + "aircraft_carrier_10b_1", + "aircraft_carrier_10c_1", + "aircraft_carrier_11a_1", + "aircraft_carrier_11b_1", + "aircraft_carrier_11c_1", + "aircraft_carrier_12a_1", + "aircraft_carrier_12b_1", + "aircraft_carrier_12c_1", + "aircraft_carrier_13a_1", + "aircraft_carrier_13b_1", + "aircraft_carrier_13c_1", + "aircraft_carrier_1a_2", + "aircraft_carrier_1b_2", + "aircraft_carrier_1c_2", + "aircraft_carrier_2a_2", + "aircraft_carrier_2b_2", + "aircraft_carrier_2c_2", + "aircraft_carrier_3a_2", + "aircraft_carrier_3b_2", + "aircraft_carrier_3c_2", + "aircraft_carrier_4a_2", + "aircraft_carrier_4b_2", + "aircraft_carrier_4c_2", + "aircraft_carrier_5a_2", + "aircraft_carrier_5b_2", + "aircraft_carrier_5c_2", + "aircraft_carrier_6a_2", + "aircraft_carrier_6b_2", + "aircraft_carrier_6c_2", + "aircraft_carrier_7a_2", + "aircraft_carrier_7b_2", + "aircraft_carrier_7c_2", + "aircraft_carrier_8a_2", + "aircraft_carrier_8b_2", + "aircraft_carrier_8c_2", + "aircraft_carrier_9a_2", + "aircraft_carrier_9b_2", + "aircraft_carrier_9c_2", + "aircraft_carrier_10a_2", + "aircraft_carrier_10b_2", + "aircraft_carrier_10c_2", + "aircraft_carrier_11a_2", + "aircraft_carrier_11b_2", + "aircraft_carrier_11c_2", + "aircraft_carrier_12a_2", + "aircraft_carrier_12b_2", + "aircraft_carrier_12c_2", + "aircraft_carrier_13a_2", + "aircraft_carrier_13b_2", + "aircraft_carrier_13c_2", + "aircraft_carrier_1a_3", + "aircraft_carrier_2a_3" + ], + "name": "aircraft carrier", + "sym": "A", + "color": "red", + "see_cost": 5, + "spawns": { "group": "GROUP_AIRCRAFT_CARRIER", "population": [ 20, 40 ], "chance": 100 }, + "flags": [ "RISK_HIGH", "LAKE" ] + }, + { + "type": "overmap_terrain", + "id": [ + "aircraft_carrier_1a_-1", + "aircraft_carrier_1b_-1", + "aircraft_carrier_1c_-1", + "aircraft_carrier_2a_-1", + "aircraft_carrier_2b_-1", + "aircraft_carrier_2c_-1", + "aircraft_carrier_3a_-1", + "aircraft_carrier_3b_-1", + "aircraft_carrier_3c_-1", + "aircraft_carrier_4a_-1", + "aircraft_carrier_4b_-1", + "aircraft_carrier_4c_-1", + "aircraft_carrier_5a_-1", + "aircraft_carrier_5b_-1", + "aircraft_carrier_5c_-1", + "aircraft_carrier_6a_-1", + "aircraft_carrier_6b_-1", + "aircraft_carrier_6c_-1", + "aircraft_carrier_7a_-1", + "aircraft_carrier_7b_-1", + "aircraft_carrier_7c_-1", + "aircraft_carrier_8a_-1", + "aircraft_carrier_8b_-1", + "aircraft_carrier_8c_-1", + "aircraft_carrier_9a_-1", + "aircraft_carrier_9b_-1", + "aircraft_carrier_9c_-1", + "aircraft_carrier_10a_-1", + "aircraft_carrier_10b_-1", + "aircraft_carrier_10c_-1", + "aircraft_carrier_11a_-1", + "aircraft_carrier_11b_-1", + "aircraft_carrier_11c_-1", + "aircraft_carrier_12a_-1", + "aircraft_carrier_12b_-1", + "aircraft_carrier_12c_-1", + "aircraft_carrier_13a_-1", + "aircraft_carrier_13b_-1", + "aircraft_carrier_13c_-1" + ], + "name": "aircraft carrier", + "sym": "A", + "color": "red", + "see_cost": 5, + "spawns": { "group": "GROUP_AIRCRAFT_CARRIER_TECHNICIANS", "population": [ 20, 35 ], "chance": 100 }, + "flags": [ "RISK_HIGH", "LAKE" ] + } +] From 4a48fc89ccbc87cd0023db52845260b28e479017 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sun, 26 Jul 2020 12:20:36 -0400 Subject: [PATCH 03/15] add hospital bed --- data/json/vehicles/carts.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/data/json/vehicles/carts.json b/data/json/vehicles/carts.json index a88dcd479991..55ff473e455d 100644 --- a/data/json/vehicles/carts.json +++ b/data/json/vehicles/carts.json @@ -306,6 +306,27 @@ { "x": 0, "y": 0, "part": "basketsm" } ] }, + { + "id": "hospital_bed", + "type": "vehicle", + "name": "hospital bed", + "blueprint": [ + [ "x" ], + [ "o" ] + ], + "parts": [ + { "x": -1, "y": 0, "part": "xlframe_vertical_2" }, + { "x": -1, "y": 0, "part": "wheel_10" }, + { "x": -1, "y": 0, "part": "bed" }, + { "x": 0, "y": 0, "part": "xlframe_vertical_2" }, + { "x": 0, "y": 0, "part": "wheel_10" }, + { "x": 0, "y": 0, "part": "bed" } + ], + "items": [ + { "x": 0, "y": 0, "chance": 70, "item_groups": [ "hospital_bed" ] }, + { "x": -1, "y": 0, "chance": 70, "item_groups": [ "hospital_bed" ] } + ] + }, { "id": "laundry_cart", "type": "vehicle", From 60361752918054b44db44e36e6ac6a6f14c02b39 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Fri, 20 Aug 2021 20:20:47 -0600 Subject: [PATCH 04/15] Add fireman cabinet and item group --- .../furniture-storage.json | 73 +++++++++++++++++++ data/json/itemgroups/tools.json | 20 +++++ 2 files changed, 93 insertions(+) diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json index aa512e999257..994261a83f78 100644 --- a/data/json/furniture_and_terrain/furniture-storage.json +++ b/data/json/furniture_and_terrain/furniture-storage.json @@ -911,6 +911,79 @@ "items": [ { "item": "2x4", "count": [ 3, 6 ] }, { "item": "splinter", "count": [ 2, 4 ] } ] } }, + { + "type": "furniture", + "id": "f_fireman_cabinet", + "name": "fireman's cabinet", + "looks_like": "f_displaycase", + "description": "A conspicuously painted metallic cabinet, visibly holding tools behind a thin panel of tempered glass. ", + "symbol": "#", + "color": "light_red", + "move_cost_mod": -1, + "coverage": 80, + "required_str": -1, + "flags": [ "TRANSPARENT", "SEALED", "PLACE_ITEM", "PICKABLE" ], + "lockpick_result": "f_fireman_cabinet_o", + "lockpick_message": "With a satisfying click, the lock and the cabinet open.", + "examine_action": "locked_object_pickable", + "bash": { + "str_min": 6, + "str_max": 20, + "sound": "glass breaking", + "sound_fail": "whack!", + "sound_vol": 16, + "sound_fail_vol": 12, + "furn_set": "f_fireman_cabinet_b", + "items": [ { "item": "glass_shard", "count": [ 25, 50 ] } ] + } + }, + { + "type": "furniture", + "id": "f_fireman_cabinet_o", + "name": "unlocked fireman's cabinet", + "looks_like": "f_displaycase", + "description": "A conspicuously painted metallic cabinet. Its glass panel door was left unlocked and slightly ajar.", + "symbol": "#", + "color": "light_red", + "move_cost_mod": -1, + "coverage": 80, + "required_str": -1, + "flags": [ "TRANSPARENT", "PLACE_ITEM" ], + "bash": { + "str_min": 6, + "str_max": 20, + "sound": "glass breaking", + "sound_fail": "whack!", + "sound_vol": 16, + "sound_fail_vol": 12, + "furn_set": "f_fireman_cabinet_b", + "items": [ { "item": "glass_shard", "count": [ 25, 50 ] } ] + } + }, + { + "type": "furniture", + "id": "f_fireman_cabinet_b", + "name": "open fireman's cabinet", + "looks_like": "f_displaycase_b", + "description": "A conspicuously painted metallic cabinet. It's protective glass panel lies broken from some past emergency or looting attempt.", + "symbol": "#", + "color": "light_red", + "move_cost_mod": -1, + "coverage": 80, + "required_str": -1, + "flags": [ "TRANSPARENT", "PLACE_ITEM" ], + "bash": { + "str_min": 10, + "str_max": 20, + "sound": "metal screeching!", + "sound_fail": "clang!", + "items": [ + { "item": "scrap", "count": [ 2, 8 ] }, + { "item": "pipe", "count": [ 1, 3 ] }, + { "item": "water_faucet", "prob": 50 } + ] + } + }, { "type": "furniture", "id": "f_standing_tank", diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json index 2fd823e2c5f1..44218b3dbe75 100644 --- a/data/json/itemgroups/tools.json +++ b/data/json/itemgroups/tools.json @@ -424,6 +424,26 @@ [ "acetylene_machine", 1 ] ] }, + { + "id": "fireman_cabinet", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "items": [ + { "item": "extinguisher", "prob": 35 }, + { "item": "sm_extinguisher", "prob": 35 }, + { + "collection": [ + { "item": "hose" }, + { "item": "sm_extinguisher" }, + { "item": "fire_ax", "prob": 50 }, + { "item": "crash_axe", "prob": 80 }, + { "item": "throw_extinguisher", "prob": 30, "count": [ 3, 5 ] } + ], + "prob": 30 + } + ] + }, { "type": "item_group", "id": "tools_robotics", From 1e936336f45fd7a6babc4beef19f1539a63a6f5a Mon Sep 17 00:00:00 2001 From: Volch Date: Wed, 13 Dec 2023 19:05:12 +0300 Subject: [PATCH 05/15] Remove unsued furn --- .../furniture-storage.json | 73 ------------------- 1 file changed, 73 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-storage.json b/data/json/furniture_and_terrain/furniture-storage.json index 994261a83f78..aa512e999257 100644 --- a/data/json/furniture_and_terrain/furniture-storage.json +++ b/data/json/furniture_and_terrain/furniture-storage.json @@ -911,79 +911,6 @@ "items": [ { "item": "2x4", "count": [ 3, 6 ] }, { "item": "splinter", "count": [ 2, 4 ] } ] } }, - { - "type": "furniture", - "id": "f_fireman_cabinet", - "name": "fireman's cabinet", - "looks_like": "f_displaycase", - "description": "A conspicuously painted metallic cabinet, visibly holding tools behind a thin panel of tempered glass. ", - "symbol": "#", - "color": "light_red", - "move_cost_mod": -1, - "coverage": 80, - "required_str": -1, - "flags": [ "TRANSPARENT", "SEALED", "PLACE_ITEM", "PICKABLE" ], - "lockpick_result": "f_fireman_cabinet_o", - "lockpick_message": "With a satisfying click, the lock and the cabinet open.", - "examine_action": "locked_object_pickable", - "bash": { - "str_min": 6, - "str_max": 20, - "sound": "glass breaking", - "sound_fail": "whack!", - "sound_vol": 16, - "sound_fail_vol": 12, - "furn_set": "f_fireman_cabinet_b", - "items": [ { "item": "glass_shard", "count": [ 25, 50 ] } ] - } - }, - { - "type": "furniture", - "id": "f_fireman_cabinet_o", - "name": "unlocked fireman's cabinet", - "looks_like": "f_displaycase", - "description": "A conspicuously painted metallic cabinet. Its glass panel door was left unlocked and slightly ajar.", - "symbol": "#", - "color": "light_red", - "move_cost_mod": -1, - "coverage": 80, - "required_str": -1, - "flags": [ "TRANSPARENT", "PLACE_ITEM" ], - "bash": { - "str_min": 6, - "str_max": 20, - "sound": "glass breaking", - "sound_fail": "whack!", - "sound_vol": 16, - "sound_fail_vol": 12, - "furn_set": "f_fireman_cabinet_b", - "items": [ { "item": "glass_shard", "count": [ 25, 50 ] } ] - } - }, - { - "type": "furniture", - "id": "f_fireman_cabinet_b", - "name": "open fireman's cabinet", - "looks_like": "f_displaycase_b", - "description": "A conspicuously painted metallic cabinet. It's protective glass panel lies broken from some past emergency or looting attempt.", - "symbol": "#", - "color": "light_red", - "move_cost_mod": -1, - "coverage": 80, - "required_str": -1, - "flags": [ "TRANSPARENT", "PLACE_ITEM" ], - "bash": { - "str_min": 10, - "str_max": 20, - "sound": "metal screeching!", - "sound_fail": "clang!", - "items": [ - { "item": "scrap", "count": [ 2, 8 ] }, - { "item": "pipe", "count": [ 1, 3 ] }, - { "item": "water_faucet", "prob": 50 } - ] - } - }, { "type": "furniture", "id": "f_standing_tank", From 697fc94f0caa055a0baefebabf0c2d71fa155248 Mon Sep 17 00:00:00 2001 From: GuardianDll Date: Sat, 21 May 2022 21:32:02 +0200 Subject: [PATCH 06/15] adding the scenario --- data/json/scenarios.json | 26 ++++++++++++++++++++++++++ data/json/start_locations.json | 12 ++++++++++++ 2 files changed, 38 insertions(+) diff --git a/data/json/scenarios.json b/data/json/scenarios.json index bc314f07d3c1..363f63f496fa 100644 --- a/data/json/scenarios.json +++ b/data/json/scenarios.json @@ -705,5 +705,31 @@ "bio_gangster" ], "flags": [ "CHALLENGE", "LONE_START" ] + }, + { + "type": "scenario", + "id": "aircraft_carrier_start", + "name": "CVN Sailor", + "points": 4, + "description": "Lorem ipsum.", + "start_name": "Aircraft Carrier", + "allowed_locs": [ "aircraft_carrier_berth", "aircraft_carrier_bridge" ], + "professions": [ + "unemployed", + "recruit", + "rifleman", + "specops", + "labtech", + "medic", + "mili_pilot", + "mili_medic", + "mili_burner", + "hazmat_unit", + "major-general", + "nco", + "combat-mechanic", + "combat-engineer" + ], + "flags": [ "CHALLENGE", "LONE_START" ] } ] diff --git a/data/json/start_locations.json b/data/json/start_locations.json index 2206bc5733fa..42e77509ce9f 100644 --- a/data/json/start_locations.json +++ b/data/json/start_locations.json @@ -447,6 +447,18 @@ "name": "Military Base Warehouse", "terrain": [ "mil_base_2g" ] }, + { + "type": "start_location", + "id": "aircraft_carrier_berth", + "name": "Aircraft Carrier Berth", + "terrain": [ "aircraft_carrier_1b" ] + }, + { + "type": "start_location", + "id": "aircraft_carrier_bridge", + "name": "Aircraft Carrier Captain's Bridge", + "terrain": [ "aircraft_carrier_1b" ] + }, { "type": "start_location", "id": "sloc_private_resort", From 709927b7ae19fea90d38f402006e174a8a93ad88 Mon Sep 17 00:00:00 2001 From: GuardianDll Date: Sat, 21 May 2022 21:47:56 +0200 Subject: [PATCH 07/15] description, small tweaks in proffesions list --- data/json/scenarios.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/data/json/scenarios.json b/data/json/scenarios.json index 363f63f496fa..fd6557bb29a6 100644 --- a/data/json/scenarios.json +++ b/data/json/scenarios.json @@ -711,20 +711,19 @@ "id": "aircraft_carrier_start", "name": "CVN Sailor", "points": 4, - "description": "Lorem ipsum.", + "description": "In some reason your mission on the coast of North Korea was ended in the middle of the lake, in unknown location. You have no idea what's happened, but now you have more important things to do.", "start_name": "Aircraft Carrier", "allowed_locs": [ "aircraft_carrier_berth", "aircraft_carrier_bridge" ], "professions": [ "unemployed", + "electrician", + "chef", "recruit", "rifleman", "specops", - "labtech", "medic", "mili_pilot", "mili_medic", - "mili_burner", - "hazmat_unit", "major-general", "nco", "combat-mechanic", From 9ad1cbf81f4b4fa10a5246e8b9b146f4b9fade81 Mon Sep 17 00:00:00 2001 From: GuardianDll <67688115+GuardianDll@users.noreply.github.com> Date: Sat, 21 May 2022 23:56:58 +0200 Subject: [PATCH 08/15] Update data/json/scenarios.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/json/scenarios.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/scenarios.json b/data/json/scenarios.json index fd6557bb29a6..235d59f1617e 100644 --- a/data/json/scenarios.json +++ b/data/json/scenarios.json @@ -711,7 +711,7 @@ "id": "aircraft_carrier_start", "name": "CVN Sailor", "points": 4, - "description": "In some reason your mission on the coast of North Korea was ended in the middle of the lake, in unknown location. You have no idea what's happened, but now you have more important things to do.", + "description": "For some reason your mission off the coast of North Korea was ended in the middle of a lake, in unknown location. You have no idea what's happened, but now you have more important things to do.", "start_name": "Aircraft Carrier", "allowed_locs": [ "aircraft_carrier_berth", "aircraft_carrier_bridge" ], "professions": [ From 8329dc67df248aee118811dbe36cc7306f1a4ec4 Mon Sep 17 00:00:00 2001 From: waxcatape <89343493+waxcatape@users.noreply.github.com> Date: Thu, 24 Nov 2022 18:31:38 +0000 Subject: [PATCH 09/15] let the "like new" apache on the aircraft carrier take off. (#62152) Co-authored-by: waxcatape --- .../furniture_and_terrain/terrain-floors-outdoors.json | 8 +++++--- .../json/mapgen/aircraft_carrier/aircraft_carrier_z1.json | 2 +- .../json/mapgen/aircraft_carrier/aircraft_carrier_z2.json | 4 ++-- data/json/mapgen_palettes/aircraft_carrier_palette.json | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-floors-outdoors.json b/data/json/furniture_and_terrain/terrain-floors-outdoors.json index 2e84938b5d32..71d7ec23af1a 100644 --- a/data/json/furniture_and_terrain/terrain-floors-outdoors.json +++ b/data/json/furniture_and_terrain/terrain-floors-outdoors.json @@ -418,11 +418,13 @@ { "type": "terrain", "id": "t_elevator_no_roof", - "roof": "t_null", + "name": "elevator", + "description": "An elevator section of the flight deck.", "symbol": ".", "color": "dark_gray", - "flags": [ "TRANSPARENT", "FLAT" ], - "copy-from": "t_elevator" + "looks_like": "t_elevator", + "move_cost": 2, + "flags": [ "TRANSPARENT", "FLAT", "ELEVATOR" ] }, { "type": "terrain", diff --git a/data/json/mapgen/aircraft_carrier/aircraft_carrier_z1.json b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z1.json index 588f642adf1b..aa3510c9d091 100644 --- a/data/json/mapgen/aircraft_carrier/aircraft_carrier_z1.json +++ b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z1.json @@ -79,7 +79,7 @@ "πππππ-;55Y;;КYY5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;5;;-πππππππππππππππ", "ππππ--;55555555555;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;55;-πππππππππππππππ", "ππππ-;;555{{;xxx;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;t5;-----πππππππππππ", - "πππ--;5555Ch;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;t5;;;;;-πππππππππππ", + "πππ--;5555Ch;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;t5;зззз-πππππππππππ", "πππ-;;5C{5{h;{{{;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;55555555πππππππππππ", "πππ-;55h{5Ch;{{{;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4(44444444444444444", "πππ-;5{;;+;;;;;;;5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4444444444444444444", diff --git a/data/json/mapgen/aircraft_carrier/aircraft_carrier_z2.json b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z2.json index f1ac2b23aacf..4d252f4c9d4a 100644 --- a/data/json/mapgen/aircraft_carrier/aircraft_carrier_z2.json +++ b/data/json/mapgen/aircraft_carrier/aircraft_carrier_z2.json @@ -79,8 +79,8 @@ "ππππππ-11111111111138111111121111111111831111111111111--ππππππππππππππππ", "ππππππ-111111111111381111111211111111183111111111111111-ππππππππππππππππ", "πππππ--111111111111381111111811111111183111111111111111-ππππππππππππππππ", - "πππππ-1111111111111381111111811111111183111111111111111-------ππππππππππ", - "ππππ--1111111111111381111111211111111183111111111111222222222-ππππππππππ", + "πππππ-1111111111111381111111811111111183111111111111111-ππππππππππππππππ", + "ππππ--1111111111111381111111211111111183111111111111222222222πππππππππππ", "ππππ-1111111111111138111111121111111118311111111111124(44444444444444444", "πππ--1111111111111381111111811111111118311111111111124444444444444444444", "πππ-<1111111111111381111111811111111118311111111111124444444444444444444", diff --git a/data/json/mapgen_palettes/aircraft_carrier_palette.json b/data/json/mapgen_palettes/aircraft_carrier_palette.json index c0a088c3e0a9..8aefbe20c116 100644 --- a/data/json/mapgen_palettes/aircraft_carrier_palette.json +++ b/data/json/mapgen_palettes/aircraft_carrier_palette.json @@ -8,6 +8,7 @@ "*": "t_gates_control_metal", "-": "t_metal_railing", ";": "t_metal_floor", + "з": "t_metal_floor_no_roof", "λ": "t_reinforced_glass", "?": [ "t_door_metal_interior_locked", "t_door_metal_interior_locked", "t_door_metal_interior_locked", "t_door_metal_c" ], "<": "t_stairs_down", From 767316bf313bdc7148238d413c0a2f6a15a85952 Mon Sep 17 00:00:00 2001 From: Volch Date: Wed, 13 Dec 2023 19:00:38 +0300 Subject: [PATCH 10/15] Make it work --- .../terrain-floors-outdoors.json | 2 +- .../itemgroups/Clothing_Gear/clothing.json | 6 +- data/json/itemgroups/furniture.json | 2 - data/json/itemgroups/military.json | 13 +--- .../aircraft_carrier_palette.json | 36 +++++----- data/json/monstergroups/military.json | 69 +++++++++---------- data/json/scenarios.json | 9 +-- 7 files changed, 58 insertions(+), 79 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-floors-outdoors.json b/data/json/furniture_and_terrain/terrain-floors-outdoors.json index 71d7ec23af1a..6578cb40ff7c 100644 --- a/data/json/furniture_and_terrain/terrain-floors-outdoors.json +++ b/data/json/furniture_and_terrain/terrain-floors-outdoors.json @@ -434,7 +434,7 @@ "symbol": ".", "looks_like": "t_pavement", "color": "dark_gray", - "connects_to": "METALFLOOR", + "//connects_to": "METALFLOOR", "move_cost": 2, "flags": [ "FLAT", "ROAD", "TRANSPARENT" ], "bash": { diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index 276509ab45d1..ee1e19a4289a 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -116,7 +116,7 @@ "//": "todo: when #57228 would be closed, change this one to copy-from `clothing_military`", "items": [ { "group": "clothing_soldier_shirt" }, - { "distribution": [ { "item": "jacket_army_modern", "prob": 50 }, { "item": "combat_shirt", "prob": 50 } ] }, + { "distribution": [ { "item": "jacket_army", "prob": 50 }, { "item": "tshirt", "prob": 50 } ] }, { "item": "pants_army" }, { "item": "webbing_belt" }, { "distribution": [ { "item": "socks", "prob": 95 }, { "item": "socks_wool", "prob": 5 } ] }, @@ -239,8 +239,8 @@ "//": "todo: when #57228 would be closed, change this one to copy-from `clothing_military`", "items": [ { "item": "chestrig", "prob": 40 }, - { "item": "flight_helmet", "ammo-item": "light_plus_battery_cell", "charges": [ 0, 150 ] }, - { "item": "mil_flight_suit", "prob": 80 }, + { "item": "helmet_army" }, + { "item": "jacket_army", "prob": 80 }, { "item": "nomex_gloves" }, { "item": "webbing_belt" }, { "distribution": [ { "item": "socks", "prob": 30 }, { "item": "nomex_socks", "prob": 70 } ] }, diff --git a/data/json/itemgroups/furniture.json b/data/json/itemgroups/furniture.json index 26103dc2fb53..289bc2359ba5 100644 --- a/data/json/itemgroups/furniture.json +++ b/data/json/itemgroups/furniture.json @@ -84,10 +84,8 @@ { "item": "stereo", "prob": 30 }, { "item": "portable_game", "prob": 30 }, { "item": "battery_charger", "prob": 40 }, - { "item": "extension_cable", "prob": 30 }, { "item": "microphone_xlr_generic", "prob": 20 }, { "item": "cable_xlr", "prob": 40 }, - { "item": "cable_speaker", "prob": 20 }, { "item": "headphones_circumaural", "prob": 10 }, { "item": "cable_instrument", "prob": 5 } ] diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index 6d713018c29b..5b8aaac2f729 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -598,7 +598,7 @@ { "id": "maps_milspec", "type": "item_group", - "items": [ [ "militarymap", 100 ], [ "satellitemap", 100 ] ] + "items": [ [ "militarymap", 100 ] ] }, { "id": "supplies_mechanics_milspec", @@ -613,25 +613,14 @@ [ "hdframe", 20 ], [ "motor", 2 ], [ "wheel", 10 ], - { "item": "polycarbonate_sheet", "prob": 4, "count": [ 1, 3 ] }, - { "item": "rubber_cement", "prob": 15, "count": [ 3, 9 ] }, - [ "vac_mold", 1 ], [ "wheel_wide", 10 ], [ "wheel_small", 10 ], [ "wheel_wide_or", 5 ], - [ "tire_medium", 10 ], - [ "tire_wide", 5 ], - [ "tire_wide_or", 5 ], - [ "deflated_wheel", 10 ], - [ "deflated_wheel_wide_or", 5 ], - [ "wheel_rim_medium", 5 ], - [ "wheel_rim_wide", 5 ], [ "1cyl_combustion", 1 ], [ "v2_combustion", 2 ], [ "i4_combustion", 2 ], [ "v6_combustion", 10 ], [ "v6_diesel", 10 ], - { "item": "aero_engine_light", "prob": 1 }, [ "vehicle_controls", 3 ], [ "horn_car", 1 ], [ "horn_big", 1 ], diff --git a/data/json/mapgen_palettes/aircraft_carrier_palette.json b/data/json/mapgen_palettes/aircraft_carrier_palette.json index 8aefbe20c116..c03bded80fcd 100644 --- a/data/json/mapgen_palettes/aircraft_carrier_palette.json +++ b/data/json/mapgen_palettes/aircraft_carrier_palette.json @@ -36,21 +36,22 @@ " ": "t_water_dp", "g": "t_switchgear_s", "ω": "t_metal_floor", - "ξ": "t_deck_coating_no_roof" + "ξ": "t_deck_coating_no_roof", + ":": "t_machinery_light", + "^": "t_machinery_heavy", + "_": "t_machinery_electronic", + "Э": "t_generator_broken" }, "furniture": { "θ": "f_rack", "A": "f_rack", - "$": [ "f_treadmill", "f_treadmill_mechanical" ], + "$": "f_treadmill", "%": "f_exercise", "&": "f_toilet", "[": "f_table", - "^": "f_machinery_heavy", - "_": "f_machinery_electronic", ")": "f_table", "{": "f_table", - "!": [ "f_ergometer", "f_ergometer_mechanical" ], - ":": "f_machinery_light", + "!": "f_ergometer", "M": "f_locker", "}": "f_rack", "a": "f_dishwasher", @@ -100,7 +101,6 @@ "Ц": "f_pinball_machine", "ч": "f_drill_press", "Ч": "f_heavy_lathe", - "Э": "f_generator_broken", "я": "f_rack", "Я": "f_rack", "п": "f_rack", @@ -119,8 +119,8 @@ "items": { "M": [ { "item": "fireman_cabinet", "chance": 100, "repeat": [ 2, 4 ] }, - { "item": "used_1st_aid", "chance": 55, "repeat": [ 1, 2 ] }, - { "item": "used_ifak", "chance": 55, "repeat": [ 1, 2 ] } + { "item": "drugs_soldier", "chance": 55, "repeat": [ 1, 2 ] }, + { "item": "chem_home", "chance": 55, "repeat": [ 1, 2 ] } ], "θ": [ { "item": "mechanics", "chance": 80, "repeat": [ 1, 4 ] }, @@ -164,7 +164,7 @@ { "item": "pasta", "chance": 55, "repeat": [ 0, 6 ] } ], "G": [ - { "item": "loaded_lbv", "chance": 45, "repeat": [ 0, 2 ] }, + { "item": "clothing_soldier_set", "chance": 45, "repeat": [ 0, 2 ] }, { "item": "military_standard_grenades", "chance": 55, "repeat": [ 1, 2 ] }, { "item": "infantry_common_gear", "chance": 55 }, { "item": "infantry_medical_gear", "chance": 30 }, @@ -204,7 +204,8 @@ { "item": "mags_milspec", "chance": 55, "repeat": [ 1, 3 ] } ], "Q": [ - { "item": "batteries", "chance": 45, "repeat": [ 0, 2 ] }, + { "item": "ammo_atomic_batteries_full", "chance": 45, "repeat": [ 0, 2 ] }, + { "item": "ammo_any_batteries_full", "chance": 45, "repeat": [ 0, 2 ] }, { "item": "electronics", "chance": 55, "repeat": [ 0, 2 ] }, { "item": "supplies_electronics", "chance": 45, "repeat": [ 0, 8 ] } ], @@ -232,7 +233,8 @@ ], "п": [ { "item": "inactive_bots_milspec", "chance": 20, "repeat": [ 0, 3 ] } ], "q": [ - { "item": "batteries", "chance": 45, "repeat": [ 0, 8 ] }, + { "item": "ammo_atomic_batteries_full", "chance": 45, "repeat": [ 0, 4 ] }, + { "item": "ammo_any_batteries_full", "chance": 45, "repeat": [ 0, 6 ] }, { "item": "supplies_electronics", "chance": 55, "repeat": [ 0, 2 ] } ], "B": [ @@ -245,7 +247,7 @@ "ж": [ { "item": "guns_milspec", "chance": 40, "repeat": [ 1, 3 ] }, { "item": "ammo_milspec", "chance": 55, "repeat": [ 1, 5 ] }, - { "item": "ammo_casings_milspec", "chance": 55, "repeat": [ 1, 5 ] } + { "item": "ammo_casings", "chance": 55, "repeat": [ 1, 5 ] } ], "Ж": [ { "item": "supplies_mechanics_milspec", "chance": 50, "repeat": [ 1, 6 ] }, @@ -253,13 +255,14 @@ { "item": "supplies_metal", "chance": 30, "repeat": [ 0, 3 ] } ], "Ω": [ - { "item": "batteries", "chance": 45, "repeat": [ 0, 2 ] }, + { "item": "ammo_atomic_batteries_full", "chance": 45, "repeat": [ 0, 2 ] }, + { "item": "ammo_any_batteries_full", "chance": 45, "repeat": [ 0, 2 ] }, { "item": "supplies_electronics", "chance": 55, "repeat": [ 0, 2 ] }, { "item": "chem_home", "chance": 60, "repeat": [ 0, 2 ] }, { "item": "tailoring_fabric", "chance": 30, "repeat": [ 0, 2 ] }, { "item": "supplies_plumbing", "chance": 50, "repeat": [ 0, 2 ] }, { "item": "office_supplies", "chance": 50, "repeat": [ 0, 2 ] }, - { "item": "writing_utensils", "chance": 50, "repeat": [ 0, 2 ] }, + { "item": "bookstore_misc", "chance": 50, "repeat": [ 0, 2 ] }, { "item": "candy_chocolate", "chance": 50, "repeat": [ 0, 2 ] }, { "item": "salty_snacks", "chance": 50, "repeat": [ 0, 2 ] }, { "item": "snacks", "chance": 50, "repeat": [ 0, 2 ] }, @@ -295,7 +298,6 @@ { "item": "hardware_books", "chance": 5 }, { "item": "dojo_manuals", "chance": 5 }, { "item": "exotic_books", "chance": 2 }, - { "item": "carpentrybooks", "chance": 5 }, { "item": "religious_books", "chance": 75, "repeat": [ 0, 3 ] }, { "item": "manuals", "chance": 5 }, { "item": "textbooks", "chance": 5 }, @@ -324,6 +326,6 @@ "n": { "vehicle": "hospital_bed", "chance": 100, "status": 1 }, "Θ": { "vehicle": "hospital_bed", "chance": 100, "rotation": 270, "status": 1 } }, - "vendingmachines": { "J": { "item_group": "vending_drink", "lootable": true }, "K": { "item_group": "vending_food", "lootable": true } } + "vendingmachines": { "J": { "item_group": "vending_drink" }, "K": { "item_group": "vending_food" } } } ] diff --git a/data/json/monstergroups/military.json b/data/json/monstergroups/military.json index e3a4509701ff..bb0ee3f6d9e3 100644 --- a/data/json/monstergroups/military.json +++ b/data/json/monstergroups/military.json @@ -123,49 +123,46 @@ "name": "GROUP_AIRCRAFT_CARRIER", "type": "monstergroup", "//": "no children, 40% tech personel 20% civilian personel (med, fire, cook, clercs etc), 20% uniformed zombie, 10% army pilots, and 10% military zeds", + "default": "mon_zombie_technician", "monsters": [ - { "monster": "mon_zombie_technician", "weight": 15 }, - { "monster": "mon_feral_human_tool", "weight": 15 }, - { "monster": "mon_zombie_tough", "weight": 6 }, - { "monster": "mon_zombie_static", "weight": 10 }, - { "monster": "mon_zombie_fireman", "weight": 6 }, - { "monster": "mon_zombie_medical", "weight": 6 }, - { "monster": "mon_zombie_fat", "weight": 6 }, - { "monster": "mon_zombie_rot", "weight": 6 }, - { "monster": "mon_zombie_crawler", "weight": 6 }, - { "monster": "mon_zombie_brainless", "weight": 6 }, - { "monster": "mon_zombie_milbase_personnel", "weight": 18 }, - { "monster": "mon_zombie_military_pilot", "weight": 18 }, - { "monster": "mon_zombie_soldier", "weight": 6 }, - { "monster": "mon_zombie_flamer", "weight": 12, "cost_multiplier": 2 }, - { "monster": "mon_zombie_military_pilot", "weight": 6 }, - { "monster": "mon_zombie_soldier", "weight": 15, "cost_multiplier": 5, "pack_size": [ 2, 4 ] }, - { "monster": "mon_zombie_bio_op", "weight": 2, "cost_multiplier": 10 }, - { "monster": "mon_zombie_bio_op2", "weight": 2, "cost_multiplier": 10, "starts": "60 days" }, - { "monster": "mon_feral_human_pipe", "weight": 6 }, - { "monster": "mon_feral_human_crowbar", "weight": 6 }, - { "monster": "mon_feral_human_axe", "weight": 6 }, - { "monster": "mon_feral_sapien_spear", "weight": 6 }, - { "monster": "mon_feral_human_pipe", "weight": 6 }, - { "monster": "mon_feral_soldier", "weight": 6 } + { "monster": "mon_zombie_technician", "freq": 90, "cost_multiplier": 1 }, + { "monster": "mon_feral_human_tool", "freq": 90, "cost_multiplier": 1 }, + { "monster": "mon_zombie_tough", "freq": 36, "cost_multiplier": 1 }, + { "monster": "mon_zombie_static", "freq": 60, "cost_multiplier": 1 }, + { "monster": "mon_zombie_fireman", "freq": 36, "cost_multiplier": 1 }, + { "monster": "mon_zombie_fat", "freq": 36, "cost_multiplier": 1 }, + { "monster": "mon_zombie_rot", "freq": 36, "cost_multiplier": 1 }, + { "monster": "mon_zombie_crawler", "freq": 36, "cost_multiplier": 1 }, + { "monster": "mon_zombie_brainless", "freq": 36, "cost_multiplier": 1 }, + { "monster": "mon_zombie_military_pilot", "freq": 106, "cost_multiplier": 1 }, + { "monster": "mon_zombie_soldier", "freq": 36, "cost_multiplier": 1 }, + { "monster": "mon_zombie_flamer", "freq": 72, "cost_multiplier": 2 }, + { "monster": "mon_zombie_military_pilot", "freq": 36, "cost_multiplier": 1 }, + { "monster": "mon_zombie_soldier", "freq": 90, "cost_multiplier": 5, "pack_size": [ 2, 4 ] }, + { "monster": "mon_zombie_bio_op", "freq": 12, "cost_multiplier": 10 }, + { "monster": "mon_zombie_bio_op2", "freq": 12, "cost_multiplier": 10, "starts": 1440 }, + { "monster": "mon_feral_human_pipe", "freq": 36, "cost_multiplier": 1 }, + { "monster": "mon_feral_human_crowbar", "freq": 36, "cost_multiplier": 1 }, + { "monster": "mon_feral_human_axe", "freq": 36, "cost_multiplier": 1 }, + { "monster": "mon_feral_human_pipe", "freq": 36, "cost_multiplier": 1 }, + { "monster": "mon_feral_soldier", "freq": 36, "cost_multiplier": 1 } ] }, { "name": "GROUP_AIRCRAFT_CARRIER_TECHNICIANS", "type": "monstergroup", + "default": "mon_zombie_technician", "monsters": [ - { "monster": "mon_zombie_technician", "weight": 67 }, - { "monster": "mon_feral_human_tool", "weight": 67 }, - { "monster": "mon_zombie_static", "weight": 12 }, - { "monster": "mon_zombie_fireman", "weight": 6 }, - { "monster": "mon_zombie_medical", "weight": 6 }, - { "monster": "mon_zombie_fat", "weight": 6 }, - { "monster": "mon_feral_human_pipe", "weight": 6 }, - { "monster": "mon_feral_human_crowbar", "weight": 6 }, - { "monster": "mon_feral_human_axe", "weight": 6 }, - { "monster": "mon_feral_sapien_spear", "weight": 6 }, - { "monster": "mon_feral_human_pipe", "weight": 6 }, - { "monster": "mon_feral_soldier", "weight": 6 } + { "monster": "mon_zombie_technician", "freq": 365, "cost_multiplier": 1 }, + { "monster": "mon_feral_human_tool", "freq": 365, "cost_multiplier": 1 }, + { "monster": "mon_zombie_static", "freq": 60, "cost_multiplier": 1 }, + { "monster": "mon_zombie_fireman", "freq": 30, "cost_multiplier": 1 }, + { "monster": "mon_zombie_fat", "freq": 30, "cost_multiplier": 1 }, + { "monster": "mon_feral_human_pipe", "freq": 30, "cost_multiplier": 1 }, + { "monster": "mon_feral_human_crowbar", "freq": 30, "cost_multiplier": 1 }, + { "monster": "mon_feral_human_axe", "freq": 30, "cost_multiplier": 1 }, + { "monster": "mon_feral_human_pipe", "freq": 30, "cost_multiplier": 1 }, + { "monster": "mon_feral_soldier", "freq": 30, "cost_multiplier": 1 } ] } ] diff --git a/data/json/scenarios.json b/data/json/scenarios.json index 235d59f1617e..3b693fc2603b 100644 --- a/data/json/scenarios.json +++ b/data/json/scenarios.json @@ -718,16 +718,9 @@ "unemployed", "electrician", "chef", - "recruit", - "rifleman", "specops", "medic", - "mili_pilot", - "mili_medic", - "major-general", - "nco", - "combat-mechanic", - "combat-engineer" + "mili_pilot" ], "flags": [ "CHALLENGE", "LONE_START" ] } From 201232333644a1494784c7a7bcaa616bfd402e3e Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Wed, 13 Dec 2023 18:12:18 +0000 Subject: [PATCH 11/15] style(autofix.ci): automated formatting --- data/json/scenarios.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/data/json/scenarios.json b/data/json/scenarios.json index 3b693fc2603b..9164e6671c6c 100644 --- a/data/json/scenarios.json +++ b/data/json/scenarios.json @@ -714,14 +714,7 @@ "description": "For some reason your mission off the coast of North Korea was ended in the middle of a lake, in unknown location. You have no idea what's happened, but now you have more important things to do.", "start_name": "Aircraft Carrier", "allowed_locs": [ "aircraft_carrier_berth", "aircraft_carrier_bridge" ], - "professions": [ - "unemployed", - "electrician", - "chef", - "specops", - "medic", - "mili_pilot" - ], + "professions": [ "unemployed", "electrician", "chef", "specops", "medic", "mili_pilot" ], "flags": [ "CHALLENGE", "LONE_START" ] } ] From ce66181e82a7867ce67968929576d69535f45082 Mon Sep 17 00:00:00 2001 From: scarf Date: Thu, 14 Dec 2023 08:02:49 +0900 Subject: [PATCH 12/15] feat: add `Military Rifleman` and `Combat Engineer` --- data/json/scenarios.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/scenarios.json b/data/json/scenarios.json index 9164e6671c6c..82d939cc25d4 100644 --- a/data/json/scenarios.json +++ b/data/json/scenarios.json @@ -714,7 +714,7 @@ "description": "For some reason your mission off the coast of North Korea was ended in the middle of a lake, in unknown location. You have no idea what's happened, but now you have more important things to do.", "start_name": "Aircraft Carrier", "allowed_locs": [ "aircraft_carrier_berth", "aircraft_carrier_bridge" ], - "professions": [ "unemployed", "electrician", "chef", "specops", "medic", "mili_pilot" ], + "professions": [ "unemployed", "electrician", "chef", "soldier", "specops", "medic", "mili_pilot", "prof_combat_engineer" ], "flags": [ "CHALLENGE", "LONE_START" ] } ] From d56f47b87f803be951281f1144bdbb8a18f1431d Mon Sep 17 00:00:00 2001 From: scarf Date: Thu, 14 Dec 2023 08:20:17 +0900 Subject: [PATCH 13/15] fix: add electric grid --- data/json/overmap/overmap_special/aircraft_carrier.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/overmap/overmap_special/aircraft_carrier.json b/data/json/overmap/overmap_special/aircraft_carrier.json index 62aa039e4612..ecda177f8f79 100644 --- a/data/json/overmap/overmap_special/aircraft_carrier.json +++ b/data/json/overmap/overmap_special/aircraft_carrier.json @@ -201,6 +201,6 @@ "city_distance": [ -1, 1000 ], "locations": [ "lake_surface" ], "occurrences": [ 75, 100 ], - "flags": [ "CLASSIC", "LAKE", "MAN_MADE", "UNIQUE", "MILITARY" ] + "flags": [ "CLASSIC", "LAKE", "MAN_MADE", "UNIQUE", "MILITARY", "ELECTRIC_GRID" ] } ] From 1741274d60b38ba6c0e08a88112be33c7cb60203 Mon Sep 17 00:00:00 2001 From: scarf Date: Thu, 14 Dec 2023 11:49:27 +0900 Subject: [PATCH 14/15] fix: huge elevators not working for vehicles used floodfill to optain arbitrary size of elevator tiles. --- src/iexamine_elevator.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/iexamine_elevator.cpp b/src/iexamine_elevator.cpp index 215a3c53b523..8801469a4820 100644 --- a/src/iexamine_elevator.cpp +++ b/src/iexamine_elevator.cpp @@ -1,9 +1,10 @@ -#include "detached_ptr.h" #include + #include "cata_algo.h" #include "game.h" #include "iexamine.h" #include "mapdata.h" +#include "flood_fill.h" #include "output.h" #include "omdata.h" #include "overmapbuffer.h" @@ -36,15 +37,10 @@ using tiles = std::vector; auto here( const Character &you ) -> elevator::tiles { const auto &here = get_map(); - const auto &points = closest_points_first( you.pos(), SEEX - 1 ); + const auto is_elevator = [&here]( const tripoint & pos ) -> bool { return here.has_flag( TFLAG_ELEVATOR, pos ); }; - elevator::tiles tiles; - std::copy_if( points.begin(), points.end(), std::back_inserter( tiles ), - [&here]( const tripoint & pos ) { - return here.has_flag( TFLAG_ELEVATOR, pos ); - } ); - - return tiles; + std::unordered_set visited; + return ff::point_flood_fill_4_connected( you.pos(), visited, is_elevator ); } auto dest( const elevator::tiles &elevator_here, From 6dc6c1ca82b830333f065f4bbae02b75ac9f0a0d Mon Sep 17 00:00:00 2001 From: scarf Date: Thu, 14 Dec 2023 11:49:47 +0900 Subject: [PATCH 15/15] feat: working carrier elevators --- data/json/mapgen_palettes/aircraft_carrier_palette.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/json/mapgen_palettes/aircraft_carrier_palette.json b/data/json/mapgen_palettes/aircraft_carrier_palette.json index c03bded80fcd..806f747e651c 100644 --- a/data/json/mapgen_palettes/aircraft_carrier_palette.json +++ b/data/json/mapgen_palettes/aircraft_carrier_palette.json @@ -2,7 +2,6 @@ { "type": "palette", "id": "aircraft_carrier_palette", - "//": "big elevators are disabled by default due to bugs with elevators itself - they works really weird with such size. same to small one - the game can transport only character, ignoring everything else", "terrain": { ",": "t_bridge", "*": "t_gates_control_metal", @@ -21,8 +20,8 @@ "t": "t_console_broken", "5": "t_wall_metal", "4": "t_elevator_no_roof", - "(": "t_elevator_control_off", - "α": "t_elevator_control_off", + "(": "t_elevator_control", + "α": "t_elevator_control", "+": [ "t_door_metal_c", "t_door_metal_c", "t_door_metal_c", "t_door_metal_c", "t_door_metal_interior_locked" ], "1": "t_deck_coating_no_roof", "2": "t_deck_coating_no_roof_y",