feat(balance): military locations overhaul, part 1 (#4051)

* Commit for remote * Commit for remote * Commit for remote * Commit for remote * Commit for remote * Commit for remote * Commit for remote * Commit for remote * This should finally get it ready... * One last bit of lint and error checking weh * Lil addition * I swear on your fucking yeezys
cataclysmbnteam · Jan 6, 2024 · 6bff212 · 6bff212
1 parent 6bb0de9
commit 6bff212
Show file tree

Hide file tree

Showing 22 changed files with 729 additions and 2,614 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -113,20 +113,28 @@
     "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", "prob": 50 }, { "item": "tshirt", "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" } ] }
-        ]
-      }
+    "//": "Assorted basic clothing for military stockpiles.  Excludes underwear, armor and storage items",
+    "items": [
+      { "item": "helmet_liner", "prob": 5 },
+      { "item": "balclava", "prob": 5 },
+      { "item": "hood_rain", "prob": 5 },
+      { "item": "beret", "prob": 3 },
+      { "item": "beret_wool", "prob": 2 },
+      { "item": "jacket_army", "prob": 5 },
+      { "item": "winter_jacket_army", "prob": 5 },
+      { "item": "coat_rain", "prob": 3 },
+      { "item": "folding_poncho", "prob": 2 },
+      { "item": "webbing_belt", "prob": 5 },
+      { "item": "gloves_liner", "prob": 3 },
+      { "item": "gloves_liner_wool", "prob": 2 },
+      { "item": "winter_gloves_army", "prob": 5 },
+      { "item": "gloves_tactical", "prob": 10 },
+      { "item": "pants_army", "prob": 5 },
+      { "item": "winter_pants_army", "prob": 5 },
+      { "item": "knee_pads", "prob": 5 },
+      { "item": "elbow_pads", "prob": 5 },
+      { "item": "boots", "prob": 10 },
+      { "item": "boots_combat", "prob": 10 }
     ]
   },
   {
@@ -254,7 +262,6 @@
     "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": "helmet_army" },
@@ -278,7 +285,7 @@
     "id": "clothing_soldier_shirt",
     "type": "item_group",
     "subtype": "distribution",
