feat(content,port): aircraft carrier

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": {

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 } ] },

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 }
     ]

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 ],

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,21 +247,22 @@
       "ж": [
         { "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 ] },
         { "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": "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" } }
   }
 ]

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 }
     ]
   }
 ]

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" ]
   }