Crowns the Mas .223 with the Obsoletion Hat (CleverRaven#72659)

* fixes merge errors. * fair well Mas .223. good night, sweet prince. * Update data/json/obsoletion_and_migration_0.I/migration_items.json * Update data/json/obsoletion_and_migration_0.I/migration_items.json * removes the Mas again. please die, oh you french firearm. --------- Co-authored-by: Maleclypse <[email protected]>
arijust · Apr 9, 2024 · 5d295aa · 5d295aa
1 parent fd6d09d
commit 5d295aa
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 69 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -764,7 +764,6 @@
       { "group": "nested_ak47", "prob": 100 },
       { "group": "nested_bfg50", "prob": 5 },
       { "group": "nested_carbine_flintlock", "prob": 140 },
-      { "group": "nested_famas", "prob": 1 },
       { "group": "nested_m60_semi", "prob": 10 },
       { "group": "nested_rifle_flintlock", "prob": 180 },
       { "group": "nested_oa93", "prob": 3 },
@@ -803,7 +802,6 @@
         "charges-max": 0
       },
       { "item": "type99_sniper", "contents-item": "arisaka_monopod", "prob": 2, "charges-min": 0, "charges-max": 0 },
-      { "item": "famas", "prob": 5 },
       { "item": "m60_semi", "prob": 5 },
       { "item": "oa93", "prob": 3 },
       { "item": "steyr_aug", "prob": 5 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -2019,19 +2019,6 @@
     "ammo": 100,
     "entries": [ { "item": "carbine_flintlock", "charges-min": 0, "charges-max": 1 }, { "group": "on_hand_flintlock" } ]
   },
-  {
-    "id": "nested_famas",
-    "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": "famas", "charges-min": 0, "charges-max": 25 },
-      { "item": "famasmag" },
-      { "item": "famasmag", "prob": 50 },
-      { "group": "on_hand_223" }
-    ]
-  },
   {
     "id": "nested_m60_semi",
     "type": "item_group",

diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json
@@ -159,43 +159,6 @@
     ],
     "melee_damage": { "bash": 9 }
   },
-  {
-    "id": "famas",
-    "copy-from": "rifle_auto",
-    "looks_like": "modular_ar15",
-    "type": "GUN",
-    "name": { "str_sp": "MAS .223" },
-    "description": "A bullpup assault rifle that was used by French armed forces only until recently.  While the FAMAS was famous for its high fire rate, the MAS .223 is a semi-auto only variation imported to the US in the late eighties.  It retains the integral bipod, though.",
-    "weight": "3610 g",
-    "volume": "3429 ml",
-    "longest_side": "759 mm",
-    "barrel_length": "488 mm",
-    "price": 2800000,
-    "price_postapoc": 2500,
-    "to_hit": -1,
-    "material": [ "steel", "plastic" ],
-    "symbol": "(",
-    "color": "dark_gray",
-    "ammo": [ "223" ],
-    "dispersion": 180,
-    "durability": 8,
-    "min_cycle_recoil": 1350,
-    "built_in_mods": [ "bipod" ],
-    "valid_mod_locations": [
-      [ "barrel", 1 ],
-      [ "bore", 1 ],
-      [ "brass catcher", 1 ],
-      [ "grip mount", 1 ],
-      [ "mechanism", 2 ],
-      [ "muzzle", 1 ],
-      [ "sights mount", 1 ],
-      [ "sling", 1 ],
-      [ "underbarrel mount", 1 ],
-      [ "underbarrel", 1 ]
-    ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "famasmag" ] } ],
-    "melee_damage": { "bash": 12 }
-  },
   {
     "id": "fs2000",
     "copy-from": "rifle_semi",

diff --git a/data/json/items/magazine/223.json b/data/json/items/magazine/223.json
@@ -11,23 +11,6 @@
     "linkage": "ammolink223",
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": false, "ammo_restriction": { "223": 500 } } ]
   },
-  {
-    "id": "famasmag",
-    "looks_like": "stanag30",
-    "type": "MAGAZINE",
-    "name": { "str": "MAS 25-round magazine" },
-    "description": "A 25-round magazine for the MAS .223.  It resembles a STANAG magazine but is not compatible nor interchangeable.",
-    "copy-from": "stanag30",
-    "flags": [ "MAG_COMPACT" ],
-    "pocket_data": [
-      {
-        "pocket_type": "MAGAZINE",
-        "rigid": true,
-        "allowed_speedloaders": [ "clip223_10rd" ],
-        "ammo_restriction": { "223": 25 }
-      }
-    ]
-  },
   {
     "id": "ruger5",
     "looks_like": "stanag30",

diff --git a/data/json/obsoletion_and_migration_0.I/migration_items.json b/data/json/obsoletion_and_migration_0.I/migration_items.json
@@ -1212,6 +1212,16 @@
     "type": "MIGRATION",
     "replace": "remington_870"
   },
+  {
+    "id": "famas",
+    "type": "MIGRATION",
+    "replace": "rdb_223"
+  },
+  {
+    "id": "famasmag",
+    "type": "MIGRATION",
+    "replace": "stanag30"
+  },
   {
     "id": "mossberg_500",
     "type": "MIGRATION",