From deff7991ce49c4f5848522f7a30dc546bcb2b627 Mon Sep 17 00:00:00 2001 From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Thu, 23 Nov 2023 00:27:47 +0100 Subject: [PATCH] STI Tactical DS 2011 10mm, now fixed (#69580) * STI Tactical DS 2011 10mm * Update data/json/items/gun/10mm.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/gun/10mm.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/items/gun/10mm.json Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * Update data/json/items/magazine/10mm.json Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * Update data/json/items/magazine/10mm.json Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * Update generic_guns_validator.py * Update generic_guns_validator.py * Update gg_firearms_migration.json * Update data/json/items/gun/10mm.json Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * add itemgroup, add the variant * Update data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json * fix what actually should be fixed * migrate mags --------- Co-authored-by: Cataclysmo091 <116690226+Cataclysmo091@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- .../itemgroups/Weapons_Mods_Ammo/guns.json | 3 ++ .../Weapons_Mods_Ammo/magazines.json | 2 ++ .../Weapons_Mods_Ammo/nested_guns.json | 13 +++++++ data/json/items/gun/10mm.json | 34 ++++++++++++++++++ data/json/items/magazine/10mm.json | 36 +++++++++++++++++++ .../firearms/gg_firearms_migration.json | 1 + .../magazines/gg_magazines_migration.json | 2 ++ 7 files changed, 91 insertions(+) diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json index 4cfbc233e62ec..3f57fa777ac28 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json @@ -15,6 +15,7 @@ { "group": "nested_glock_40", "prob": 2 }, { "group": "nested_m1911", "prob": 50 }, { "group": "nested_m1911_10", "prob": 15 }, + { "group": "nested_STI_DS_10", "prob": 15 }, { "group": "nested_m9", "prob": 30 }, { "group": "nested_px4", "prob": 24 }, { "group": "nested_px4_40", "prob": 20 }, @@ -67,6 +68,7 @@ { "item": "glock_20", "variant": "glock_40", "prob": 2, "charges-min": 0 }, { "item": "m1911", "prob": 50, "charges-min": 0 }, { "item": "m1911_10", "prob": 15, "charges-min": 0 }, + { "item": "STI_DS_10", "prob": 15, "charges-min": 0 }, { "item": "m9", "variant": "m9", "prob": 30, "charges-min": 0 }, { "item": "px4", "prob": 24, "charges-min": 0 }, { "item": "px4_40", "prob": 20, "charges-min": 0 }, @@ -119,6 +121,7 @@ { "item": "glock_20", "variant": "glock_40", "prob": 2 }, { "item": "m1911", "prob": 50 }, { "item": "m1911_10", "prob": 15 }, + { "item": "STI_DS_10", "prob": 15, "charges-min": 0 }, { "item": "m9", "variant": "m9", "prob": 30 }, { "item": "px4", "prob": 24 }, { "item": "px4_40", "prob": 20 }, diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json index dd1b4715c8b86..e9fbd90af6c75 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json @@ -154,6 +154,8 @@ [ "glock_29mag", 2 ], [ "m1911mag", 25 ], [ "m1911_10mag", 2 ], + [ "2011_17_mag", 2 ], + [ "2011_22_mag", 1 ], [ "mosquitomag", 10 ], [ "kpf9mag", 5 ], [ "kpf9mag_8rd", 2 ], diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json index 5d7bde69a8bee..0016cfa2e41e0 100644 --- a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json +++ b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json @@ -155,6 +155,19 @@ { "group": "on_hand_10mm" } ] }, + { + "id": "nested_STI_DS_10", + "type": "item_group", + "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack", + "subtype": "collection", + "ammo": 100, + "entries": [ + { "item": "STI_DS_10", "charges-min": 0, "charges-max": 7 }, + { "item": "2011_17_mag" }, + { "item": "2011_17_mag", "prob": 50 }, + { "group": "on_hand_10mm" } + ] + }, { "id": "nested_m9", "type": "item_group", diff --git a/data/json/items/gun/10mm.json b/data/json/items/gun/10mm.json index 22e4b4838fad9..7a2af85e22cee 100644 --- a/data/json/items/gun/10mm.json +++ b/data/json/items/gun/10mm.json @@ -301,5 +301,39 @@ "min_cycle_recoil": 675, "modes": [ [ "DEFAULT", "semi-auto", 1 ] ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "magazine_well": "103 ml", "item_restriction": [ "glock_20mag", "tdi_10mm_mag" ] } ] + }, + { + "id": "STI_DS_10", + "copy-from": "pistol_base", + "looks_like": "m1911_10", + "type": "GUN", + "name": { "str": "double-stack 10mm 1911" }, + "description": "An updated version of the M1911 pistol, chambered in 10mm Auto, that uses double-stack magazines for greater capacity.", + "variant_type": "gun", + "variants": [ + { + "id": "STI_DS_10", + "name": { "str": "STI Tactical 2011 DS 10mm" }, + "description": "A next-gen model of the venerable 1911, ready to win World War Z. Modernized and manufactured by Staccato, sporting a double-stack magwell, sleek solid-steel frame, and ergonomic grip; favored by certain dog-loving assassins. This model is chambered in 10mm Auto.", + "weight": 1 + } + ], + "weight": "1191 g", + "volume": "430 ml", + "longest_side": "231 mm", + "price": 269900, + "price_postapoc": 3000, + "to_hit": -2, + "material": [ "steel" ], + "symbol": "(", + "color": "dark_gray", + "ammo": "10mm", + "dispersion": 460, + "durability": 6, + "min_cycle_recoil": 570, + "blackpowder_tolerance": 48, + "flags": [ "ALLOWS_BODY_BLOCK" ], + "pocket_data": [ { "magazine_well": "60 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "2011_17_mag", "2011_22_mag" ] } ], + "melee_damage": { "bash": 12 } } ] diff --git a/data/json/items/magazine/10mm.json b/data/json/items/magazine/10mm.json index b86d08b64dbb8..6d9ec770671ce 100644 --- a/data/json/items/magazine/10mm.json +++ b/data/json/items/magazine/10mm.json @@ -194,5 +194,41 @@ "ammo_type": [ "10mm" ], "flags": [ "MAG_COMPACT" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "10mm": 15 } } ] + }, + { + "id": "2011_17_mag", + "looks_like": "glock17_17", + "type": "MAGAZINE", + "name": { "str": "2011 10mm 17-round magazine" }, + "description": "A lightweight, 17-round, steel magazine with a polymer baseplate. Used in 2011 pistols chambered for 10mm Auto.", + "weight": "70 g", + "volume": "110 ml", + "longest_side": "140 mm", + "price": 10000, + "price_postapoc": 100, + "material": [ "plastic", "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "10mm" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "10mm": 17 } } ] + }, + { + "id": "2011_22_mag", + "looks_like": "glock17_17", + "type": "MAGAZINE", + "name": { "str": "2011 10mm 22-round magazine" }, + "description": "A lightweight, 22-round, steel magazine with a polymer baseplate. Used in 2011 pistols chambered for 10mm Auto.", + "weight": "85 g", + "volume": "125 ml", + "longest_side": "170 mm", + "price": 10000, + "price_postapoc": 100, + "material": [ "plastic", "steel" ], + "symbol": "#", + "color": "light_gray", + "ammo_type": [ "10mm" ], + "flags": [ "MAG_COMPACT" ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "10mm": 22 } } ] } ] diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 67502e6952021..d2110c9a90965 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -103,6 +103,7 @@ "walther_p38", "walther_ccp", "makarov", + "STI_DS_10", "af2011a1_38super", "m1911a1_38super", "glock_22", diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index 0bfab77a55e34..4412ff14a11cf 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -25,6 +25,8 @@ "m9mag_20rd", "makarovmag", "glock40mag", + "2011_17_mag", + "2011_22_mag", "sig40mag", "bhp40mag", "ppq40mag_10rd",