From f4bb83008ea4d7d9152ba09a7734ab96efdf1081 Mon Sep 17 00:00:00 2001 From: Tonkatsu <7764202+tenmillimaster@users.noreply.github.com> Date: Tue, 26 May 2020 23:40:22 -0500 Subject: [PATCH] Remove RM99 caseless revolver (#39556) * migrate rm99 * Update item_blacklist.json Co-authored-by: Tonkatsu Co-authored-by: Kevin Granade --- .../locations_commercial.json | 1 - .../itemgroups/Weapons_Mods_Ammo/guns.json | 1 - .../Weapons_Mods_Ammo/magazines.json | 1 - data/json/itemgroups/military.json | 1 - data/json/items/gun/8x40mm.json | 36 +------------------ data/json/items/magazine/8x40mm.json | 21 +---------- data/json/items/migration.json | 10 ++++++ .../blacklists/item_blacklist.json | 1 - .../firearms/gg_firearms_migration.json | 2 +- 9 files changed, 13 insertions(+), 61 deletions(-) diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json index 397662f5c2ba1..d6817a0b28685 100644 --- 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 index 205239faa390f..a68a02edcdfa4 100644 --- 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 index e556dcb1a3ed1..5147a375f7f3f 100644 --- 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 index 1bc173af02dd0..6448782a295fe 100644 --- 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 index d1b041d1e523c..5394c071d09d9 100644 --- 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 index 6ee86fc27f2a5..453ea3f3160e8 100644 --- 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 index 9fffcbced1de2..47e8365c25640 100644 --- 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 index 4ee71013522cc..8102ab8095837 100644 --- 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 index e64e811f02928..9f75268a849c8 100644 --- 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" },