From 8ad5b23dd04e99baf759f0eda6d4767956c8bd03 Mon Sep 17 00:00:00 2001 From: ymber Date: Mon, 18 May 2020 10:42:26 +0100 Subject: [PATCH] Add magazine wells to items --- data/json/items/generic/toys_and_sports.json | 26 +- data/json/items/gun/12mm.json | 12 +- data/json/items/gun/20x66mm.json | 24 +- data/json/items/gun/22.json | 82 ++++- data/json/items/gun/223.json | 204 ++++++++---- data/json/items/gun/300.json | 12 +- data/json/items/gun/3006.json | 41 ++- data/json/items/gun/300BLK.json | 26 +- data/json/items/gun/308.json | 112 ++++++- data/json/items/gun/32.json | 40 ++- data/json/items/gun/357sig.json | 30 +- data/json/items/gun/38.json | 33 +- data/json/items/gun/380.json | 60 +++- data/json/items/gun/38super.json | 20 +- data/json/items/gun/40.json | 91 +++++- data/json/items/gun/40x53mm.json | 12 +- data/json/items/gun/410shot.json | 12 +- data/json/items/gun/44.json | 32 +- data/json/items/gun/45.json | 90 +++++- data/json/items/gun/454.json | 22 +- data/json/items/gun/46.json | 10 +- data/json/items/gun/460.json | 12 +- data/json/items/gun/50.json | 59 +++- data/json/items/gun/500.json | 11 +- data/json/items/gun/545x39.json | 12 +- data/json/items/gun/57.json | 20 +- data/json/items/gun/5x50.json | 24 +- data/json/items/gun/66mm.json | 12 +- data/json/items/gun/762.json | 51 ++- data/json/items/gun/762R.json | 11 +- data/json/items/gun/762x25.json | 20 +- data/json/items/gun/8x40mm.json | 95 +++++- data/json/items/gun/9mm.json | 231 ++++++++++++-- data/json/items/gun/9x18.json | 20 +- data/json/items/gun/chemical_spray.json | 10 +- data/json/items/gun/flammable.json | 20 +- data/json/items/gun/shot.json | 32 +- data/json/items/gunmod/underbarrel.json | 12 +- data/json/items/melee/bludgeons.json | 39 ++- data/json/items/melee/misc.json | 13 +- data/json/items/melee/swords_and_blades.json | 62 ++-- data/json/items/obsolete.json | 78 ++++- data/json/items/tool/cooking.json | 143 +++++---- data/json/items/tool/electronics.json | 170 ++++++---- data/json/items/tool/fire.json | 17 +- data/json/items/tool/lighting.json | 85 +++-- data/json/items/tool/med.json | 10 +- data/json/items/tool/metalworking.json | 10 +- data/json/items/tool/misc.json | 57 ++-- data/json/items/tool/radio_tools.json | 62 ++-- data/json/items/tool/science.json | 293 +++++++++++------- data/json/items/tool/smoking.json | 13 +- data/json/items/tool/toileteries.json | 10 +- data/json/items/tool/woodworking.json | 26 +- data/json/items/tool/workshop.json | 147 +++++---- data/json/items/tool_armor.json | 193 +++++++----- data/mods/Aftershock/items/obsolete.json | 13 +- data/mods/Aftershock/items/tools.json | 23 +- data/mods/Aftershock/items/weapons.json | 27 +- data/mods/CrazyCataclysm/crazy_items.json | 10 +- data/mods/Generic_Guns/firearms/grenade.json | 10 +- data/mods/Generic_Guns/firearms/pistol.json | 61 +++- .../Generic_Guns/firearms/pistol_magnum.json | 31 +- .../Generic_Guns/firearms/pistol_tiny.json | 21 +- data/mods/Generic_Guns/firearms/rifle.json | 61 +++- .../Generic_Guns/firearms/rifle_huge.json | 20 +- data/mods/Generic_Guns/firearms/shot.json | 10 +- .../mods/Magiclysm/items/enchanted_wands.json | 10 +- data/mods/Magiclysm/items/obsolete.json | 20 +- data/mods/TEST_DATA/items.json | 13 +- 70 files changed, 2593 insertions(+), 808 deletions(-) diff --git a/data/json/items/generic/toys_and_sports.json b/data/json/items/generic/toys_and_sports.json index 8a81360a0d16f..aaf0feaa0df25 100644 --- a/data/json/items/generic/toys_and_sports.json +++ b/data/json/items/generic/toys_and_sports.json @@ -16,10 +16,13 @@ "charges_per_use": 1, "turns_per_charge": 20, "use_action": "DOLLCHAT", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_minus_disposable_cell", "light_disposable_cell", "light_minus_battery_cell", @@ -28,7 +31,7 @@ "light_atomic_battery_cell", "light_minus_atomic_battery_cell" ] - ] + } ] }, { @@ -48,10 +51,13 @@ "charges_per_use": 1, "turns_per_charge": 20, "use_action": "DOLLCHAT", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_minus_disposable_cell", "light_disposable_cell", "light_minus_battery_cell", @@ -60,7 +66,7 @@ "light_atomic_battery_cell", "light_minus_atomic_battery_cell" ] - ] + } ] }, { diff --git a/data/json/items/gun/12mm.json b/data/json/items/gun/12mm.json index 05ca317c29eed..24da85a479237 100644 --- a/data/json/items/gun/12mm.json +++ b/data/json/items/gun/12mm.json @@ -29,7 +29,15 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "12mm", [ "hk_g80mag" ] ] ], - "flags": [ "NEVER_JAMS" ] + "flags": [ "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "hk_g80mag" ] + } + ] } ] diff --git a/data/json/items/gun/20x66mm.json b/data/json/items/gun/20x66mm.json index bf8586fd11726..cb67a0ce7b954 100644 --- a/data/json/items/gun/20x66mm.json +++ b/data/json/items/gun/20x66mm.json @@ -70,8 +70,16 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "20x66mm", [ "20x66_20_mag", "20x66_40_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] + "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "20x66_20_mag", "20x66_40_mag" ] + } + ] }, { "id": "rm228", @@ -103,7 +111,15 @@ [ "stock", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "20x66mm", [ "20x66_10_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] + "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "20x66_10_mag" ] + } + ] } ] diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index efe023a510528..fe91af87d8e1a 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -38,7 +38,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "22", [ "a180mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "a180mag" ] + } + ] }, { "id": "marlin_9a", @@ -63,7 +71,6 @@ "durability": 8, "blackpowder_tolerance": 56, "clip_size": 19, - "magazines": [ [ "22", [ "marlin_tubeloader" ] ] ], "valid_mod_locations": [ [ "accessories", 4 ], [ "barrel", 1 ], @@ -80,7 +87,15 @@ ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], "flags": [ "RELOAD_ONE" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "22": 19 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "marlin_tubeloader" ] + } + ] }, { "id": "moss_brownie", @@ -195,7 +210,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "22", [ "ruger1022mag", "ruger1022bigmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "ruger1022mag", "ruger1022bigmag" ] + } + ] }, { "id": "ruger_lcr_22", @@ -206,8 +229,15 @@ "weight": "420 g", "ammo": [ "22" ], "clip_size": 8, - "magazines": [ [ "22", [ "22_speedloader8" ] ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "22": 8 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "22_speedloader8" ] + } + ] }, { "id": "sig_mosquito", @@ -245,7 +275,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "22", [ "mosquitomag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "mosquitomag" ] + } + ] }, { "id": "sw_22", @@ -266,7 +304,15 @@ "dispersion": 480, "durability": 7, "min_cycle_recoil": 39, - "magazines": [ [ "22", [ "sw22mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "sw22mag" ] + } + ] }, { "id": "j22", @@ -288,7 +334,15 @@ "durability": 5, "min_cycle_recoil": 39, "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "22", [ "j22mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "j22mag" ] + } + ] }, { "id": "walther_p22", @@ -309,6 +363,14 @@ "dispersion": 480, "durability": 7, "min_cycle_recoil": 39, - "magazines": [ [ "22", [ "wp22mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "wp22mag" ] + } + ] } ] diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index 5e433c672d3d2..622d9ca17d707 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -23,10 +23,13 @@ "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], "barrel_length": "250 ml", "built_in_mods": [ "folding_stock" ], - "magazines": [ - [ - "223", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stanag30", "stanag5", "stanag10", @@ -41,7 +44,7 @@ "stanag150", "survivor223mag" ] - ] + } ] }, { @@ -64,10 +67,13 @@ "dispersion": 150, "durability": 7, "min_cycle_recoil": 1350, - "magazines": [ - [ - "223", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stanag30", "stanag5", "stanag10", @@ -82,7 +88,7 @@ "stanag150", "survivor223mag" ] - ] + } ] }, { @@ -107,7 +113,15 @@ "dispersion": 380, "durability": 6, "min_cycle_recoil": 1350, - "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stanag30", "stanag50", "survivor223mag" ] + } + ] }, { "id": "famas", @@ -144,7 +158,15 @@ [ "underbarrel mount", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "223", [ "famasmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "famasmag" ] + } + ] }, { "id": "fs2000", @@ -167,7 +189,6 @@ "durability": 9, "min_cycle_recoil": 1350, "default_mods": [ "factory_handguard" ], - "magazines": [ [ "223", [ "stanag30" ] ] ], "//": "Forward ejection port would require a different brass catcher design, so there is no slot for it. Bullpup design requires the factory stock to function.", "valid_mod_locations": [ [ "accessories", 2 ], @@ -177,6 +198,15 @@ [ "rail mount", 1 ], [ "sights", 1 ], [ "underbarrel mount", 1 ] + ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stanag30" ] + } ] }, { @@ -202,10 +232,13 @@ "durability": 8, "min_cycle_recoil": 1350, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], - "magazines": [ - [ - "223", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stanag30", "stanag5", "stanag10", @@ -220,7 +253,7 @@ "stanag150", "survivor223mag" ] - ] + } ] }, { @@ -244,7 +277,15 @@ "durability": 8, "min_cycle_recoil": 1350, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], - "magazines": [ [ "223", [ "g36mag_30rd", "g36mag_100rd" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "g36mag_30rd", "g36mag_100rd" ] + } + ] }, { "id": "m249", @@ -282,10 +323,13 @@ [ "sling", 1 ], [ "stock", 1 ] ], - "magazines": [ - [ - "223", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "belt223", "stanag30", "stanag5", @@ -301,7 +345,7 @@ "stanag150", "survivor223mag" ] - ] + } ] }, { @@ -320,10 +364,14 @@ "description": "A H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.", "weight": "3710 g", "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], - "magazines": [ - [ - "223", - [ + "relative": { "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "durability": 1 }, + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stanag30", "stanag5", "stanag10", @@ -338,9 +386,8 @@ "stanag150", "survivor223mag" ] - ] - ], - "relative": { "ranged_damage": { "damage_type": "bullet", "amount": 1 }, "durability": 1 } + } + ] }, { "id": "m4a1", @@ -364,10 +411,13 @@ "durability": 6, "min_cycle_recoil": 1350, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], - "magazines": [ - [ - "223", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stanag30", "stanag5", "stanag10", @@ -382,7 +432,7 @@ "stanag150", "survivor223mag" ] - ] + } ] }, { @@ -406,10 +456,13 @@ "durability": 7, "min_cycle_recoil": 1350, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ] ], - "magazines": [ - [ - "223", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stanag30", "stanag5", "stanag10", @@ -424,7 +477,7 @@ "stanag150", "survivor223mag" ] - ] + } ] }, { @@ -449,7 +502,15 @@ "dispersion": 380, "durability": 6, "min_cycle_recoil": 1350, - "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stanag30", "stanag50", "survivor223mag" ] + } + ] }, { "id": "rifle_223", @@ -527,7 +588,15 @@ [ "stock mount", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "223", [ "ruger20", "ruger5", "ruger10", "ruger30", "ruger90", "ruger100", "ruger_makeshiftmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "ruger20", "ruger5", "ruger10", "ruger30", "ruger90", "ruger100", "ruger_makeshiftmag" ] + } + ] }, { "id": "scar_l", @@ -551,10 +620,13 @@ "durability": 8, "min_cycle_recoil": 1350, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], - "magazines": [ - [ - "223", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stanag30", "stanag5", "stanag10", @@ -569,7 +641,7 @@ "stanag150", "survivor223mag" ] - ] + } ] }, { @@ -592,10 +664,13 @@ "min_cycle_recoil": 1350, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ], "built_in_mods": [ "folding_stock" ], - "magazines": [ - [ - "223", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stanag30", "stanag5", "stanag10", @@ -610,7 +685,7 @@ "stanag150", "survivor223mag" ] - ] + } ] }, { @@ -649,7 +724,15 @@ [ "sling", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "223", [ "augmag_30rd", "augmag_10rd", "augmag_42rd", "augmag_100rd" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "augmag_30rd", "augmag_10rd", "augmag_42rd", "augmag_100rd" ] + } + ] }, { "id": "surv_carbine_223", @@ -687,10 +770,13 @@ [ "rail mount", 1 ], [ "sights mount", 1 ] ], - "magazines": [ - [ - "223", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "survivor223mag", "stanag30", "stanag5", @@ -705,7 +791,7 @@ "stanag100drum", "stanag150" ] - ] + } ] } ] diff --git a/data/json/items/gun/300.json b/data/json/items/gun/300.json index 29f87071c5f2f..ab775480c573b 100644 --- a/data/json/items/gun/300.json +++ b/data/json/items/gun/300.json @@ -19,8 +19,16 @@ "durability": 8, "min_cycle_recoil": 4770, "barrel_length": "500 ml", - "magazines": [ [ "300", [ "m2010mag" ] ] ], - "flags": [ "NEVER_JAMS" ] + "flags": [ "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "m2010mag" ] + } + ] }, { "id": "weatherby_5", diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json index 8ee4ded31c953..8ae9eeb979eb2 100644 --- a/data/json/items/gun/3006.json +++ b/data/json/items/gun/3006.json @@ -37,7 +37,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], - "magazines": [ [ "3006", [ "blrmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "blrmag" ] + } + ] }, { "id": "garand", @@ -75,7 +83,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "3006", [ "garandclip" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "garandclip" ] + } + ] }, { "id": "m1903", @@ -112,9 +128,16 @@ [ "stock mount", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "3006", [ "3006_clip" ] ] ], "flags": [ "RELOAD_ONE" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "3006": 5 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "3006_clip" ] + } + ] }, { "id": "m1918", @@ -154,7 +177,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "3006", [ "m1918mag", "m1918bigmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "m1918mag", "m1918bigmag" ] + } + ] }, { "id": "remington_700", diff --git a/data/json/items/gun/300BLK.json b/data/json/items/gun/300BLK.json index 253b364462d38..7dca2e1c4c5d8 100644 --- a/data/json/items/gun/300BLK.json +++ b/data/json/items/gun/300BLK.json @@ -23,10 +23,13 @@ "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], "barrel_length": "250 ml", "built_in_mods": [ "folding_stock" ], - "magazines": [ - [ - "300blk", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stanag30", "stanag5", "stanag10", @@ -41,7 +44,7 @@ "stanag150", "survivor223mag" ] - ] + } ] }, { @@ -79,10 +82,13 @@ [ "sling", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ - [ - "300blk", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stanag30", "stanag5", "stanag10", @@ -97,7 +103,7 @@ "stanag150", "survivor223mag" ] - ] + } ] }, { diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json index 71a33307ad665..03a2c5582e0c8 100644 --- a/data/json/items/gun/308.json +++ b/data/json/items/gun/308.json @@ -22,7 +22,15 @@ "min_cycle_recoil": 2700, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], "barrel_length": "500 ml", - "magazines": [ [ "308", [ "falmag", "falbigmag", "fal_makeshiftmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "falmag", "falbigmag", "fal_makeshiftmag" ] + } + ] }, { "id": "hk_g3", @@ -46,7 +54,15 @@ "min_cycle_recoil": 2700, "durability": 8, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ], - "magazines": [ [ "308", [ "g3mag", "g3bigmag", "g3_makeshiftmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "g3mag", "g3bigmag", "g3_makeshiftmag" ] + } + ] }, { "id": "m134", @@ -75,8 +91,16 @@ "valid_mod_locations": [ [ "brass catcher", 1 ], [ "sling", 1 ], [ "rail mount", 1 ], [ "sights mount", 1 ] ], "modes": [ [ "DEFAULT", "low auto", 50 ], [ "AUTO", "high auto", 100 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], - "magazines": [ [ "308", [ "belt308" ] ] ], - "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ] + "flags": [ "NEVER_JAMS", "MOUNTED_GUN" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "belt308" ] + } + ] }, { "id": "m14ebr", @@ -140,7 +164,15 @@ [ "stock mount", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "308", [ "m14mag", "m14smallmag", "m14_makeshiftmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "m14mag", "m14smallmag", "m14_makeshiftmag" ] + } + ] }, { "id": "m240", @@ -178,7 +210,15 @@ [ "sling", 1 ], [ "stock", 1 ] ], - "magazines": [ [ "308", [ "belt308" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "belt308" ] + } + ] }, { "id": "m60", @@ -217,7 +257,15 @@ [ "sling", 1 ], [ "stock", 1 ] ], - "magazines": [ [ "308", [ "belt308" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "belt308" ] + } + ] }, { "id": "m60_semi", @@ -265,7 +313,15 @@ [ "rail mount", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "308", [ "g3_makeshiftmag", "g3mag", "g3bigmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "g3_makeshiftmag", "g3mag", "g3bigmag" ] + } + ] }, { "id": "savage_111f", @@ -303,7 +359,15 @@ "ammo": [ "308" ], "ranged_damage": { "damage_type": "bullet", "amount": -3 }, "min_cycle_recoil": 2700, - "magazines": [ [ "308", [ "scarhmag", "scarhbigmag", "scarhmag_30rd", "scarh_makeshiftmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "scarhmag", "scarhbigmag", "scarhmag_30rd", "scarh_makeshiftmag" ] + } + ] }, { "id": "M24", @@ -368,7 +432,15 @@ "min_cycle_recoil": 2700, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], "default_mods": [ "adjustable_stock" ], - "magazines": [ [ "308", [ "hk417mag_20rd", "hk417mag_10rd", "hk417_makeshiftmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "hk417mag_20rd", "hk417mag_10rd", "hk417_makeshiftmag" ] + } + ] }, { "id": "m110a1", @@ -392,7 +464,15 @@ "durability": 8, "min_cycle_recoil": 2700, "default_mods": [ "adjustable_stock", "bipod", "rifle_scope", "suppressor" ], - "magazines": [ [ "308", [ "hk417mag_20rd", "hk417mag_10rd", "hk417_makeshiftmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "hk417mag_20rd", "hk417mag_10rd", "hk417_makeshiftmag" ] + } + ] }, { "id": "ar10", @@ -415,6 +495,14 @@ "dispersion": 150, "durability": 7, "min_cycle_recoil": 2700, - "magazines": [ [ "308", [ "ar10mag_20rd", "ar10_makeshiftmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "ar10mag_20rd", "ar10_makeshiftmag" ] + } + ] } ] diff --git a/data/json/items/gun/32.json b/data/json/items/gun/32.json index 954cb16fb6f7a..6f7b2cd17880b 100644 --- a/data/json/items/gun/32.json +++ b/data/json/items/gun/32.json @@ -34,7 +34,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "32", [ "sigp230mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "sigp230mag" ] + } + ] }, { "id": "skorpion_61", @@ -75,7 +83,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "32", [ "skorpion61mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "skorpion61mag" ] + } + ] }, { "id": "walther_ppk", @@ -112,7 +128,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "32", [ "ppkmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "ppkmag" ] + } + ] }, { "id": "kp32", @@ -133,6 +157,14 @@ "dispersion": 480, "durability": 8, "min_cycle_recoil": 135, - "magazines": [ [ "32", [ "kp32mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "kp32mag" ] + } + ] } ] diff --git a/data/json/items/gun/357sig.json b/data/json/items/gun/357sig.json index 5824eae93821b..37b229bcf7e59 100644 --- a/data/json/items/gun/357sig.json +++ b/data/json/items/gun/357sig.json @@ -18,7 +18,15 @@ "ammo": [ "357sig" ], "dispersion": 480, "durability": 7, - "magazines": [ [ "357sig", [ "p226mag_12rd_357sig" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "p226mag_12rd_357sig" ] + } + ] }, { "id": "glock_31", @@ -30,7 +38,15 @@ "volume": "443 ml", "price_postapoc": 2250, "ammo": [ "357sig" ], - "magazines": [ [ "357sig", [ "glock40mag", "glock40bigmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "glock40mag", "glock40bigmag" ] + } + ] }, { "id": "p320_357sig", @@ -50,6 +66,14 @@ "ammo": [ "357sig" ], "dispersion": 480, "durability": 6, - "magazines": [ [ "357sig", [ "p320mag_13rd_357sig" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "p320mag_13rd_357sig" ] + } + ] } ] diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index 3d356648c9524..ab7537000bd59 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -90,8 +90,15 @@ "durability": 8, "blackpowder_tolerance": 56, "clip_size": 6, - "magazines": [ [ "38", [ "38_speedloader6" ] ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "38": 6 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "38_speedloader6" ] + } + ] }, { "id": "rifle_38", @@ -154,7 +161,6 @@ "durability": 10, "blackpowder_tolerance": 56, "clip_size": 5, - "magazines": [ [ "38", [ "38_speedloader5" ] ] ], "valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], @@ -166,7 +172,15 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "38": 5 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "38_speedloader5" ] + } + ] }, { "id": "sw_619", @@ -189,7 +203,6 @@ "durability": 10, "blackpowder_tolerance": 56, "clip_size": 7, - "magazines": [ [ "38", [ "38_speedloader" ] ] ], "valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], @@ -201,6 +214,14 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "357mag": 7, "38": 7 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "38_speedloader" ] + } + ] } ] diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json index 61e5a5dd07201..68f9dd61bec30 100644 --- a/data/json/items/gun/380.json +++ b/data/json/items/gun/380.json @@ -14,7 +14,15 @@ "ammo": [ "380" ], "min_cycle_recoil": 270, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 6 ] ], - "magazines": [ [ "380", [ "mac11mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "mac11mag" ] + } + ] }, { "id": "kp3at", @@ -28,7 +36,15 @@ "price_postapoc": 1750, "ammo": [ "380" ], "min_cycle_recoil": 270, - "magazines": [ [ "380", [ "kp3atmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "kp3atmag" ] + } + ] }, { "id": "fn1910", @@ -49,7 +65,15 @@ "dispersion": 480, "durability": 7, "min_cycle_recoil": 270, - "magazines": [ [ "380", [ "fn1910mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "fn1910mag" ] + } + ] }, { "id": "rugerlcp", @@ -70,7 +94,15 @@ "dispersion": 480, "durability": 8, "min_cycle_recoil": 270, - "magazines": [ [ "380", [ "rugerlcpmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "rugerlcpmag" ] + } + ] }, { "id": "hptcf380", @@ -90,7 +122,15 @@ "ammo": [ "380" ], "dispersion": 480, "durability": 7, - "magazines": [ [ "380", [ "hptcf380mag_8rd", "hptcf380mag_10rd" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "hptcf380mag_8rd", "hptcf380mag_10rd" ] + } + ] }, { "id": "taurus_spectrum", @@ -112,6 +152,14 @@ "dispersion": 480, "durability": 7, "min_cycle_recoil": 225, - "magazines": [ [ "380", [ "taurus_spectrum_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "taurus_spectrum_mag" ] + } + ] } ] diff --git a/data/json/items/gun/38super.json b/data/json/items/gun/38super.json index 6988f623e5130..95223085d9014 100644 --- a/data/json/items/gun/38super.json +++ b/data/json/items/gun/38super.json @@ -34,7 +34,15 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "38super", [ "af2011a1mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "af2011a1mag" ] + } + ] }, { "id": "m1911a1_38super", @@ -55,6 +63,14 @@ "ammo": [ "38super" ], "dispersion": 480, "durability": 7, - "magazines": [ [ "38super", [ "m1911mag_10rd_38super" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "m1911mag_10rd_38super" ] + } + ] } ] diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json index 04f651ab8d55d..433588154782a 100644 --- a/data/json/items/gun/40.json +++ b/data/json/items/gun/40.json @@ -19,7 +19,15 @@ "dispersion": 480, "durability": 7, "min_cycle_recoil": 450, - "magazines": [ [ "40", [ "90two40mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "90two40mag" ] + } + ] }, { "id": "glock_22", @@ -58,7 +66,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "40", [ "glock40mag", "glock40bigmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "glock40mag", "glock40bigmag" ] + } + ] }, { "id": "px4_40", @@ -80,7 +96,15 @@ "dispersion": 480, "durability": 7, "min_cycle_recoil": 450, - "magazines": [ [ "40", [ "px4_40mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "px4_40mag" ] + } + ] }, { "id": "rifle_40", @@ -156,7 +180,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "40", [ "sig40mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "sig40mag" ] + } + ] }, { "id": "smg_40", @@ -196,7 +228,15 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "40", [ "smg_40_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "smg_40_mag" ] + } + ] }, { "id": "surv_six_shooter", @@ -259,7 +299,6 @@ "durability": 8, "blackpowder_tolerance": 56, "clip_size": 6, - "magazines": [ [ "40", [ "40_speedloader6" ] ] ], "valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], @@ -270,7 +309,15 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "10mm": 6, "40": 6 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "40_speedloader6" ] + } + ] }, { "id": "hi_power_40", @@ -290,7 +337,15 @@ "ammo": [ "40" ], "dispersion": 480, "durability": 8, - "magazines": [ [ "40", [ "bhp40mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "bhp40mag" ] + } + ] }, { "id": "walther_ppq_40", @@ -309,7 +364,15 @@ "ammo": [ "40" ], "dispersion": 480, "durability": 9, - "magazines": [ [ "40", [ "ppq40mag_10rd", "ppq40mag_12rd", "ppq40mag_14rd" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "ppq40mag_10rd", "ppq40mag_12rd", "ppq40mag_14rd" ] + } + ] }, { "id": "hptjcp", @@ -329,6 +392,14 @@ "ammo": [ "40" ], "dispersion": 480, "durability": 7, - "magazines": [ [ "40", [ "hptjcpmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "hptjcpmag" ] + } + ] } ] diff --git a/data/json/items/gun/40x53mm.json b/data/json/items/gun/40x53mm.json index 9ec1be57f1c27..0c639556207df 100644 --- a/data/json/items/gun/40x53mm.json +++ b/data/json/items/gun/40x53mm.json @@ -29,7 +29,15 @@ [ "underbarrel mount", 1 ] ], "modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ], [ "AUTO", "auto", 2, "NPC_AVOID" ] ], - "magazines": [ [ "40x53mm", [ "belt40mm" ] ] ], - "flags": [ "MOUNTED_GUN" ] + "flags": [ "MOUNTED_GUN" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "belt40mm" ] + } + ] } ] diff --git a/data/json/items/gun/410shot.json b/data/json/items/gun/410shot.json index 3dd3a9ce18a4e..bd829b4df9af8 100644 --- a/data/json/items/gun/410shot.json +++ b/data/json/items/gun/410shot.json @@ -17,8 +17,16 @@ "durability": 7, "barrel_length": "750 ml", "ammo": [ "410shot" ], - "magazines": [ [ "410shot", [ "saiga410mag_10rd", "saiga410mag_30rd" ] ] ], - "flags": [ "NEVER_JAMS" ] + "flags": [ "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "saiga410mag_10rd", "saiga410mag_30rd" ] + } + ] }, { "id": "shotgun_410", diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json index 29c66d6460bc2..07e9634726a9b 100644 --- a/data/json/items/gun/44.json +++ b/data/json/items/gun/44.json @@ -36,7 +36,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "44", [ "deaglemag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "deaglemag" ] + } + ] }, { "id": "henry_big_boy", @@ -137,7 +145,6 @@ "durability": 8, "blackpowder_tolerance": 56, "clip_size": 6, - "magazines": [ [ "44", [ "44_speedloader6" ] ] ], "valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], @@ -149,7 +156,15 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "44": 6 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "44_speedloader6" ] + } + ] }, { "id": "sw629", @@ -173,7 +188,6 @@ "durability": 8, "blackpowder_tolerance": 56, "clip_size": 6, - "magazines": [ [ "44", [ "44_speedloader6" ] ] ], "valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], @@ -185,6 +199,14 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "44": 6 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "44_speedloader6" ] + } + ] } ] diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json index 7c0951558ae2b..ee160193c0717 100644 --- a/data/json/items/gun/45.json +++ b/data/json/items/gun/45.json @@ -37,7 +37,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "45", [ "tdi_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "tdi_mag" ] + } + ] }, { "id": "hk_ump45", @@ -79,7 +87,15 @@ ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], "default_mods": [ "folding_stock" ], - "magazines": [ [ "45", [ "ump45mag", "ump45_makeshiftmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "ump45mag", "ump45_makeshiftmag" ] + } + ] }, { "id": "m1911", @@ -104,7 +120,15 @@ "durability": 7, "min_cycle_recoil": 540, "blackpowder_tolerance": 48, - "magazines": [ [ "45", [ "m1911mag", "m1911bigmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "m1911mag", "m1911bigmag" ] + } + ] }, { "id": "m1911_MEU", @@ -159,7 +183,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "45", [ "mac10mag", "smg_45_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "mac10mag", "smg_45_mag" ] + } + ] }, { "id": "rifle_45", @@ -239,7 +271,15 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "45", [ "smg_45_mag", "mac10mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "smg_45_mag", "mac10mag" ] + } + ] }, { "id": "surv_hand_cannon", @@ -307,7 +347,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "45", [ "thompson_mag", "thompson_bigmag", "thompson_drum", "thompson_makeshiftmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "thompson_mag", "thompson_bigmag", "thompson_drum", "thompson_makeshiftmag" ] + } + ] }, { "id": "usp_45", @@ -321,7 +369,15 @@ "price_postapoc": 2500, "ranged_damage": 0, "built_in_mods": [ "match_trigger" ], - "magazines": [ [ "45", [ "usp45mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "usp45mag" ] + } + ] }, { "id": "mk23", @@ -354,7 +410,15 @@ "ammo": [ "45" ], "dispersion": 480, "durability": 9, - "magazines": [ [ "45", [ "ppq45mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "ppq45mag" ] + } + ] }, { "id": "hptjhp", @@ -375,6 +439,14 @@ "ammo": [ "45" ], "dispersion": 480, "durability": 7, - "magazines": [ [ "45", [ "hptjhpmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "hptjhpmag" ] + } + ] } ] diff --git a/data/json/items/gun/454.json b/data/json/items/gun/454.json index f63546faaff5a..ddf2a3e1f5ce3 100644 --- a/data/json/items/gun/454.json +++ b/data/json/items/gun/454.json @@ -20,7 +20,6 @@ "durability": 8, "blackpowder_tolerance": 56, "clip_size": 5, - "magazines": [ [ "454", [ "454_speedloader5" ] ] ], "valid_mod_locations": [ [ "accessories", 2 ], [ "grip", 1 ], @@ -30,7 +29,15 @@ [ "stock mount", 1 ], [ "underbarrel mount", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "454": 5, "410shot": 5, "45colt": 5 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "454_speedloader5" ] + } + ] }, { "id": "raging_judge", @@ -42,7 +49,14 @@ "weight": "2070 g", "volume": "1175 ml", "clip_size": 6, - "magazines": [ [ "454", [ "454_speedloader6" ] ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "454": 6, "410shot": 6, "45colt": 6 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "454_speedloader6" ] + } + ] } ] diff --git a/data/json/items/gun/46.json b/data/json/items/gun/46.json index b273a36f2ec0a..a06a91a91dd16 100644 --- a/data/json/items/gun/46.json +++ b/data/json/items/gun/46.json @@ -37,6 +37,14 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "46", [ "hk46mag", "hk46bigmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "hk46mag", "hk46bigmag" ] + } + ] } ] diff --git a/data/json/items/gun/460.json b/data/json/items/gun/460.json index 08ddc9916fe71..1e95df83773bc 100644 --- a/data/json/items/gun/460.json +++ b/data/json/items/gun/460.json @@ -9,8 +9,16 @@ "price": 166800, "price_postapoc": 3250, "ammo": [ "460", "45" ], - "magazines": [ [ "460", [ "m1911mag", "m1911bigmag" ] ], [ "45", [ "m1911mag", "m1911bigmag" ] ] ], "relative": { "durability": -1 }, - "built_in_mods": [ "barrel_ported" ] + "built_in_mods": [ "barrel_ported" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "m1911mag", "m1911bigmag", "m1911mag", "m1911bigmag" ] + } + ] } ] diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 9c726904e76ca..7014e2596607b 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -21,8 +21,16 @@ "durability": 8, "barrel_length": "1250 ml", "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ], - "magazines": [ [ "50", [ "m107a1mag" ] ] ], - "flags": [ "NEVER_JAMS" ] + "flags": [ "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "m107a1mag" ] + } + ] }, { "id": "m2browning", @@ -58,8 +66,16 @@ [ "rail mount", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "50", [ "belt50" ] ] ], - "flags": [ "MOUNTED_GUN" ] + "flags": [ "MOUNTED_GUN" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "belt50" ] + } + ] }, { "id": "m2browning_sawn", @@ -84,7 +100,6 @@ [ "rail mount", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ ], "relative": { "weight": -21500, "volume": -6, @@ -94,7 +109,15 @@ "barrel_length": -1 }, "flags": [ "RELOAD_EJECT" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "50": 1 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ ] + } + ] }, { "id": "as50", @@ -118,8 +141,16 @@ "reload": 400, "barrel_length": "1250 ml", "default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ], - "magazines": [ [ "50", [ "as50mag" ] ] ], - "flags": [ "NEVER_JAMS" ] + "flags": [ "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "as50mag" ] + } + ] }, { "id": "tac50", @@ -143,8 +174,16 @@ "reload": 450, "barrel_length": "1250 ml", "default_mods": [ "recoil_stock", "bipod", "rifle_scope", "muzzle_brake" ], - "magazines": [ [ "50", [ "tac50mag" ] ] ], - "flags": [ "NEVER_JAMS" ] + "flags": [ "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "tac50mag" ] + } + ] }, { "id": "bfg50", diff --git a/data/json/items/gun/500.json b/data/json/items/gun/500.json index 9dd788a52e137..028cb710783a8 100644 --- a/data/json/items/gun/500.json +++ b/data/json/items/gun/500.json @@ -57,7 +57,6 @@ "durability": 8, "blackpowder_tolerance": 56, "clip_size": 5, - "magazines": [ [ "500", [ "500_speedloader5" ] ] ], "valid_mod_locations": [ [ "accessories", 2 ], [ "grip", 1 ], @@ -67,6 +66,14 @@ [ "stock mount", 1 ], [ "underbarrel mount", 1 ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "500": 5 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "500_speedloader5" ] + } + ] } ] diff --git a/data/json/items/gun/545x39.json b/data/json/items/gun/545x39.json index f703ea67ef517..f0776a85b9ad5 100644 --- a/data/json/items/gun/545x39.json +++ b/data/json/items/gun/545x39.json @@ -37,7 +37,15 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "545x39", [ "ak74mag", "rpk74mag" ] ] ], - "flags": [ "NEVER_JAMS" ] + "flags": [ "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "ak74mag", "rpk74mag" ] + } + ] } ] diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json index 1a1508633e527..fbdb6f0b98dea 100644 --- a/data/json/items/gun/57.json +++ b/data/json/items/gun/57.json @@ -34,7 +34,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "57", [ "fn57mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "fn57mag" ] + } + ] }, { "id": "fn_p90", @@ -72,6 +80,14 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "57", [ "fnp90mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "fnp90mag" ] + } + ] } ] diff --git a/data/json/items/gun/5x50.json b/data/json/items/gun/5x50.json index 0c6f3163e0c7a..8587b8ab3d017 100644 --- a/data/json/items/gun/5x50.json +++ b/data/json/items/gun/5x50.json @@ -36,8 +36,16 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "5x50", [ "5x50_100_mag", "5x50_50_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] + "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "5x50_100_mag", "5x50_50_mag" ] + } + ] }, { "id": "needlepistol", @@ -71,7 +79,15 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "5x50", [ "5x50_50_mag", "5x50_100_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] + "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "5x50_50_mag", "5x50_100_mag" ] + } + ] } ] diff --git a/data/json/items/gun/66mm.json b/data/json/items/gun/66mm.json index 8a0f3a36748b0..fbdb6d7fe10c3 100644 --- a/data/json/items/gun/66mm.json +++ b/data/json/items/gun/66mm.json @@ -20,10 +20,18 @@ "dispersion": 300, "durability": 7, "modes": [ [ "DEFAULT", "single shot", 1 ], [ "BURST", "all barrels", 4 ] ], - "magazines": [ [ "m235", [ "m74_clip" ] ] ], "reload": 600, "loudness": 200, "valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], [ "sling", 1 ] ], - "flags": [ "BACKBLAST", "NEVER_JAMS" ] + "flags": [ "BACKBLAST", "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "m74_clip" ] + } + ] } ] diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json index 1ae1187eaaf91..9e02910fda61d 100644 --- a/data/json/items/gun/762.json +++ b/data/json/items/gun/762.json @@ -35,7 +35,15 @@ [ "stock", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] + } + ] }, { "id": "arx160", @@ -76,7 +84,15 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "akmag30", "akmag10", "akmag20", "akmag40" ] + } + ] }, { "id": "sks", @@ -117,9 +133,16 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "762", [ "762x39_clip" ] ] ], "flags": [ "RELOAD_ONE", "NEVER_JAMS" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "762": 10 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "762x39_clip" ] + } + ] }, { "id": "aksemi", @@ -156,7 +179,15 @@ [ "stock", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] + } + ] }, { "id": "draco", @@ -194,6 +225,14 @@ [ "stock mount", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] + } + ] } ] diff --git a/data/json/items/gun/762R.json b/data/json/items/gun/762R.json index 2043965834a10..9dd327fd2fe7d 100644 --- a/data/json/items/gun/762R.json +++ b/data/json/items/gun/762R.json @@ -71,9 +71,16 @@ [ "sights", 1 ], [ "sling", 1 ] ], - "magazines": [ [ "762R", [ "762R_clip" ] ] ], "flags": [ "RELOAD_ONE" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "762R": 5 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "762R_clip" ] + } + ] }, { "id": "mosin91_30_ebr", diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json index df891e2c3e8ae..ba44697a55f42 100644 --- a/data/json/items/gun/762x25.json +++ b/data/json/items/gun/762x25.json @@ -38,7 +38,15 @@ [ "rail mount", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "762x25", [ "ppshmag", "ppshdrum" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "ppshmag", "ppshdrum" ] + } + ] }, { "id": "tokarev", @@ -59,6 +67,14 @@ "dispersion": 225, "durability": 7, "min_cycle_recoil": 270, - "magazines": [ [ "762x25", [ "tokarevmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "tokarevmag" ] + } + ] } ] diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json index 3e304c64618b3..5e59f8114ccc0 100644 --- a/data/json/items/gun/8x40mm.json +++ b/data/json/items/gun/8x40mm.json @@ -31,8 +31,16 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "8x40mm", [ "8x40_10_mag", "8x40_25_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] + "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "8x40_10_mag", "8x40_25_mag" ] + } + ] }, { "id": "rm11b_sniper_rifle", @@ -69,8 +77,16 @@ [ "sling", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "8x40mm", [ "8x40_10_mag", "8x40_25_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] + "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "8x40_10_mag", "8x40_25_mag" ] + } + ] }, { "id": "rm2000_smg", @@ -104,8 +120,16 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "8x40mm", [ "8x40_25_mag", "8x40_10_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] + "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "8x40_25_mag", "8x40_10_mag" ] + } + ] }, { "id": "rm298", @@ -132,8 +156,16 @@ "reload": 400, "barrel_length": "1500 ml", "valid_mod_locations": [ [ "barrel", 1 ], [ "grip", 1 ], [ "mechanism", 4 ], [ "rail", 1 ], [ "sights", 1 ], [ "sling", 1 ], [ "stock", 1 ] ], - "magazines": [ [ "8x40mm", [ "8x40_500_mag", "8x40_250_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] + "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "8x40_500_mag", "8x40_250_mag" ] + } + ] }, { "id": "rm51_assault_rifle", @@ -167,8 +199,16 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "8x40mm", [ "8x40_50_mag", "8x40_100_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] + "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "8x40_50_mag", "8x40_100_mag" ] + } + ] }, { "id": "rm614_lmg", @@ -204,8 +244,16 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "8x40mm", [ "8x40_250_mag", "8x40_500_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] + "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "8x40_250_mag", "8x40_500_mag" ] + } + ] }, { "id": "rm88_battle_rifle", @@ -238,8 +286,16 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "8x40mm", [ "8x40_100_mag", "8x40_50_mag", "8x40_250_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] + "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "8x40_100_mag", "8x40_50_mag", "8x40_250_mag" ] + } + ] }, { "id": "rm99_pistol", @@ -263,7 +319,6 @@ "dispersion": 175, "durability": 9, "clip_size": 5, - "magazines": [ [ "8x40mm", [ "8x40_speedloader5" ] ] ], "valid_mod_locations": [ [ "accessories", 2 ], [ "barrel", 1 ], @@ -275,6 +330,14 @@ [ "underbarrel", 1 ] ], "flags": [ "WATERPROOF_GUN", "RELOAD_ONE", "NEVER_JAMS" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "8x40mm": 5 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "8x40_speedloader5" ] + } + ] } ] diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json index faf22e90f226a..7f949e368801f 100644 --- a/data/json/items/gun/9mm.json +++ b/data/json/items/gun/9mm.json @@ -19,7 +19,15 @@ "dispersion": 480, "durability": 7, "min_cycle_recoil": 450, - "magazines": [ [ "9mm", [ "m9mag", "m9bigmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "m9mag", "m9bigmag" ] + } + ] }, { "id": "calico", @@ -60,7 +68,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "9mm", [ "calicomag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "calicomag" ] + } + ] }, { "id": "cx4", @@ -101,7 +117,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "9mm", [ "m9bigmag", "m9mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "m9bigmag", "m9mag" ] + } + ] }, { "id": "glock_19", @@ -125,7 +149,15 @@ "durability": 6, "blackpowder_tolerance": 48, "min_cycle_recoil": 380, - "magazines": [ [ "9mm", [ "glockmag", "glockbigmag", "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "glockmag", "glockbigmag", "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd" ] + } + ] }, { "id": "hk_mp5", @@ -166,7 +198,15 @@ [ "stock", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "9mm", [ "mp5mag", "mp5bigmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "mp5mag", "mp5bigmag" ] + } + ] }, { "id": "hk_mp5sd", @@ -264,8 +304,15 @@ "armor_data": { "covers": [ "ARM_EITHER", "HAND_EITHER" ], "coverage": 10, "encumbrance": 30, "material_thickness": 2 }, "flags": [ "OVERSIZE", "RELOAD_EJECT", "BELTED", "RESTRICT_HANDS" ], "valid_mod_locations": [ ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "max_contains_volume": "1 L", "max_contains_weight": "10 kg", "holster": true } ], - "magazines": [ [ "9mm", [ "mp5mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "mp5mag" ] + } + ] }, { "id": "ksub2000", @@ -305,7 +352,15 @@ [ "sling", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "9mm", [ "glockmag", "glockbigmag", "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "glockmag", "glockbigmag", "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd" ] + } + ] }, { "id": "m9", @@ -328,7 +383,15 @@ "dispersion": 480, "durability": 7, "min_cycle_recoil": 450, - "magazines": [ [ "9mm", [ "m9mag", "m9bigmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "m9mag", "m9bigmag" ] + } + ] }, { "id": "px4", @@ -350,7 +413,15 @@ "dispersion": 440, "durability": 7, "min_cycle_recoil": 450, - "magazines": [ [ "9mm", [ "px4mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "px4mag" ] + } + ] }, { "id": "rifle_9mm", @@ -431,7 +502,15 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "9mm", [ "survivor9mm_mag", "stenmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "survivor9mm_mag", "stenmag" ] + } + ] }, { "id": "sten", @@ -467,7 +546,15 @@ [ "underbarrel mount", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "9mm", [ "stenmag", "survivor9mm_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "stenmag", "survivor9mm_mag" ] + } + ] }, { "id": "tec9", @@ -506,7 +593,15 @@ [ "underbarrel", 1 ] ], "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ], - "magazines": [ [ "9mm", [ "tec9mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "tec9mag" ] + } + ] }, { "id": "usp_9mm", @@ -530,7 +625,15 @@ "durability": 9, "blackpowder_tolerance": 48, "min_cycle_recoil": 450, - "magazines": [ [ "9mm", [ "usp9mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "usp9mag" ] + } + ] }, { "id": "uzi", @@ -569,7 +672,15 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "9mm", [ "uzimag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "uzimag" ] + } + ] }, { "id": "glock_17", @@ -593,7 +704,15 @@ "blackpowder_tolerance": 48, "min_cycle_recoil": 380, "//2": "Glock 17s cannot load magazines shorter than the standard 17rd magazine.", - "magazines": [ [ "9mm", [ "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd", "glockbigmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "glock17_17", "glock17_22", "glock_drum_50rd", "glock_drum_100rd", "glockbigmag" ] + } + ] }, { "id": "glock_18c", @@ -621,7 +740,15 @@ "bashing": 2, "ammo": [ "9mm" ], "min_cycle_recoil": 450, - "magazines": [ [ "9mm", [ "kpf9mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "kpf9mag" ] + } + ] }, { "id": "m17", @@ -642,7 +769,15 @@ "dispersion": 480, "durability": 6, "min_cycle_recoil": 450, - "magazines": [ [ "9mm", [ "p320mag_17rd_9x19mm" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "p320mag_17rd_9x19mm" ] + } + ] }, { "id": "hi_power_9mm", @@ -662,7 +797,15 @@ "ammo": [ "9mm" ], "dispersion": 480, "durability": 8, - "magazines": [ [ "9mm", [ "bhp9mag_13rd", "bhp9mag_15rd" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "bhp9mag_13rd", "bhp9mag_15rd" ] + } + ] }, { "id": "walther_p38", @@ -682,7 +825,15 @@ "ammo": [ "9mm" ], "dispersion": 480, "durability": 8, - "magazines": [ [ "9mm", [ "p38mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "p38mag" ] + } + ] }, { "id": "walther_ppq_9mm", @@ -701,7 +852,15 @@ "ammo": [ "9mm" ], "dispersion": 480, "durability": 9, - "magazines": [ [ "9mm", [ "ppq9mag_10rd", "ppq9mag_15rd", "ppq9mag_17rd" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "ppq9mag_10rd", "ppq9mag_15rd", "ppq9mag_17rd" ] + } + ] }, { "id": "hptc9", @@ -721,7 +880,15 @@ "ammo": [ "9mm" ], "dispersion": 480, "durability": 7, - "magazines": [ [ "9mm", [ "hptc9mag_8rd", "hptc9mag_10rd", "hptc9mag_15rd" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "hptc9mag_8rd", "hptc9mag_10rd", "hptc9mag_15rd" ] + } + ] }, { "id": "cz75", @@ -741,7 +908,15 @@ "ammo": [ "9mm" ], "dispersion": 480, "durability": 8, - "magazines": [ [ "9mm", [ "cz75mag_12rd", "cz75mag_20rd", "cz75mag_26rd" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "cz75mag_12rd", "cz75mag_20rd", "cz75mag_26rd" ] + } + ] }, { "id": "walther_ccp", @@ -761,6 +936,14 @@ "ammo": [ "9mm" ], "dispersion": 480, "durability": 8, - "magazines": [ [ "9mm", [ "ccpmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "ccpmag" ] + } + ] } ] diff --git a/data/json/items/gun/9x18.json b/data/json/items/gun/9x18.json index cb032ac54ca70..db7ae2ae58004 100644 --- a/data/json/items/gun/9x18.json +++ b/data/json/items/gun/9x18.json @@ -32,7 +32,15 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "9x18", [ "makarovmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "makarovmag" ] + } + ] }, { "id": "skorpion_82", @@ -46,6 +54,14 @@ "ammo": [ "9x18" ], "min_cycle_recoil": 270, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ], - "magazines": [ [ "9x18", [ "skorpion82mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "skorpion82mag" ] + } + ] } ] diff --git a/data/json/items/gun/chemical_spray.json b/data/json/items/gun/chemical_spray.json index 0b4a67c22b58c..8fa4df29ef16e 100644 --- a/data/json/items/gun/chemical_spray.json +++ b/data/json/items/gun/chemical_spray.json @@ -19,7 +19,6 @@ "ammo": [ "chemical_spray" ], "dispersion": 300, "durability": 6, - "magazines": [ [ "chemical_spray", [ "pressurized_tank_chem" ] ] ], "valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], @@ -28,6 +27,15 @@ [ "sling", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] + ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "pressurized_tank_chem" ] + } ] } ] diff --git a/data/json/items/gun/flammable.json b/data/json/items/gun/flammable.json index 7368f8b5a7d09..aa2c4967b9929 100644 --- a/data/json/items/gun/flammable.json +++ b/data/json/items/gun/flammable.json @@ -26,7 +26,15 @@ [ "sights mount", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "flammable", [ "pressurized_tank" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "pressurized_tank" ] + } + ] }, { "id": "rm451_flamethrower", @@ -50,6 +58,14 @@ "valid_mod_locations": [ [ "accessories", 4 ], [ "rail", 1 ], [ "grip", 1 ], [ "sling", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ], "extend": { "flags": [ "FIRE_20", "MODE_BURST", "NON-FOULING" ] }, "delete": { "flags": [ "FIRE_100" ] }, - "magazines": [ [ "flammable", [ "rm4502", "rm4504" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "rm4502", "rm4504" ] + } + ] } ] diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index a0edf64faea81..a59912fd2eea1 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -54,8 +54,16 @@ "ups_charges": 1, "reload": 200, "valid_mod_locations": [ [ "accessories", 4 ], [ "sights", 1 ], [ "rail mount", 1 ] ], - "magazines": [ [ "shot", [ "shotbelt_20" ] ] ], - "flags": [ "MOUNTED_GUN" ] + "flags": [ "MOUNTED_GUN" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "shotbelt_20" ] + } + ] }, { "id": "browning_a5", @@ -492,7 +500,15 @@ [ "sights mount", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "shot", [ "saiga10mag", "saiga30mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "saiga10mag", "saiga30mag" ] + } + ] }, { "id": "shotgun_d", @@ -694,7 +710,15 @@ [ "underbarrel mount", 1 ] ], "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ], - "magazines": [ [ "shot", [ "USAS10mag", "USAS20mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "USAS10mag", "USAS20mag" ] + } + ] }, { "id": "winchester_1887", diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json index fd68b642865e6..c4382d0cc1a90 100644 --- a/data/json/items/gunmod/underbarrel.json +++ b/data/json/items/gunmod/underbarrel.json @@ -446,8 +446,16 @@ "mod_targets": [ "rifle", "crossbow" ], "gun_data": { "ammo": "20x66mm", "skill": "shotgun", "dispersion": 320, "durability": 9, "reload": 125 }, "min_skills": [ [ "weapon", 2 ], [ "shotgun", 2 ] ], - "magazines": [ [ "20x66mm", [ "20x66_10_mag" ] ] ], - "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ] + "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "20x66_10_mag" ] + } + ] }, { "id": "rm121aux_mod", diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index 08c7f8e8d9979..867287a319667 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -546,11 +546,14 @@ "type": "transform" }, "flags": [ "DURABLE_MELEE", "SHEATH_SPEAR" ], - "magazines": [ - [ - "battery", - [ "medium_plus_battery_cell", "medium_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_plus_battery_cell", "medium_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -970,11 +973,14 @@ "techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ], "use_action": "TAZER", "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -997,11 +1003,14 @@ "techniques": [ "WBLOCK_2", "RAPID" ], "use_action": "SHOCKTONFA_OFF", "flags": [ "DURABLE_MELEE", "NONCONDUCTIVE" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { diff --git a/data/json/items/melee/misc.json b/data/json/items/melee/misc.json index e04de04b8410d..e9e919ab222d2 100644 --- a/data/json/items/melee/misc.json +++ b/data/json/items/melee/misc.json @@ -70,11 +70,14 @@ "ammo": [ "battery" ], "charges_per_use": 100, "use_action": "TAZER", - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] } ] diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 6262263b96488..80c625540945a 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -1095,11 +1095,14 @@ "use_action": "TAZER", "extend": { "flags": [ "NONCONDUCTIVE" ] }, "relative": { "volume": "250 ml", "weight": "151 g" }, - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -1115,11 +1118,14 @@ "use_action": "TAZER", "extend": { "flags": [ "NONCONDUCTIVE" ] }, "relative": { "volume": "250 ml", "weight": "151 g" }, - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -1135,11 +1141,14 @@ "use_action": "TAZER", "extend": { "flags": [ "NONCONDUCTIVE" ] }, "relative": { "volume": "250 ml", "weight": "151 g" }, - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -1575,8 +1584,14 @@ "techniques": [ "WBLOCK_1", "SPIN", "SWEEP" ], "use_action": "ECS_LAJATANG_OFF", "flags": [ "NONCONDUCTIVE", "ALWAYS_TWOHAND" ], - "magazines": [ - [ "battery", [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] + } ] }, { @@ -1690,11 +1705,14 @@ "use_action": "E_COMBATSAW_OFF", "techniques": [ "WBLOCK_1", "SWEEP" ], "flags": [ "ALWAYS_TWOHAND" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index 9d99ac28c28ac..8e6d3948e577c 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -422,7 +422,15 @@ "dispersion": 600, "durability": 6, "relative": { "reload": 2 }, - "magazines": [ [ "flammable", [ "aux_pressurized_tank", "pressurized_tank" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "aux_pressurized_tank", "pressurized_tank" ] + } + ] }, { "id": "bio_advreactor", @@ -1768,12 +1776,19 @@ "blackpowder_tolerance": 32, "loudness": 30, "clip_size": 5, - "magazines": [ [ "223", [ "223_speedloader5" ] ] ], "valid_mod_locations": [ [ "accessories", 2 ], [ "sights", 1 ], [ "underbarrel", 1 ] ], "proportional": { "reload": 0.7 }, "extend": { "flags": [ "RELOAD_ONE", "RELOAD_EJECT", "NEVER_JAMS" ] }, "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "223": 5 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "223_speedloader5" ] + } + ] }, { "id": "223_speedloader5", @@ -1856,9 +1871,17 @@ "location": "underbarrel", "mod_targets": [ "rifle", "shotgun", "smg", "crossbow", "launcher" ], "gun_data": { "ammo": "flammable", "skill": "launcher", "dispersion": 300, "durability": 10 }, - "magazines": [ [ "flammable", [ "aux_pressurized_tank" ] ] ], "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ], - "flags": [ "FIRE_100", "PUMP_RAIL_COMPATIBLE", "NON-FOULING" ] + "flags": [ "FIRE_100", "PUMP_RAIL_COMPATIBLE", "NON-FOULING" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "aux_pressurized_tank" ] + } + ] }, { "type": "recipe", @@ -2239,7 +2262,15 @@ [ "rail mount", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "nail", [ "nailmag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "nailmag" ] + } + ] }, { "id": "nailrifle", @@ -2263,9 +2294,17 @@ [ "rail mount", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "nail", [ "nailmag" ] ] ], "relative": { "weight": 1000, "volume": 6, "range": 3, "ranged_damage": { "damage_type": "stab", "amount": 4 } }, - "proportional": { "price": 3, "dispersion": 0.5 } + "proportional": { "price": 3, "dispersion": 0.5 }, + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "nailmag" ] + } + ] }, { "id": "nailmag", @@ -2634,11 +2673,14 @@ "ammo": [ "battery" ], "charges_per_use": 2, "use_action": "ROBOTCONTROL", - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -2678,6 +2720,14 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "545x39", [ "ak74mag", "rpk74mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "ak74mag", "rpk74mag" ] + } + ] } ] diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json index 1f281bf9c2aa4..99de10cdce400 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -83,11 +83,14 @@ "charges_per_use": 5, "use_action": "CARVER_OFF", "flags": [ "SHEATH_SWORD", "NONCONDUCTIVE" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -233,11 +236,14 @@ "charges_per_use": 10, "qualities": [ [ "BOIL", 1 ] ], "use_action": "HOTPLATE", - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -256,11 +262,14 @@ "color": "blue", "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -351,11 +360,14 @@ "color": "white", "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -449,11 +461,14 @@ "ammo": [ "battery" ], "charges_per_use": 5, "use_action": "HOTPLATE", - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -541,11 +556,14 @@ "color": "white", "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -567,11 +585,14 @@ "charges_per_use": 5, "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ], "use_action": [ "HOTPLATE", "HEAT_FOOD" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -651,11 +672,14 @@ "charges_per_use": 5, "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ], "use_action": [ "HOTPLATE", "HEAT_FOOD" ], - "magazines": [ - [ - "battery", - [ "medium_plus_battery_cell", "medium_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_plus_battery_cell", "medium_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -691,11 +715,14 @@ "power_draw": 1500000, "qualities": [ [ "CONTAIN", 1 ] ], "use_action": "MULTICOOKER", - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -949,11 +976,14 @@ "color": "white", "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -991,10 +1021,13 @@ "charges_per_use": 1, "use_action": "WATER_PURIFIER", "flags": [ "ALLOWS_REMOTE_USE" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -1003,7 +1036,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] } ] diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index 6ed0e990b48ed..d8bac7c76361d 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -33,10 +33,13 @@ "ammo": [ "battery" ], "charges_per_use": 5, "use_action": "CAMERA", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_plus_battery_cell", "light_minus_battery_cell", "light_battery_cell", @@ -45,7 +48,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -65,10 +68,13 @@ "charges_per_use": 5, "use_action": "CAMERA", "flags": [ "CAMERA_PRO", "ALWAYS_TWOHAND" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_plus_battery_cell", "light_minus_battery_cell", "light_battery_cell", @@ -77,7 +83,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -103,10 +109,13 @@ "type": "transform" }, "flags": [ "WATCH", "ALARMCLOCK" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_plus_battery_cell", "light_minus_battery_cell", "light_minus_disposable_cell", @@ -115,7 +124,7 @@ "light_atomic_battery_cell", "light_minus_atomic_battery_cell" ] - ] + } ] }, { @@ -179,10 +188,13 @@ "charges_per_use": 1, "use_action": "EINKTABLETPC", "flags": [ "WATCH" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_plus_battery_cell", "light_battery_cell", "light_minus_battery_cell", @@ -191,7 +203,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -210,10 +222,13 @@ "symbol": ",", "color": "green", "ammo": [ "battery" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -222,7 +237,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -241,10 +256,13 @@ "ammo": [ "battery" ], "charges_per_use": 1, "use_action": "GEIGER", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -253,7 +271,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -282,10 +300,13 @@ "color": "light_gray", "ammo": [ "battery" ], "use_action": "HAND_CRANK", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -294,7 +315,7 @@ "heavy_battery_cell", "heavy_plus_battery_cell" ] - ] + } ] }, { @@ -326,11 +347,14 @@ } ], "flags": [ "WATCH" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -358,10 +382,13 @@ "ammo": [ "battery" ], "use_action": "MP3", "charges_per_use": 1, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -370,7 +397,7 @@ "light_disposable_cell", "light_minus_disposable_cell" ] - ] + } ] }, { @@ -402,10 +429,13 @@ "charges_per_use": 1, "use_action": "NOISE_EMITTER_OFF", "flags": [ "RADIO_MODABLE" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -414,7 +444,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -442,10 +472,13 @@ "color": "light_gray", "ammo": [ "battery" ], "use_action": "PORTABLE_GAME", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_disposable_cell", "light_minus_disposable_cell", "light_battery_cell", @@ -454,7 +487,7 @@ "light_atomic_battery_cell", "light_minus_atomic_battery_cell" ] - ] + } ] }, { @@ -529,10 +562,16 @@ "symbol": ";", "color": "light_gray", "ammo": [ "battery" ], - "magazines": [ - [ "battery", [ "heavy_plus_battery_cell", "heavy_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] - ], - "flags": [ "IS_UPS" ] + "flags": [ "IS_UPS" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "heavy_plus_battery_cell", "heavy_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] + } + ] }, { "id": "vibrator", @@ -549,10 +588,13 @@ "ammo": [ "battery" ], "charges_per_use": 10, "use_action": "VIBE", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -561,7 +603,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] } ] diff --git a/data/json/items/tool/fire.json b/data/json/items/tool/fire.json index e373a75d4cffe..97ebec9a3282b 100644 --- a/data/json/items/tool/fire.json +++ b/data/json/items/tool/fire.json @@ -14,10 +14,14 @@ "ammo": [ "battery" ], "charges_per_use": 5, "use_action": { "type": "firestarter" }, - "magazines": [ - [ - "battery", - [ + "flags": [ "FIRESTARTER" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_minus_battery_cell", "light_plus_battery_cell", @@ -26,9 +30,8 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] - ], - "flags": [ "FIRESTARTER" ] + } + ] }, { "id": "fire_drill", diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index 49318327ef0c6..189cf36cd73a9 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -161,10 +161,13 @@ "need_charges_msg": "The lantern has no batteries." }, "flags": [ "RADIO_MODABLE", "ALLOWS_REMOTE_USE" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_minus_battery_cell", "light_minus_disposable_cell", "light_minus_atomic_battery_cell", @@ -173,7 +176,7 @@ "light_plus_battery_cell", "light_atomic_battery_cell" ] - ] + } ] }, { @@ -208,10 +211,13 @@ "need_charges": 1, "need_charges_msg": "The flashlight's batteries are dead." }, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_disposable_cell", "light_minus_disposable_cell", "light_battery_cell", @@ -220,7 +226,7 @@ "light_atomic_battery_cell", "light_minus_atomic_battery_cell" ] - ] + } ] }, { @@ -389,10 +395,13 @@ "need_charges": 1, "need_charges_msg": "The heavy duty flashlight's batteries are dead." }, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_disposable_cell", "light_minus_disposable_cell", "light_plus_battery_cell", @@ -401,7 +410,7 @@ "light_atomic_battery_cell", "light_minus_atomic_battery_cell" ] - ] + } ] }, { @@ -460,10 +469,13 @@ "need_charges": 1, "type": "transform" }, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -472,7 +484,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -537,7 +549,15 @@ "need_charges": 1, "need_charges_msg": "The %s must be attached to a gas cylinder to light." }, - "magazines": [ [ "weldgas", [ "weldtank", "tinyweldtank" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "weldtank", "tinyweldtank" ] + } + ] }, { "id": "oxylamp_on", @@ -571,7 +591,15 @@ "need_charges_msg": "The reading light winks out.", "type": "transform" }, - "magazines": [ [ "battery", [ "light_minus_disposable_cell", "light_minus_battery_cell", "light_minus_atomic_battery_cell" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_minus_disposable_cell", "light_minus_battery_cell", "light_minus_atomic_battery_cell" ] + } + ] }, { "id": "reading_light_on", @@ -609,10 +637,13 @@ "type": "transform" }, "flags": [ "RADIO_ACTIVATION", "RADIOSIGNAL_2" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -621,7 +652,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { diff --git a/data/json/items/tool/med.json b/data/json/items/tool/med.json index e8639b216fb7d..c5c9f908c79e8 100644 --- a/data/json/items/tool/med.json +++ b/data/json/items/tool/med.json @@ -37,8 +37,14 @@ "power_draw": 1500000, "looks_like": "microwave", "ammo": [ "battery" ], - "magazines": [ - [ "battery", [ "heavy_plus_battery_cell", "heavy_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "heavy_plus_battery_cell", "heavy_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] + } ] }, { diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json index cef7d4dec354f..173347b493eaf 100644 --- a/data/json/items/tool/metalworking.json +++ b/data/json/items/tool/metalworking.json @@ -152,8 +152,14 @@ "color": "light_gray", "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], - "magazines": [ - [ "battery", [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] + } ] }, { diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json index cf1fd6163732d..5278ec355bce9 100644 --- a/data/json/items/tool/misc.json +++ b/data/json/items/tool/misc.json @@ -99,12 +99,6 @@ "price_postapoc": 100, "material": "plastic", "ammo": [ "battery" ], - "magazines": [ - [ - "battery", - [ "light_minus_battery_cell", "light_minus_disposable_cell", "light_battery_cell", "light_disposable_cell" ] - ] - ], "charges_per_use": 1, "max_charges": 100, "use_action": { @@ -114,7 +108,16 @@ "need_charges": 1, "need_charges_msg": "The dab pen's batteries need more charge.", "type": "transform" - } + }, + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_minus_battery_cell", "light_minus_disposable_cell", "light_battery_cell", "light_disposable_cell" ] + } + ] }, { "type": "TOOL", @@ -132,12 +135,6 @@ "ammo": [ "battery" ], "power_draw": 9000, "revert_to": "dab_pen", - "magazines": [ - [ - "battery", - [ "light_minus_battery_cell", "light_minus_disposable_cell", "light_battery_cell", "light_disposable_cell" ] - ] - ], "charges_per_use": 1, "max_charges": 100, "use_action": { @@ -147,7 +144,16 @@ "need_charges": 0, "need_charges_msg": "The dab pen's batteries need more charge.", "type": "transform" - } + }, + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_minus_battery_cell", "light_minus_disposable_cell", "light_battery_cell", "light_disposable_cell" ] + } + ] }, { "id": "e_tool", @@ -360,8 +366,14 @@ "menu_text": "Turn on", "type": "transform" }, - "magazines": [ - [ "battery", [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] + } ] }, { @@ -579,11 +591,14 @@ "menu_text": "Turn on", "type": "transform" }, - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { diff --git a/data/json/items/tool/radio_tools.json b/data/json/items/tool/radio_tools.json index 56dfda2091dee..dfc48792c1cc3 100644 --- a/data/json/items/tool/radio_tools.json +++ b/data/json/items/tool/radio_tools.json @@ -27,10 +27,13 @@ "turns_per_charge": 5, "proportional": { "weight": 0.21, "volume": 0.25, "price": 0.2 }, "use_action": "RADIOCONTROL", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_disposable_cell", "light_minus_disposable_cell", "light_battery_cell", @@ -39,7 +42,7 @@ "light_atomic_battery_cell", "light_minus_atomic_battery_cell" ] - ] + } ] }, { @@ -54,7 +57,15 @@ "proportional": { "weight": 0.73, "volume": 0.75, "price": 0.8 }, "use_action": "RADIOCAR", "flags": [ "RADIO_CONTAINER" ], - "magazines": [ [ "battery", [ "light_minus_disposable_cell", "light_minus_battery_cell", "light_minus_atomic_battery_cell" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_minus_disposable_cell", "light_minus_battery_cell", "light_minus_atomic_battery_cell" ] + } + ] }, { "id": "radio_car_on", @@ -99,10 +110,13 @@ "ammo": [ "battery" ], "charges_per_use": 1, "use_action": "RADIO_OFF", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_disposable_cell", "light_minus_disposable_cell", "light_battery_cell", @@ -111,7 +125,7 @@ "light_atomic_battery_cell", "light_minus_atomic_battery_cell" ] - ] + } ] }, { @@ -141,10 +155,13 @@ "ammo": [ "battery" ], "charges_per_use": 1, "flags": [ "TWO_WAY_RADIO" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_disposable_cell", "light_minus_disposable_cell", "light_battery_cell", @@ -153,7 +170,7 @@ "light_atomic_battery_cell", "light_minus_atomic_battery_cell" ] - ] + } ] }, { @@ -173,10 +190,13 @@ "charges_per_use": 1, "turns_per_charge": 10, "use_action": "REMOTEVEH", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -185,7 +205,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] } ] diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index 6ade64bd77ec3..812b6c516eae7 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -54,11 +54,14 @@ "charges_per_use": 1, "qualities": [ [ "DISTILL", 1 ], [ "CHEM", 3 ], [ "BOIL", 1 ] ], "use_action": "HOTPLATE", - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -90,11 +93,14 @@ "material": [ "steel", "copper", "plastic" ], "symbol": ";", "ammo": [ "battery" ], - "magazines": [ - [ - "battery", - [ "battery_car", "battery_motorbike", "small_storage_battery", "medium_storage_battery", "storage_battery" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "battery_car", "battery_motorbike", "small_storage_battery", "medium_storage_battery", "storage_battery" ] + } ] }, { @@ -106,7 +112,6 @@ "weight": "40860 g", "ammo": [ "battery" ], "charges_per_use": 1, - "magazines": [ [ "battery", [ "large_storage_battery", "storage_battery" ] ] ], "volume": "27 L", "price": 100000, "to_hit": -10, @@ -114,7 +119,16 @@ "material": "steel", "symbol": "E", "flags": [ "ALLOWS_REMOTE_USE" ], - "color": "dark_gray" + "color": "dark_gray", + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "large_storage_battery", "storage_battery" ] + } + ] }, { "id": "vac_oven_small_full", @@ -130,7 +144,6 @@ "material": "steel", "ammo": [ "battery" ], "charges_per_use": 1, - "magazines": [ [ "battery", [ "large_storage_battery", "storage_battery" ] ] ], "symbol": "E", "color": "dark_gray", "use_action": { @@ -141,7 +154,16 @@ "need_charges_msg": "The vacuum oven's batteries need more charge.", "type": "transform" }, - "flags": [ "TRADER_AVOID", "ALLOWS_REMOTE_USE" ] + "flags": [ "TRADER_AVOID", "ALLOWS_REMOTE_USE" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "large_storage_battery", "storage_battery" ] + } + ] }, { "id": "vac_oven_small_on", @@ -158,7 +180,6 @@ "power_draw": 120000, "revert_to": "vac_oven_small_full", "charges_per_use": 1, - "magazines": [ [ "battery", [ "large_storage_battery", "storage_battery" ] ] ], "material": "steel", "symbol": "E", "color": "dark_gray", @@ -171,7 +192,16 @@ "transform_age": 259200, "not_ready_msg": "The vacuum oven is still purging." }, - "flags": [ "TRADER_AVOID", "NO_UNLOAD", "ALLOWS_REMOTE_USE" ] + "flags": [ "TRADER_AVOID", "NO_UNLOAD", "ALLOWS_REMOTE_USE" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "large_storage_battery", "storage_battery" ] + } + ] }, { "id": "vac_oven_small_done", @@ -186,11 +216,19 @@ "bashing": 10, "ammo": [ "battery" ], "charges_per_use": 1, - "magazines": [ [ "battery", [ "large_storage_battery", "storage_battery" ] ] ], "material": "steel", "symbol": "E", "color": "dark_gray", - "flags": [ "TRADER_AVOID", "ALLOWS_REMOTE_USE" ] + "flags": [ "TRADER_AVOID", "ALLOWS_REMOTE_USE" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "large_storage_battery", "storage_battery" ] + } + ] }, { "id": "closed_loop_extractor_small", @@ -219,10 +257,14 @@ "need_charges_msg": "The small closed loop extractor's batteries need more charge.", "type": "transform" }, - "magazines": [ - [ - "battery", - [ + "qualities": [ [ "EXTRACT", 2 ] ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_disposable_cell", @@ -236,9 +278,8 @@ "large_storage_battery", "storage_battery" ] - ] - ], - "qualities": [ [ "EXTRACT", 2 ] ] + } + ] }, { "id": "closed_loop_extractor_small_on", @@ -267,10 +308,14 @@ "need_charges_msg": "The small closed loop extractor's batteries need more charge.", "type": "transform" }, - "magazines": [ - [ - "battery", - [ + "qualities": [ [ "EXTRACT", 2 ] ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_disposable_cell", @@ -284,9 +329,8 @@ "large_storage_battery", "storage_battery" ] - ] - ], - "qualities": [ [ "EXTRACT", 2 ] ] + } + ] }, { "id": "closed_loop_extractor_large", @@ -305,10 +349,23 @@ "flags": [ "ALLOWS_REMOTE_USE", "TRADER_AVOID" ], "ammo": [ "battery" ], "charges_per_use": 1, - "magazines": [ - [ - "battery", - [ + "use_action": { + "target": "closed_loop_extractor_large_on", + "msg": "You turn on the large closed loop extractor.", + "menu_text": "turn on", + "active": true, + "need_charges": 1, + "need_charges_msg": "The large closed loop extractor's batteries need more charge.", + "type": "transform" + }, + "qualities": [ [ "EXTRACT", 1 ] ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_disposable_cell", @@ -322,18 +379,8 @@ "large_storage_battery", "storage_battery" ] - ] - ], - "use_action": { - "target": "closed_loop_extractor_large_on", - "msg": "You turn on the large closed loop extractor.", - "menu_text": "turn on", - "active": true, - "need_charges": 1, - "need_charges_msg": "The large closed loop extractor's batteries need more charge.", - "type": "transform" - }, - "qualities": [ [ "EXTRACT", 1 ] ] + } + ] }, { "id": "closed_loop_extractor_large_on", @@ -354,10 +401,22 @@ "power_draw": 1500000, "revert_to": "closed_loop_extractor_large", "charges_per_use": 1, - "magazines": [ - [ - "battery", - [ + "use_action": { + "target": "closed_loop_extractor_large", + "msg": "You turn off the large closed loop extractor.", + "menu_text": "turn off", + "need_charges": 0, + "need_charges_msg": "The large closed loop extractor's batteries need more charge.", + "type": "transform" + }, + "qualities": [ [ "EXTRACT", 1 ] ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_disposable_cell", @@ -371,17 +430,8 @@ "large_storage_battery", "storage_battery" ] - ] - ], - "use_action": { - "target": "closed_loop_extractor_large", - "msg": "You turn off the large closed loop extractor.", - "menu_text": "turn off", - "need_charges": 0, - "need_charges_msg": "The large closed loop extractor's batteries need more charge.", - "type": "transform" - }, - "qualities": [ [ "EXTRACT", 1 ] ] + } + ] }, { "id": "oil_extractor_crude", @@ -457,10 +507,13 @@ "need_charges_msg": "The vacuum pump's batteries need more charge.", "type": "transform" }, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_disposable_cell", @@ -474,7 +527,7 @@ "large_storage_battery", "storage_battery" ] - ] + } ] }, { @@ -505,10 +558,13 @@ "need_charges_msg": "The vacuum pump's batteries need more charge.", "type": "transform" }, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_disposable_cell", @@ -522,7 +578,7 @@ "large_storage_battery", "storage_battery" ] - ] + } ] }, { @@ -731,10 +787,13 @@ "charges_per_use": 5, "use_action": "WEATHER_TOOL", "flags": [ "THERMOMETER", "HYGROMETER", "BAROMETER" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_disposable_cell", @@ -743,7 +802,7 @@ "light_minus_disposable_cell", "light_minus_atomic_battery_cell" ] - ] + } ] }, { @@ -763,11 +822,14 @@ "symbol": ";", "color": "light_gray", "qualities": [ [ "ANALYSIS", 1 ] ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -802,11 +864,14 @@ "material": [ "plastic", "steel" ], "symbol": ";", "color": "light_gray", - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -841,10 +906,13 @@ "material": [ "plastic", "glass" ], "symbol": ";", "color": "light_gray", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -853,7 +921,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -872,10 +940,13 @@ "material": [ "plastic" ], "symbol": ";", "color": "light_gray", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -884,7 +955,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -903,10 +974,13 @@ "material": [ "plastic", "glass" ], "symbol": ";", "color": "light_gray", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -915,7 +989,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -1121,10 +1195,13 @@ "color": "white", "ammo": [ "battery" ], "qualities": [ [ "CONCENTRATE", 1 ] ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -1133,7 +1210,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { diff --git a/data/json/items/tool/smoking.json b/data/json/items/tool/smoking.json index e2a40bda3054e..6778fe2b80e9b 100644 --- a/data/json/items/tool/smoking.json +++ b/data/json/items/tool/smoking.json @@ -17,10 +17,13 @@ "charges_per_use": 1, "power_draw": 7500, "use_action": "ECIG", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -29,7 +32,7 @@ "light_minus_disposable_cell", "light_minus_atomic_battery_cell" ] - ] + } ] }, { diff --git a/data/json/items/tool/toileteries.json b/data/json/items/tool/toileteries.json index 350a0ea38fabe..098db22f9a9ee 100644 --- a/data/json/items/tool/toileteries.json +++ b/data/json/items/tool/toileteries.json @@ -49,7 +49,15 @@ "ammo": [ "battery" ], "charges_per_use": 10, "use_action": "HAIRKIT", - "magazines": [ [ "battery", [ "light_minus_battery_cell", "light_minus_atomic_battery_cell", "light_minus_disposable_cell" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_minus_battery_cell", "light_minus_atomic_battery_cell", "light_minus_disposable_cell" ] + } + ] }, { "id": "mop", diff --git a/data/json/items/tool/woodworking.json b/data/json/items/tool/woodworking.json index 0c7408aec6813..e5b387e443f8f 100644 --- a/data/json/items/tool/woodworking.json +++ b/data/json/items/tool/woodworking.json @@ -75,11 +75,14 @@ "charges_per_use": 5, "use_action": { "target": "circsaw_on", "msg": "You turn on the circular saw.", "active": true, "type": "transform" }, "flags": [ "NONCONDUCTIVE" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -156,11 +159,14 @@ "techniques": "SWEEP", "use_action": "ELEC_CHAINSAW_OFF", "flags": [ "NONCONDUCTIVE" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index 4e1742674e881..4f4ad5c7e260f 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -76,11 +76,14 @@ "charges_per_use": 1, "power_draw": 800000, "flags": [ "NONCONDUCTIVE" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -187,11 +190,14 @@ "charges_per_use": 20, "qualities": [ [ "CONTAIN", 1 ] ], "use_action": "HOTPLATE", - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -211,11 +217,14 @@ "color": "yellow", "ammo": [ "battery" ], "qualities": [ [ "DRILL", 3 ], [ "SCREW", 1 ] ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -413,8 +422,14 @@ "color": "dark_gray", "ammo": [ "battery" ], "flags": [ "ALLOWS_REMOTE_USE" ], - "magazines": [ - [ "battery", [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] + } ] }, { @@ -446,13 +461,16 @@ [ "CHISEL", 3 ] ], "use_action": [ "GUN_REPAIR", "CROWBAR", "HAMMER" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] - ], - "flags": [ "ALLOWS_REMOTE_USE" ] + "flags": [ "ALLOWS_REMOTE_USE" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } + ] }, { "id": "makeshift_hammer", @@ -586,8 +604,16 @@ "charges_per_use": 4, "use_action": "OXYTORCH", "qualities": [ [ "WELD", 2 ] ], - "magazines": [ [ "weldgas", [ "weldtank", "tinyweldtank" ] ] ], - "flags": [ "ALLOWS_REMOTE_USE" ] + "flags": [ "ALLOWS_REMOTE_USE" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "weldtank", "tinyweldtank" ] + } + ] }, { "id": "paint_brush", @@ -673,10 +699,13 @@ "color": "light_gray", "ammo": [ "battery" ], "flags": [ "TRADER_AVOID" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -685,7 +714,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -772,13 +801,16 @@ [ "CHISEL", 3 ] ], "use_action": [ "GUN_REPAIR", "CROWBAR", "HAMMER" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] - ], - "flags": [ "ALLOWS_REMOTE_USE" ] + "flags": [ "ALLOWS_REMOTE_USE" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } + ] }, { "id": "soldering_iron", @@ -808,10 +840,13 @@ { "flame": false, "type": "cauterize" } ], "flags": [ "SPEAR", "BELT_CLIP", "ALLOWS_REMOTE_USE" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_minus_battery_cell", "light_battery_cell", "light_plus_battery_cell", @@ -820,7 +855,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -963,11 +998,14 @@ } ], "flags": [ "ALLOWS_REMOTE_USE" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -999,11 +1037,14 @@ } ], "flags": [ "ALLOWS_REMOTE_USE" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 690e65f983422..e4c6123184b84 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -167,10 +167,13 @@ "encumbrance": 15, "coverage": 80, "material_thickness": 4, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -179,7 +182,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -315,7 +318,15 @@ "symbol": "[", "ammo": "battery", "use_action": "PORTABLE_GAME", - "magazines": [ [ "battery", [ "light_minus_battery_cell", "light_minus_atomic_battery_cell", "light_minus_disposable_cell" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_minus_battery_cell", "light_minus_atomic_battery_cell", "light_minus_disposable_cell" ] + } + ] }, { "type": "TOOL_ARMOR", @@ -412,10 +423,13 @@ "warmth": 10, "coverage": 100, "material_thickness": 1, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -424,7 +438,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -468,10 +482,13 @@ "warmth": 10, "coverage": 100, "material_thickness": 1, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_plus_battery_cell", "light_battery_cell", "light_minus_battery_cell", @@ -480,7 +497,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -524,10 +541,13 @@ "warmth": 10, "coverage": 100, "material_thickness": 1, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -536,7 +556,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -580,10 +600,13 @@ "warmth": 10, "coverage": 100, "material_thickness": 1, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -592,7 +615,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -658,10 +681,13 @@ "covers": [ "HEAD" ], "coverage": 15, "material_thickness": 1, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_plus_battery_cell", "light_minus_battery_cell", @@ -670,7 +696,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -714,10 +740,13 @@ "covers": [ "HEAD" ], "coverage": 20, "material_thickness": 1, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_plus_battery_cell", "light_battery_cell", "light_minus_battery_cell", @@ -726,7 +755,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -1480,10 +1509,13 @@ "encumbrance": 40, "coverage": 100, "material_thickness": 2, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_plus_battery_cell", "light_battery_cell", "light_minus_battery_cell", @@ -1492,7 +1524,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -1541,10 +1573,13 @@ "encumbrance": 40, "coverage": 100, "material_thickness": 2, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_plus_battery_cell", "light_battery_cell", "light_minus_battery_cell", @@ -1553,7 +1588,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -1805,7 +1840,15 @@ "coverage": 5, "material_thickness": 1, "flags": [ "BELTED", "FRAGILE", "ALLOWS_NATURAL_ATTACKS", "WATER_FRIENDLY", "OVERSIZE" ], - "magazines": [ [ "battery", [ "light_minus_battery_cell", "light_minus_atomic_battery_cell" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_minus_battery_cell", "light_minus_atomic_battery_cell" ] + } + ] }, { "type": "ARMOR", @@ -2379,11 +2422,14 @@ "warmth": 10, "coverage": 100, "material_thickness": 1, - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -2738,10 +2784,13 @@ "encumbrance": 5, "coverage": 10, "material_thickness": 2, - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_plus_battery_cell", "light_battery_cell", "light_minus_battery_cell", @@ -2750,7 +2799,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -3055,11 +3104,14 @@ "need_charges_msg": "The blanket's batteries are dead." }, "flags": [ "OVERSIZE", "OUTER", "ALLOWS_NATURAL_ATTACKS" ], - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] }, { @@ -3105,13 +3157,16 @@ "need_charges": 1, "need_charges_msg": "The mask's batteries are dead." }, - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] - ], - "flags": [ "OUTER", "SUN_GLASSES" ] + "flags": [ "OUTER", "SUN_GLASSES" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } + ] }, { "id": "foodperson_mask_on", diff --git a/data/mods/Aftershock/items/obsolete.json b/data/mods/Aftershock/items/obsolete.json index f42cef1911246..96a06e3bd73fe 100644 --- a/data/mods/Aftershock/items/obsolete.json +++ b/data/mods/Aftershock/items/obsolete.json @@ -114,10 +114,13 @@ }, "flags": [ "WATERPROOF", "FLASH_PROTECTION", "ONLY_ONE", "STURDY" ], "looks_like": "depowered_helmet", - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_minus_battery_cell", "light_plus_battery_cell", @@ -126,7 +129,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { diff --git a/data/mods/Aftershock/items/tools.json b/data/mods/Aftershock/items/tools.json index d53e7fb9a1029..e9126bd74bc5b 100644 --- a/data/mods/Aftershock/items/tools.json +++ b/data/mods/Aftershock/items/tools.json @@ -227,7 +227,15 @@ "encumbrance": 2, "covers": [ "LEG_EITHER" ], "flags": [ "RECHARGE", "WAIST", "FRAGILE", "OVERSIZE", "WATERPROOF", "IS_UPS", "NO_RELOAD", "NO_UNLOAD" ], - "magazines": [ ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ ] + } + ] }, { "id": "adv_UPS_off", @@ -273,11 +281,14 @@ "ammo": [ "battery" ], "charges_per_use": 2, "use_action": "ROBOTCONTROL", - "magazines": [ - [ - "battery", - [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] - ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "medium_battery_cell", "medium_plus_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } ] } ] diff --git a/data/mods/Aftershock/items/weapons.json b/data/mods/Aftershock/items/weapons.json index df28f3a46b786..8c94b236cbe66 100644 --- a/data/mods/Aftershock/items/weapons.json +++ b/data/mods/Aftershock/items/weapons.json @@ -24,10 +24,13 @@ "active": true }, "flags": [ "USE_UPS", "NO_UNLOAD", "NO_RELOAD" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_battery_cell", "light_minus_battery_cell", "light_plus_battery_cell", @@ -36,7 +39,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, { @@ -181,10 +184,16 @@ "reload": 500, "valid_mod_locations": [ [ "accessories", 4 ], [ "sights", 1 ], [ "sling", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ], "ammo_effects": [ "LASER", "DRAW_AS_LINE" ], - "magazines": [ - [ "battery", [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] ] - ], - "flags": [ "NEVER_JAMS", "FIRE_20", "NON-FOULING" ] + "flags": [ "NEVER_JAMS", "FIRE_20", "NON-FOULING" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "heavy_battery_cell", "heavy_plus_battery_cell", "heavy_atomic_battery_cell", "heavy_disposable_cell" ] + } + ] }, { "id": "TANK", diff --git a/data/mods/CrazyCataclysm/crazy_items.json b/data/mods/CrazyCataclysm/crazy_items.json index ed547af2d2eda..d102441e431e2 100644 --- a/data/mods/CrazyCataclysm/crazy_items.json +++ b/data/mods/CrazyCataclysm/crazy_items.json @@ -94,7 +94,15 @@ "ammo": [ "9mm" ], "dispersion": 480, "durability": 7, - "magazines": [ [ "9mm", [ "hptc9mag_8rd", "hptc9mag_10rd", "hptc9mag_15rd" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "hptc9mag_8rd", "hptc9mag_10rd", "hptc9mag_15rd" ] + } + ] }, { "id": "firekatana_off", diff --git a/data/mods/Generic_Guns/firearms/grenade.json b/data/mods/Generic_Guns/firearms/grenade.json index 256179235b6a0..f5b025eb913e0 100644 --- a/data/mods/Generic_Guns/firearms/grenade.json +++ b/data/mods/Generic_Guns/firearms/grenade.json @@ -16,7 +16,15 @@ "name": { "str": "automatic grenade launcher" }, "ammo": [ "ammo_grenade" ], "description": "This large, clumsy looking launcher looks like the offspring of a machine gun and a mortar; its bore is huge, and its action is just as massive. A huge belt of grenade cartridges loads into its tray, allowing several grenades to be launched in rapid succession. If one grenade fired from this isn't enough to solve your problems, surely a dozen more are. This must be mounted on a frame to be fired, and reloading is a bit slow.", - "magazines": [ [ "ammo_grenade", [ "grenade_belt" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "grenade_belt" ] + } + ] }, { "id": "grenade_pistol", diff --git a/data/mods/Generic_Guns/firearms/pistol.json b/data/mods/Generic_Guns/firearms/pistol.json index 132ad276eb391..11fd2a3763282 100644 --- a/data/mods/Generic_Guns/firearms/pistol.json +++ b/data/mods/Generic_Guns/firearms/pistol.json @@ -16,7 +16,15 @@ "name": { "str": "machine pistol" }, "ammo": [ "ammo_pistol" ], "description": "This pistol is a tiny machinegun you can stuff into a holster, with which you could dump its magazine at a blistering rate into any close range foes. Machine pistols mostly see use by vehicle crewmen or bodygaurds of VIPs. Due to its preposterous rate of fire it is difficult to control.", - "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "pistol_mag", "pistol_smg_mag" ] + } + ] }, { "id": "pistol_medium", @@ -25,7 +33,15 @@ "name": { "str": "defensive pistol" }, "ammo": [ "ammo_pistol" ], "description": "A modern pistol fit for duty, military service, or personal defense, with a detachable box magazine and a reliable action. Though its chambering is capable of meeting FBI penetration minimums, the lack of a shoulder stock limits its utility.", - "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "pistol_mag", "pistol_smg_mag" ] + } + ] }, { "id": "pistol_pcc", @@ -34,7 +50,15 @@ "name": "survivalist carbine", "ammo": [ "ammo_pistol" ], "description": "These small carbines share ammunition and magazines with common pistols, offering a more controllable carbine than a normal rifle, while also reducing ammunition costs. Because of their compatibility, they pair well with duty pistols, allowing one to transition to a more stable weapon without carrying extra ammo or magazines.", - "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "pistol_mag", "pistol_smg_mag" ] + } + ] }, { "id": "pistol_revolver", @@ -44,8 +68,15 @@ "ammo": [ "ammo_pistol" ], "description": "Revolvers like this, chambered for standard defensive calibers, were a favorite of police departments for nearly a century, up until the 1986 Miami shootout. Afterwards, the slow reloading and shooting of revolvers were considered liabilities; still, this model's accuracy and moderate recoil make for a serviceable sidearm, and there are no magazines for you to lose or damage.", "clip_size": 6, - "magazines": [ [ "ammo_pistol", [ "pistol_speedloader" ] ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_pistol": 6 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "pistol_speedloader" ] + } + ] }, { "id": "pistol_smg", @@ -54,7 +85,15 @@ "name": "submachine gun", "ammo": [ "ammo_pistol" ], "description": "Chambered in common pistol ammunition, this compact long arm is perfect for trench raiders, vehicular crewmen, SWAT teams and special forces. Though not as accurate as a proper rifle, especially at longer ranges, it is very controllable in automatic fire. It feeds from detachable box magazines, which are easy to unload into close range targets.", - "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "pistol_mag", "pistol_smg_mag" ] + } + ] }, { "id": "pistol_pipe_smg", @@ -63,6 +102,14 @@ "name": "survivor subgun", "ammo": [ "ammo_pistol" ], "description": "A crudely constructed fully automatic submachinegun, accepting standard pistol and submachine gun magazines. The heavy bolt makes accurate fire difficult, and its questionable construction makes for poor reliability and longevity. Similar designs of desperation from the Second World War served their nations well enough, so this should be good for zombies... right? Accepts standard pistol ammunition.", - "magazines": [ [ "ammo_pistol", [ "pistol_mag", "pistol_smg_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "pistol_mag", "pistol_smg_mag" ] + } + ] } ] diff --git a/data/mods/Generic_Guns/firearms/pistol_magnum.json b/data/mods/Generic_Guns/firearms/pistol_magnum.json index e03a8a6b6abaf..7b73a78344e33 100644 --- a/data/mods/Generic_Guns/firearms/pistol_magnum.json +++ b/data/mods/Generic_Guns/firearms/pistol_magnum.json @@ -7,7 +7,15 @@ "ammo": [ "ammo_pistol_magnum", "ammo_pistol" ], "//": "We're just going to prtend that .357 and .44 magnum deagles will run .38's and .44 special just fine", "description": "This large pistol is almost as heavy as a small carbine, and just about as powerful too. Chambered in hard hitting magnum calibers, it is suitable for hunting medium game, humans, or offsetting any of one's perceived deficiencies. Though tradtionally such magnums are revolvers, this one is a magazine fed semi-automatic.", - "magazines": [ [ "ammo_pistol", [ "pistol_magnum_mag" ] ], [ "ammo_pistol_magnum", [ "pistol_magnum_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "pistol_magnum_mag", "pistol_magnum_mag" ] + } + ] }, { "id": "pistol_magnum_levergun", @@ -47,7 +55,15 @@ [ "sights mount", 1 ], [ "underbarrel mount", 1 ] ], - "magazines": [ [ "ammo_pistol", [ "pistol_magnum_mag" ] ], [ "ammo_pistol_magnum", [ "pistol_magnum_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "pistol_magnum_mag", "pistol_magnum_mag" ] + } + ] }, { "id": "pistol_magnum_pipe", @@ -68,7 +84,14 @@ "ammo": [ "ammo_pistol_magnum", "ammo_pistol" ], "description": "Early handgun hunters helped develop this revolver's magnum ammunition from standard calibers, which needed heavier revolvers to safely fire it. These revolvers' cylinders can thus chamber both magnum and standard pistol ammunition. You could take medium to large game with this hefty piece.", "clip_size": 6, - "magazines": [ [ "ammo_pistol", [ "pistol_speedloader" ] ], [ "ammo_pistol_magnum", [ "pistol_speedloader" ] ] ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_pistol_magnum": 6, "ammo_pistol": 6 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "pistol_speedloader", "pistol_speedloader" ] + } + ] } ] diff --git a/data/mods/Generic_Guns/firearms/pistol_tiny.json b/data/mods/Generic_Guns/firearms/pistol_tiny.json index 580a63c88bf11..9bcd8504c2421 100644 --- a/data/mods/Generic_Guns/firearms/pistol_tiny.json +++ b/data/mods/Generic_Guns/firearms/pistol_tiny.json @@ -7,8 +7,15 @@ "ammo": [ "ammo_pistol_tiny" ], "description": "With near non-existent recoil and inexpensive ammunition, rifles like this one are popular introductory firearms. It has a built in magazine, capable of holding an impressive amount of its small cartridges. You could take small game with this, but anything bigger might not even notice.", "clip_size": 19, - "magazines": [ ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_pistol_tiny": 19 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ ] + } + ] }, { "id": "pistol_tiny_target", @@ -17,7 +24,15 @@ "name": "target pistol", "ammo": [ "ammo_pistol_tiny" ], "description": "This medium sized pistol fires cheap and plentiful plinking ammo, and is exceptionally popular for practice or target shooting. This pistol is unsuited for taking on anything but small game, as it is meant to poke holes in paper. Accepts box magazines.", - "magazines": [ [ "ammo_pistol_tiny", [ "pistol_tiny_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "pistol_tiny_mag" ] + } + ] }, { "id": "pistol_tiny_zip", diff --git a/data/mods/Generic_Guns/firearms/rifle.json b/data/mods/Generic_Guns/firearms/rifle.json index 7fff5f4946410..bf4ceac88f10d 100644 --- a/data/mods/Generic_Guns/firearms/rifle.json +++ b/data/mods/Generic_Guns/firearms/rifle.json @@ -6,7 +6,15 @@ "name": { "str": "assault rifle" }, "ammo": [ "ammo_rifle" ], "description": "The products of decades of improvement, rifle such as this are handy, reliable, and adaptable. An 'assault rifle', it is capable of providing both accurate semi-automatic fire and bursts of automatic fire. Short of large creatures and light vehicles, this should take care of most of your problems out to several hundred meters.", - "magazines": [ [ "ammo_rifle", [ "rifle_mag", "rifle_sniper_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "rifle_mag", "rifle_sniper_mag" ] + } + ] }, { "id": "rifle_lmg", @@ -15,7 +23,15 @@ "name": { "str": "light machine gun" }, "ammo": [ "ammo_rifle" ], "description": "The light machine gun is a formidable implement for suppressive fire, an important part of squad tactics. Its belt feed allows for hundreds of rounds to be loaded, and its heavy components can withstand long bursts of fire. While perhaps not as precise as a service rifle, a light machinegun does allow for a considerable amount of energy to be sent down range. Slow to reload.", - "magazines": [ [ "ammo_rifle", [ "rifle_belt" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "rifle_belt" ] + } + ] }, { "id": "rifle_pipe_rifle", @@ -25,8 +41,15 @@ "ammo": [ "ammo_rifle" ], "description": "A crude longarm chambered in standard rifle ammunition, reinforced near the chamber. It holds a single a round and has a crude assembly to fire it. There's no extractor, so it might be slow to reload, and its construction makes for poor reliability and longevity.", "clip_size": 1, - "magazines": [ ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "ammo_rifle": 1 } } ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ ] + } + ] }, { "id": "rifle_pipe_carbine", @@ -35,7 +58,15 @@ "name": "survivor carbine", "ammo": [ "ammo_rifle" ], "description": "A crudely constructed carbine chambered for standard rifle ammo, fed from service rifle magazines. It locks with a rudimentary lever action system. The high pressures involved and questionable construction make for less than ideal durability and reliability, but this should still be a serviceable weapon, provided you can stay accurate with it.", - "magazines": [ [ "ammo_rifle", [ "rifle_mag", "rifle_sniper_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "rifle_mag", "rifle_sniper_mag" ] + } + ] }, { "id": "rifle_sniper", @@ -44,7 +75,15 @@ "name": "sniper rifle", "ammo": [ "ammo_rifle" ], "description": "Sniper rifles fill military, police and civilian needs for precise, accurate fire. Modern examples feature detachable magazines and various mounting interfaces for optics and supports. With care and practice, all should be quite capable of eliminating bipedal threats from very safe ranges. ", - "magazines": [ [ "ammo_rifle", [ "rifle_sniper_mag", "rifle_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "rifle_sniper_mag", "rifle_mag" ] + } + ] }, { "id": "rifle_sporter", @@ -53,6 +92,14 @@ "name": "sporter carbine", "ammo": [ "ammo_rifle" ], "description": "Though often mislabeled an asssault rifle, this common, cheap magazine fed carbine isn't capable of automatic fire. While almost as effective as a proper rifle, the wider variety of components and varying levels of maintenance make these less reliable than their military brethren. These rifles are just as adequate for taking on anything smaller than large game, however.", - "magazines": [ [ "ammo_rifle", [ "rifle_mag", "rifle_sniper_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "rifle_mag", "rifle_sniper_mag" ] + } + ] } ] diff --git a/data/mods/Generic_Guns/firearms/rifle_huge.json b/data/mods/Generic_Guns/firearms/rifle_huge.json index 46c7b65fb38e0..9c4c628e63fe6 100644 --- a/data/mods/Generic_Guns/firearms/rifle_huge.json +++ b/data/mods/Generic_Guns/firearms/rifle_huge.json @@ -6,7 +6,15 @@ "name": { "str": "anti-materiel rifle" }, "ammo": [ "ammo_rifle_huge" ], "description": "Large, intimidating, and overbuilt, this hefty rifle fires huge projectiles with relative precision. Though it resembles a sniper rifle, this anti-material weapon is best suited for blinding tanks, shooting at aircraft, or destroying explosives. It feeds from comically oversized magazines.", - "magazines": [ [ "ammo_rifle_huge", [ "rifle_huge_amr_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "rifle_huge_amr_mag" ] + } + ] }, { "id": "rifle_huge_double", @@ -27,6 +35,14 @@ "name": { "str": "heavy machine gun" }, "ammo": [ "ammo_rifle_huge" ], "description": "This large, ungainly belt-fed machine gun fires huge projectiles, originally intended for turn of the century anti-vehicular use. While no longer suitable for modern tanks or aircraft, thinner skinned vehicles or drones are just as susceptible, as are any other 'smaller' threats. Slow to reload, incredibly loud, and must be mounted to be fired.", - "magazines": [ [ "ammo_rifle_huge", [ "rifle_huge_belt" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "rifle_huge_belt" ] + } + ] } ] diff --git a/data/mods/Generic_Guns/firearms/shot.json b/data/mods/Generic_Guns/firearms/shot.json index eb7cde8535d55..8acbfbdcc31db 100644 --- a/data/mods/Generic_Guns/firearms/shot.json +++ b/data/mods/Generic_Guns/firearms/shot.json @@ -32,7 +32,15 @@ "name": "tactical shotgun", "ammo": [ "ammo_shot" ], "description": "A detachable magazine fed shotgun, mostly oriented towards overly enthusiastic civilians. Featuring rails and a menacing black appearance, this sort of shotgun doesn't really look like it has a sporting use. The magazines reduce lengthy reloading times associated with shotguns. Though known for being somewhat finicky, these can be tuned to run with some reliability.", - "magazines": [ [ "ammo_shot", [ "shot_mag" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "shot_mag" ] + } + ] }, { "id": "bio_shotgun_gun", diff --git a/data/mods/Magiclysm/items/enchanted_wands.json b/data/mods/Magiclysm/items/enchanted_wands.json index 1e80593a5ce6b..62f1cf0496962 100644 --- a/data/mods/Magiclysm/items/enchanted_wands.json +++ b/data/mods/Magiclysm/items/enchanted_wands.json @@ -14,7 +14,15 @@ "flags": [ "BELT_CLIP", "NONCONDUCTIVE" ], "charges_per_use": 1, "ammo": [ "crystallized_mana" ], - "magazines": [ [ "crystallized_mana", [ "small_mana_crystal" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "small_mana_crystal" ] + } + ] }, { "abstract": "disp_wand", diff --git a/data/mods/Magiclysm/items/obsolete.json b/data/mods/Magiclysm/items/obsolete.json index 6496ccb544324..d88a387c2f723 100644 --- a/data/mods/Magiclysm/items/obsolete.json +++ b/data/mods/Magiclysm/items/obsolete.json @@ -15,7 +15,15 @@ "charges_per_use": 1, "ammo": [ "crystallized_mana" ], "use_action": { "type": "cast_spell", "spell_id": "fireball", "no_fail": true, "level": 5, "need_wielding": true }, - "magazines": [ [ "crystallized_mana", [ "small_mana_crystal" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "small_mana_crystal" ] + } + ] }, { "id": "wand_magic_missile", @@ -33,6 +41,14 @@ "charges_per_use": 1, "ammo": [ "crystallized_mana" ], "use_action": { "type": "cast_spell", "spell_id": "magic_missile", "no_fail": true, "level": 10, "need_wielding": true }, - "magazines": [ [ "crystallized_mana", [ "small_mana_crystal" ] ] ] + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "small_mana_crystal" ] + } + ] } ] diff --git a/data/mods/TEST_DATA/items.json b/data/mods/TEST_DATA/items.json index bae275165b88a..c1701e28938b1 100644 --- a/data/mods/TEST_DATA/items.json +++ b/data/mods/TEST_DATA/items.json @@ -263,10 +263,13 @@ { "flame": false, "type": "cauterize" } ], "flags": [ "SPEAR", "BELT_CLIP", "ALLOWS_REMOTE_USE" ], - "magazines": [ - [ - "battery", - [ + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "max_contains_volume": "20 L", + "max_contains_weight": "20 kg", + "item_restriction": [ "light_minus_battery_cell", "light_battery_cell", "light_plus_battery_cell", @@ -275,7 +278,7 @@ "light_minus_disposable_cell", "light_disposable_cell" ] - ] + } ] }, {