-    "entries": [ { "item": "tshirt" } ]
+    "entries": [ { "item": "tshirt", "prob": 75 }, { "item": "army_top", "prob": 15 }, { "item": "tank_top", "prob": 10 } ]
   },
   {
     "id": "clothing_outdoor_pants",
@@ -376,7 +383,14 @@
     "type": "item_group",
     "//": "Tactical gear that can be strapped to the legs",
     "subtype": "distribution",
-    "entries": [ { "item": "legpouch_large", "prob": 100 }, { "item": "legrig", "prob": 100 } ]
+    "entries": [
+      { "item": "legpouch", "prob": 25 },
+      { "item": "legpouch_large", "prob": 75 },
+      { "item": "legrig", "prob": 50 },
+      { "item": "dump_pouch", "prob": 50 },
+      { "item": "grenadebandolier", "prob": 25 },
+      { "item": "grenadebandolier", "prob": 25 }
+    ]
   },
   {
     "id": "clothing_tactical_torso",
@@ -391,7 +405,26 @@
       { "item": "backpack_tactical_large", "prob": 20 },
       { "item": "tacvest", "prob": 160 },
       { "item": "molle_pack", "prob": 100 },
-      { "item": "rucksack", "prob": 80 }
+      { "item": "rucksack", "prob": 80 },
+      { "item": "duffelbag", "prob": 20 },
+      { "item": "bigback", "prob": 10 }
+    ]
+  },
+  {
+    "id": "military_ballistic_armor",
+    "type": "item_group",
+    "//": "All ballistic armor items one might see in a military stockpile",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "kevlar", "prob": 5 },
+      { "item": "modularvest", "prob": 10 },
+      { "item": "modularvestceramic", "prob": 20 },
+      { "item": "modularvesthard", "prob": 5 },
+      { "item": "helmet_army", "prob": 30 },
+      { "item": "tac_helmet", "prob": 10 },
+      { "item": "glasses_bal", "prob": 10 },
+      { "item": "mask_bal", "prob": 5 },
+      { "item": "shield_ballistic", "prob": 5 }
     ]
   },
   {
@@ -1900,105 +1933,81 @@
     "type": "item_group",
     "id": "mil_armor",
     "items": [
-      [ "pants_army", 10 ],
-      [ "jacket_army", 10 ],
-      [ "winter_pants_army", 30 ],
-      [ "winter_jacket_army", 30 ],
-      [ "winter_gloves_army", 30 ],
-      [ "army_top", 30 ],
-      [ "kevlar", 10 ],
-      [ "modularvest", 25 ],
-      [ "modularvestceramic", 30 ],
-      [ "vest", 15 ],
-      [ "mask_gas", 10 ],
-      [ "goggles_nv", 1 ],
-      [ "goggles_ir", 1 ],
-      [ "optical_cloak", 1 ],
-      [ "holo_cloak", 1 ],
-      [ "backpack", 32 ],
-      [ "adv_UPS_off", 10 ],
-      [ "tacvest", 10 ],
-      [ "molle_pack", 8 ],
-      [ "duffelbag", 15 ],
-      [ "dump_pouch", 20 ],
-      [ "legrig", 10 ],
-      [ "under_armor", 20 ],
-      [ "boots", 70 ],
-      [ "boots_combat", 70 ],
-      [ "gloves_tactical", 30 ],
-      [ "glasses_bal", 40 ],
+      { "group": "clothing_military_distribution", "prob": 500 },
+      { "group": "clothing_tactical_torso", "prob": 75 },
+      { "group": "clothing_tactical_leg", "prob": 50 },
+      { "group": "military_ballistic_armor", "prob": 200 },
+      { "group": "pwr_armor", "prob": 10 },
+      { "group": "pwr_armor_acc", "prob": 10 },
+      { "group": "mil_armor_electronics", "prob": 20 },
       [ "chestguard_hard", 20 ],
       [ "armguard_hard", 20 ],
       [ "legguard_hard", 15 ],
-      [ "power_armor_helmet_basic", 3 ],
-      [ "power_armor_basic", 3 ],
-      [ "power_armor_frame", 4 ],
-      [ "power_armor_back_holster", 1 ],
-      [ "power_armor_holster", 1 ],
-      [ "power_armor_chest_rig", 1 ],
-      [ "power_armor_bscabbard", 1 ],
-      [ "power_armor_scabbard", 1 ],
-      [ "power_armor_sheath", 1 ],
-      [ "helmet_army", 40 ],
-      [ "helmet_liner", 10 ],
-      [ "beret", 50 ],
-      [ "beret_wool", 40 ],
-      [ "elbow_pads", 50 ],
-      [ "knee_pads", 50 ],
+      [ "mask_gas", 10 ]
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "mil_armor_electronics",
+    "items": [
+      { "item": "radio", "prob": 5, "charges": [ 0, 300 ] },
+      { "item": "two_way_radio", "prob": 20, "charges": [ 0, 300 ] },
+      { "item": "adv_UPS_off", "prob": 20, "charges": [ 0, 2000 ] },
+      { "group": "used_UPS", "prob": 5 },
+      { "item": "goggles_nv", "prob": 20, "charges": [ 0, 150 ] },
+      { "item": "goggles_ir", "prob": 20, "charges": [ 0, 150 ] },
       [ "solarpack", 5 ],
-      [ "shield_ballistic", 3 ]
+      [ "optical_cloak", 3 ],
+      [ "holo_cloak", 2 ]
     ]
   },
   {
     "type": "item_group",
     "id": "pwr_armor",
-    "items": [
-      [ "power_armor_helmet_basic", 10 ],
-      [ "power_armor_basic", 10 ],
-      [ "power_armor_heavy", 5 ],
-      [ "power_armor_helmet_heavy", 5 ],
-      [ "power_armor_light", 15 ],
-      [ "power_armor_helmet_light", 15 ]
+    "subtype": "distribution",
+    "entries": [
+      { "collection": [ { "item": "power_armor_basic" }, { "item": "power_armor_helmet_basic", "prob": 75 } ], "prob": 40 },
+      { "item": "power_armor_helmet_basic", "prob": 10 },
+      {
+        "collection": [ { "item": "power_armor_light" }, { "item": "power_armor_helmet_light", "prob": 75 } ],
+        "prob": 20
+      },
+      { "item": "power_armor_helmet_light", "prob": 5 },
+      {
+        "collection": [ { "item": "power_armor_heavy" }, { "item": "power_armor_helmet_heavy", "prob": 75 } ],
+        "prob": 20
+      },
+      { "item": "power_armor_helmet_heavy", "prob": 5 }
     ]
   },
   {
     "type": "item_group",
     "id": "pwr_armor_acc",
     "items": [
-      [ "power_armor_frame", 1 ],
-      [ "power_armor_back_holster", 1 ],
-      [ "power_armor_holster", 1 ],
-      [ "power_armor_chest_rig", 1 ],
-      [ "power_armor_bscabbard", 1 ],
-      [ "power_armor_scabbard", 1 ],
-      [ "power_armor_sheath", 1 ]
+      [ "power_armor_frame", 25 ],
+      [ "power_armor_chest_rig", 25 ],
+      [ "power_armor_back_holster", 10 ],
+      [ "power_armor_holster", 10 ],
+      [ "power_armor_bscabbard", 10 ],
+      [ "power_armor_scabbard", 10 ],
+      [ "power_armor_sheath", 10 ]
     ]
   },
   {
     "type": "item_group",
     "id": "mil_accessories",
     "items": [
+      { "group": "mil_armor_electronics", "prob": 40 },
+      { "group": "pwr_armor_acc", "prob": 10 },
       [ "mask_gas", 10 ],
       [ "duffelbag", 15 ],
-      [ "goggles_nv", 1 ],
-      [ "goggles_ir", 1 ],
-      [ "optical_cloak", 1 ],
-      [ "holo_cloak", 1 ],
       [ "mess_kit", 9 ],
       [ "mil_mess_kit", 1 ],
       [ "backpack", 32 ],
       [ "briefcase", 10 ],
-      { "item": "adv_UPS_off", "prob": 10, "charges": [ 0, 2000 ] },
       [ "chestguard_hard", 20 ],
       [ "armguard_hard", 20 ],
       [ "legguard_hard", 15 ],
-      [ "power_armor_frame", 4 ],
-      [ "power_armor_back_holster", 1 ],
-      [ "power_armor_holster", 1 ],
-      [ "power_armor_chest_rig", 1 ],
-      [ "power_armor_bscabbard", 1 ],
-      [ "power_armor_scabbard", 1 ],
-      [ "power_armor_sheath", 1 ],
       [ "elbow_pads", 40 ],
       [ "knee_pads", 40 ],
       [ "mask_bal", 5 ],
@@ -2012,7 +2021,6 @@
       [ "holster", 15 ],
       [ "sholster", 10 ],
       [ "bandolier_shotgun", 8 ],
-      [ "solarpack", 5 ],
       [ "chem_hexamine", 3 ],
       [ "esbit_stove", 6 ],
       [ "mess_tin", 4 ],
@@ -2023,16 +2031,15 @@
     "type": "item_group",
     "id": "mil_armor_torso",
     "items": [
+      { "group": "clothing_tactical_torso", "prob": 20 },
+      { "group": "clothing_soldier_shirt", "prob": 30 },
       [ "kevlar", 10 ],
       [ "modularvest", 25 ],
       [ "modularvestceramic", 30 ],
       [ "winter_jacket_army", 30 ],
       [ "vest", 15 ],
-      [ "tacvest", 10 ],
-      [ "molle_pack", 8 ],
       [ "under_armor", 20 ],
       [ "power_armor_basic", 5 ],
-      [ "army_top", 30 ],
       [ "elbow_pads", 20 ]
     ]
   },

diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json
@@ -43,6 +43,7 @@
       { "item": "oatmeal", "prob": 40 },
       { "item": "fruit_leather", "prob": 15 },
       { "item": "salted_fish", "prob": 15 },
+      { "item": "meat_salted", "prob": 15 },
       { "item": "dry_beans", "prob": 40 },
       { "item": "dry_lentils", "prob": 30 },
       { "item": "dry_rice", "prob": 40 }

diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json
@@ -32,8 +32,8 @@
       { "item": "bot_flashbang_hack", "prob": 2 },
       { "item": "bot_gasbomb_hack", "prob": 2 },
       { "item": "bot_haulerbot", "prob": 2 },
-      { "item": "bot_rifleturret", "prob": 2 },
-      { "item": "bot_antimateriel", "prob": 2 }
+      { "item": "bot_turret_medium", "prob": 2 },
+      { "item": "bot_turret_longrange", "prob": 2 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json
@@ -1512,6 +1512,17 @@
       { "group": "on_hand_308" }
     ]
   },
+  {
+    "id": "everyday_m2browning",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "item": "m2browning", "ammo-item": "50_incendiary", "charges-min": 0, "charges-max": 100 },
+      { "group": "on_hand_50" }
+    ]
+  },
   {
     "id": "everyday_bh_m89",
     "type": "item_group",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -578,6 +578,7 @@
       { "group": "nested_m249", "prob": 25 },
       { "group": "nested_m27iar", "prob": 50 },
       { "group": "nested_m60", "prob": 15 },
+      { "group": "nested_m2browning", "prob": 20 },
       { "group": "nested_rm11b_sniper_rifle", "prob": 15 },
       { "group": "nested_rm298", "prob": 10 },
       { "group": "nested_rm51_assault_rifle", "prob": 25 },
@@ -605,6 +606,7 @@
       { "group": "everyday_m249", "prob": 25 },
       { "group": "everyday_m27iar", "prob": 50 },
       { "group": "everyday_m60", "prob": 15 },
+      { "group": "everyday_m2browning", "prob": 20 },
       { "group": "everyday_rm11b_sniper_rifle", "prob": 15 },
       { "group": "everyday_rm298", "prob": 10 },
       { "group": "everyday_rm51_assault_rifle", "prob": 25 },
@@ -929,9 +931,11 @@
       [ "m74_clip", 150 ],
       { "item": "m3_carlgustav", "prob": 50, "charges-min": 1, "charges-max": 1 },
       { "item": "AT4", "prob": 50, "charges-min": 1, "charges-max": 1 },
+      { "item": "atgm_launcher", "prob": 100, "charges": 1 },
       [ "84x246mm_he", 100 ],
       [ "84x246mm_hedp", 80 ],
-      [ "84x246mm_smoke", 100 ]
+      [ "84x246mm_smoke", 100 ],
+      { "item": "atgm_heat", "prob": 100, "charges": [ 1, 5 ] }
     ]
   },
   {

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -1515,6 +1515,14 @@
     "ammo": 100,
     "entries": [ { "item": "m60", "charges-min": 0, "charges-max": 100 }, { "group": "on_hand_308" } ]
   },
+  {
+    "id": "nested_m2browning",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [ { "item": "m2browning", "charges-min": 0, "charges-max": 100 }, { "group": "on_hand_50" } ]
+  },
   {
     "id": "nested_rm11b_sniper_rifle",
     "type": "item_group",

diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json
@@ -77,6 +77,7 @@
     "entries": [
       { "group": "book_gunmags", "prob": 100 },
       { "group": "book_martial", "prob": 100 },
+      { "item": "mag_fieldrepair", "prob": 50 },
       { "item": "manual_bashing", "prob": 40 },
       { "item": "manual_knives", "prob": 40 },
       { "item": "manual_launcher", "prob": 20 },