From 1d210ecce91025974a7155895283744f04cc230d Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:18:47 -0500 Subject: [PATCH 01/63] first draft incl. weapon, magazine, ammo and ammo type --- data/json/items/ammo/exodii.json | 11 +++++++++ data/json/items/ammo_types.json | 6 +++++ data/json/items/gun/exodii.json | 35 ++++++++++++++++++++++++++++ data/json/items/magazine/exodii.json | 14 +++++++++++ 4 files changed, 66 insertions(+) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 1b85f692133da..ad0183da7afa6 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -223,6 +223,17 @@ "effects": [ "NEVER_MISFIRES" ], "casing": "caotel_cell_spent" }, + { + "id": "khuunaofaai_ammo_firework", + "type": "AMMO", + "range": 100, + "name": { "str": "firework payload" }, + "description": "Pressurized chemical payload for the Khuunäöfaai. Highly reactive to oxygen, removing it from the container would be a bad idea.", + "ammo_type": "khuunaofaai_payload", + "effects": [ "NEVER_MISFIRES", "FLASHBANG", "TRAIL", "EXPLOSIVE_HESHOT" ], + "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, + "color": "light_gray" + }, { "id": "33naval_ball", "type": "AMMO", diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json index b23e24a33dd94..afcf64fb90ed7 100644 --- a/data/json/items/ammo_types.json +++ b/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", diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index 8b5e2580db6f4..ca4bbc609cb44 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -81,6 +81,41 @@ "flags": [ "NEVER_JAMS", "RELOAD_EJECT", "RELOAD_ONE", "EASY_CLEAN" ], "melee_damage": { "bash": 12 } }, + { + "id": "khuunaofaai", + "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", + "variant": [ + { + "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", diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index 8b9f66647f607..b50a9876fa314 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -57,6 +57,20 @@ "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 cartridge" }, + "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 to be used in combat and doesn't do a lot of damage, but it can ignite or blind its targets, and the tanks capacity is larger than the other loads the Exodii created for it.", + "weight": "1268 g", + "volume": "1250 ml", + "longest_side": "160 mm", + "price_postapoc": "24 USD 80 cent", + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "airtight": true, "ammo_restriction": { "": 16 }, "watertight": true } ], + "flag": [ "MAG_BULKY", "NO_UNLOAD", "NO_RELOAD" ], + "material": "steel" + }, { "id": "ree_33_4_mag", "looks_like": "stanag30", From e6ce8dc466fde94d3de6e67acc122f55fff6e9a8 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:25:04 -0500 Subject: [PATCH 02/63] fix missing s in variants --- data/json/items/gun/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index ca4bbc609cb44..f28973c3209ec 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -94,7 +94,7 @@ "longest_side": "1080 mm", "price_postapoc": "75 USD", "variant_type": "gun", - "variant": [ + "variants": [ { "id": "Khuunaofaai", "name": { "str": "Khuunäöfaai ordnance cannon" }, From 3fa3c28de7d34ba42a8fde98be7939cd89dd6b21 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:31:09 -0500 Subject: [PATCH 03/63] fix missing s in flags --- data/json/items/magazine/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index b50a9876fa314..a6050d7a387fc 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -68,7 +68,7 @@ "longest_side": "160 mm", "price_postapoc": "24 USD 80 cent", "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "airtight": true, "ammo_restriction": { "": 16 }, "watertight": true } ], - "flag": [ "MAG_BULKY", "NO_UNLOAD", "NO_RELOAD" ], + "flags": [ "MAG_BULKY", "NO_UNLOAD", "NO_RELOAD" ], "material": "steel" }, { From 27a2eaeddd61dee78c710a664b34a092eec597cf Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:34:12 -0500 Subject: [PATCH 04/63] forgot to put in an ammo restriction --- data/json/items/magazine/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index a6050d7a387fc..60c1459e8da59 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -67,7 +67,7 @@ "volume": "1250 ml", "longest_side": "160 mm", "price_postapoc": "24 USD 80 cent", - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "airtight": true, "ammo_restriction": { "": 16 }, "watertight": true } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "airtight": true, "ammo_restriction": { "khuunaofaai_ammo_firework": 16 }, "watertight": true } ], "flags": [ "MAG_BULKY", "NO_UNLOAD", "NO_RELOAD" ], "material": "steel" }, From 20af21d4992c9049be1e9927d26b80451f44d58e Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:46:29 -0500 Subject: [PATCH 05/63] fix missing values from ammo --- data/json/items/ammo/exodii.json | 23 ++++++++++++++--------- data/json/items/magazine/exodii.json | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index ad0183da7afa6..50adcb6b02f6d 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -224,15 +224,20 @@ "casing": "caotel_cell_spent" }, { - "id": "khuunaofaai_ammo_firework", - "type": "AMMO", - "range": 100, - "name": { "str": "firework payload" }, - "description": "Pressurized chemical payload for the Khuunäöfaai. Highly reactive to oxygen, removing it from the container would be a bad idea.", - "ammo_type": "khuunaofaai_payload", - "effects": [ "NEVER_MISFIRES", "FLASHBANG", "TRAIL", "EXPLOSIVE_HESHOT" ], - "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, - "color": "light_gray" + "id": "khuunaofaai_ammo_firework", + "type": "AMMO", + "range": 100, + "name": { "str": "firework payload" }, + "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", "FLASHBANG", "TRAIL", "EXPLOSIVE_HESHOT" ], + "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, + "recoil": 1000, + "dispersion": 20, + "color": "light_gray", + "weight": "4 g", + "volume": "125 ml", + "flags": [ "NO_DROP" ] }, { "id": "33naval_ball", diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index 60c1459e8da59..bb394ea1a7ceb 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -67,7 +67,7 @@ "volume": "1250 ml", "longest_side": "160 mm", "price_postapoc": "24 USD 80 cent", - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "airtight": true, "ammo_restriction": { "khuunaofaai_ammo_firework": 16 }, "watertight": true } ], + "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" }, From 278019a619095fccff5c11654aac21c8a34a5476 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Mon, 6 Jan 2025 21:55:02 -0500 Subject: [PATCH 06/63] add missing symbols --- data/json/items/ammo/exodii.json | 3 ++- data/json/items/magazine/exodii.json | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 50adcb6b02f6d..03f61754dacdf 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -234,7 +234,8 @@ "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, "recoil": 1000, "dispersion": 20, - "color": "light_gray", + "color": "green", + "symbol": "=", "weight": "4 g", "volume": "125 ml", "flags": [ "NO_DROP" ] diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index bb394ea1a7ceb..e4ad076444565 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -65,9 +65,19 @@ "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 to be used in combat and doesn't do a lot of damage, but it can ignite or blind its targets, and the tanks 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 } ], + "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" }, From d0ae4cd88d8a09ad32e7e28eb5d6f3cfb4ff2aa6 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:00:38 -0500 Subject: [PATCH 07/63] generic guns migrations --- data/mods/Generic_Guns/ammo/gg_ammo_migration.json | 2 +- data/mods/Generic_Guns/firearms/gg_firearms_migration.json | 2 +- data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json index 9c4b9659c68ef..c3c10c6512a4c 100644 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json +++ b/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" }, diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json index de1af0d5a6c9f..5ecd3f4f71d41 100644 --- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json +++ b/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" }, diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json index f59864a9a67ed..02c3a1bd0d79e 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json @@ -13,7 +13,8 @@ "a180mag2", "a180mag3", "a180mag4", - "af2011a1mag" + "af2011a1mag", + "exodii_khuunaofaai_mag_firework" ] } ] From 4455ed1de136599f8fa419c781b11987b8af5215 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:07:12 -0500 Subject: [PATCH 08/63] smoke_big effect on firework ammo --- data/json/items/ammo/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 03f61754dacdf..e5f72c8bc2a16 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -230,7 +230,7 @@ "name": { "str": "firework payload" }, "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", "FLASHBANG", "TRAIL", "EXPLOSIVE_HESHOT" ], + "effects": [ "NEVER_MISFIRES", "FLASHBANG", "TRAIL", "SMOKE_BIG" ], "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, "recoil": 1000, "dispersion": 20, From 61d5eeb8a20f8b547016d14421c116479a6ab07e Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 7 Jan 2025 16:17:06 -0500 Subject: [PATCH 09/63] add copy-from and remove uneeded effects. trying to fix hard crash --- data/json/items/ammo/exodii.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index e5f72c8bc2a16..30a4f03b12bf7 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -230,10 +230,11 @@ "name": { "str": "firework payload" }, "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", "FLASHBANG", "TRAIL", "SMOKE_BIG" ], + "effects": [ "NEVER_MISFIRES", "SMOKE_BIG" ], "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, - "recoil": 1000, + "recoil": 60, "dispersion": 20, + "copy-from": "84x246mm_smoke", "color": "green", "symbol": "=", "weight": "4 g", From 664fe4ef5ea174c0a82c556ed6a8ad31372699e4 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Wed, 8 Jan 2025 18:17:27 -0500 Subject: [PATCH 10/63] Update data/json/items/ammo/exodii.json Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> --- data/json/items/ammo/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 30a4f03b12bf7..fac344e8a4a07 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -227,7 +227,7 @@ "id": "khuunaofaai_ammo_firework", "type": "AMMO", "range": 100, - "name": { "str": "firework payload" }, + "name": { "str": "khuunäöfaai firework payload" }, "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" ], From 737b2974b71d9804e46d517729d0f43a0dd69d34 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Thu, 9 Jan 2025 11:49:51 -0500 Subject: [PATCH 11/63] minor changes --- data/json/items/ammo/exodii.json | 3 ++- data/json/items/magazine/exodii.json | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index fac344e8a4a07..3a86f70f28d5d 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -227,7 +227,7 @@ "id": "khuunaofaai_ammo_firework", "type": "AMMO", "range": 100, - "name": { "str": "khuunäöfaai firework payload" }, + "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" ], @@ -235,6 +235,7 @@ "recoil": 60, "dispersion": 20, "copy-from": "84x246mm_smoke", + "price_postapoc": "1 USD", "color": "green", "symbol": "=", "weight": "4 g", diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index e4ad076444565..4f878b523e1b5 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -61,8 +61,8 @@ "id": "exodii_khuunaofaai_mag_firework", "looks_like": "metal_tank_little", "type": "MAGAZINE", - "name": { "str": "Khuunaofaai celebration cartridge" }, - "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 to be used in combat and doesn't do a lot of damage, but it can ignite or blind its targets, and the tanks capacity is larger than the other loads the Exodii created for it.", + "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": "#", From 4b2c35aaa997519bd5841779a374ba2dffc8c677 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Thu, 9 Jan 2025 12:01:19 -0500 Subject: [PATCH 12/63] added comment for translators --- data/json/items/gun/exodii.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index f28973c3209ec..c83891c375685 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -83,6 +83,7 @@ }, { "id": "khuunaofaai", + "//": "note for translators, its pronounced \"Ku-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", From dade66fa77167f85bf073b2f2833f7c1a17052da Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Thu, 9 Jan 2025 12:08:26 -0500 Subject: [PATCH 13/63] add cannon to recognized gun names --- data/json/items/gun/exodii.json | 2 +- tools/json_tools/gun_variant_validator.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index c83891c375685..e3bf783c99dc8 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -83,7 +83,7 @@ }, { "id": "khuunaofaai", - "//": "note for translators, its pronounced \"Ku-hu-na-o-fa-i\" and doesn't actually mean anything, you can translate the syllables directly.", + "//": "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", diff --git a/tools/json_tools/gun_variant_validator.py b/tools/json_tools/gun_variant_validator.py index 3332c6750442a..8de6011c3f3bb 100755 --- a/tools/json_tools/gun_variant_validator.py +++ b/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 From 95764bde05d899e0873cf7f686db373fbde4e12a Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:12:30 -0500 Subject: [PATCH 14/63] common string between mag and gun added --- data/json/items/magazine/exodii.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index 4f878b523e1b5..1d1ac4208d21b 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -61,10 +61,19 @@ "id": "exodii_khuunaofaai_mag_firework", "looks_like": "metal_tank_little", "type": "MAGAZINE", - "name": { "str": "Khuunaofaai celebration payload" }, + "name": { "str": "ordnance cannon 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", + "variant_type": "gun", + "variants": [ + { + "id": "exodii_khuunaofaai_mag_firework", + "name": { "str": "Khuunäöfaai 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": 1 + } + ], "symbol": "#", "color": "light_gray", "longest_side": "160 mm", From 2e7ee1f30b997f841af7c5b2c6beca274eef8474 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:18:29 -0500 Subject: [PATCH 15/63] valid json --- data/json/items/magazine/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index 1d1ac4208d21b..d8a7f3f416278 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -65,7 +65,7 @@ "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", - "variant_type": "gun", + "variant_type": "gun", "variants": [ { "id": "exodii_khuunaofaai_mag_firework", From 5d6e4aac49e69dd9fab998011eda020eb5149a08 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:44:50 -0500 Subject: [PATCH 16/63] changes to effects --- data/json/items/ammo/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 3a86f70f28d5d..f67d0888d2358 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -230,7 +230,7 @@ "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" ], + "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "PYROTECHNIC_DISPLAY" ], "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, "recoil": 60, "dispersion": 20, From ebd152d4083d5cd5c9fb6c25cd99758570e3da7e Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Thu, 9 Jan 2025 15:56:50 -0500 Subject: [PATCH 17/63] attempt to fix ammo error --- data/json/items/ammo/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index f67d0888d2358..4aa29e79eb031 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -227,7 +227,7 @@ "id": "khuunaofaai_ammo_firework", "type": "AMMO", "range": 100, - "name": { "str": "khuunäöfaai firework" }, + "name": { "str": "firework ordnance" }, "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", "NON_FOULING", "TRAIL", "PYROTECHNIC_DISPLAY" ], From 45ec2f6c8851e55e8324d74bfe7cf0afc70519e7 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Thu, 9 Jan 2025 18:14:10 -0500 Subject: [PATCH 18/63] ditto --- data/json/items/ammo/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 4aa29e79eb031..e7a09c4226c10 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -227,7 +227,7 @@ "id": "khuunaofaai_ammo_firework", "type": "AMMO", "range": 100, - "name": { "str": "firework ordnance" }, + "name": { "str": "khuunaofaai 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", "NON_FOULING", "TRAIL", "PYROTECHNIC_DISPLAY" ], From bf388cfc3f60645306d9ab71d5a4c54fc2aafad7 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Thu, 9 Jan 2025 20:35:29 -0500 Subject: [PATCH 19/63] i overlooked the umlauts and capitalization --- data/json/items/ammo/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index e7a09c4226c10..da30d07b9b4c3 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -227,7 +227,7 @@ "id": "khuunaofaai_ammo_firework", "type": "AMMO", "range": 100, - "name": { "str": "khuunaofaai firework" }, + "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", "NON_FOULING", "TRAIL", "PYROTECHNIC_DISPLAY" ], From 2a80ddfddcfb82d7a1811a7a892fbb61ee478779 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 15:21:45 -0500 Subject: [PATCH 20/63] proper comma --- data/json/items/gun/exodii.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index e3bf783c99dc8..4e945ff1491c2 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -83,12 +83,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.", + "//": "note for translators, its pronounced \"Ka-hu-na-o-fa-aye\" 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.", + "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" ], @@ -99,7 +99,7 @@ { "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.", + "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 } ], From 8bd6aaf3788b9642a5f3af2c884ff613888b4aaa Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 17:35:12 -0500 Subject: [PATCH 21/63] replace ammo with ammo_type in magazine pocket --- data/json/items/magazine/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index d8a7f3f416278..60b4e8d95c416 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -83,7 +83,7 @@ "pocket_type": "MAGAZINE", "rigid": true, "airtight": true, - "ammo_restriction": { "khuunaofaai_ammo_firework": 10 }, + "ammo_restriction": { "khuunaofaai_payload": 10 }, "watertight": true } ], From 51e33e814f0db032f112af89decf940314121bce Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 17:50:21 -0500 Subject: [PATCH 22/63] make fireworks behave like a firework --- data/json/items/ammo/exodii.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index da30d07b9b4c3..aacbe5ab42692 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -230,11 +230,10 @@ "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", "NON_FOULING", "TRAIL", "PYROTECHNIC_DISPLAY" ], + "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "FLASHBANG", "SMOKE" ], "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, "recoil": 60, "dispersion": 20, - "copy-from": "84x246mm_smoke", "price_postapoc": "1 USD", "color": "green", "symbol": "=", From b38e20a43eb8bb50fb0eaebe047e948b918e419f Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 17:57:56 -0500 Subject: [PATCH 23/63] unique ammo effect. still needs tweaking. --- data/json/ammo_effects.json | 6 ++++++ data/json/items/ammo/exodii.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json index 5633e561bbad8..2c19b95b05378 100644 --- a/data/json/ammo_effects.json +++ b/data/json/ammo_effects.json @@ -334,6 +334,12 @@ "type": "ammo_effect", "explosion": { "power": 66 } }, + { + "id": "EXPLOSIVE_EXODII_FIREWORK", + "//": "a large, shockwave like explosion with no shrapnel.", + "type": "ammo_effect", + "explosion": { "power": 100 } + }, { "id": "EXPLOSIVE_HESHOT", "type": "ammo_effect", diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index aacbe5ab42692..1bddb3983341e 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -230,7 +230,7 @@ "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", "NON_FOULING", "TRAIL", "FLASHBANG", "SMOKE" ], + "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "FLASHBANG", "SMOKE", "EXPLOSIVE_EXODII_FIREWORK" ], "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, "recoil": 60, "dispersion": 20, From b6db353abc0b565964ae4f725fb26210c00e3f6f Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 18:12:20 -0500 Subject: [PATCH 24/63] tweakin --- data/json/ammo_effects.json | 2 +- data/json/items/ammo/exodii.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json index 2c19b95b05378..2bf51f2caa0de 100644 --- a/data/json/ammo_effects.json +++ b/data/json/ammo_effects.json @@ -338,7 +338,7 @@ "id": "EXPLOSIVE_EXODII_FIREWORK", "//": "a large, shockwave like explosion with no shrapnel.", "type": "ammo_effect", - "explosion": { "power": 100 } + "explosion": { "power": 288 } }, { "id": "EXPLOSIVE_HESHOT", diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 1bddb3983341e..b634d5b47ee7b 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -230,7 +230,7 @@ "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", "NON_FOULING", "TRAIL", "FLASHBANG", "SMOKE", "EXPLOSIVE_EXODII_FIREWORK" ], + "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "FLASHBANG", "SMOKE_BIG", "EXPLOSIVE_EXODII_FIREWORK" ], "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, "recoil": 60, "dispersion": 20, From b1ef199736c53549d6c4dd7ba4a67d3016ae4822 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 18:23:45 -0500 Subject: [PATCH 25/63] add to guns_blacklist with the other exodii weapons --- tools/json_tools/gun_variant_validator.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/json_tools/gun_variant_validator.py b/tools/json_tools/gun_variant_validator.py index 8de6011c3f3bb..2c58a7e645de8 100755 --- a/tools/json_tools/gun_variant_validator.py +++ b/tools/json_tools/gun_variant_validator.py @@ -66,6 +66,7 @@ GUNS_BLACKLIST = { # Well named, faction-specific weapon, with weird ammo "brogyeki", + "khuunaofaai", "exodii_plasma_fan", "exodii_plasma_projectile", } From 91a030b11affbd3734ed1a8774c048d7585bad17 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 18:36:04 -0500 Subject: [PATCH 26/63] please recognize it now --- data/json/items/ammo/exodii.json | 2 +- data/json/items/magazine/exodii.json | 4 ++-- tools/json_tools/gun_variant_validator.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index b634d5b47ee7b..dc9d4c09b843d 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -227,7 +227,7 @@ "id": "khuunaofaai_ammo_firework", "type": "AMMO", "range": 100, - "name": { "str": "Khuunäöfaai firework" }, + "name": { "str": "Khuunäöfaai firework payload" }, "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", "NON_FOULING", "TRAIL", "FLASHBANG", "SMOKE_BIG", "EXPLOSIVE_EXODII_FIREWORK" ], diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index 60b4e8d95c416..d7babcbee1f44 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -61,7 +61,7 @@ "id": "exodii_khuunaofaai_mag_firework", "looks_like": "metal_tank_little", "type": "MAGAZINE", - "name": { "str": "ordnance cannon celebration payload" }, + "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.", "weight": "1268 g", "volume": "1250 ml", @@ -69,7 +69,7 @@ "variants": [ { "id": "exodii_khuunaofaai_mag_firework", - "name": { "str": "Khuunäöfaai celebration payload" }, + "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.", "weight": 1 } diff --git a/tools/json_tools/gun_variant_validator.py b/tools/json_tools/gun_variant_validator.py index 2c58a7e645de8..5d92dae74b803 100755 --- a/tools/json_tools/gun_variant_validator.py +++ b/tools/json_tools/gun_variant_validator.py @@ -73,6 +73,7 @@ AMMO_BLACKLIST = { "arrow", "bolt", + "payload", "chemical_spray", "fishspear", "nail", From fe592aef16633c394ee8368022e9a5c1a87c5823 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 18:41:32 -0500 Subject: [PATCH 27/63] capitalize that K --- data/json/items/gun/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index 4e945ff1491c2..3005ecf10b2ae 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -99,7 +99,7 @@ { "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.", + "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 } ], From 79f49c9c39ecfc0d32bbab590e6b317679e203ca Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 18:44:41 -0500 Subject: [PATCH 28/63] GOTCHA --- data/json/items/magazine/exodii.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index d7babcbee1f44..facce98059950 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -76,6 +76,7 @@ ], "symbol": "#", "color": "light_gray", + "ammo_type": [ "khuunaofaai_payload" ], "longest_side": "160 mm", "price_postapoc": "24 USD 80 cent", "pocket_data": [ From a656a99797b46fd89098bb891a46cdfa7126759f Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 18:47:34 -0500 Subject: [PATCH 29/63] Update exodii.json --- data/json/items/magazine/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index facce98059950..87f10d4090f81 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -84,7 +84,7 @@ "pocket_type": "MAGAZINE", "rigid": true, "airtight": true, - "ammo_restriction": { "khuunaofaai_payload": 10 }, + "ammo_restriction": { "khuunaofaai_ammo_firework": 10 }, "watertight": true } ], From dc3bcd62a98d77e807ccd293cee3e72cfd15095c Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 18:52:48 -0500 Subject: [PATCH 30/63] fireworks doesn't have recoil does it? --- data/json/items/ammo/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index dc9d4c09b843d..e63777f3abe3c 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -232,7 +232,7 @@ "ammo_type": "khuunaofaai_payload", "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "FLASHBANG", "SMOKE_BIG", "EXPLOSIVE_EXODII_FIREWORK" ], "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, - "recoil": 60, + "recoil": 10, "dispersion": 20, "price_postapoc": "1 USD", "color": "green", From 7ff750c9abdd16578f997fb9f5d2e86f1efdb186 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 19:21:50 -0500 Subject: [PATCH 31/63] second ammo type --- data/json/items/ammo/exodii.json | 10 ++++++++++ data/json/items/magazine/exodii.json | 29 ++++++++++++++++++++++++++-- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index e63777f3abe3c..b6e8c64651c05 100644 --- 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 index 87f10d4090f81..f9fc84602f22b 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -62,7 +62,7 @@ "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", @@ -70,7 +70,7 @@ { "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", From 0b8434fef4c053087af6504cb3054a4b03b41d69 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 19:23:33 -0500 Subject: [PATCH 32/63] missing types --- data/json/items/ammo/exodii.json | 1 + data/json/items/magazine/exodii.json | 1 + 2 files changed, 2 insertions(+) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index b6e8c64651c05..61d5836b23020 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -243,6 +243,7 @@ }, { "id": "khuunaofaai_ammo_incendiary", + "type": "AMMO", "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.", diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index f9fc84602f22b..afc62ce110454 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -95,6 +95,7 @@ "id": "exodii_khuunaofaai_mag_incendiary", "copy-from": "exodii_khuunaofaai_mag_firework", "name": { "str": "ordnance cannon incendiary canister" }, + "type": "MAGAZINE", "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": [ From 1daab54d78dcda8a5b3ed174dc2e4b4b94d08c92 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 19:24:48 -0500 Subject: [PATCH 33/63] add price --- data/json/items/ammo/exodii.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 61d5836b23020..65f7e238a7d1c 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -250,6 +250,7 @@ "ammo_type": "khuunaofaai_payload", "copy-from": "khuunaofaai_ammo_firework", "weight": "12 g", + "price_postapoc": "8 USD", "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "PYROPHORIC" ] }, { From 074ab283c29ff3ead4888de0666c5f43884444d2 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 19:40:46 -0500 Subject: [PATCH 34/63] forgot ammo_type --- data/json/items/magazine/exodii.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index afc62ce110454..5260f0b81f890 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -94,6 +94,7 @@ { "id": "exodii_khuunaofaai_mag_incendiary", "copy-from": "exodii_khuunaofaai_mag_firework", + "ammo_type": [ "khuunaofaai_payload" ], "name": { "str": "ordnance cannon incendiary canister" }, "type": "MAGAZINE", "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.", From 6dbfd5acbff1feb4def5b2d6134e9c4734103c62 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 19:44:29 -0500 Subject: [PATCH 35/63] Update exodii.json --- data/json/items/gun/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index 3005ecf10b2ae..9258b91b17bd2 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -111,7 +111,7 @@ { "magazine_well": "1250 ml", "pocket_type": "MAGAZINE_WELL", - "item_restriction": [ "exodii_khuunaofaai_mag_firework" ] + "item_restriction": [ "exodii_khuunaofaai_mag_firework", "exodii_khuunaofaai_mag_incendiary" ] } ], "reload_noise_volume": 20, From 7a779fe95e2227d1bd89f2e1683c4faf700f0e0d Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 19:48:45 -0500 Subject: [PATCH 36/63] Update gg_ammo_migration.json --- data/mods/Generic_Guns/ammo/gg_ammo_migration.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json index c3c10c6512a4c..6a66be2978041 100644 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json @@ -617,7 +617,7 @@ "replace": "gg_plasma_cell" }, { - "id": [ "84x246mm_hedp", "m235_tpa", "RPG-7_pg7vr", "RPG-7_tbg7v", "RPG-7_og7v" ], + "id": [ "84x246mm_hedp", "m235_tpa", "RPG-7_pg7vr", "RPG-7_tbg7v", "RPG-7_og7v", "khuunaofaai_ammo_incendiary" ], "type": "MIGRATION", "replace": "rocket_hedp" }, From bab9e92f86ff8676a3718b309076d95486d39a01 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 19:51:53 -0500 Subject: [PATCH 37/63] Update gg_magazines_blacklist.json --- data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json index 02c3a1bd0d79e..32581bef6dd57 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json @@ -14,7 +14,8 @@ "a180mag3", "a180mag4", "af2011a1mag", - "exodii_khuunaofaai_mag_firework" + "exodii_khuunaofaai_mag_firework", + "exodii_khuunaofaai_mag_incendiary" ] } ] From db84f9e5f166090cb13482cd18e206e68f0212ea Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:00:38 -0500 Subject: [PATCH 38/63] more than copy-from --- data/json/items/ammo/exodii.json | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 65f7e238a7d1c..8c4b4c0caa8f1 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -229,7 +229,7 @@ "range": 100, "name": { "str": "Khuunäöfaai firework payload" }, "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", + "ammo_type": "khuunaofaai_payload" "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "FLASHBANG", "SMOKE_BIG", "EXPLOSIVE_EXODII_FIREWORK" ], "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, "recoil": 10, @@ -247,11 +247,17 @@ "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", + "ammo_type": "khuunaofaai_payload" + "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "PYROPHORIC" ], + "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, + "recoil": 10, + "dispersion": 20, "price_postapoc": "8 USD", - "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "PYROPHORIC" ] + "color": "green", + "symbol": "=", + "weight": "12 g", + "volume": "125 ml", + "flags": [ "NO_DROP" ] }, { "id": "33naval_ball", From 3946eabf1e548681af42a1aea95a4c7d0bd0abb7 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:01:33 -0500 Subject: [PATCH 39/63] no comma --- data/json/items/ammo/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 8c4b4c0caa8f1..148ff19629f5e 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -229,7 +229,7 @@ "range": 100, "name": { "str": "Khuunäöfaai firework payload" }, "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" + "ammo_type": "khuunaofaai_payload", "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "FLASHBANG", "SMOKE_BIG", "EXPLOSIVE_EXODII_FIREWORK" ], "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, "recoil": 10, From cc0701317c561422addef24cefd46fc034fd8898 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 10 Jan 2025 20:02:16 -0500 Subject: [PATCH 40/63] forgot a SECOND comma --- data/json/items/ammo/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 148ff19629f5e..4484dffe00ba8 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -247,7 +247,7 @@ "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" + "ammo_type": "khuunaofaai_payload", "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "PYROPHORIC" ], "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, "recoil": 10, From d891df97c060e6b1193809e6b0a4a7a60b9eaf36 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Sun, 12 Jan 2025 17:18:20 -0500 Subject: [PATCH 41/63] guardians suggestion, different ammo types --- data/json/items/ammo/exodii.json | 2 +- data/json/items/ammo_types.json | 8 +++++++- data/json/items/gun/exodii.json | 2 +- data/json/items/magazine/exodii.json | 6 +++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 4484dffe00ba8..e05238234b288 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -247,7 +247,7 @@ "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", + "ammo_type": "khuunaofaai_payload_fire", "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "PYROPHORIC" ], "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, "recoil": 10, diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json index afcf64fb90ed7..f8551d91bd6fc 100644 --- a/data/json/items/ammo_types.json +++ b/data/json/items/ammo_types.json @@ -831,9 +831,15 @@ { "type": "ammunition_type", "id": "khuunaofaai_payload", - "name": "Khuunäöfaai pressurized payload", + "name": "Khuunäöfaai firework payload", "default": "khuunaofaai_ammo_firework" }, + { + "type": "ammunition_type", + "id": "khuunaofaai_payload_fire", + "name": "Khuunäöfaai incendiary payload", + "default": "khuunaofaai_ammo_incendiary" + }, { "type": "ammunition_type", "id": "glowstick_juice", diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index 9258b91b17bd2..ef517b36ed102 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -115,7 +115,7 @@ } ], "reload_noise_volume": 20, - "ammo": [ "khuunaofaai_payload" ] + "ammo": [ "khuunaofaai_payload", "khuunaofaai_payload_fire" ] }, { "id": "sapra", diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index 5260f0b81f890..d030e274a2adc 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -84,7 +84,7 @@ "pocket_type": "MAGAZINE", "rigid": true, "airtight": true, - "ammo_restriction": { "khuunaofaai_ammo_firework": 10 }, + "ammo_restriction": { "khuunaofaai_payload": 10 }, "watertight": true } ], @@ -94,7 +94,7 @@ { "id": "exodii_khuunaofaai_mag_incendiary", "copy-from": "exodii_khuunaofaai_mag_firework", - "ammo_type": [ "khuunaofaai_payload" ], + "ammo_type": [ "khuunaofaai_payload_fire" ], "name": { "str": "ordnance cannon incendiary canister" }, "type": "MAGAZINE", "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.", @@ -113,7 +113,7 @@ "pocket_type": "MAGAZINE", "rigid": true, "airtight": true, - "ammo_restriction": { "khuunaofaai_ammo_incendiary": 4 }, + "ammo_restriction": { "khuunaofaai_payload_fire": 4 }, "watertight": true } ] From 0d0fc832b8ab9809c8592dcae6f34f287756e2ea Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Sun, 12 Jan 2025 20:27:54 -0500 Subject: [PATCH 42/63] third ammo type, corrosive payload, first draft. --- data/json/ammo_effects.json | 6 ++++++ data/json/items/ammo/exodii.json | 14 +++++++++++++- data/json/items/ammo_types.json | 6 ++++++ data/json/items/magazine/exodii.json | 26 ++++++++++++++++++++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json index 2bf51f2caa0de..73a02451a17ab 100644 --- a/data/json/ammo_effects.json +++ b/data/json/ammo_effects.json @@ -216,6 +216,12 @@ "//": "Leaves a pool of acid on detonation", "aoe": { "field_type": "fd_acid", "intensity_min": 3, "intensity_max": 3 } }, + { + "id": "CORROSIVE", + "type": "ammo_effect", + "//": "Leaves a large pool of acid on detonation", + "aoe": { "field_type": "fd_acid", "intensity_min": 3, "intensity_max": 3, "radius": 13 } + }, { "id": "TOXICGAS", "type": "ammo_effect", diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index e05238234b288..fb1bd9106c574 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -249,7 +249,7 @@ "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_fire", "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "PYROPHORIC" ], - "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 4 }, + "damage": { "damage_type": "fire", "amount": 44, "armor_penetration": 4 }, "recoil": 10, "dispersion": 20, "price_postapoc": "8 USD", @@ -259,6 +259,18 @@ "volume": "125 ml", "flags": [ "NO_DROP" ] }, + { + "id": "khuunaofaai_ammo_corrosive", + "type": "AMMO", + "range": 100, + "name": { "str": "Khuunäöfaai corrosive payload" }, + "description": "Pressurized chemical payload for the Khuunäöfaai. Essentially a juiced up version of pirahna solution, removing it from the tank would be a bad idea.", + "ammo_type": "khuunaofaai_payload_corrosive", + "effects": [ "NEVER_MISFIRES", "NON_FOULING", "CORROSIVE" ], + "damage": { "damage_type": "acid", "amount": 30, "armor_penetration": 4 }, + "copy-from": "khuunaofaai_ammo_firework", + "weight": "6 g", + "price_postapoc": "5 USD" { "id": "33naval_ball", "type": "AMMO", diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json index f8551d91bd6fc..0a0183dab6ba3 100644 --- a/data/json/items/ammo_types.json +++ b/data/json/items/ammo_types.json @@ -840,6 +840,12 @@ "name": "Khuunäöfaai incendiary payload", "default": "khuunaofaai_ammo_incendiary" }, + { + "type": "ammunition_type", + "id": "khuunaofaai_payload_acid", + "name": "Khuunäöfaai corrosive payload", + "default": "khuunaofaai_ammo_corrosive" + }, { "type": "ammunition_type", "id": "glowstick_juice", diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index d030e274a2adc..bffa85542530f 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -118,6 +118,32 @@ } ] }, + { + "id": "exodii_khuunaofaai_mag_corrosive", + "copy-from": "exodii_khuunaofaai_mag_firework", + "ammo_type": [ "khuunaofaai_payload_acid" ], + "name": { "str": "ordnance cannon corrosive canister" }, + "type": "MAGAZINE", + "description": "A pressurized tank containing a mixture of several different acids and peroxides, capable of rapidly breaking down the organic tissues of zombies and mutants alike. Apparently developed for cases where the incendiary payload would fail, like low to zero oxygen environments and targets capable of self-extinguishing - It's somewhat alarming the Exodii run into those scenarios frequently enough to justify producing this.", + "variant_type": "gun", + "variants": [ + { + "id": "exodii_khuunaofaai_mag_corrosive", + "name": { "str": "Khuunäöfaai corrosive canister" }, + "description": "A pressurized tank containing a mixture of several different acids and peroxides, capable of rapidly breaking down the organic tissues of zombies and mutants alike. Apparently developed for cases where the incendiary payload would fail, like low to zero oxygen environments and targets capable of self-extinguishing - It's somewhat alarming the Exodii run into those scenarios frequently enough to justify producing this.", + "weight": 1 + } + ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE", + "rigid": true, + "airtight": true, + "ammo_restriction": { "khuunaofaai_payload_acid": 4 }, + "watertight": true + } + ] + }, { "id": "ree_33_4_mag", "looks_like": "stanag30", From 334d41eae5dd98756192edfaa166942f460529e9 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Sun, 12 Jan 2025 20:33:50 -0500 Subject: [PATCH 43/63] Update exodii.json --- data/json/items/ammo/exodii.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index fb1bd9106c574..44dd6d2de3f0f 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -271,6 +271,7 @@ "copy-from": "khuunaofaai_ammo_firework", "weight": "6 g", "price_postapoc": "5 USD" + }, { "id": "33naval_ball", "type": "AMMO", From 996a71122d00c55ab4d58b3a467124546640fd77 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Sun, 12 Jan 2025 20:35:39 -0500 Subject: [PATCH 44/63] Update exodii.json --- data/json/items/ammo/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 44dd6d2de3f0f..1821cb5df8a02 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -265,7 +265,7 @@ "range": 100, "name": { "str": "Khuunäöfaai corrosive payload" }, "description": "Pressurized chemical payload for the Khuunäöfaai. Essentially a juiced up version of pirahna solution, removing it from the tank would be a bad idea.", - "ammo_type": "khuunaofaai_payload_corrosive", + "ammo_type": "khuunaofaai_payload_acid", "effects": [ "NEVER_MISFIRES", "NON_FOULING", "CORROSIVE" ], "damage": { "damage_type": "acid", "amount": 30, "armor_penetration": 4 }, "copy-from": "khuunaofaai_ammo_firework", From 6a121990a1997c92f47709bba4eecfb5e7f68f00 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Sun, 12 Jan 2025 20:46:48 -0500 Subject: [PATCH 45/63] gun takes the new ammo --- data/json/items/gun/exodii.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index ef517b36ed102..84fa101463e5f 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -111,11 +111,11 @@ { "magazine_well": "1250 ml", "pocket_type": "MAGAZINE_WELL", - "item_restriction": [ "exodii_khuunaofaai_mag_firework", "exodii_khuunaofaai_mag_incendiary" ] + "item_restriction": [ "exodii_khuunaofaai_mag_firework", "exodii_khuunaofaai_mag_incendiary", "exodii_khuunaofaai_mag_corrosive" ] } ], "reload_noise_volume": 20, - "ammo": [ "khuunaofaai_payload", "khuunaofaai_payload_fire" ] + "ammo": [ "khuunaofaai_payload", "khuunaofaai_payload_fire", "khuunaofaai_payload_acid" ] }, { "id": "sapra", From 79c48d0d4fd0510cb4b8deb5a0167088cdb1451c Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Mon, 13 Jan 2025 21:25:05 -0500 Subject: [PATCH 46/63] forgot the generic guns migrations --- data/json/ammo_effects.json | 2 +- data/mods/Generic_Guns/ammo/gg_ammo_migration.json | 2 +- data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json index 73a02451a17ab..3b666225bf13d 100644 --- a/data/json/ammo_effects.json +++ b/data/json/ammo_effects.json @@ -220,7 +220,7 @@ "id": "CORROSIVE", "type": "ammo_effect", "//": "Leaves a large pool of acid on detonation", - "aoe": { "field_type": "fd_acid", "intensity_min": 3, "intensity_max": 3, "radius": 13 } + "aoe": { "field_type": "fd_acid", "intensity_min": 3, "intensity_max": 3, "radius": 5 } }, { "id": "TOXICGAS", diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json index 6a66be2978041..6968c97829118 100644 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json @@ -617,7 +617,7 @@ "replace": "gg_plasma_cell" }, { - "id": [ "84x246mm_hedp", "m235_tpa", "RPG-7_pg7vr", "RPG-7_tbg7v", "RPG-7_og7v", "khuunaofaai_ammo_incendiary" ], + "id": [ "84x246mm_hedp", "m235_tpa", "RPG-7_pg7vr", "RPG-7_tbg7v", "RPG-7_og7v", "khuunaofaai_ammo_incendiary", "khuunaofaai_ammo_corrosive" ], "type": "MIGRATION", "replace": "rocket_hedp" }, diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json index 32581bef6dd57..55a370b36705d 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json @@ -15,7 +15,8 @@ "a180mag4", "af2011a1mag", "exodii_khuunaofaai_mag_firework", - "exodii_khuunaofaai_mag_incendiary" + "exodii_khuunaofaai_mag_incendiary", + "exodii_khuunaofaai_mag_corrosive" ] } ] From 0526ed8fac660c36aa97f7ed89e0872a77dd7bae Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Mon, 13 Jan 2025 21:28:18 -0500 Subject: [PATCH 47/63] linted gg_ammo_migration --- data/mods/Generic_Guns/ammo/gg_ammo_migration.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json index 6968c97829118..22744d0b3d8d4 100644 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json @@ -617,7 +617,15 @@ "replace": "gg_plasma_cell" }, { - "id": [ "84x246mm_hedp", "m235_tpa", "RPG-7_pg7vr", "RPG-7_tbg7v", "RPG-7_og7v", "khuunaofaai_ammo_incendiary", "khuunaofaai_ammo_corrosive" ], + "id": [ + "84x246mm_hedp", + "m235_tpa", + "RPG-7_pg7vr", + "RPG-7_tbg7v", + "RPG-7_og7v", + "khuunaofaai_ammo_incendiary", + "khuunaofaai_ammo_corrosive" + ], "type": "MIGRATION", "replace": "rocket_hedp" }, From f71af88581a6d1cf3f1fa9cfd8bade4708a17031 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Mon, 13 Jan 2025 21:35:49 -0500 Subject: [PATCH 48/63] I wasn't satisfied with the description --- data/json/items/magazine/exodii.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index bffa85542530f..4df47c4bc6e2a 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -124,13 +124,13 @@ "ammo_type": [ "khuunaofaai_payload_acid" ], "name": { "str": "ordnance cannon corrosive canister" }, "type": "MAGAZINE", - "description": "A pressurized tank containing a mixture of several different acids and peroxides, capable of rapidly breaking down the organic tissues of zombies and mutants alike. Apparently developed for cases where the incendiary payload would fail, like low to zero oxygen environments and targets capable of self-extinguishing - It's somewhat alarming the Exodii run into those scenarios frequently enough to justify producing this.", + "description": "A pressurized tank containing one of the special payloads the Exodii made for the Khuunäöfaai, a mixture of several acids and peroxides capable of rapidly breaking down the organic tissues of zombies and mutants alike. Apparently developed for cases where the incendiary payload would fail, like low to zero oxygen environments and targets capable of self-extinguishing - It's somewhat alarming the Exodii run into those scenarios frequently enough to justify producing this.", "variant_type": "gun", "variants": [ { "id": "exodii_khuunaofaai_mag_corrosive", "name": { "str": "Khuunäöfaai corrosive canister" }, - "description": "A pressurized tank containing a mixture of several different acids and peroxides, capable of rapidly breaking down the organic tissues of zombies and mutants alike. Apparently developed for cases where the incendiary payload would fail, like low to zero oxygen environments and targets capable of self-extinguishing - It's somewhat alarming the Exodii run into those scenarios frequently enough to justify producing this.", + "description": "A pressurized tank containing one of the special payloads the Exodii made for the Khuunäöfaai, a mixture of several acids and peroxides capable of rapidly breaking down the organic tissues of zombies and mutants alike. Apparently developed for cases where the incendiary payload would fail, like low to zero oxygen environments and targets capable of self-extinguishing - It's somewhat alarming the Exodii run into those scenarios frequently enough to justify producing this.", "weight": 1 } ], From 1ddaa62043a783adaef10f1bda5562cca1d61c5a Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:01:25 -0500 Subject: [PATCH 49/63] corrosive ammo now uses a spell rather than an ammo effect, take 1 --- data/json/ammo_effects.json | 12 ++++++------ data/json/items/gun/exodii.json | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json index 3b666225bf13d..901523f49109e 100644 --- a/data/json/ammo_effects.json +++ b/data/json/ammo_effects.json @@ -216,12 +216,6 @@ "//": "Leaves a pool of acid on detonation", "aoe": { "field_type": "fd_acid", "intensity_min": 3, "intensity_max": 3 } }, - { - "id": "CORROSIVE", - "type": "ammo_effect", - "//": "Leaves a large pool of acid on detonation", - "aoe": { "field_type": "fd_acid", "intensity_min": 3, "intensity_max": 3, "radius": 5 } - }, { "id": "TOXICGAS", "type": "ammo_effect", @@ -346,6 +340,12 @@ "type": "ammo_effect", "explosion": { "power": 288 } }, + { + "id": "CORROSIVE", + "type": "ammo_effect", + "always_cast_spell": true, + "spell_data": { "id": "spell_corrosive_spray" } + }, { "id": "EXPLOSIVE_HESHOT", "type": "ammo_effect", diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index 84fa101463e5f..f6c9648f05e45 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -117,6 +117,26 @@ "reload_noise_volume": 20, "ammo": [ "khuunaofaai_payload", "khuunaofaai_payload_fire", "khuunaofaai_payload_acid" ] }, + { + "id": "spell_corrosive_spray", + "type": "SPELL", + "name": { "str": "corrosive spray", "//~": "NO_I18N" }, + "description": { "str": "Your weapon coats its target in highly corrosive chemicals", "//~": "NO_I18N" }, + "effect": "attack", + "shape": "blast", + "valid_targets": [ "hostile", "ally", "ground" ], + "effect_str": "corroding", + "min_duration": 1200, + "max_duration": 1200, + "min_aoe": 12, + "max_aoe": 12, + "difficulty": 1, + "min_range": 10, + "max_range": 10, + "field_type": "fd_acid", + "min_field_intensity": 3, + "max_field_intensity": 3 + }, { "id": "sapra", "looks_like": "smle_mk3", From 9dab2c4ba6a827c613ce0255b83d456e28a0c097 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:02:48 -0500 Subject: [PATCH 50/63] make this a teensy bit more deadly --- data/json/ammo_effects.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json index 901523f49109e..225b0188c7b2c 100644 --- a/data/json/ammo_effects.json +++ b/data/json/ammo_effects.json @@ -338,7 +338,7 @@ "id": "EXPLOSIVE_EXODII_FIREWORK", "//": "a large, shockwave like explosion with no shrapnel.", "type": "ammo_effect", - "explosion": { "power": 288 } + "explosion": { "power": 318 } }, { "id": "CORROSIVE", From dac4037c18de07583a5bb5ea2796a2a69e39c758 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:04:57 -0500 Subject: [PATCH 51/63] field_id not field_type --- data/json/items/gun/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index f6c9648f05e45..b01eb810cf81c 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -133,7 +133,7 @@ "difficulty": 1, "min_range": 10, "max_range": 10, - "field_type": "fd_acid", + "field_id": "fd_acid", "min_field_intensity": 3, "max_field_intensity": 3 }, From e6560ba4cff83957c9b0312378a406f1a1ad5719 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:09:53 -0500 Subject: [PATCH 52/63] tweak some values --- data/json/items/gun/exodii.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index b01eb810cf81c..a4a247aa916c7 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -126,16 +126,16 @@ "shape": "blast", "valid_targets": [ "hostile", "ally", "ground" ], "effect_str": "corroding", - "min_duration": 1200, - "max_duration": 1200, + "min_duration": 1300, + "max_duration": 1300, "min_aoe": 12, "max_aoe": 12, "difficulty": 1, "min_range": 10, "max_range": 10, "field_id": "fd_acid", - "min_field_intensity": 3, - "max_field_intensity": 3 + "min_field_intensity": 2, + "max_field_intensity": 2 }, { "id": "sapra", From 9ed30d34bc10f567015ba57dca5f550305ae905f Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:11:26 -0500 Subject: [PATCH 53/63] tweaked the wrong values --- data/json/items/gun/exodii.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index a4a247aa916c7..88a759e5f563e 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -128,14 +128,14 @@ "effect_str": "corroding", "min_duration": 1300, "max_duration": 1300, - "min_aoe": 12, - "max_aoe": 12, + "min_aoe": 9, + "max_aoe": 9, "difficulty": 1, "min_range": 10, "max_range": 10, "field_id": "fd_acid", - "min_field_intensity": 2, - "max_field_intensity": 2 + "min_field_intensity": 3, + "max_field_intensity": 3 }, { "id": "sapra", From 3d9e8e1a0cfc6939d12141086fe118408351bc61 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:12:53 -0500 Subject: [PATCH 54/63] more tweaking --- data/json/items/gun/exodii.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index 88a759e5f563e..c98993eefffbc 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -128,8 +128,8 @@ "effect_str": "corroding", "min_duration": 1300, "max_duration": 1300, - "min_aoe": 9, - "max_aoe": 9, + "min_aoe": 6, + "max_aoe": 6, "difficulty": 1, "min_range": 10, "max_range": 10, From 3b8fa83c71123bb7e4eec212171c076584902df1 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:17:24 -0500 Subject: [PATCH 55/63] the only reason i found out this crashed the game is because I saw a pristine RV in my debug world and wanted to blow it up --- data/json/items/ammo/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 1821cb5df8a02..7412e81e01735 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -249,7 +249,7 @@ "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_fire", "effects": [ "NEVER_MISFIRES", "NON_FOULING", "TRAIL", "PYROPHORIC" ], - "damage": { "damage_type": "fire", "amount": 44, "armor_penetration": 4 }, + "damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 4 }, "recoil": 10, "dispersion": 20, "price_postapoc": "8 USD", From f4712982e4390246fc5a1c15e0feb3431b184537 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:26:07 -0500 Subject: [PATCH 56/63] the ammo costs more money than the canisters. selling an empty canister is now a negative. --- data/json/items/ammo/exodii.json | 4 ++-- data/json/items/magazine/exodii.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 7412e81e01735..1ce4378d82370 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -252,7 +252,7 @@ "damage": { "damage_type": "bullet", "amount": 44, "armor_penetration": 4 }, "recoil": 10, "dispersion": 20, - "price_postapoc": "8 USD", + "price_postapoc": "10 USD 80 cent", "color": "green", "symbol": "=", "weight": "12 g", @@ -270,7 +270,7 @@ "damage": { "damage_type": "acid", "amount": 30, "armor_penetration": 4 }, "copy-from": "khuunaofaai_ammo_firework", "weight": "6 g", - "price_postapoc": "5 USD" + "price_postapoc": "8 USD 66 cent" }, { "id": "33naval_ball", diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index 4df47c4bc6e2a..f8a09fc2f4185 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -78,7 +78,7 @@ "color": "light_gray", "ammo_type": [ "khuunaofaai_payload" ], "longest_side": "160 mm", - "price_postapoc": "24 USD 80 cent", + "price_postapoc": "10 USD", "pocket_data": [ { "pocket_type": "MAGAZINE", @@ -107,7 +107,7 @@ "weight": 1 } ], - "price_postapoc": "38 USD 50 cent", + "price_postapoc": "10 USD", "pocket_data": [ { "pocket_type": "MAGAZINE", From 1f4916325a9e1afc77f2b7ebcb04674645afa166 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 16:07:22 -0500 Subject: [PATCH 57/63] final ammo type, first draft --- data/json/ammo_effects.json | 4 +++ data/json/items/ammo/exodii.json | 11 ++++++++ data/json/items/ammo_types.json | 6 +++++ data/json/items/gun/exodii.json | 20 ++++++++++++++ data/json/items/magazine/exodii.json | 26 +++++++++++++++++++ .../Generic_Guns/ammo/gg_ammo_migration.json | 2 +- .../magazines/gg_magazines_blacklist.json | 3 ++- 7 files changed, 70 insertions(+), 2 deletions(-) diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json index 225b0188c7b2c..056ba095d9c6d 100644 --- a/data/json/ammo_effects.json +++ b/data/json/ammo_effects.json @@ -346,6 +346,10 @@ "always_cast_spell": true, "spell_data": { "id": "spell_corrosive_spray" } }, + "id": "GLUE_FOAM", + "type": "ammo_effect", + "always_cast_spell": true, + "spell_data": { "id": "spell_adhesive_spray" } { "id": "EXPLOSIVE_HESHOT", "type": "ammo_effect", diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 1ce4378d82370..3e41cbe0866fd 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -272,6 +272,17 @@ "weight": "6 g", "price_postapoc": "8 USD 66 cent" }, + "id": "khuunaofaai_ammo_foam", + "type": "AMMO", + "range": 100, + "name": { "str": "Khuunäöfaai foaming payload" }, + "description": "Pressurized chemical payload for the Khuunäöfaai. An incredibly powerful binding agent and sealant, removing it from the tank would be a bad idea.", + "ammo_type": "khuunaofaai_payload_glue", + "effects": [ "NEVER_MISFIRES", "NON_FOULING", "GLUE_FOAM" ], + "damage": { "damage_type": "bullet", "amount": 10, "armor_penetration": 4 }, + "copy-from": "khuunaofaai_ammo_firework", + "weight": "8 g", + "price_postapoc": "5 USD 10 cent" { "id": "33naval_ball", "type": "AMMO", diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json index 0a0183dab6ba3..64c2587b96e4d 100644 --- a/data/json/items/ammo_types.json +++ b/data/json/items/ammo_types.json @@ -846,6 +846,12 @@ "name": "Khuunäöfaai corrosive payload", "default": "khuunaofaai_ammo_corrosive" }, + { + "type": "ammunition_type", + "id": "khuunaofaai_payload_glue", + "name": "Khuunäöfaai adhesive payload", + "default": "khuunaofaai_ammo_foam" + }, { "type": "ammunition_type", "id": "glowstick_juice", diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index c98993eefffbc..26069bcb610c1 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -137,6 +137,26 @@ "min_field_intensity": 3, "max_field_intensity": 3 }, + { + "id": "spell_adhesive_spray", + "type": "SPELL", + "name": { "str": "adhesive spray", "//~": "NO_I18N" }, + "description": { "str": "Your weapon coats its target in quickly hardening resin", "//~": "NO_I18N" }, + "effect": "attack", + "shape": "blast", + "valid_targets": [ "hostile", "ally", "ground" ], + "effect_str": "sludged", + "min_duration": 60000, + "max_duration": 60000, + "min_aoe": 6, + "max_aoe": 6, + "difficulty": 1, + "min_range": 10, + "max_range": 10, + "field_id": "fd_sludge", + "min_field_intensity": 3, + "max_field_intensity": 3 + }, { "id": "sapra", "looks_like": "smle_mk3", diff --git a/data/json/items/magazine/exodii.json b/data/json/items/magazine/exodii.json index f8a09fc2f4185..695812bd5767d 100644 --- a/data/json/items/magazine/exodii.json +++ b/data/json/items/magazine/exodii.json @@ -144,6 +144,32 @@ } ] }, + { + "id": "exodii_khuunaofaai_mag_adhesive", + "copy-from": "exodii_khuunaofaai_mag_firework", + "ammo_type": [ "khuunaofaai_payload_glue" ], + "name": { "str": "ordnance cannon adhesive canister" }, + "type": "MAGAZINE", + "description": "A pressurized tank containing one of the special payloads the Exodii made for the Khuunäöfaai, an industrial grade chemical that adheres to anything it touches and hardens into a concrete-like resin. Invented on some alternate Earth for quickly fixing holes in zeppelin and high-altitude craft, the Exodii found the substance useful for sticking nasty things in place when they otherwise couldn't be destroyed, or they didn't want to waste the ammunition to.", + "variant_type": "gun", + "variants": [ + { + "id": "exodii_khuunaofaai_mag_adhesive", + "name": { "str": "Khuunäöfaai adhesive canister" }, + "description": "A pressurized tank containing one of the special payloads the Exodii made for the Khuunäöfaai, an industrial grade chemical that adheres to anything it touches and hardens into a concrete-like resin. Invented on some alternate Earth for quickly fixing holes in zeppelin and high-altitude craft, the Exodii found the substance useful for sticking nasty things in place when they otherwise couldn't be destroyed, or they didn't want to waste the ammunition to.", + "weight": 1 + } + ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE", + "rigid": true, + "airtight": true, + "ammo_restriction": { "khuunaofaai_payload_glue": 6 }, + "watertight": true + } + ] + }, { "id": "ree_33_4_mag", "looks_like": "stanag30", diff --git a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json index 22744d0b3d8d4..271f3f201f4e0 100644 --- a/data/mods/Generic_Guns/ammo/gg_ammo_migration.json +++ b/data/mods/Generic_Guns/ammo/gg_ammo_migration.json @@ -640,7 +640,7 @@ "replace": "rifle_pellet_hunting" }, { - "id": [ "84x246mm_smoke", "khuunaofaai_ammo_firework" ], + "id": [ "84x246mm_smoke", "khuunaofaai_ammo_firework", "khuunaofaai_ammo_foam" ], "type": "MIGRATION", "replace": "rocket_smoke" }, diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json index 55a370b36705d..271920c18eb56 100644 --- a/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json +++ b/data/mods/Generic_Guns/magazines/gg_magazines_blacklist.json @@ -16,7 +16,8 @@ "af2011a1mag", "exodii_khuunaofaai_mag_firework", "exodii_khuunaofaai_mag_incendiary", - "exodii_khuunaofaai_mag_corrosive" + "exodii_khuunaofaai_mag_corrosive", + "exodii_khuunaofaai_mag_adhesive" ] } ] From 8f80b16555e51073da631ba550b50a00d89b3516 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 16:13:47 -0500 Subject: [PATCH 58/63] stupido --- data/json/ammo_effects.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json index 056ba095d9c6d..feba219934996 100644 --- a/data/json/ammo_effects.json +++ b/data/json/ammo_effects.json @@ -346,10 +346,12 @@ "always_cast_spell": true, "spell_data": { "id": "spell_corrosive_spray" } }, + { "id": "GLUE_FOAM", "type": "ammo_effect", "always_cast_spell": true, "spell_data": { "id": "spell_adhesive_spray" } + }, { "id": "EXPLOSIVE_HESHOT", "type": "ammo_effect", From 09c757ba2961faf9c1a8a2229c27571076ba430a Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 16:15:58 -0500 Subject: [PATCH 59/63] Update exodii.json --- data/json/items/ammo/exodii.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/items/ammo/exodii.json b/data/json/items/ammo/exodii.json index 3e41cbe0866fd..29cbb1379ea51 100644 --- a/data/json/items/ammo/exodii.json +++ b/data/json/items/ammo/exodii.json @@ -272,6 +272,7 @@ "weight": "6 g", "price_postapoc": "8 USD 66 cent" }, + { "id": "khuunaofaai_ammo_foam", "type": "AMMO", "range": 100, @@ -283,6 +284,7 @@ "copy-from": "khuunaofaai_ammo_firework", "weight": "8 g", "price_postapoc": "5 USD 10 cent" + }, { "id": "33naval_ball", "type": "AMMO", From 06d466a7582758535c847b9723c90c0f2b75ed24 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 16:23:41 -0500 Subject: [PATCH 60/63] Update exodii.json --- data/json/items/gun/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index 26069bcb610c1..84716d52ea4df 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -115,7 +115,7 @@ } ], "reload_noise_volume": 20, - "ammo": [ "khuunaofaai_payload", "khuunaofaai_payload_fire", "khuunaofaai_payload_acid" ] + "ammo": [ "khuunaofaai_payload", "khuunaofaai_payload_fire", "khuunaofaai_payload_acid", "khuunaofaai_payload_glue" ] }, { "id": "spell_corrosive_spray", From 00cf8b5fe10f93afa7b96f9c596ac7dd496bbf56 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 16:27:19 -0500 Subject: [PATCH 61/63] Update exodii.json --- data/json/items/gun/exodii.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index 84716d52ea4df..8d2ee11296b09 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -111,7 +111,7 @@ { "magazine_well": "1250 ml", "pocket_type": "MAGAZINE_WELL", - "item_restriction": [ "exodii_khuunaofaai_mag_firework", "exodii_khuunaofaai_mag_incendiary", "exodii_khuunaofaai_mag_corrosive" ] + "item_restriction": [ "exodii_khuunaofaai_mag_firework", "exodii_khuunaofaai_mag_incendiary", "exodii_khuunaofaai_mag_corrosive", "exodii_khuunaofaai_mag_adhesive" ] } ], "reload_noise_volume": 20, From 08c4ba27a192ff4ebe8dc666ae6e0b19e9d1c008 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Tue, 14 Jan 2025 16:36:09 -0500 Subject: [PATCH 62/63] divergent JSONification theory --- data/json/items/gun/exodii.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index 8d2ee11296b09..4d9a313532f46 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -111,7 +111,12 @@ { "magazine_well": "1250 ml", "pocket_type": "MAGAZINE_WELL", - "item_restriction": [ "exodii_khuunaofaai_mag_firework", "exodii_khuunaofaai_mag_incendiary", "exodii_khuunaofaai_mag_corrosive", "exodii_khuunaofaai_mag_adhesive" ] + "item_restriction": [ + "exodii_khuunaofaai_mag_firework", + "exodii_khuunaofaai_mag_incendiary", + "exodii_khuunaofaai_mag_corrosive", + "exodii_khuunaofaai_mag_adhesive" + ] } ], "reload_noise_volume": 20, From 94dd58439b17312105ee03d191492425166cb3d6 Mon Sep 17 00:00:00 2001 From: ZigVert <56202842+Daved27hundred@users.noreply.github.com> Date: Fri, 17 Jan 2025 17:41:41 -0500 Subject: [PATCH 63/63] THE GLUE. --- data/json/effects.json | 20 ++++++++++++++++++++ data/json/items/gun/exodii.json | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/data/json/effects.json b/data/json/effects.json index 63ab409df07c7..3075254b0471c 100644 --- a/data/json/effects.json +++ b/data/json/effects.json @@ -2561,6 +2561,26 @@ "flags": [ "EFFECT_LIMB_SCORE_MOD" ], "show_in_info": true }, + { + "type": "effect_type", + "id": "glued", + "name": [ "Encased" ], + "desc": [ "A substance hard as rock holds you in place." ], + "apply_message": "The foam splatters you and quickly hardens!", + "rating": "bad", + "miss_messages": [ [ "The shell of resin doesn't budge from your efforts to break it.", 8 ] ], + "max_intensity": 1, + "limb_score_mods": [ + { "limb_score": "move_speed", "modifier": 0 }, + { "limb_score": "footing", "modifier": 0 }, + { "limb_score": "balance", "modifier": 0.2 }, + { "limb_score": "block", "modifier": 0.1 }, + { "limb_score": "lift", "modifier": 0.2 }, + { "limb_score": "breathing", "modifier": 0 } + ], + "flags": [ "EFFECT_LIMB_SCORE_MOD" ], + "show_in_info": true + }, { "type": "effect_type", "id": "bite", diff --git a/data/json/items/gun/exodii.json b/data/json/items/gun/exodii.json index 4d9a313532f46..7991f3f72ae08 100644 --- a/data/json/items/gun/exodii.json +++ b/data/json/items/gun/exodii.json @@ -150,11 +150,11 @@ "effect": "attack", "shape": "blast", "valid_targets": [ "hostile", "ally", "ground" ], - "effect_str": "sludged", + "effect_str": "glued", "min_duration": 60000, "max_duration": 60000, "min_aoe": 6, - "max_aoe": 6, + "max_aoe": 7, "difficulty": 1, "min_range": 10, "max_range": 10,