Power Armor Spawn Rebalance (#3029)

* Add files via upload * Added an item group for Power Armor * added missed comma * Update clothing.json * Update data/json/mapgen/bunker.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/mapgen/mil_surplus.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/mapgen/police_station.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/mapgen/police_station.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/mapgen/police_station.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/itemgroups/Clothing_Gear/clothing.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update clothing.json additional item group for power item accessories * Update bunker.json * Update mil_surplus.json * Update police_station.json * Update data/json/itemgroups/Clothing_Gear/clothing.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/mapgen/bunker.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/itemgroups/Clothing_Gear/clothing.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
cataclysmbnteam · Jul 25, 2023 · a55914c · a55914c
1 parent f07fc7b
commit a55914c
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 5 deletions.
diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json
@@ -1876,6 +1876,31 @@
       [ "shield_ballistic", 3 ]
     ]
   },
+  {
+    "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 ]
+    ]
+  },
+  {
+    "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 ]
+    ]
+  },
   {
     "type": "item_group",
     "id": "mil_accessories",

diff --git a/data/json/mapgen/bunker.json b/data/json/mapgen/bunker.json
@@ -192,6 +192,8 @@
         { "group": "ammo_milspec", "x": [ 2, 6 ], "y": 8, "chance": 100, "repeat": [ 30, 250 ] },
         { "group": "grenades", "x": [ 2, 6 ], "y": 8, "chance": 100, "repeat": [ 5, 15 ] },
         { "group": "mil_hw", "x": [ 7, 8 ], "y": 8, "chance": 100, "repeat": [ 15, 40 ] },
+        { "group": "pwr_armor", "x": [ 7, 8 ], "y": 6, "chance": 20, "repeat": [ 1, 2 ] },
+        { "group": "pwr_armor_acc", "x": [ 7, 8 ], "y": 6, "chance": 40, "repeat": [ 1, 2 ] },
         { "group": "mil_armor", "x": [ 7, 8 ], "y": 6, "chance": 65, "repeat": [ 1, 2 ] },
         { "group": "guns_rifle_milspec", "x": [ 2, 6 ], "y": 6, "chance": 80, "repeat": [ 1, 3 ] },
         { "group": "guns_rifle_milspec", "x": 5, "y": [ 19, 20 ], "chance": 80, "repeat": [ 1, 3 ] },

diff --git a/data/json/mapgen/mil_surplus.json b/data/json/mapgen/mil_surplus.json
@@ -265,7 +265,8 @@
         { "chance": 75, "repeat": [ 1, 4 ], "item": "mil_surplus", "x": 21, "y": [ 11, 19 ] },
         { "chance": 75, "repeat": [ 1, 4 ], "item": "mil_surplus", "x": [ 17, 18 ], "y": [ 11, 18 ] },
         { "chance": 75, "repeat": [ 1, 4 ], "item": "mil_surplus", "x": [ 14, 15 ], "y": [ 11, 18 ] },
-        { "chance": 75, "repeat": [ 1, 4 ], "item": "mil_surplus", "x": [ 9, 10 ], "y": [ 9, 10 ] }
+        { "chance": 75, "repeat": [ 1, 4 ], "item": "mil_surplus", "x": [ 9, 10 ], "y": [ 9, 10 ] },
+        { "chance": 3, "repeat": [ 1, 4 ], "item": "pwr_armor_acc", "x": [ 9, 10 ], "y": [ 9, 10 ] }
       ]
     }
   },

diff --git a/data/json/mapgen/police_station.json b/data/json/mapgen/police_station.json
@@ -20,8 +20,8 @@
         "|5.....................|",
         "|-=-|..|+-|-+|-+--|-+--|",
         "|..1|..|.S|S.|t..c|....|",
-        "|..1|..|.t|t.|...c|Ccc.|",
-        "|..1|..|+-|-+|...c|.cc.|",
+        "|a.1|..|.t|t.|...c|Ccc.|",
+        "|n.1|..|+-|-+|...c|.cc.|",
         "|lll|..|.&|&.|cccc|.C..|",
         "|----**----------------|",
         ",4,,,,,,,,,,,,,,,,,,,,,,",
@@ -63,6 +63,8 @@
         "t": { "item": "trash_cart", "chance": 50 },
         "c": { "item": "kitchen", "chance": 40, "repeat": [ 2, 4 ] },
         "1": { "item": "cop_gear", "chance": 70, "repeat": [ 2, 4 ] },
+        "n": { "item": "pwr_armor", "chance": 15, "repeat": [ 2, 4 ] },
+        "a": { "item": "pwr_armor_acc", "chance": 20, "repeat": [ 2, 4 ] },
         "l": { "item": "cop_armory", "chance": 70, "repeat": [ 2, 4 ] },
         "L": { "item": "cop_evidence", "chance": 60, "repeat": [ 2, 4 ] }
       },
@@ -179,7 +181,7 @@
         "|L.L|<.*__,,,,,,,,,,,,,,",
         "|L.L|---|_,,,,,,,,,,,,,,",
         "|L.2FFF.|_,,,,,,,,,,,,,,",
-        "|L.....<|_,,,,,,,,,,,,,,",
+        "|L...an<|_,,,,,,,,,,,,,,",
         "|LLLLLL.|_,,,,,,,,,,,,,,",
         "--------|9,,,,,,,,,,,,,,"
       ],
@@ -223,6 +225,8 @@
         "c": { "item": "kitchen", "chance": 40 },
         "1": { "item": "cop_gear", "chance": 70 },
         "l": { "item": "cop_armory", "chance": 70 },
+        "n": { "item": "pwr_armor", "chance": 10 },
+        "a": { "item": "pwr_armor_acc", "chance": 15 },
         "L": { "item": "cop_evidence", "chance": 60 },
         "N": { "item": "vending_food_items", "chance": 70, "repeat": [ 4, 12 ] },
         "U": { "item": "vending_drink_items", "chance": 70, "repeat": [ 4, 12 ] }
@@ -443,7 +447,7 @@
         "|.................|,,,,,",
         "|--------*------*-|,,,,,",
         "|llll|5......+$|.<|,,,,,",
-        "|....=..|----|----|%%%%^",
+        "|na..=..|----|----|%%%%^",
         "|1111|..|tccf|4_I_,,,,,^",
         "|----|..|C...|,___,,,,,^",
         "|....|..|T..Y|,,,,,,,,,^",
@@ -502,6 +506,8 @@
         "t": { "item": "trash_cart", "chance": 50, "repeat": [ 2, 3 ] },
         "1": { "item": "cop_gear", "chance": 70, "repeat": [ 2, 3 ] },
         "l": { "item": "cop_armory", "chance": 70, "repeat": [ 2, 3 ] },
+        "a": { "item": "pwr_armor_acc", "chance": 15, "repeat": [ 2, 4 ] },
+        "n": { "item": "pwr_armor", "chance": 10, "repeat": [ 2, 4 ] },
         "L": { "item": "cop_evidence", "chance": 60, "repeat": [ 2, 3 ] },
         "D": { "item": "office", "chance": 60, "repeat": [ 2, 3 ] },
         "T": { "item": "dining", "chance": 60, "repeat": [ 2, 3 ] },