From 426639732f63d13224ac7f0056e5a0d05e958dce Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Tue, 22 Oct 2024 07:39:57 -0600 Subject: [PATCH 1/2] Suit batteries --- .../itemgroups/clothing/winter_outfits.json | 6 ++++- .../itemgroups/loot_corpse_groups.json | 1 + .../Aftershock/items/armor/winter_suits.json | 8 +++---- data/mods/Aftershock/items/battery.json | 23 +++++++++++++++++++ data/mods/Aftershock/items/tool_armor.json | 4 ++-- .../augustmoon_tool_trader.json | 1 + 6 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 data/mods/Aftershock/items/battery.json diff --git a/data/mods/Aftershock/itemgroups/clothing/winter_outfits.json b/data/mods/Aftershock/itemgroups/clothing/winter_outfits.json index 2b6d0b64c5191..792f89a6618c7 100644 --- a/data/mods/Aftershock/itemgroups/clothing/winter_outfits.json +++ b/data/mods/Aftershock/itemgroups/clothing/winter_outfits.json @@ -32,7 +32,11 @@ "type": "item_group", "//": "The matching frontier-cryosuit set. Includes suit, mask and possible future accessories", "subtype": "collection", - "entries": [ { "item": "afs_frontier_cryo" }, { "item": "afs_frontier_cryomask", "prob": 90 } ] + "entries": [ + { "item": "afs_frontier_cryo" }, + { "item": "afs_frontier_cryomask", "prob": 90 }, + { "item": "afs_heavy_suit_battery_cell", "count": [ 1, 2 ], "prob": 25, "charges": [ 0, 1000 ] } + ] }, { "id": "afs_cryopod_g", diff --git a/data/mods/Aftershock/itemgroups/loot_corpse_groups.json b/data/mods/Aftershock/itemgroups/loot_corpse_groups.json index 0011c84ad73b6..e3e0b30814b87 100644 --- a/data/mods/Aftershock/itemgroups/loot_corpse_groups.json +++ b/data/mods/Aftershock/itemgroups/loot_corpse_groups.json @@ -13,6 +13,7 @@ ] }, { "group": "afs_survivor_weapon_set", "prob": 80 }, + { "item": "afs_heavy_suit_battery_cell", "count": [ 1, 2 ], "prob": 80, "charges": [ 100, 1000 ] }, { "group": "afs_tools_scavenging", "prob": 30 }, { "group": "tools_survival", "prob": 80, "count": [ 1, 3 ] }, { "group": "afs_cheap_food", "prob": 30, "count": [ 2, 6 ] }, diff --git a/data/mods/Aftershock/items/armor/winter_suits.json b/data/mods/Aftershock/items/armor/winter_suits.json index 2740f3764f5aa..2107b58c9477f 100644 --- a/data/mods/Aftershock/items/armor/winter_suits.json +++ b/data/mods/Aftershock/items/armor/winter_suits.json @@ -104,8 +104,8 @@ { "pocket_type": "MAGAZINE_WELL", "rigid": true, - "flag_restriction": [ "BATTERY_MEDIUM" ], - "default_magazine": "medium_battery_cell" + "flag_restriction": [ "BATTERY_HEAVY" ], + "default_magazine": "afs_heavy_suit_battery_cell" } ], "warmth": 20, @@ -169,8 +169,8 @@ { "pocket_type": "MAGAZINE_WELL", "rigid": true, - "flag_restriction": [ "BATTERY_MEDIUM" ], - "default_magazine": "medium_battery_cell" + "flag_restriction": [ "BATTERY_HEAVY" ], + "default_magazine": "afs_heavy_suit_battery_cell" } ], "warmth": 20, diff --git a/data/mods/Aftershock/items/battery.json b/data/mods/Aftershock/items/battery.json new file mode 100644 index 0000000000000..4ee155b7e9797 --- /dev/null +++ b/data/mods/Aftershock/items/battery.json @@ -0,0 +1,23 @@ +[ + { + "id": "afs_heavy_suit_battery_cell", + "type": "MAGAZINE", + "category": "tool_magazine", + "name": { "str": "suit battery", "str_pl": "suit batteries" }, + "description": "A heavy battery cell, compatible with most industrial equipment but purposefully designed to power EVA suits. It's a bit too big to fit in most portable tools.", + "ascii_picture": "heavy_plus_battery_cell", + "weight": "880 g", + "volume": "900 ml", + "longest_side": "113 mm", + "price": "200 USD", + "price_postapoc": "200 USD", + "material": [ { "type": "budget_steel", "portion": 99 }, { "type": "plastic", "portion": 1 } ], + "symbol": "=", + "color": "yellow", + "ammo_type": [ "battery" ], + "capacity": 1000, + "looks_like": "battery", + "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "BATTERY_HEAVY" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 1000 } } ] + } +] diff --git a/data/mods/Aftershock/items/tool_armor.json b/data/mods/Aftershock/items/tool_armor.json index 6d858e83e79fd..c6a362a63741b 100644 --- a/data/mods/Aftershock/items/tool_armor.json +++ b/data/mods/Aftershock/items/tool_armor.json @@ -20,8 +20,8 @@ { "pocket_type": "MAGAZINE_WELL", "rigid": true, - "flag_restriction": [ "BATTERY_MEDIUM" ], - "default_magazine": "medium_battery_cell" + "flag_restriction": [ "BATTERY_HEAVY" ], + "default_magazine": "afs_heavy_suit_battery_cell" } ], "use_action": { diff --git a/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_tool_trader.json b/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_tool_trader.json index 9bc7868a31f73..8eadfd67b4e83 100644 --- a/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_tool_trader.json +++ b/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_tool_trader.json @@ -36,6 +36,7 @@ { "group": "afs_tools_scavenging", "count": [ 6, 12 ] }, { "group": "afs_tools_pocket", "count": [ 5, 10 ] }, { "item": "afs_40g_plasma_civ", "count": [ 2, 5 ] }, + { "item": "afs_heavy_suit_battery_cell", "count": [ 2, 5 ] }, { "group": "afs_tools_welding_consumable", "count": [ 6, 8 ] }, { "group": "afs_augustmoon_batteries_disposable", "count": [ 5, 10 ] }, { "group": "afs_augustmoon_batteries_rechargeable", "count": [ 2, 3 ], "prob": 20 } From a61b81d58c66a423b723cedf00e056fc51d90085 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Tue, 22 Oct 2024 09:33:20 -0600 Subject: [PATCH 2/2] Update data/mods/Aftershock/items/battery.json --- data/mods/Aftershock/items/battery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/battery.json b/data/mods/Aftershock/items/battery.json index 4ee155b7e9797..feb19c629c83b 100644 --- a/data/mods/Aftershock/items/battery.json +++ b/data/mods/Aftershock/items/battery.json @@ -4,7 +4,7 @@ "type": "MAGAZINE", "category": "tool_magazine", "name": { "str": "suit battery", "str_pl": "suit batteries" }, - "description": "A heavy battery cell, compatible with most industrial equipment but purposefully designed to power EVA suits. It's a bit too big to fit in most portable tools.", + "description": "A heavy battery cell, compatible with most industrial equipment but purposefully designed to power EVA suits It's a bit too big to fit in most portable tools.", "ascii_picture": "heavy_plus_battery_cell", "weight": "880 g", "volume": "900 ml",