Remove RM99 caseless revolver (#39556)

* migrate rm99 * Update item_blacklist.json Co-authored-by: Tonkatsu <[email protected]> Co-authored-by: Kevin Granade <[email protected]>
CleverRaven · May 27, 2020 · f4bb830 · f4bb830
1 parent 8d2e907
commit f4bb830
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 61 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -11,7 +11,6 @@
       { "group": "tobacco_products", "prob": 161 },
       { "item": "sponge", "prob": 10 },
       { "group": "ammo_pocket_batteries_full", "prob": 50 },
-      { "item": "rm99_pistol", "prob": 1 },
       { "item": "rm103a_pistol", "prob": 1 },
       { "item": "rm228", "prob": 2 },
       { "item": "vibrator", "prob": 3 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -151,7 +151,6 @@
       { "item": "pistol_flintlock", "prob": 150 },
       { "item": "raging_bull", "prob": 100, "charges-min": 0, "charges-max": 5 },
       { "item": "raging_judge", "prob": 20, "charges-min": 0, "charges-max": 5 },
-      { "item": "rm99_pistol", "prob": 150, "charges-min": 0, "charges-max": 5 },
       { "item": "tokarev", "prob": 100, "charges-min": 0, "charges-max": 8 },
       { "item": "walther_ppk", "prob": 100, "charges-min": 0, "charges-max": 8 },
       { "item": "colt_saa", "prob": 150, "charges-min": 0, "charges-max": 6 }

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -164,7 +164,6 @@
       [ "454_speedloader5", 5 ],
       [ "454_speedloader6", 5 ],
       [ "500_speedloader5", 5 ],
-      [ "8x40_speedloader5", 5 ],
       [ "glock_drum_50rd", 5 ],
       [ "glock_drum_100rd", 5 ],
       [ "90two40mag", 5 ],

diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
@@ -226,7 +226,6 @@
       { "item": "rm614_lmg", "prob": 1 },
       { "item": "rm2000_smg", "prob": 1 },
       { "item": "8mm_caseless", "prob": 2 },
-      { "item": "rm99_pistol", "prob": 1 },
       { "item": "8mm_jhp", "prob": 2 },
       { "item": "8mm_fmj", "prob": 2 },
       { "item": "laser_rifle", "prob": 1 },

diff --git a/data/json/items/gun/8x40mm.json b/data/json/items/gun/8x40mm.json
@@ -286,6 +286,7 @@
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
     ],
+    "magazines": [ [ "8x40mm", [ "8x40_100_mag", "8x40_50_mag", "8x40_250_mag" ] ] ],
     "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ],
     "pocket_data": [
       {
@@ -296,40 +297,5 @@
         "item_restriction": [ "8x40_100_mag", "8x40_50_mag", "8x40_250_mag" ]
       }
     ]
-  },
-  {
-    "id": "rm99_pistol",
-    "type": "GUN",
-    "reload_noise_volume": 10,
-    "name": { "str": "RM99 revolver" },
-    "//": "Bear in mind that most revolvers don't reach $1K.  Expensive.",
-    "description": "Considered overkill by some, the Rivtech M99 remains an exceedingly powerful addition to the arsenal of any gunslinger.",
-    "weight": "1204 g",
-    "volume": "750 ml",
-    "price": 210000,
-    "price_postapoc": 8000,
-    "to_hit": -2,
-    "bashing": 12,
-    "material": [ "superalloy", "ceramic" ],
-    "symbol": "(",
-    "color": "dark_gray",
-    "ammo": [ "8x40mm" ],
-    "skill": "pistol",
-    "ranged_damage": { "damage_type": "bullet", "amount": 10 },
-    "dispersion": 175,
-    "durability": 9,
-    "clip_size": 5,
-    "valid_mod_locations": [
-      [ "accessories", 2 ],
-      [ "barrel", 1 ],
-      [ "grip", 1 ],
-      [ "mechanism", 4 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
-      [ "stock", 1 ],
-      [ "underbarrel", 1 ]
-    ],
-    "flags": [ "WATERPROOF_GUN", "RELOAD_ONE", "NEVER_JAMS" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "holster": true, "ammo_restriction": { "8x40mm": 5 } } ]
   }
 ]
diff --git a/data/json/items/magazine/8x40mm.json b/data/json/items/magazine/8x40mm.json
@@ -113,25 +113,6 @@
     "capacity": 50,
     "reliability": 10,
     "reload_time": 50,
-    "flags": [ "MAG_COMPACT" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "8x40mm": 50 } } ]
-  },
-  {
-    "id": "8x40_speedloader5",
-    "looks_like": "38_speedloader",
-    "type": "MAGAZINE",
-    "name": { "str": "RMGS5 8x40mm speedloader" },
-    "description": "This speedloader, made by Rivtech for use with RM99 revolver, can hold 5 rounds of 8x40mm caseless rounds and quickly reload a compatible revolver.",
-    "weight": "92 g",
-    "volume": "250 ml",
-    "price": 8000,
-    "price_postapoc": 250,
-    "material": [ "superalloy", "plastic" ],
-    "symbol": "#",
-    "color": "dark_gray",
-    "ammo_type": [ "8x40mm" ],
-    "capacity": 5,
-    "flags": [ "SPEEDLOADER" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "8x40mm": 5 } } ]
+    "flags": [ "MAG_COMPACT" ]
   }
 ]
diff --git a/data/json/items/migration.json b/data/json/items/migration.json
@@ -1189,6 +1189,16 @@
     "type": "MIGRATION",
     "replace": "akmag40"
   },
+  {
+    "id": "rm99_pistol",
+    "type": "MIGRATION",
+    "replace": "rm103a_pistol"
+  },
+  {
+    "id": "8x40_speedloader5",
+    "type": "MIGRATION",
+    "replace": "8x40_10_mag"
+  },
   {
     "id": "kevlar_plate",
     "type": "MIGRATION",

diff --git a/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json b/data/mods/Dark-Skies-Above/blacklists/item_blacklist.json
@@ -234,7 +234,6 @@
       "rm614_lmg",
       "rm802",
       "rm88_battle_rifle",
-      "rm99_pistol",
       "steel_rail",
       "taint_tornado",
       "unbio_blaster_gun",

diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -145,7 +145,7 @@
     "replace": "pistol_pipe_smg"
   },
   {
-    "id": [ "cop_38", "model_10_revolver", "ruger_lcr_38", "sw_610", "bond_410", "colt_saa", "rm99_pistol", "m47a1" ],
+    "id": [ "cop_38", "model_10_revolver", "ruger_lcr_38", "sw_610", "bond_410", "colt_saa", "m47a1" ],
     "type": "MIGRATION",
     "replace": "pistol_revolver"
   },