New Exodii weapon, the Khuunäöfaai

data/json/items/ammo/exodii.json

@@ -223,6 +223,25 @@
     "effects": [ "NEVER_MISFIRES" ],
     "casing": "caotel_cell_spent"
   },
+  {
+    "id": "khuunaofaai_ammo_firework",
+    "type": "AMMO",
+    "range": 100,
+    "name": { "str": "khuunäöfaai firework" },
+    "description": "Pressurized chemical payload for the Khuunäöfaai.  Highly reactive to oxygen, removing it from the tank would be a bad idea.",
+    "ammo_type": "khuunaofaai_payload",
+    "effects": [ "NEVER_MISFIRES", "SMOKE_BIG" ],
+    "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 },
+    "recoil": 60,
+    "dispersion": 20,
+    "copy-from": "84x246mm_smoke",
+    "price_postapoc": "1 USD",
+    "color": "green",
+    "symbol": "=",
+    "weight": "4 g",
+    "volume": "125 ml",
+    "flags": [ "NO_DROP" ]
+  },
   {
     "id": "33naval_ball",
     "type": "AMMO",

data/json/items/ammo_types.json

@@ -828,6 +828,12 @@
     "name": "Caotel cell",
     "default": "caotel_cell"
   },
+  {
+    "type": "ammunition_type",
+    "id": "khuunaofaai_payload",
+    "name": "Khuunäöfaai pressurized payload",
+    "default": "khuunaofaai_ammo_firework"
+  },
   {
     "type": "ammunition_type",
     "id": "glowstick_juice",

data/json/items/gun/exodii.json

@@ -81,6 +81,42 @@
     "flags": [ "NEVER_JAMS", "RELOAD_EJECT", "RELOAD_ONE", "EASY_CLEAN" ],
     "melee_damage": { "bash": 12 }
   },
+  {
+    "id": "khuunaofaai",
+    "//": "note for translators, its pronounced \"Ka-hu-na-o-fa-i\" and doesn't actually mean anything, you can translate the syllables directly.",
+    "copy-from": "m4_carlgustav",
+    "looks_like": "m202_flash",
+    "type": "GUN",
+    "name": { "str": "Exodii ordnance cannon" },
+    "description": "An oddball in the Exodii’s oddball selection of armaments - This robust, shoulder mounted weapons platform started life not as a weapon, but as a ceremonial firework cannon, mounted in droves atop of parade tanks the size of buildings by some globe spanning military culture.  Little of its original design remains under the retrofits and wear, with even its engravings worn down to nothing by time.  The khuunäöfaai finds its niche in disposing incoming hordes from large distances, helped by the variety of chemical payloads its been modified to fire.",
+    "weight": "8180 g",
+    "volume": "10360 ml",
+    "material": [ "steel", "gold" ],
+    "longest_side": "1080 mm",
+    "price_postapoc": "75 USD",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "Khuunaofaai",
+        "name": { "str": "Khuunäöfaai ordnance cannon" },
+        "description": "An oddball in the Exodii’s oddball selection of armaments - This robust, shoulder mounted weapons platform started life not as a weapon, but as a ceremonial firework cannon, mounted in droves atop of parade tanks the size of buildings by some globe spanning military culture.  Little of its original design remains under the retrofits and wear, with even its engravings worn down to nothing by time.  The khuunäöfaai finds its niche in disposing incoming hordes from large distances, helped by the variety of chemical payloads its been modified to fire.",
+        "weight": 1
+      }
+    ],
+    "color": "red",
+    "valid_mod_locations": [ [ "sights_mount", 1 ], [ "sling", 1 ] ],
+    "flags": [ "NEVER_JAMS", "NON_FOULING" ],
+    "melee_damage": { "bash": 12 },
+    "pocket_data": [
+      {
+        "magazine_well": "1250 ml",
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "exodii_khuunaofaai_mag_firework" ]
+      }
+    ],
+    "reload_noise_volume": 20,
+    "ammo": [ "khuunaofaai_payload" ]
+  },
   {
     "id": "sapra",
     "looks_like": "smle_mk3",

data/json/items/magazine/exodii.json

@@ -57,6 +57,30 @@
     "flags": [ "MAG_BULKY" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "273x44": 5 } } ]
   },
+  {
+    "id": "exodii_khuunaofaai_mag_firework",
+    "looks_like": "metal_tank_little",
+    "type": "MAGAZINE",
+    "name": { "str": "Khuunaofaai celebration payload" },
+    "description": "A pressurized tank containing the original firework load of the Khuunäöfaai.  This chemical payload contains two different compounds of copper, so that the projectiles burn a sharp blue and green to represent the united Earth it came from.  It isn't intended for combat, but getting hit by a massive firework is dangerous enough that it was brought along.  The tank capacity is larger than the other loads the Exodii created for it.",
+    "weight": "1268 g",
+    "volume": "1250 ml",
+    "symbol": "#",
+    "color": "light_gray",
+    "longest_side": "160 mm",
+    "price_postapoc": "24 USD 80 cent",
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE",
+        "rigid": true,
+        "airtight": true,
+        "ammo_restriction": { "khuunaofaai_ammo_firework": 10 },
+        "watertight": true
+      }
+    ],
+    "flags": [ "MAG_BULKY", "NO_UNLOAD", "NO_RELOAD" ],
+    "material": "steel"
+  },
   {
     "id": "ree_33_4_mag",
     "looks_like": "stanag30",

data/mods/Generic_Guns/ammo/gg_ammo_migration.json

@@ -632,7 +632,7 @@
     "replace": "rifle_pellet_hunting"
   },
   {
-    "id": [ "84x246mm_smoke" ],
+    "id": [ "84x246mm_smoke", "khuunaofaai_ammo_firework" ],
     "type": "MIGRATION",
     "replace": "rocket_smoke"
   },

data/mods/Generic_Guns/firearms/gg_firearms_migration.json

@@ -418,7 +418,7 @@
     "replace": "rocket_disposable"
   },
   {
-    "id": [ "m202_flash", "m3_carlgustav", "m4_carlgustav", "RPG", "surv_rocket_launcher" ],
+    "id": [ "m202_flash", "m3_carlgustav", "m4_carlgustav", "RPG", "surv_rocket_launcher", "khuunaofaai" ],
     "type": "MIGRATION",
     "replace": "rocket_recoilless"
   },

data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json

@@ -13,7 +13,8 @@
       "a180mag2",
       "a180mag3",
       "a180mag4",
-      "af2011a1mag"
+      "af2011a1mag",
+      "exodii_khuunaofaai_mag_firework"
     ]
   }
 ]

tools/json_tools/gun_variant_validator.py

@@ -163,6 +163,7 @@
 TYPE_DESCRIPTORS = [
     "automagnum",
     "blunderbuss",
+    "cannon",
     "carbine",
     "coilgun",
     # Not great, but weird can get a pass