diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index 55a9bdee9a010..4953014dc358a 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -244,7 +244,6 @@ { "item": "rm51_assault_rifle", "prob": 25, "charges-min": 0, "charges-max": 50 }, { "item": "rm614_lmg", "prob": 10, "charges-min": 0, "charges-max": 100 }, { "item": "rm88_battle_rifle", "prob": 25, "charges-min": 0, "charges-max": 50 }, - { "item": "sig552", "prob": 100, "charges-min": 0, "charges-max": 30 }, { "item": "scar_l", "prob": 50, "charges-min": 0, "charges-max": 30 }, { "item": "scar_h", "prob": 50, "charges-min": 0, "charges-max": 20 }, { "item": "m110a1", "prob": 50, "charges-min": 0, "charges-max": 20 }, @@ -278,7 +277,9 @@ { "item": "trex_gun", "prob": 60 }, { "item": "arx160", "prob": 40, "charges-min": 0, "charges-max": 30 }, { "item": "iwi_tavor_x95_300blk", "prob": 10, "charges-min": 0, "charges-max": 30 }, - { "item": "acr_300blk", "prob": 15, "charges-min": 0, "charges-max": 30 } + { "item": "acr_300blk", "prob": 15, "charges-min": 0, "charges-max": 30 }, + { "item": "sig553", "prob": 5, "charges-min": 0, "charges-max": 30 }, + { "item": "sig550", "prob": 3, "charges-min": 0, "charges-max": 30 } ] }, { diff --git a/data/json/itemgroups/magazines.json b/data/json/itemgroups/magazines.json index 1d753bfaefb78..30abfd1870404 100644 --- a/data/json/itemgroups/magazines.json +++ b/data/json/itemgroups/magazines.json @@ -252,7 +252,9 @@ [ "m1918bigmag", 40 ], [ "ruger1022bigmag", 70 ], [ "lw223mag", 20 ], - [ "lw223bigmag", 20 ] + [ "lw223bigmag", 20 ], + [ "sig_sg20", 3 ], + [ "sig_sg30", 5 ] ] }, { diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index e7a56e160400c..27a453a5c35ee 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -424,25 +424,76 @@ "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ] }, { - "id": "sig552", + "id": "sig550", "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": { "str": "SIG 552" }, + "name": { "str": "SIG SG 550" }, + "description": "SIG SG 550 is an assault rifle made to be operated under the coldest, harshest conditions in the mountains of Switzerland. Accurate and reliable, like a Swiss watch.", + "weight": "3600 g", + "volume": "2795 ml", + "price": 400000, + "to_hit": -1, + "bashing": 12, + "material": [ "steel", "plastic" ], + "ammo": "223", + "dispersion": 140, + "durability": 9, + "min_cycle_recoil": 1350, + "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ], + "default_mods": [ "bipod" ], + "built_in_mods": [ "folding_stock" ], + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "barrel", 1 ], + [ "bore", 1 ], + [ "brass catcher", 1 ], + [ "mechanism", 4 ], + [ "muzzle", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "grip", 1 ], + [ "rail mount", 1 ], + [ "stock", 1 ], + [ "underbarrel", 1 ] + ], + "magazines": [ [ "223", [ "sig_sg30", "sig_sg20" ] ] ] + }, + { + "id": "sig553", + "copy-from": "rifle_auto", + "looks_like": "ar15", + "type": "GUN", + "name": { "str": "SIG SG 553" }, "description": "A compact selective fire automatic rifle designed for the Swiss military. It features a three-round burst mode and an integrated folding stock.", "weight": "3000 g", - "volume": "1750 ml", + "volume": "2150 ml", "price": 320000, "to_hit": -1, "bashing": 10, "material": [ "steel", "plastic" ], "ammo": "223", + "ranged_damage": -6, "dispersion": 180, "durability": 9, "min_cycle_recoil": 1350, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "BURST", "3 rd.", 3 ], [ "AUTO", "auto", 4 ] ], "built_in_mods": [ "folding_stock" ], - "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ] + "valid_mod_locations": [ + [ "accessories", 4 ], + [ "barrel", 1 ], + [ "bore", 1 ], + [ "brass catcher", 1 ], + [ "mechanism", 4 ], + [ "muzzle", 1 ], + [ "sights", 1 ], + [ "sling", 1 ], + [ "grip", 1 ], + [ "rail mount", 1 ], + [ "stock", 1 ], + [ "underbarrel mount", 1 ] + ], + "magazines": [ [ "223", [ "sig_sg30", "sig_sg20" ] ] ] }, { "id": "steyr_aug", diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json index 47d69c343d536..201bc29919049 100644 --- a/data/json/items/magazine/223.json +++ b/data/json/items/magazine/223.json @@ -115,6 +115,38 @@ "reliability": 8, "flags": [ "MAG_COMPACT" ] }, + { + "id": "sig_sg20", + "type": "MAGAZINE", + "name": "SIG SG 20-round magazine", + "description": "A slick 20-round capacity magazine used with SIG SG rifles.", + "weight": "90 g", + "volume": "400 ml", + "price": 15000, + "material": "plastic", + "symbol": "#", + "color": "light_gray", + "ammo_type": "223", + "capacity": 20, + "reliability": 8, + "flags": [ "MAG_COMPACT" ] + }, + { + "id": "sig_sg30", + "type": "MAGAZINE", + "name": "SIG SG 30-round magazine", + "description": "A standard capacity magazine used with SIG SG rifles.", + "weight": "110 g", + "volume": "500 ml", + "price": 17500, + "material": "plastic", + "symbol": "#", + "color": "light_gray", + "ammo_type": "223", + "capacity": 30, + "reliability": 8, + "flags": [ "MAG_COMPACT" ] + }, { "id": "stanag30", "type": "MAGAZINE", diff --git a/data/json/items/migration.json b/data/json/items/migration.json index 7d070924b2dd9..d94e7490de3b2 100644 --- a/data/json/items/migration.json +++ b/data/json/items/migration.json @@ -988,5 +988,10 @@ "id": "40mm_casing", "type": "MIGRATION", "replace": "40x46mm_m118_casing" + }, + { + "id": "sig552", + "type": "MIGRATION", + "replace": "sig553" } ] diff --git a/data/json/martialarts.json b/data/json/martialarts.json index 92bf6897be7b9..e7180ec3d15f4 100644 --- a/data/json/martialarts.json +++ b/data/json/martialarts.json @@ -634,7 +634,7 @@ "m27iar", "rm51_assault_rifle", "rm88_battle_rifle", - "sig552", + "sig553", "sks", "steyr_aug" ] diff --git a/data/json/recipes/weapon/magazines.json b/data/json/recipes/weapon/magazines.json index 5ea6c15d9f4b1..8a9e3f31a21c2 100644 --- a/data/json/recipes/weapon/magazines.json +++ b/data/json/recipes/weapon/magazines.json @@ -126,7 +126,6 @@ [ "m4a1", -1 ], [ "m16a4", -1 ], [ "scar_l", -1 ], - [ "sig552", -1 ], [ "surv_carbine_223", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index 8e2d504853afe..9a05919b792a8 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json @@ -275,7 +275,8 @@ "mosin91_30", "ar15", "ruger_mini", - "sig552", + "sig553", + "sig550", "steyr_aug", "iwi_tavor_x95_300blk", "ar15_retool_300blk", diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json index 0625cba48c116..0523ffb2f7b9a 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json @@ -156,6 +156,8 @@ "lw223mag", "stanag30", "stanag50", + "sig_sg20", + "sig_sg30", "blrmag", "m1918bigmag", "m1918mag",