second ammo type

CleverRaven · Jan 11, 2025 · 7ff750c · 7ff750c
1 parent dc3bcd6
commit 7ff750c
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json
@@ -241,6 +241,16 @@
     "volume": "125 ml",
     "flags": [ "NO_DROP" ]
   },
+  {
+    "id": "khuunaofaai_ammo_incendiary",
+    "range": 88,
+    "name": { "str": "Khuunäöfaai incendiary payload" },
+    "description": "Pressurized chemical payload for the Khuunäöfaai.  Highly flammable and reactive to oxygen, removing it from the tank would be a bad idea.",
+    "ammo_type": "khuunaofaai_payload",
+    "copy-from": "khuunaofaai_ammo_firework",
+    "weight": "12 g",
+    "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "PYROPHORIC" ]
+  },
   {
     "id": "33naval_ball",
     "type": "AMMO",

diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json
@@ -62,15 +62,15 @@
     "looks_like": "metal_tank_little",
     "type": "MAGAZINE",
     "name": { "str": "ordnance cannon celebration canister" },
-    "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.",
+    "description": "A pressurized tank containing the original firework payload 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",
     "variant_type": "gun",
     "variants": [
       {
         "id": "exodii_khuunaofaai_mag_firework",
         "name": { "str": "Khuunäöfaai celebration canister" },
-        "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.",
+        "description": "A pressurized tank containing the original firework payload 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": 1
       }
     ],
@@ -91,6 +91,31 @@
     "flags": [ "MAG_BULKY", "NO_UNLOAD", "NO_RELOAD" ],
     "material": "steel"
   },
+  {
+    "id": "exodii_khuunaofaai_mag_incendiary",
+    "copy-from": "exodii_khuunaofaai_mag_firework",
+    "name": { "str": "ordnance cannon incendiary canister" },
+    "description": "A pressurized tank containing one of the special payloads the Exodii made for the Khuunäöfaai, something akin to white phosphorous on your Earth.  Its simplicity and effectiveness against targets big and small makes it the cannon's most popular ammunition by far.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "exodii_khuunaofaai_mag_incendiary",
+        "name": { "str": "Khuunäöfaai incendiary canister" },
+        "description": "A pressurized tank containing one of the special payloads the Exodii made for the Khuunäöfaai, something akin to white phosphorous on your Earth.  Its simplicity and effectiveness against targets big and small makes it the cannon's most popular ammunition by far.",
+        "weight": 1
+      }
+    ],
+    "price_postapoc": "38 USD 50 cent",
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE",
+        "rigid": true,
+        "airtight": true,
+        "ammo_restriction": { "khuunaofaai_ammo_incendiary": 4 },
+        "watertight": true
+      }
+    ]
+  },
   {
     "id": "ree_33_4_mag",
     "looks_like": "stanag30",