From 839d8116335c66b50119cfa1916d8b6111af3e16 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 17 Jul 2024 19:06:17 -0500 Subject: [PATCH 01/28] yugg gun --- data/json/ammo_effects.json | 5 +++ data/json/items/ammo/barb.json | 20 +++++++++++ data/json/items/ammo_types.json | 6 ++++ .../monster_special_attacks/monster_gun.json | 35 +++++++++++++++++++ data/json/monsters/nether.json | 10 +++++- 5 files changed, 75 insertions(+), 1 deletion(-) diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json index 82c3eccf89c7e..ce41077a3c2d6 100644 --- a/data/json/ammo_effects.json +++ b/data/json/ammo_effects.json @@ -368,6 +368,11 @@ "type": "ammo_effect", "explosion": { "power": 7980, "shrapnel": { "casing_mass": 8725, "fragment_mass": 0.5 } } }, + { + "id": "GENE_STING", + "type": "ammo_effect", + "spell_data": { "id": "spell_gene_sting" } + }, { "id": "FLASHBANG", "type": "ammo_effect", diff --git a/data/json/items/ammo/barb.json b/data/json/items/ammo/barb.json index 04cb31719c8c4..6212b75448dd0 100644 --- a/data/json/items/ammo/barb.json +++ b/data/json/items/ammo/barb.json @@ -18,5 +18,25 @@ "show_stats": true, "effects": [ "PARALYZEPOISON" ], "melee_damage": { "bash": 6, "cut": 2 } + }, + { + "type": "AMMO", + "id": "gene_sting_barb", + "price": "4 USD", + "name": { "str": "gene sting barb" }, + "symbol": "=", + "color": "cyan", + "description": "Tiny droplets of cyan venom trickle out of the sponge-like tissue of this sharp barb.", + "material": [ "bone" ], + "volume": "250 ml", + "weight": "37 g", + "ammo_type": "barb", + "damage": { "damage_type": "stab", "amount": 5, "armor_penetration": 5 }, + "dispersion": 120, + "loudness": 0, + "count": 10, + "show_stats": true, + "effects": [ "GENE_STING" ], + "melee_damage": { "bash": 6, "cut": 2 } } ] diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json index 9a0d870ee8340..6a4464e27b54d 100644 --- a/data/json/items/ammo_types.json +++ b/data/json/items/ammo_types.json @@ -71,6 +71,12 @@ "name": "barb", "default": "barb_paralysis" }, + { + "type": "ammunition_type", + "id": "gene_sting", + "name": "yugg stinger", + "default": "gene_sting_barb" + }, { "type": "ammunition_type", "id": "BB", diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json index 3b5690d4340d9..4166b02ac24a3 100644 --- a/data/json/monster_special_attacks/monster_gun.json +++ b/data/json/monster_special_attacks/monster_gun.json @@ -99,6 +99,41 @@ "durability": 8, "melee_damage": { "bash": 2 } }, + { + "id": "gene_sting", + "type": "GUN", + "symbol": "%", + "color": "red", + "name": { "str": "barb launching organ" }, + "description": "A mutated organ capable of launching bony barbs at great speed.", + "material": [ "hflesh" ], + "flags": [ + "PRIMITIVE_RANGED_WEAPON", + "GENE_STING" + "PSEUDO", + "NEVER_JAMS", + "NONCONDUCTIVE", + "NO_REPAIR", + "WATERPROOF_GUN", + "NO_SALVAGE", + "NO_UNLOAD", + "RELOAD_AND_SHOOT" + ], + "skill": "pistol", + "ammo": [ "barb" ], + "clip_size": 1, + "weight": "540 g", + "volume": "750 ml", + "longest_side": "25 cm", + "to_hit": 1, + "reload_noise_volume": 2, + "loudness": 2, + "range": 12, + "dispersion": 100, + "durability": 8, + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting_barb": 1 } } ], + "melee_damage": { "bash": 2 } + }, { "id": "feral_human_thrown_rock", "type": "GUN", diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json index 593b6f51cae1e..0a0e2b40c542d 100644 --- a/data/json/monsters/nether.json +++ b/data/json/monsters/nether.json @@ -1478,7 +1478,15 @@ "weakpoint_sets": [ "wps_netherium_abomination" ], "harvest": "exempt", "death_function": { "corpse_type": "NO_CORPSE", "eoc": "EOC_YUGG_DEATH" }, - "special_attacks": [ { "type": "spell", "spell_data": { "id": "spell_gene_sting", "min_level": 5 }, "cooldown": 160 } ], + "special_attacks": [ + { + "type": "gun", + "cooldown": 2, + "gun_type": "gene_sting", + "ranges": [ [ 2, 24, "DEFAULT" ] ], + "description": "The yugg launches a viscous barb!" + } + ], "flags": [ "SEES", "HEARS", From 83c018c02c60e1be59905f1b2b45a03be4303fdd Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 17 Jul 2024 19:38:31 -0500 Subject: [PATCH 02/28] Update data/json/monster_special_attacks/monster_gun.json --- data/json/monster_special_attacks/monster_gun.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json index 4166b02ac24a3..515f15dc5e9b5 100644 --- a/data/json/monster_special_attacks/monster_gun.json +++ b/data/json/monster_special_attacks/monster_gun.json @@ -109,7 +109,7 @@ "material": [ "hflesh" ], "flags": [ "PRIMITIVE_RANGED_WEAPON", - "GENE_STING" + "GENE_STING", "PSEUDO", "NEVER_JAMS", "NONCONDUCTIVE", From 1b52890c5290f9d73bfe15024199b08cd612021d Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 17 Jul 2024 20:57:51 -0500 Subject: [PATCH 03/28] Fix --- data/json/monster_special_attacks/monster_gun.json | 2 +- data/json/monsters/nether.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json index 4166b02ac24a3..32896032760e2 100644 --- a/data/json/monster_special_attacks/monster_gun.json +++ b/data/json/monster_special_attacks/monster_gun.json @@ -100,7 +100,7 @@ "melee_damage": { "bash": 2 } }, { - "id": "gene_sting", + "id": "gene_sting_gun", "type": "GUN", "symbol": "%", "color": "red", diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json index 0a0e2b40c542d..cb96b93a20acd 100644 --- a/data/json/monsters/nether.json +++ b/data/json/monsters/nether.json @@ -1482,7 +1482,7 @@ { "type": "gun", "cooldown": 2, - "gun_type": "gene_sting", + "gun_type": "gene_sting_gun", "ranges": [ [ 2, 24, "DEFAULT" ] ], "description": "The yugg launches a viscous barb!" } From d41432c02138a239caf1dcdb7b69028062afe52e Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 17 Jul 2024 21:06:12 -0500 Subject: [PATCH 04/28] Update generic_guns_validator.py --- tools/json_tools/generic_guns_validator.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/json_tools/generic_guns_validator.py b/tools/json_tools/generic_guns_validator.py index e0ca14f781778..7afc4691e76ff 100755 --- a/tools/json_tools/generic_guns_validator.py +++ b/tools/json_tools/generic_guns_validator.py @@ -25,6 +25,7 @@ 'chemical_spray', 'fishspear', 'flammable', + 'gene_sting_gun', 'm235', # Rocket 'metal_rail', 'nail', From f92b6ce4b14d56a323dcd80cccd795594ff6ee9c Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 17 Jul 2024 21:23:38 -0500 Subject: [PATCH 05/28] burrowing nether --- data/json/monsters/nether.json | 2 +- data/json/species.json | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json index cb96b93a20acd..be69728e081fb 100644 --- a/data/json/monsters/nether.json +++ b/data/json/monsters/nether.json @@ -1458,7 +1458,7 @@ "description": "A huge, slimy worm-like creature. Its pale, flattened head drips an oily mucus as it breaches the ground, searching for prey. Its pinkish mouth opens and closes, revealing long fangs glistening with ropey strands of saliva, which leave smoldering stains wherever they drip.", "default_faction": "nether", "bodytype": "snake", - "species": [ "NETHER" ], + "species": [ "NETHER_BURROWING" ], "diff": 10, "volume": "600 L", "weight": "800 kg", diff --git a/data/json/species.json b/data/json/species.json index 6bca1fae4c041..1aa8d723b6c0e 100644 --- a/data/json/species.json +++ b/data/json/species.json @@ -60,6 +60,13 @@ "description": "a nether creature", "flags": [ "DRACULIN_IMMUNE" ] }, + { + "type": "SPECIES", + "id": "NETHER_BURROWING", + "description": "a nether creature", + "footsteps": "slithering", + "flags": [ "DRACULIN_IMMUNE" ] + }, { "type": "SPECIES", "id": "NETHER_EMANATION", From d4ecb6532776130d427048a450fa4c56837badec Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 17 Jul 2024 23:06:02 -0500 Subject: [PATCH 06/28] Update tools/json_tools/generic_guns_validator.py --- tools/json_tools/generic_guns_validator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/json_tools/generic_guns_validator.py b/tools/json_tools/generic_guns_validator.py index 7afc4691e76ff..4bec77e145d14 100755 --- a/tools/json_tools/generic_guns_validator.py +++ b/tools/json_tools/generic_guns_validator.py @@ -25,7 +25,7 @@ 'chemical_spray', 'fishspear', 'flammable', - 'gene_sting_gun', + 'gene_sting_barb', 'm235', # Rocket 'metal_rail', 'nail', From b0281f6eca96f7ac23e1955c5a9ff2b372fb92cc Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 17 Jul 2024 23:07:34 -0500 Subject: [PATCH 07/28] Update generic_guns_validator.py --- tools/json_tools/generic_guns_validator.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/json_tools/generic_guns_validator.py b/tools/json_tools/generic_guns_validator.py index 4bec77e145d14..6cbd15d72c5b1 100755 --- a/tools/json_tools/generic_guns_validator.py +++ b/tools/json_tools/generic_guns_validator.py @@ -57,6 +57,7 @@ 'ksg-25', 'raging_judge', 'american_180', + 'gene_sting_gun', 'ppsh', 'af2011a1_38super', # Magazines From fee85168eb7d8620de2f44f71f9a1d15527e0489 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 17 Jul 2024 23:58:14 -0500 Subject: [PATCH 08/28] Update monster_gun.json --- data/json/monster_special_attacks/monster_gun.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json index 4a62386db879a..e1a50eb3faede 100644 --- a/data/json/monster_special_attacks/monster_gun.json +++ b/data/json/monster_special_attacks/monster_gun.json @@ -120,7 +120,7 @@ "RELOAD_AND_SHOOT" ], "skill": "pistol", - "ammo": [ "barb" ], + "ammo": [ "gene_sting" ], "clip_size": 1, "weight": "540 g", "volume": "750 ml", From c5adc308818454bb022603169133dda0269d64a6 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed, 17 Jul 2024 23:58:50 -0500 Subject: [PATCH 09/28] Update monster_gun.json --- data/json/monster_special_attacks/monster_gun.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json index e1a50eb3faede..ee55677e75fae 100644 --- a/data/json/monster_special_attacks/monster_gun.json +++ b/data/json/monster_special_attacks/monster_gun.json @@ -131,7 +131,7 @@ "range": 12, "dispersion": 100, "durability": 8, - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting_barb": 1 } } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting": 1 } } ], "melee_damage": { "bash": 2 } }, { From 40a7f2d5605b14c1a9b569473c1dd00e9639d099 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 18 Jul 2024 17:00:36 -0500 Subject: [PATCH 10/28] Update monster_gun.json --- data/json/monster_special_attacks/monster_gun.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json index ee55677e75fae..623b670121d51 100644 --- a/data/json/monster_special_attacks/monster_gun.json +++ b/data/json/monster_special_attacks/monster_gun.json @@ -109,7 +109,6 @@ "material": [ "hflesh" ], "flags": [ "PRIMITIVE_RANGED_WEAPON", - "GENE_STING", "PSEUDO", "NEVER_JAMS", "NONCONDUCTIVE", @@ -120,7 +119,7 @@ "RELOAD_AND_SHOOT" ], "skill": "pistol", - "ammo": [ "gene_sting" ], + "ammo": [ "gene_sting_barb" ], "clip_size": 1, "weight": "540 g", "volume": "750 ml", @@ -131,7 +130,7 @@ "range": 12, "dispersion": 100, "durability": 8, - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting": 1 } } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting_barb": 15 } } ], "melee_damage": { "bash": 2 } }, { From f8901893a9f25e15aa26cd1a857fab75a1a17221 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:32:47 -0500 Subject: [PATCH 11/28] fix --- data/json/items/ammo/barb.json | 2 +- data/json/monster_special_attacks/monster_gun.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/ammo/barb.json b/data/json/items/ammo/barb.json index 6212b75448dd0..09d6663768fc7 100644 --- a/data/json/items/ammo/barb.json +++ b/data/json/items/ammo/barb.json @@ -30,7 +30,7 @@ "material": [ "bone" ], "volume": "250 ml", "weight": "37 g", - "ammo_type": "barb", + "ammo_type": "gene_sting", "damage": { "damage_type": "stab", "amount": 5, "armor_penetration": 5 }, "dispersion": 120, "loudness": 0, diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json index 623b670121d51..f55684bc37684 100644 --- a/data/json/monster_special_attacks/monster_gun.json +++ b/data/json/monster_special_attacks/monster_gun.json @@ -119,7 +119,7 @@ "RELOAD_AND_SHOOT" ], "skill": "pistol", - "ammo": [ "gene_sting_barb" ], + "ammo": [ "gene_sting" ], "clip_size": 1, "weight": "540 g", "volume": "750 ml", From 5fded1d20986236ef63f99746e48b2ba9010b5fc Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 18 Jul 2024 21:46:13 -0500 Subject: [PATCH 12/28] Update data/json/monster_special_attacks/monster_gun.json --- data/json/monster_special_attacks/monster_gun.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json index f55684bc37684..0563ffe49df6a 100644 --- a/data/json/monster_special_attacks/monster_gun.json +++ b/data/json/monster_special_attacks/monster_gun.json @@ -130,7 +130,7 @@ "range": 12, "dispersion": 100, "durability": 8, - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting_barb": 15 } } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting": 15 } } ], "melee_damage": { "bash": 2 } }, { From 4c50ec2bde7c341215640504d9d9601a0e936f04 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 18 Jul 2024 21:52:13 -0500 Subject: [PATCH 13/28] Fixes --- data/json/monster_special_attacks/monster_gun.json | 2 +- data/json/monsters/nether.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json index 0563ffe49df6a..7ed795f6b87c0 100644 --- a/data/json/monster_special_attacks/monster_gun.json +++ b/data/json/monster_special_attacks/monster_gun.json @@ -130,7 +130,7 @@ "range": 12, "dispersion": 100, "durability": 8, - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting": 15 } } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting": 1 } } ], "melee_damage": { "bash": 2 } }, { diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json index be69728e081fb..034a757c20b4f 100644 --- a/data/json/monsters/nether.json +++ b/data/json/monsters/nether.json @@ -1474,6 +1474,7 @@ "melee_dice_sides": 5, "melee_damage": [ { "damage_type": "cut", "amount": 8 } ], "bleed_rate": 50, + "starting_ammo": { "gene_sting_barb": 100 }, "families": [ "prof_wp_netherium_abomination" ], "weakpoint_sets": [ "wps_netherium_abomination" ], "harvest": "exempt", @@ -1483,7 +1484,7 @@ "type": "gun", "cooldown": 2, "gun_type": "gene_sting_gun", - "ranges": [ [ 2, 24, "DEFAULT" ] ], + "ranges": [ [ 2, 18, "DEFAULT" ] ], "description": "The yugg launches a viscous barb!" } ], From e5b0aaeccfe15d5b0e5db708a2f445e2a2bc538a Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 18 Jul 2024 23:53:01 -0500 Subject: [PATCH 14/28] Fixes --- data/json/monster_special_attacks/monster_gun.json | 4 ++-- data/json/monster_special_attacks/spells.json | 3 +-- data/json/monsters/nether.json | 5 ++++- data/json/monsters/zed_fusion.json | 3 +++ 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json index 7ed795f6b87c0..684044ff700b3 100644 --- a/data/json/monster_special_attacks/monster_gun.json +++ b/data/json/monster_special_attacks/monster_gun.json @@ -104,7 +104,7 @@ "type": "GUN", "symbol": "%", "color": "red", - "name": { "str": "barb launching organ" }, + "name": { "str": "viscous barb launcher" }, "description": "A mutated organ capable of launching bony barbs at great speed.", "material": [ "hflesh" ], "flags": [ @@ -130,7 +130,7 @@ "range": 12, "dispersion": 100, "durability": 8, - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting": 1 } } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "gene_sting": 100 } } ], "melee_damage": { "bash": 2 } }, { diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json index 1c672121f4733..22f3d584287c1 100644 --- a/data/json/monster_special_attacks/spells.json +++ b/data/json/monster_special_attacks/spells.json @@ -598,8 +598,7 @@ "max_range": 24, "sound_description": "ssszziiipp", "damage_type": "biological", - "min_damage": 5, - "max_damage": 17, + "min_damage": 0, "extra_effects": [ { "id": "spell_gene_sting_selector" } ] }, { diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json index 034a757c20b4f..b61f86bbfb041 100644 --- a/data/json/monsters/nether.json +++ b/data/json/monsters/nether.json @@ -1482,8 +1482,11 @@ "special_attacks": [ { "type": "gun", - "cooldown": 2, + "cooldown": 5, "gun_type": "gene_sting_gun", + "ammo_type": "gene_sting_barb", + "no_ammo_sound": "SCREEE!!!!", + "require_targeting_player": false, "ranges": [ [ 2, 18, "DEFAULT" ] ], "description": "The yugg launches a viscous barb!" } diff --git a/data/json/monsters/zed_fusion.json b/data/json/monsters/zed_fusion.json index cbd173d2ee258..c19c819287109 100644 --- a/data/json/monsters/zed_fusion.json +++ b/data/json/monsters/zed_fusion.json @@ -277,6 +277,9 @@ "type": "gun", "cooldown": 2, "gun_type": "barb_launcher", + "ammo_type": "barb_paralysis", + "no_ammo_sound": "unch", + "require_targeting_player": false, "ranges": [ [ 2, 12, "DEFAULT" ] ], "description": "The impaler launches a barb!" }, From 84f4d96c5c8a3acde9890efb5710e2b545d71feb Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Fri, 19 Jul 2024 15:49:00 -0500 Subject: [PATCH 15/28] Update data/json/species.json --- data/json/species.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/species.json b/data/json/species.json index 1aa8d723b6c0e..70473c998d88e 100644 --- a/data/json/species.json +++ b/data/json/species.json @@ -64,7 +64,7 @@ "type": "SPECIES", "id": "NETHER_BURROWING", "description": "a nether creature", - "footsteps": "slithering", + "footsteps": "rustling", "flags": [ "DRACULIN_IMMUNE" ] }, { From 63a31e6745d735233848ff5f5ecd10f90236c12d Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 21 Jul 2024 00:06:13 -0500 Subject: [PATCH 16/28] Damage type --- data/json/damage_types.json | 45 ++++++++++++++++++++++++++++++++++ data/json/items/ammo/barb.json | 2 +- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/data/json/damage_types.json b/data/json/damage_types.json index 630175ffd8da3..d4d40f5be26a4 100644 --- a/data/json/damage_types.json +++ b/data/json/damage_types.json @@ -140,6 +140,51 @@ "melee_combat_info": { "order": 600, "show_type": false }, "ablative_info": { "order": 600, "show_type": false } }, + { + "id": "genetic_damage_pierce", + "type": "damage_type", + "physical": true, + "edged": true, + "melee_only": true, + "magic_color": "light_green", + "name": "genetic pierce", + "skill": "stabbing", + "derived_from": [ "stab", 1 ], + "immune_flags": { "character": [ "STAB_IMMUNE" ] }, + "ondamage_eocs": [ "EOC_random_mutate" ] + }, + { + "id": "genetic_damage_pierce", + "type": "damage_info_order", + "info_display": "detailed", + "verb": "shocking", + "bionic_info": { "order": 601, "show_type": true }, + "protection_info": { "order": 701, "show_type": true }, + "pet_prot_info": { "order": 701, "show_type": false }, + "melee_combat_info": { "order": 601, "show_type": false }, + "ablative_info": { "order": 601, "show_type": false } + }, + { + "id": "genetic_damage_ballistic", + "type": "damage_type", + "physical": true, + "magic_color": "light_green", + "name": "genetic ballistic", + "derived_from": [ "bullet", 1 ], + "immune_flags": { "character": [ "BULLET_IMMUNE" ] }, + "ondamage_eocs": [ "EOC_random_mutate" ] + }, + { + "id": "genetic_damage_ballistic", + "type": "damage_info_order", + "info_display": "detailed", + "verb": "shocking", + "bionic_info": { "order": 601, "show_type": true }, + "protection_info": { "order": 701, "show_type": true }, + "pet_prot_info": { "order": 701, "show_type": false }, + "melee_combat_info": { "order": 601, "show_type": false }, + "ablative_info": { "order": 601, "show_type": false } + }, { "//": "e.g. fire, plasma", "id": "heat", diff --git a/data/json/items/ammo/barb.json b/data/json/items/ammo/barb.json index 09d6663768fc7..a589649573e5e 100644 --- a/data/json/items/ammo/barb.json +++ b/data/json/items/ammo/barb.json @@ -31,7 +31,7 @@ "volume": "250 ml", "weight": "37 g", "ammo_type": "gene_sting", - "damage": { "damage_type": "stab", "amount": 5, "armor_penetration": 5 }, + "damage": { "damage_type": "genetic_damage_ballistic", "amount": 5, "armor_penetration": 5 }, "dispersion": 120, "loudness": 0, "count": 10, From 4f693b4acdbbe1d64ebac249207b3ee1015adebe Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 21 Jul 2024 00:12:04 -0500 Subject: [PATCH 17/28] Update spells.json --- data/json/monster_special_attacks/spells.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json index 22f3d584287c1..b4eb0ed34219a 100644 --- a/data/json/monster_special_attacks/spells.json +++ b/data/json/monster_special_attacks/spells.json @@ -617,7 +617,7 @@ { "type": "effect_on_condition", "id": "EOC_random_mutate", - "condition": "u_is_character", + "condition": { "and": [ { "u_is_character" }, { "math": [ "_damage_taken", ">", "0" ] } ] }, "effect": [ { "set_string_var": "", "target_var": { "context_val": "dart_mutation_category" }, "parse_tags": true }, { "u_mutate_category": { "context_val": "dart_mutation_category" }, "use_vitamins": false } From d443697c11dce61293e27c63e83cd85d7455fdac Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 21 Jul 2024 19:40:30 -0500 Subject: [PATCH 18/28] Update spells.json --- data/json/monster_special_attacks/spells.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json index b4eb0ed34219a..3c3b116188c17 100644 --- a/data/json/monster_special_attacks/spells.json +++ b/data/json/monster_special_attacks/spells.json @@ -617,7 +617,7 @@ { "type": "effect_on_condition", "id": "EOC_random_mutate", - "condition": { "and": [ { "u_is_character" }, { "math": [ "_damage_taken", ">", "0" ] } ] }, + "condition": { "u_is_npc" }, "effect": [ { "set_string_var": "", "target_var": { "context_val": "dart_mutation_category" }, "parse_tags": true }, { "u_mutate_category": { "context_val": "dart_mutation_category" }, "use_vitamins": false } From 71ad208587553cb5e6135a81cf39ee1721d9076f Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 21 Jul 2024 19:59:10 -0500 Subject: [PATCH 19/28] Update spells.json --- data/json/monster_special_attacks/spells.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json index 3c3b116188c17..0d11d947ac849 100644 --- a/data/json/monster_special_attacks/spells.json +++ b/data/json/monster_special_attacks/spells.json @@ -617,7 +617,7 @@ { "type": "effect_on_condition", "id": "EOC_random_mutate", - "condition": { "u_is_npc" }, + "condition": "u_is_npc", "effect": [ { "set_string_var": "", "target_var": { "context_val": "dart_mutation_category" }, "parse_tags": true }, { "u_mutate_category": { "context_val": "dart_mutation_category" }, "use_vitamins": false } From 417b8f1f7e78f9a1b3dd0d143e24d7846d9a95d4 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 21 Jul 2024 22:12:47 -0500 Subject: [PATCH 20/28] It works! --- data/json/monster_special_attacks/spells.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json index 0d11d947ac849..55f9524ad9b24 100644 --- a/data/json/monster_special_attacks/spells.json +++ b/data/json/monster_special_attacks/spells.json @@ -617,10 +617,10 @@ { "type": "effect_on_condition", "id": "EOC_random_mutate", - "condition": "u_is_npc", + "condition": { "and": [ { "math": [ "_damage_taken", ">", "0" ] }, "u_is_npc" ] }, "effect": [ { "set_string_var": "", "target_var": { "context_val": "dart_mutation_category" }, "parse_tags": true }, - { "u_mutate_category": { "context_val": "dart_mutation_category" }, "use_vitamins": false } + { "npc_mutate_category": { "context_val": "dart_mutation_category" }, "use_vitamins": false } ] }, { From e0c700ffabbaee1728453ec80b44689a3acdb39b Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 21 Jul 2024 23:42:48 -0500 Subject: [PATCH 21/28] Apply suggestions from code review --- data/json/items/ammo/barb.json | 4 ++++ data/json/monster_special_attacks/monster_gun.json | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/data/json/items/ammo/barb.json b/data/json/items/ammo/barb.json index a589649573e5e..4622a1eea68ca 100644 --- a/data/json/items/ammo/barb.json +++ b/data/json/items/ammo/barb.json @@ -37,6 +37,10 @@ "count": 10, "show_stats": true, "effects": [ "GENE_STING" ], + "grip": "bad", + "length": "hand", + "surface": "pierce", + "balance": "good" "melee_damage": { "bash": 6, "cut": 2 } } ] diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json index 684044ff700b3..87db766ae1563 100644 --- a/data/json/monster_special_attacks/monster_gun.json +++ b/data/json/monster_special_attacks/monster_gun.json @@ -124,7 +124,6 @@ "weight": "540 g", "volume": "750 ml", "longest_side": "25 cm", - "to_hit": 1, "reload_noise_volume": 2, "loudness": 2, "range": 12, From a2c26e3c9d01fad11c15ac8d49ca156b46012e06 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 22 Jul 2024 00:35:46 -0500 Subject: [PATCH 22/28] Update data/json/items/ammo/barb.json --- data/json/items/ammo/barb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/barb.json b/data/json/items/ammo/barb.json index 4622a1eea68ca..e490d074e4ce4 100644 --- a/data/json/items/ammo/barb.json +++ b/data/json/items/ammo/barb.json @@ -40,7 +40,7 @@ "grip": "bad", "length": "hand", "surface": "pierce", - "balance": "good" + "balance": "good", "melee_damage": { "bash": 6, "cut": 2 } } ] From ba89ee2d8f8fab626551a26b0813f762bc27341e Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:25:54 -0500 Subject: [PATCH 23/28] Update data/json/items/ammo/barb.json --- data/json/items/ammo/barb.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/json/items/ammo/barb.json b/data/json/items/ammo/barb.json index e490d074e4ce4..c4adc8c866c41 100644 --- a/data/json/items/ammo/barb.json +++ b/data/json/items/ammo/barb.json @@ -37,9 +37,6 @@ "count": 10, "show_stats": true, "effects": [ "GENE_STING" ], - "grip": "bad", - "length": "hand", - "surface": "pierce", "balance": "good", "melee_damage": { "bash": 6, "cut": 2 } } From 186fbec110465e385a3d6f4f5735204d08ec620d Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 22 Jul 2024 19:11:00 -0500 Subject: [PATCH 24/28] Update data/json/items/ammo/barb.json --- data/json/items/ammo/barb.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/ammo/barb.json b/data/json/items/ammo/barb.json index c4adc8c866c41..a589649573e5e 100644 --- a/data/json/items/ammo/barb.json +++ b/data/json/items/ammo/barb.json @@ -37,7 +37,6 @@ "count": 10, "show_stats": true, "effects": [ "GENE_STING" ], - "balance": "good", "melee_damage": { "bash": 6, "cut": 2 } } ] From d2f6c12646245fceb3b8cf86c3c866e2358389df Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 23 Jul 2024 00:50:47 -0500 Subject: [PATCH 25/28] Update data/json/items/ammo/barb.json --- data/json/items/ammo/barb.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/barb.json b/data/json/items/ammo/barb.json index a589649573e5e..70197c3852115 100644 --- a/data/json/items/ammo/barb.json +++ b/data/json/items/ammo/barb.json @@ -29,7 +29,7 @@ "description": "Tiny droplets of cyan venom trickle out of the sponge-like tissue of this sharp barb.", "material": [ "bone" ], "volume": "250 ml", - "weight": "37 g", + "weight": "30 g", "ammo_type": "gene_sting", "damage": { "damage_type": "genetic_damage_ballistic", "amount": 5, "armor_penetration": 5 }, "dispersion": 120, From dbbf84155d75ae02ca104fe2d2889f827c09fbb8 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 23 Jul 2024 00:51:26 -0500 Subject: [PATCH 26/28] Update data/json/items/ammo/barb.json --- data/json/items/ammo/barb.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/ammo/barb.json b/data/json/items/ammo/barb.json index 70197c3852115..7111324d3dc1b 100644 --- a/data/json/items/ammo/barb.json +++ b/data/json/items/ammo/barb.json @@ -36,7 +36,6 @@ "loudness": 0, "count": 10, "show_stats": true, - "effects": [ "GENE_STING" ], "melee_damage": { "bash": 6, "cut": 2 } } ] From d3e9f9c52be17f75521d8652306f077582cb2293 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 23 Jul 2024 00:51:59 -0500 Subject: [PATCH 27/28] Update data/json/ammo_effects.json --- data/json/ammo_effects.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json index ce41077a3c2d6..82c3eccf89c7e 100644 --- a/data/json/ammo_effects.json +++ b/data/json/ammo_effects.json @@ -368,11 +368,6 @@ "type": "ammo_effect", "explosion": { "power": 7980, "shrapnel": { "casing_mass": 8725, "fragment_mass": 0.5 } } }, - { - "id": "GENE_STING", - "type": "ammo_effect", - "spell_data": { "id": "spell_gene_sting" } - }, { "id": "FLASHBANG", "type": "ammo_effect", From 3dd289b9f06336ad5ad8e2927b5cd033c1df7a73 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 23 Jul 2024 19:08:34 -0500 Subject: [PATCH 28/28] Update junk_dps.json --- data/mods/TEST_DATA/expected_dps_data/junk_dps.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/TEST_DATA/expected_dps_data/junk_dps.json b/data/mods/TEST_DATA/expected_dps_data/junk_dps.json index 2b376ccbdb7f2..4877118bc7615 100644 --- a/data/mods/TEST_DATA/expected_dps_data/junk_dps.json +++ b/data/mods/TEST_DATA/expected_dps_data/junk_dps.json @@ -77,6 +77,7 @@ "wizard_cane_on": 7.86, "modern_handguard": 7.94, "barb_paralysis": 8.0, + "gene_sting_barb": 6.37, "nitrogen_membrane_filter": 8.04, "pipe": 8.09, "sculpture_clay": 8.11,