Remove the MR73 (#74636)

* initial commit * ungoof the goof
CleverRaven · Jun 19, 2024 · b67ff6c · b67ff6c
1 parent cc3131f
commit b67ff6c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 63 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -134,7 +134,6 @@
       { "group": "nested_m1911-460", "prob": 3 },
       { "group": "nested_makarov", "prob": 100 },
       { "group": "nested_mauser_c96", "prob": 39 },
-      { "group": "nested_mr73", "prob": 8 },
       { "group": "nested_chiappa_rhino", "prob": 5 },
       { "group": "nested_pistol_flintlock", "prob": 150 },
       { "group": "nested_raging_bull", "prob": 100 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns_by_calibre.json
@@ -63,7 +63,7 @@
   {
     "type": "item_group",
     "id": "guns_pistol_common_357mag",
-    "items": [ { "group": "nested_mr73", "prob": 3 }, { "group": "nested_sw_619", "prob": 3 } ]
+    "items": [ { "group": "nested_sw_619", "prob": 3 } ]
   },
   {
     "type": "item_group",
@@ -291,7 +291,7 @@
   {
     "type": "item_group",
     "id": "guns_pistol_rare_357mag",
-    "items": [ { "group": "nested_chiappa_rhino", "prob": 5 }, { "group": "nested_mr73", "prob": 8 } ]
+    "items": [ { "group": "nested_chiappa_rhino", "prob": 5 } ]
   },
   {
     "type": "item_group",
@@ -355,7 +355,7 @@
   {
     "type": "item_group",
     "id": "guns_pistol_rare_display_357mag",
-    "items": [ { "item": "chiappa_rhino", "prob": 5 }, { "item": "mr73", "prob": 8 }, { "group": "modular_deagle_357", "prob": 4 } ]
+    "items": [ { "item": "chiappa_rhino", "prob": 5 }, { "group": "modular_deagle_357", "prob": 4 } ]
   },
   {
     "type": "item_group",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -291,19 +291,6 @@
     "ammo": 100,
     "entries": [ { "item": "model_10_revolver", "charges": [ 0, 6 ] }, { "group": "on_hand_38" } ]
   },
-  {
-    "id": "nested_mr73",
-    "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": "mr73", "charges": [ 0, 6 ] },
-      { "group": "on_hand_357_38mixed" },
-      { "item": "38_speedloader6" },
-      { "item": "38_speedloader6", "prob": 50 }
-    ]
-  },
   {
     "id": "nested_chiappa_rhino",
     "type": "item_group",

diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json
@@ -64,49 +64,6 @@
     ],
     "melee_damage": { "bash": 9 }
   },
-  {
-    "id": "mr73",
-    "copy-from": "pistol_revolver",
-    "looks_like": "sw_619",
-    "type": "GUN",
-    "name": { "str_sp": "Manurhin MR 73" },
-    "description": "A finely made .357 Magnum revolver with a 4 inch barrel.  It has adjustable sights, big plastic grips and a very smooth trigger.",
-    "weight": "970 g",
-    "volume": "600 ml",
-    "longest_side": "273 mm",
-    "barrel_length": "133 mm",
-    "price": "3 kUSD 600 USD",
-    "price_postapoc": "20 USD",
-    "built_in_mods": [ "match_trigger" ],
-    "default_mods": [ "pistol_grip" ],
-    "to_hit": -2,
-    "material": [ "steel", "plastic" ],
-    "symbol": "(",
-    "color": "light_gray",
-    "ammo": [ "357mag", "38" ],
-    "dispersion": 280,
-    "durability": 10,
-    "blackpowder_tolerance": 56,
-    "clip_size": 6,
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 2 ],
-      [ "rail mount", 1 ],
-      [ "sights mount", 1 ],
-      [ "stock mount", 1 ],
-      [ "underbarrel mount", 1 ]
-    ],
-    "pocket_data": [
-      {
-        "pocket_type": "MAGAZINE",
-        "rigid": true,
-        "ammo_restriction": { "357mag": 6, "38": 6 },
-        "allowed_speedloaders": [ "38_speedloader6" ]
-      }
-    ],
-    "melee_damage": { "bash": 9 }
-  },
   {
     "id": "rifle_38",
     "copy-from": "gun_base",

diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -1526,5 +1526,10 @@
     "id": "factory_handguard",
     "type": "MIGRATION",
     "replace": "grip"
+  },
+  {
+    "id": "mr73",
+    "type": "MIGRATION",
+    "replace": "sw_619"
   }
 ]
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -71,7 +71,7 @@
     "replace": "pistol_magnum_pipe"
   },
   {
-    "id": [ "sw_619", "mr73", "sw629", "bfr", "sw_500", "raging_bull", "chiappa_rhino" ],
+    "id": [ "sw_619", "sw629", "bfr", "sw_500", "raging_bull", "chiappa_rhino" ],
     "type": "MIGRATION",
     "replace": "pistol_magnum_revolver"
   },

diff --git a/data/mods/TEST_DATA/item_demographics.json b/data/mods/TEST_DATA/item_demographics.json
@@ -782,7 +782,7 @@
           "weight": 34,
           "items": { "ak47": 1, "arx160": 1, "sks": 1, "aksemi": 1, "draco": 1, "mk47": 1, "vz58_p": 1, "bren2_762": 1 }
         },
-        { "type": "357mag", "weight": 34, "items": { "mr73": 1, "sw_619": 1, "chiappa_rhino": 1 } },
+        { "type": "357mag", "weight": 34, "items": { "sw_619": 1, "chiappa_rhino": 1 } },
         {
           "type": "shot",
           "weight": 26,
@@ -1004,7 +1004,6 @@
             "mauser_m714": 1,
             "minidraco556": 1,
             "model_10_revolver": 1,
-            "mr73": 1,
             "chiappa_rhino": 1,
             "p08": 1,
             "p220_10": 1,