Fix for AFS Mastodon: Items (#39571)

* Move Uplifted SWAT gear to correct file & correct names

* Fix mastadon mutagen being mi-go targeted

data/mods/Aftershock/items/armor.json

@@ -112,5 +112,140 @@
     "use_action": "SOLARPACK_OFF",
     "solar_efficiency": 0.3,
     "flags": [ "FRAGILE", "OUTER", "ONLY_ONE", "SOLARPACK_ON" ]
+  },
+  {
+    "id": "xlswat_armor",
+    "repairs_like": "survivor_suit",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "Uplifted SWAT armor" },
+    "//": "This is well within the pricing structure I found for ballistic vest, shins, and LBE.  LEO gear ain't cheap.",
+    "description": "An extra large suit of black bulletproof armor with lots of pockets.  The word SWAT is emblazoned across the back.  Specifically designed for Uplifted officers such as Mastodons.",
+    "weight": "10 kg",
+    "volume": "20 L",
+    "price": 585000,
+    "to_hit": -3,
+    "bashing": 6,
+    "material": [ "kevlar", "cotton" ],
+    "symbol": "[",
+    "looks_like": "touring_suit",
+    "color": "dark_gray",
+    "covers": [ "LEGS", "TORSO", "ARMS" ],
+    "coverage": 95,
+    "encumbrance": 25,
+    "storage": "8 L",
+    "warmth": 35,
+    "material_thickness": 9,
+    "valid_mods": [ "steel_padded" ],
+    "environmental_protection": 4,
+    "flags": [ "OVERSIZE", "POCKETS", "STURDY" ]
+  },
+  {
+    "id": "xlballistic_vest_empty",
+    "type": "ARMOR",
+    "category": "armor",
+    "//": "Based on US Army SPCS",
+    "name": { "str": "empty XL  ballistic vest" },
+    "description": "Oversized ballistic armor without any armor inserts.  The soft armor plate carrier is still protective but it won't stop high energy projectiles.",
+    "weight": "4 kg",
+    "volume": "7 L",
+    "price": 160000,
+    "material": [ "nylon" ],
+    "symbol": "[",
+    "color": "light_gray",
+    "covers": [ "TORSO" ],
+    "coverage": 85,
+    "encumbrance": 6,
+    "warmth": 15,
+    "material_thickness": 8,
+    "flags": [ "OVERSIZE", "STURDY", "OUTER", "WATER_FRIENDLY" ]
+  },
+  {
+    "id": "xlballistic_vest_esapi",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "XL ESAPI ballistic vest" },
+    "description": "Oversized ballistic armor with ESAPI ceramic armor plates.",
+    "weight": "12 kg",
+    "volume": "9 L",
+    "price": 280000,
+    "material": [ "nylon", "ceramic" ],
+    "symbol": "[",
+    "color": "light_gray",
+    "covers": [ "TORSO" ],
+    "coverage": 85,
+    "encumbrance": 10,
+    "warmth": 15,
+    "material_thickness": 26,
+    "flags": [ "OVERSIZE", "STURDY", "OUTER", "WATER_FRIENDLY", "NO_REPAIR" ]
+  },
+  {
+    "id": "xlboots_combat",
+    "repairs_like": "boots_survivor",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "pair of XL combat boots", "str_pl": "pair of XL combat boots" },
+    "description": "Modern oversized reinforced tactical combat boots.  Very durable.",
+    "weight": "1460 g",
+    "volume": "5 L",
+    "price": 7000,
+    "price_postapoc": 14000,
+    "to_hit": -1,
+    "bashing": 1,
+    "material": [ "kevlar", "leather" ],
+    "symbol": "[",
+    "looks_like": "boots",
+    "color": "dark_gray",
+    "covers": [ "FEET" ],
+    "coverage": 100,
+    "encumbrance": 25,
+    "warmth": 25,
+    "material_thickness": 5,
+    "environmental_protection": 2,
+    "flags": [ "OVERSIZE", "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "xlgloves_tactical",
+    "repairs_like": "gloves_survivor",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "pair of XL tactical gloves", "str_pl": "pair of XL tactical gloves" },
+    "description": "A pair of oversized reinforced Kevlar tactical gloves.  Commonly used by police and military units.",
+    "weight": "1 kg",
+    "volume": "750 ml",
+    "price": 5200,
+    "to_hit": 2,
+    "material": [ "kevlar", "leather" ],
+    "symbol": "[",
+    "looks_like": "fire_gauntlets",
+    "color": "dark_gray",
+    "covers": [ "HANDS" ],
+    "coverage": 100,
+    "encumbrance": 13,
+    "warmth": 20,
+    "material_thickness": 5,
+    "flags": [ "OVERSIZE", "VARSIZE", "STURDY" ]
+  },
+  {
+    "id": "tripaw_xlgloves_tactical",
+    "repairs_like": "gloves_survivor",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str": "pair of Killophant gloves", "str_pl": "pair of Killophant gloves" },
+    "description": "A pair of reinforced Kevlar tactical gloves, specifically designed to accomodate three fingered Killophants.  Thinner than regular oversized tactical gloves.",
+    "weight": "320 g",
+    "volume": "750 ml",
+    "price": 5200,
+    "to_hit": 2,
+    "material": [ "kevlar", "leather" ],
+    "symbol": "[",
+    "looks_like": "fire_gauntlets",
+    "color": "dark_gray",
+    "covers": [ "HANDS" ],
+    "coverage": 100,
+    "encumbrance": 5,
+    "warmth": 20,
+    "material_thickness": 3,
+    "flags": [ "OVERSIZE", "VARSIZE", "STURDY" ]
   }
 ]

data/mods/Aftershock/items/mutagen.json

@@ -28,7 +28,7 @@
     "price": 1000000,
     "color": "red",
     "healthy": -4,
-    "use_action": { "type": "mutagen_iv", "mutation_category": "MIGO" }
+    "use_action": { "type": "mutagen_iv", "mutation_category": "MASTODON" }
   },
   {
     "id": "mutagen_mastodon",
@@ -37,6 +37,6 @@
     "name": { "str": "mastodon mutagen" },
     "description": "An extremely rare mutagen cocktail, it seeks to cure what's deep inside.",
     "price": 500000,
-    "use_action": { "type": "mutagen", "mutation_category": "MIGO" }
+    "use_action": { "type": "mutagen", "mutation_category": "MASTODON" }
   }
 ]