From cf2cf727765393146733b32417491d617a64cd79 Mon Sep 17 00:00:00 2001 From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com> Date: Fri, 23 Feb 2024 11:18:08 -0500 Subject: [PATCH 01/11] Update zombie_anatomy.json Add snippets for tainted arm, tainted leg, and tainted human skull --- data/json/snippets/zombie_anatomy.json | 66 ++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/data/json/snippets/zombie_anatomy.json b/data/json/snippets/zombie_anatomy.json index 824fd2b54f616..c0d207270d97f 100644 --- a/data/json/snippets/zombie_anatomy.json +++ b/data/json/snippets/zombie_anatomy.json @@ -25,6 +25,72 @@ } ] }, + { + "type": "snippet", + "category": "skull_human_tainted_desc", + "text": [ + { + "id": "skull_human_tainted_1", + "text": "The stained skull of what was once a human being. It is rotted and noticeably warped from its living form." + }, + { + "id": "skull_human_tainted_2", + "text": "The stained skull of a former human. Whatever turned their flesh to walking in death, it left its mark on their bones." + }, + { + "id": "skull_human_tainted_3", + "text": "A rotted skull from a human zombie. It feels more flexible than it should, like stiff leather, no longer natural bone." + }, + { + "id": "skull_human_tainted_4", + "text": "The brain has ossified inside this tainted skull. It doesn't feel noticeably heavier and you surmise that the brain-turned-bone must be deeply porous or hollow itself" + }, + { + "id": "skull_human_tainted_5", + "text": "This pitted human skull is filled with teeth, few of them where they should be. You can see them growing in the hollows that have developed, their roots grown long and winding, more like those of a tree." + }, + { + "id": "skull_human_tainted_6", + "text": "The teeth of this lopsided human skull have melded together like hot wax and joined with the maxilla. The eye sockets are drooping and canted to the side as if shaped while soft. Most of the suture joints of the cranium are fused over with thick lines of growth as if soldered together with bone." + } + ] + }, + { + "type": "snippet", + "category": "arm_zed_desc", + "text": [ + { + "id": "arm_zed_1", + "text": "A rotted and then shredded arm. Not much use unless you want to scrape the rancid meat from the bones." + }, + { + "id": "arm_zed_2", + "text": "Little tainted meat remains on whatever limb bones these were. It still bends at the joint but doesn't look to be moving on its own anymore." + }, + { + "id": "arm_zed_3", + "text": "This jaundiced zombie's arm still bears a full sleeve tattoo. Quality work from what you can tell through all the rot." + } + ] + }, + { + "type": "snippet", + "category": "leg_zed_desc", + "text": [ + { + "id": "leg_zed_1", + "text": "What's left of some zombie's limb. Most likely a leg based on the proportions. Though it's rotted, there is quite a bit of meat still on it." + }, + { + "id": "leg_zed_2", + "text": "You think this decaying severed limb ends in a foot. It's actually hard to tell after the hell it's been through." + }, + { + "id": "leg_zed_3", + "text": "A fat zombie haunch. It doesn't look tasty but the shape is undeniably close to a large fried chicken leg. The skin is even the right texture, though for the wrong reasons." + } + ] + }, { "type": "snippet", "category": "", From 99edf3890f949550c5fe0d988faad414fcddb7ec Mon Sep 17 00:00:00 2001 From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com> Date: Fri, 23 Feb 2024 12:19:49 -0500 Subject: [PATCH 02/11] Adjust harvest entries -Created a new harvest group and description group for headless zombies and assigned them. The generic version includes a skull item now. Several of the generic snippets directly reference a head, brain, or teeth. -Created a new harvest group for fusion zeds to butcher for more than one skull. -Added bones, marrow, and sinew to flesh golem and jabberwock harvests. Also added a chance for several skulls to jabberwock. --- data/json/harvest.json | 42 ++++++++++++++++++++++++++ data/json/monsters/zed_fusion.json | 4 +-- data/json/monsters/zed_misc.json | 6 ++-- data/json/snippets/zombie_anatomy.json | 35 +++++++++++++++++++++ 4 files changed, 82 insertions(+), 5 deletions(-) diff --git a/data/json/harvest.json b/data/json/harvest.json index 803016934721c..b3f9b36f7f3b5 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -1178,6 +1178,9 @@ "message": "You messily hack apart the hulking mass of fused, rancid flesh, taking note of anything that stands out.", "entries": [ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 }, + { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.01 }, + { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.1 }, { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.25 }, @@ -1189,7 +1192,15 @@ "type": "harvest", "message": "You messily hack apart the colossal mass of fused, rancid flesh, taking note of anything that stands out.", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 0, 3 ] }, + { "drop": "skull_moose_tusked", "type": "bone", "scale_num": [ 0, 1 ] }, + { "drop": "skull_cervine_spideer", "type": "bone", "scale_num": [ 0, 1 ] }, + { "drop": "skull_canis_triclopean", "type": "bone", "scale_num": [ 0, 1 ] }, + { "drop": "skull_rodent", "type": "bone", "scale_num": [ 0, 6 ] }, { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 }, + { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, + { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.1 }, { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.25 }, @@ -1553,6 +1564,37 @@ { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 } ] }, + { + "id": "zombie_humanoid_headless", + "//": "humanoid zombies without a skull", + "type": "harvest", + "message": "", + "entries": [ + { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 }, + { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, + { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 }, + { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, + { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 } + ] + }, + { + "id": "zombie_humanoid_multiple", + "//": "your bog standard humanoid zombie", + "type": "harvest", + "message": "", + "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 2, 5 ] }, + { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 }, + { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, + { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 }, + { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, + { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, + { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 } + ] + }, { "id": "zombie_animal", "//": "any zombie animal that does not drop leather", diff --git a/data/json/monsters/zed_fusion.json b/data/json/monsters/zed_fusion.json index 63b1eeaa169bd..5e24b80390214 100644 --- a/data/json/monsters/zed_fusion.json +++ b/data/json/monsters/zed_fusion.json @@ -21,7 +21,7 @@ "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], "dodge": 1, "families": [ "prof_intro_biology", "prof_physiology" ], - "harvest": "zombie_humanoid", + "harvest": "zombie_humanoid_multiple", "fear_triggers": [ "HURT", "FIRE" ], "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "POISON", "HUMAN" ], "armor": { "bash": 8, "electric": 2 } @@ -51,7 +51,7 @@ "melee_damage": [ { "damage_type": "cut", "amount": 0 } ], "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ], "vision_night": 3, - "harvest": "zombie_humanoid", + "harvest": "zombie_humanoid_multiple", "//grab": "All these arms to grab you with", "grab_strength": 50, "special_attacks": [ { "id": "grab", "cooldown": 7 }, { "id": "scratch" }, [ "ZOMBIE_FUSE", 80 ] ], diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index 528279c8bd78d..8a9dbbb3bca39 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -590,7 +590,7 @@ "vision_night": 0, "weakpoint_sets": [ "wps_humanoid_body_headless" ], "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ], - "harvest": "zombie_humanoid", + "harvest": "zombie_humanoid_headless", "grab_strength": 20, "special_attacks": [ { "id": "grab", "cooldown": 7 }, { "id": "scratch_humanoid" } ], "//4": "Removed Bite attack to reflect damage to mouth.", @@ -982,7 +982,7 @@ "vision_night": 4, "weakpoint_sets": [ "wps_humanoid_body_headless" ], "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ], - "harvest": "zombie_humanoid", + "harvest": "zombie_humanoid_headless", "grab_strength": 20, "special_attacks": [ { "id": "grab", "cooldown": 7 }, { "id": "scratch_humanoid" } ], "//3": "Removed Bite as this creature does not have a 'mouth'.", @@ -1819,7 +1819,7 @@ "vision_night": 5, "weakpoint_sets": [ "wps_humanoid_body_headless" ], "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ], - "harvest": "zombie_humanoid", + "harvest": "zombie_humanoid_headless", "grab_strength": 35, "special_attacks": [ { "id": "grab", "cooldown": 6 }, diff --git a/data/json/snippets/zombie_anatomy.json b/data/json/snippets/zombie_anatomy.json index c0d207270d97f..f6a057e40a753 100644 --- a/data/json/snippets/zombie_anatomy.json +++ b/data/json/snippets/zombie_anatomy.json @@ -149,6 +149,32 @@ "As you cut into its stomach, the insane fragmentary remains of some creature it devoured, which appears to have melded with its own tissues, attempt to claw at your hand before you bludgeon them until they cease moving." ] }, + { + "type": "snippet", + "category": "", + "text": [ + "The majority of the digestive tract seems to have reshaped into a singular stomach.", + "Some organs have atrophied or outright dissolved entirely.", + "The heart is overtaken by a mass of fistulas and other growths.", + "The thing's innards resemble one giant tumor more than the body of a human being.", + "The thing's feet are entirely calloused and the smaller toes are completely vestigal, simply a bump with a dead nail on them.", + "This person had a tattoo on their arm - said tattoo has reappeared in multiple spots along the inner tissues and the walls of organs.", + "While its individual fingers appear to be losing their dexterity, the zombie's flexor muscles are tense and swollen.", + "This person had an artificial hip, but it's completely overgrown with bone now.", + "Organs in the lower abdomen, mainly the kidneys and the reproductive organs, are absent.", + "The heart makes an odd, swallowing sound on occasion as you work around it.", + "Inside the chest is some unfamiliar organ, a frankenstein of nearby tissues and black veins.", + "Inside the chest is some unfamiliar organ, fatty and wrinkled like brain tissue.", + "Your search nets you no explanation as to how the creature's black blood still circulates through it, and you come to the disturbing conclusion it moves on its own.", + "You find a clump of malformed tissue leading deeper inwards, at the center of which is a bullet.", + "Its tissue has significant trouble separating from the bone in some spots.", + "The skin is loose on the muscle in some places and melded with it in others.", + "The thing's innards churn slightly even as you dig through them.", + "As you finish up, you notice your earliest cuts seem to be the tiniest bit smaller.", + "To your \"delight,\" you find a tapeworm in its gut, turgid but seemingly dead.", + "As you cut into its stomach, the insane fragmentary remains of some creature it devoured, which appears to have melded with its own tissues, attempt to claw at your hand before you bludgeon them until they cease moving." + ] + }, { "type": "snippet", "category": "", @@ -362,6 +388,15 @@ " " ] }, + { + "type": "snippet", + "category": "", + "text": [ + "", + "", + " " + ] + }, { "type": "snippet", "category": "", From 5c71789d24c9ab39ff64ec2e2685a70a66d0b499 Mon Sep 17 00:00:00 2001 From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com> Date: Sat, 24 Feb 2024 01:37:47 -0500 Subject: [PATCH 03/11] Boomers Leave Filthy Clothes This is rough and throwing an error (invalid alpha talker), but working. Death functions call new spells which call existing boomer death effects and a new EoC that places filthy clothes from the default zombie death drops item group. --- .../monster_deaths.json | 91 ++++++++++++++++++- data/json/monsterdrops/zombie.json | 3 - data/json/monsters/fungus_zombie.json | 6 +- data/json/monsters/zed_explosive.json | 16 ++-- data/json/monsters/zed_fusion.json | 2 +- 5 files changed, 100 insertions(+), 18 deletions(-) diff --git a/data/json/monster_special_attacks/monster_deaths.json b/data/json/monster_special_attacks/monster_deaths.json index 52193d5adf5db..6b21c91bfea3f 100644 --- a/data/json/monster_special_attacks/monster_deaths.json +++ b/data/json/monster_special_attacks/monster_deaths.json @@ -26,12 +26,28 @@ "shape": "blast", "effect": "upgrade" }, + { + "id": "boomer_clothes", + "type": "SPELL", + "name": { "str": "Boomer Clothes" }, + "description": "Triggers EoC to drop filthy clothing.", + "shape": "blast", + "valid_targets": [ "ground", "self" ], + "flags": [ "SILENT", "NO_EXPLOSION_SFX" ], + "effect": "effect_on_condition", + "effect_str": "EOC_BOOMER_CLOTHING" + }, + { + "type": "effect_on_condition", + "id": "EOC_BOOMER_CLOTHING", + "effect": [ { "map_spawn_item": "default_zombie_death_drops", "use_item_group": true, "flags": [ "FILTHY" ] } ] + }, { "id": "necro_boomer_death", "type": "SPELL", "name": { "str": "Necro Boomer Death" }, "description": "Revives and then upgrades zombies in a large area.", - "valid_targets": [ "ground", "ally" ], + "valid_targets": [ "ground", "ally", "self" ], "shape": "blast", "effect": "noise", "flags": [ "NO_EXPLOSION_SFX" ], @@ -40,7 +56,11 @@ "sound_type": "combat", "sound_id": "explosion", "sound_variant": "small", - "extra_effects": [ { "id": "necro_boomer_revive", "hit_self": true }, { "id": "necro_boomer_upgrade", "hit_self": true } ] + "extra_effects": [ + { "id": "necro_boomer_revive", "hit_self": true }, + { "id": "necro_boomer_upgrade", "hit_self": true }, + { "id": "boomer_clothes", "hit_self": true } + ] }, { "id": "death_guilt", @@ -244,6 +264,17 @@ "effect_str": "emit_toxic_blast", "extra_effects": [ { "id": "death_explosion", "hit_self": true } ] }, + { + "id": "death_gas_clothes", + "type": "SPELL", + "name": { "str": "Gas Explosion With Clothes" }, + "description": "Causes a small explosion of toxic gas and leave clothing.", + "flags": [ "NO_EXPLOSION_SFX" ], + "valid_targets": [ "self" ], + "effect": "noise", + "shape": "blast", + "extra_effects": [ { "id": "death_gas", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] + }, { "id": "death_smokeburst", "type": "SPELL", @@ -268,6 +299,17 @@ "effect_str": "emit_tear_gas_blast", "extra_effects": [ { "id": "death_explosion", "hit_self": true } ] }, + { + "id": "death_tear_boomer", + "type": "SPELL", + "name": { "str": "Teargas Boomer Death" }, + "description": "Calls a small explosion of teargas and boomer clothes.", + "flags": [ "NO_EXPLOSION_SFX" ], + "valid_targets": [ "self" ], + "effect": "noise", + "shape": "blast", + "extra_effects": [ { "id": "death_tearburst", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] + }, { "id": "death_relax_gas", "type": "SPELL", @@ -280,6 +322,17 @@ "effect_str": "emit_relax_gas_blast", "extra_effects": [ { "id": "death_explosion", "hit_self": true } ] }, + { + "id": "death_relax_boomer", + "type": "SPELL", + "name": { "str": "Relaxation Gas Boomer Death" }, + "description": "Calls a small explosion of relaxation gas and boomer clothes.", + "flags": [ "NO_EXPLOSION_SFX" ], + "valid_targets": [ "self" ], + "shape": "blast", + "effect": "noise", + "extra_effects": [ { "id": "death_relax_gas", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] + }, { "id": "death_fungalburst", "type": "SPELL", @@ -293,6 +346,17 @@ "effect_str": "emit_fungal_blast", "extra_effects": [ { "id": "death_explosion", "hit_self": true } ] }, + { + "id": "death_fungalburst_clothes", + "type": "SPELL", + "name": { "str": "Fungal Explosion with Clothes" }, + "description": "Causes a small explosion of fungus and leaves boomer clothes.", + "valid_targets": [ "self" ], + "flags": [ "NO_EXPLOSION_SFX" ], + "shape": "blast", + "effect": "noise", + "extra_effects": [ { "id": "death_fungalburst", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] + }, { "id": "death_pouf", "type": "SPELL", @@ -324,6 +388,17 @@ "shape": "blast", "extra_effects": [ { "id": "death_pouf", "hit_self": true } ] }, + { + "id": "death_fungus_boomer", + "type": "SPELL", + "name": { "str": "Fungal Boomer Death" }, + "description": "Calls death fungus and boomer clothes.", + "valid_targets": [ "self" ], + "flags": [ "SILENT", "NO_EXPLOSION_SFX" ], + "shape": "blast", + "effect": "noise", + "extra_effects": [ { "id": "death_fungus", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] + }, { "id": "death_darkman", "type": "SPELL", @@ -387,6 +462,16 @@ { "id": "death_conflagration", "hit_self": true } ] }, + { + "id": "death_fire_boomer", + "type": "SPELL", + "name": { "str": "Gasoline Boomer Death" }, + "valid_targets": [ "self" ], + "description": "Calls Conflagration Death and Boomer Clothes", + "effect": "noise", + "shape": "blast", + "extra_effects": [ { "id": "death_conflagration" }, { "id": "boomer_clothes" } ] + }, { "id": "death_conflagration", "type": "SPELL", @@ -512,7 +597,7 @@ "max_field_intensity": 2, "min_field_intensity": 2, "affected_body_parts": [ "eyes" ], - "extra_effects": [ { "id": "death_explosion", "hit_self": true } ] + "extra_effects": [ { "id": "death_explosion", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] }, { "id": "death_boomer_glow", diff --git a/data/json/monsterdrops/zombie.json b/data/json/monsterdrops/zombie.json index 6b2c3ecd8907d..435f165e74a05 100644 --- a/data/json/monsterdrops/zombie.json +++ b/data/json/monsterdrops/zombie.json @@ -136,7 +136,6 @@ "id": "zed_dust", "subtype": "collection", "entries": [ - { "group": "default_zombie_death_drops", "prob": 100, "damage": [ 2, 5 ] }, { "item": "corpse_ash", "count": [ 25, 35 ] }, { "item": "skull_human_tainted", "prob": 40, "damage": [ 1, 3 ] }, { "item": "bone_tainted", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 3 ] } @@ -147,7 +146,6 @@ "id": "explode_zed", "subtype": "collection", "entries": [ - { "group": "default_zombie_death_drops", "prob": 100, "damage": [ 2, 4 ] }, { "item": "skull_human_tainted", "prob": 60, "damage": [ 2, 3 ] }, { "item": "arm_zed", "prob": 30, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, { "item": "leg_zed", "prob": 30, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, @@ -165,7 +163,6 @@ "id": "explode_zed_fungal", "subtype": "collection", "entries": [ - { "group": "default_zombie_death_drops", "prob": 100, "damage": [ 2, 4 ] }, { "item": "skull_human_tainted", "prob": 60, "damage": [ 2, 3 ] }, { "item": "arm_zed", "prob": 20, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, { "item": "leg_zed", "prob": 20, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, diff --git a/data/json/monsters/fungus_zombie.json b/data/json/monsters/fungus_zombie.json index 28ede14e21c47..34aedb8562a71 100644 --- a/data/json/monsters/fungus_zombie.json +++ b/data/json/monsters/fungus_zombie.json @@ -65,7 +65,7 @@ "emit_fields": [ { "emit_id": "emit_fungal_leak", "delay": "1 s" } ], "special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ], "death_drops": "explode_zed_fungal", - "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungalburst", "hit_self": true } }, + "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungalburst_clothes", "hit_self": true } }, "flags": [ "SEES", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "FILTHY" ], "armor": { "electric": 4 } }, @@ -102,7 +102,7 @@ "emit_fields": [ { "emit_id": "emit_fungal_haze_plume", "delay": "1 s" } ], "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "scratch", 15 ] ], "death_drops": "explode_zed_fungal", - "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } }, + "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus_boomer", "hit_self": true } }, "flags": [ "SEES", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "HARDTOSHOOT", "NO_BREATHE", "PUSH_MON", "FILTHY" ], "armor": { "heat": 5, "electric": 5 } }, @@ -252,7 +252,7 @@ "harvest": "zombie_humanoid", "special_attacks": [ [ "FUNGUS", 100 ], [ "BOOMER", 20 ], [ "scratch", 20 ] ], "death_drops": "explode_zed_fungal", - "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } }, + "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus_boomer", "hit_self": true } }, "burn_into": "mon_zombie_scorched", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "PUSH_MON", "FILTHY" ], "armor": { "bash": 2, "electric": 4 } diff --git a/data/json/monsters/zed_explosive.json b/data/json/monsters/zed_explosive.json index f7616056facb5..ad8ebcb5141cf 100644 --- a/data/json/monsters/zed_explosive.json +++ b/data/json/monsters/zed_explosive.json @@ -132,11 +132,7 @@ "grab_strength": 30, "special_attacks": [ { "id": "grab" }, { "id": "scratch_humanoid" }, { "id": "bite_humanoid" } ], "death_drops": "explode_zed", - "death_function": { - "effect": { "id": "death_conflagration", "hit_self": true }, - "message": "The %s explodes!", - "corpse_type": "NO_CORPSE" - }, + "death_function": { "effect": { "id": "death_fire_boomer", "hit_self": true }, "message": "The %s explodes!", "corpse_type": "NO_CORPSE" }, "flags": [ "SEES", "HEARS", @@ -183,7 +179,7 @@ "emit_fields": [ { "emit_id": "emit_toxic_leak", "delay": "1 s" } ], "special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ], "death_drops": "explode_zed", - "death_function": { "message": "The %s explodes!", "effect": { "id": "death_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" }, + "death_function": { "message": "The %s explodes!", "effect": { "id": "death_gas_clothes", "hit_self": true }, "corpse_type": "NO_CORPSE" }, "fungalize_into": "mon_zombie_gasbag_fungus", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ], "armor": { "electric": 1 } @@ -217,7 +213,11 @@ "emit_fields": [ { "emit_id": "emit_relax_gas_leak", "delay": "1 s" } ], "special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ], "death_drops": "explode_zed", - "death_function": { "message": "The %s explodes!", "effect": { "id": "death_relax_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" }, + "death_function": { + "message": "The %s explodes!", + "effect": { "id": "death_relax_boomer", "hit_self": true }, + "corpse_type": "NO_CORPSE" + }, "fungalize_into": "mon_zombie_gasbag_fungus", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "NO_BREATHE", "REVIVES", "FILTHY" ], "armor": { "electric": 1 } @@ -251,7 +251,7 @@ "emit_fields": [ { "emit_id": "emit_tear_gas_leak", "delay": "1 s" } ], "special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ], "death_drops": "explode_zed", - "death_function": { "message": "The %s explodes!", "effect": { "id": "death_tearburst", "hit_self": true }, "corpse_type": "NO_CORPSE" }, + "death_function": { "message": "The %s explodes!", "effect": { "id": "death_tear_boomer", "hit_self": true }, "corpse_type": "NO_CORPSE" }, "fungalize_into": "mon_zombie_gasbag_fungus", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "NO_BREATHE", "REVIVES", "FILTHY" ], "armor": { "electric": 1 } diff --git a/data/json/monsters/zed_fusion.json b/data/json/monsters/zed_fusion.json index 5e24b80390214..68ff3afaee4e7 100644 --- a/data/json/monsters/zed_fusion.json +++ b/data/json/monsters/zed_fusion.json @@ -205,7 +205,7 @@ "vision_night": 3, "harvest": "exempt", "special_attacks": [ [ "SUICIDE", 20 ] ], - "death_drops": { "subtype": "collection", "groups": [ "default_zombie_death_drops", "explode_gasbag" ] }, + "death_drops": "explode_gasbag", "upgrades": { "half_life": 24, "into": "mon_zombie_gasbag_crawler" }, "death_function": { "message": "The %s explodes!", "effect": { "id": "death_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" }, "flags": [ "SEES", "HEARS", "IMMOBILE", "WARM", "POISON", "NO_BREATHE", "FILTHY" ], From 999764b77c6c531af79a9725def0ebf45660a48a Mon Sep 17 00:00:00 2001 From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com> Date: Sat, 24 Feb 2024 17:46:26 -0500 Subject: [PATCH 04/11] Hook up snippets and clean up -Set the new snippets to be called by their respective items -Linting --- data/json/items/comestibles/mutagen.json | 2 ++ data/json/items/generic/skulls.json | 3 ++- .../monster_special_attacks/monster_deaths.json | 14 +++++++------- data/json/snippets/zombie_anatomy.json | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/data/json/items/comestibles/mutagen.json b/data/json/items/comestibles/mutagen.json index 6b34f607a9e80..dbfb32885115d 100644 --- a/data/json/items/comestibles/mutagen.json +++ b/data/json/items/comestibles/mutagen.json @@ -966,6 +966,7 @@ "name": { "str": "tainted limb" }, "description": "A rotted and then shredded arm. Not much use unless you want to scrape the meat from the bones.", "copy-from": "arm", + "snippet_category": "arm_zed_desc", "use_action": [ "POISON" ], "color": "red", "material": [ "flesh" ], @@ -978,6 +979,7 @@ "name": { "str": "tainted limb" }, "description": "What's left of some zombie's limb. Most likely a leg based on the proportions. Though it's rotted, there is quite a bit of meat still on it.", "copy-from": "leg", + "snippet_category": "leg_zed_desc", "use_action": [ "POISON" ], "color": "red", "material": [ "flesh" ], diff --git a/data/json/items/generic/skulls.json b/data/json/items/generic/skulls.json index b77820068a9a4..5e0af7b502d6a 100644 --- a/data/json/items/generic/skulls.json +++ b/data/json/items/generic/skulls.json @@ -27,7 +27,8 @@ "id": "skull_human_tainted", "name": { "str": "tainted human skull" }, "description": "The stained skull of what was once a human being. It is rotted and noticeably warped from its lively form. Carrying this around probably isn't going to win you any friends.", - "copy-from": "skull_abstract" + "copy-from": "skull_abstract", + "snippet_category": "skull_human_tainted_desc" }, { "type": "GENERIC", diff --git a/data/json/monster_special_attacks/monster_deaths.json b/data/json/monster_special_attacks/monster_deaths.json index 6b21c91bfea3f..dcbc672c654d1 100644 --- a/data/json/monster_special_attacks/monster_deaths.json +++ b/data/json/monster_special_attacks/monster_deaths.json @@ -32,7 +32,7 @@ "name": { "str": "Boomer Clothes" }, "description": "Triggers EoC to drop filthy clothing.", "shape": "blast", - "valid_targets": [ "ground", "self" ], + "valid_targets": [ "ground" ], "flags": [ "SILENT", "NO_EXPLOSION_SFX" ], "effect": "effect_on_condition", "effect_str": "EOC_BOOMER_CLOTHING" @@ -271,7 +271,7 @@ "description": "Causes a small explosion of toxic gas and leave clothing.", "flags": [ "NO_EXPLOSION_SFX" ], "valid_targets": [ "self" ], - "effect": "noise", + "effect": "noise", "shape": "blast", "extra_effects": [ { "id": "death_gas", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] }, @@ -306,7 +306,7 @@ "description": "Calls a small explosion of teargas and boomer clothes.", "flags": [ "NO_EXPLOSION_SFX" ], "valid_targets": [ "self" ], - "effect": "noise", + "effect": "noise", "shape": "blast", "extra_effects": [ { "id": "death_tearburst", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] }, @@ -330,7 +330,7 @@ "flags": [ "NO_EXPLOSION_SFX" ], "valid_targets": [ "self" ], "shape": "blast", - "effect": "noise", + "effect": "noise", "extra_effects": [ { "id": "death_relax_gas", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] }, { @@ -354,7 +354,7 @@ "valid_targets": [ "self" ], "flags": [ "NO_EXPLOSION_SFX" ], "shape": "blast", - "effect": "noise", + "effect": "noise", "extra_effects": [ { "id": "death_fungalburst", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] }, { @@ -396,7 +396,7 @@ "valid_targets": [ "self" ], "flags": [ "SILENT", "NO_EXPLOSION_SFX" ], "shape": "blast", - "effect": "noise", + "effect": "noise", "extra_effects": [ { "id": "death_fungus", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] }, { @@ -468,7 +468,7 @@ "name": { "str": "Gasoline Boomer Death" }, "valid_targets": [ "self" ], "description": "Calls Conflagration Death and Boomer Clothes", - "effect": "noise", + "effect": "noise", "shape": "blast", "extra_effects": [ { "id": "death_conflagration" }, { "id": "boomer_clothes" } ] }, diff --git a/data/json/snippets/zombie_anatomy.json b/data/json/snippets/zombie_anatomy.json index f6a057e40a753..9be5550fe29d8 100644 --- a/data/json/snippets/zombie_anatomy.json +++ b/data/json/snippets/zombie_anatomy.json @@ -43,7 +43,7 @@ }, { "id": "skull_human_tainted_4", - "text": "The brain has ossified inside this tainted skull. It doesn't feel noticeably heavier and you surmise that the brain-turned-bone must be deeply porous or hollow itself" + "text": "The brain has ossified inside this tainted skull. It doesn't feel noticeably heavier and you surmise that the brain-turned-bone must be deeply porous or hollow itself." }, { "id": "skull_human_tainted_5", From e12275bc8f4b8f74a3c8cf4e04963a41ad6d2cd5 Mon Sep 17 00:00:00 2001 From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com> Date: Sat, 24 Feb 2024 19:41:59 -0500 Subject: [PATCH 05/11] Extend death drops and clothes drops to missed creatures -Create a few new death drops -Create version of boomer clothes drop for the snotgobbler -Apply these to the following monsters: 1. Snotgobbler 2. Zombie Hollow 3. Unstable Raptor 4. Fungal Skeletal Zombie 5. Fungal Skeletal Brute 6. Fungal Juggernaut 7. All four sizes of Meat Cocoon --- .../monster_deaths.json | 39 +++++++++++++++++++ data/json/monsterdrops/zombie.json | 37 ++++++++++++++++++ data/json/monsters/fungus_zombie.json | 10 +++-- data/json/monsters/zed-winged.json | 1 + data/json/monsters/zed_amalgamation.json | 4 ++ data/json/monsters/zed_children.json | 8 +++- data/json/monsters/zed_misc.json | 1 + 7 files changed, 94 insertions(+), 6 deletions(-) diff --git a/data/json/monster_special_attacks/monster_deaths.json b/data/json/monster_special_attacks/monster_deaths.json index dcbc672c654d1..9621a9e7c5a3c 100644 --- a/data/json/monster_special_attacks/monster_deaths.json +++ b/data/json/monster_special_attacks/monster_deaths.json @@ -62,6 +62,22 @@ { "id": "boomer_clothes", "hit_self": true } ] }, + { + "id": "boomer_clothes_child", + "type": "SPELL", + "name": { "str": "Boomer Child Clothes" }, + "description": "Triggers EoC to drop filthy clothing.", + "shape": "blast", + "valid_targets": [ "ground" ], + "flags": [ "SILENT", "NO_EXPLOSION_SFX" ], + "effect": "effect_on_condition", + "effect_str": "EOC_BOOMER_CHILD_CLOTHING" + }, + { + "type": "effect_on_condition", + "id": "EOC_BOOMER_CHILD_CLOTHING", + "effect": [ { "map_spawn_item": "default_zombie_children_clothes", "use_item_group": true, "flags": [ "FILTHY" ] } ] + }, { "id": "death_guilt", "type": "SPELL", @@ -599,6 +615,29 @@ "affected_body_parts": [ "eyes" ], "extra_effects": [ { "id": "death_explosion", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] }, + { + "id": "death_boomer_child", + "type": "SPELL", + "name": { "str": "Boomer Child Death" }, + "description": "Vomitous explosion.", + "valid_targets": [ "ground", "hostile", "ally", "self" ], + "flags": [ "NO_EXPLOSION_SFX", "LIQUID" ], + "min_aoe": 1, + "max_aoe": 2, + "aoe_increment": 1, + "max_level": 1, + "min_duration": 2400, + "max_duration": 2400, + "shape": "blast", + "effect": "attack", + "effect_str": "boomered", + "field_chance": 1, + "field_id": "fd_bile", + "max_field_intensity": 2, + "min_field_intensity": 2, + "affected_body_parts": [ "eyes" ], + "extra_effects": [ { "id": "death_explosion", "hit_self": true }, { "id": "boomer_clothes_child", "hit_self": true } ] + }, { "id": "death_boomer_glow", "type": "SPELL", diff --git a/data/json/monsterdrops/zombie.json b/data/json/monsterdrops/zombie.json index 435f165e74a05..e236e210c06c4 100644 --- a/data/json/monsterdrops/zombie.json +++ b/data/json/monsterdrops/zombie.json @@ -141,6 +141,12 @@ { "item": "bone_tainted", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 3 ] } ] }, + { + "type": "item_group", + "id": "zed_skin", + "subtype": "collection", + "entries": [ { "item": "raw_tainted_leather", "count": [ 5, 12 ] } ] + }, { "type": "item_group", "id": "explode_zed", @@ -175,6 +181,23 @@ { "item": "sinew", "prob": 50, "damage": [ 2, 3 ], "count": [ 5, 10 ] } ] }, + { + "type": "item_group", + "id": "explode_zed_fungal_bone", + "subtype": "collection", + "entries": [ + { "item": "skull_human_tainted", "prob": 90, "damage": [ 2, 3 ] }, + { "item": "arm_zed", "prob": 20, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, + { "item": "leg_zed", "prob": 20, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, + { "item": "blood_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, + { "item": "meat_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, + { "item": "fat_tainted", "prob": 80, "damage": [ 2, 3 ], "count": [ 1, 5 ] }, + { "item": "bone_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 15, 25 ] }, + { "item": "tainted_marrow", "prob": 50, "damage": [ 2, 3 ], "count": [ 10, 15 ] }, + { "item": "veggy_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, + { "item": "sinew", "prob": 50, "damage": [ 2, 3 ], "count": [ 5, 10 ] } + ] + }, { "type": "item_group", "id": "explode_zed_beast", @@ -222,6 +245,20 @@ { "item": "sinew", "prob": 100, "damage": [ 2, 3 ], "count": [ 8, 15 ] } ] }, + { + "type": "item_group", + "id": "explode_innards_small", + "subtype": "collection", + "entries": [ + { "item": "blood_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 3, 5 ] }, + { "item": "meat_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 2, 5 ] }, + { "item": "fat_tainted", "prob": 80, "damage": [ 2, 3 ], "count": [ 1, 3 ] }, + { "item": "bone_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 1, 3 ] }, + { "item": "tainted_marrow", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, + { "item": "tainted_innards", "prob": 100, "damage": [ 2, 3 ], "count": [ 1, 3 ] }, + { "item": "sinew", "prob": 100, "damage": [ 2, 3 ], "count": [ 1, 3 ] } + ] + }, { "type": "item_group", "id": "explode_toad", diff --git a/data/json/monsters/fungus_zombie.json b/data/json/monsters/fungus_zombie.json index 34aedb8562a71..4e961e1e6bc63 100644 --- a/data/json/monsters/fungus_zombie.json +++ b/data/json/monsters/fungus_zombie.json @@ -124,7 +124,8 @@ }, "special_attacks": [ [ "FUNGUS", 200 ] ], "harvest": "moldy_bones", - "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } }, + "death_drops": "explode_zed_fungal_bone", + "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus_boomer", "hit_self": true } }, "armor": { "bash": 0, "electric": 5 } }, { @@ -145,7 +146,8 @@ "families": [ "prof_wp_skeleton" ] }, "harvest": "moldy_bones", - "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } } + "death_drops": "explode_zed_fungal_bone", + "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus_boomer", "hit_self": true } } }, { "id": "mon_skeleton_hulk_fungus", @@ -177,8 +179,8 @@ "vision_night": 5, "harvest": "big_mr_bones", "special_attacks": [ { "id": "smash", "throw_strength": 54 } ], - "death_drops": "mon_zombie_hulk_death_drops", - "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } }, + "death_drops": "explode_zed_fungal_bone", + "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus_boomer", "hit_self": true } }, "burn_into": "mon_zombie_fiend", "flags": [ "HEARS", "STUMBLES", "WARM", "BASHES", "DESTROYS", "POISON", "NO_BREATHE", "PUSH_MON", "PUSH_VEH", "FILTHY" ], "armor": { "bash": 20, "cut": 45, "bullet": 36, "electric": 8 } diff --git a/data/json/monsters/zed-winged.json b/data/json/monsters/zed-winged.json index d1338db320e8b..2beb26931dc94 100644 --- a/data/json/monsters/zed-winged.json +++ b/data/json/monsters/zed-winged.json @@ -206,6 +206,7 @@ "corpse_type": "NO_CORPSE", "message": "The %s explodes!" }, + "death_drops": "explode_innards_small", "upgrades": false }, { diff --git a/data/json/monsters/zed_amalgamation.json b/data/json/monsters/zed_amalgamation.json index c2e14b5ceb36f..9e472378ee483 100644 --- a/data/json/monsters/zed_amalgamation.json +++ b/data/json/monsters/zed_amalgamation.json @@ -9,6 +9,7 @@ "volume": "20 L", "weight": "20 kg", "upgrades": { "age_grow": 1, "into_group": "GROUP_COCOON_TINY" }, + "death_drops": "explode_innards_small", "death_function": { "message": "The %s explodes in a shower of gore!", "corpse_type": "NO_CORPSE", @@ -34,6 +35,7 @@ "hp": 100, "speed": 100, "upgrades": { "age_grow": 1, "into_group": "GROUP_COCOON_SMALL", "multiple_spawns": true, "spawn_range": 5 }, + "death_drops": "explode_innards_small", "death_function": { "message": "The %s explodes in a shower of gore!", "corpse_type": "NO_CORPSE", @@ -54,6 +56,7 @@ "weight": "200 kg", "hp": 200, "upgrades": { "age_grow": 1, "into_group": "GROUP_COCOON_MED_1", "multiple_spawns": true, "spawn_range": 5 }, + "death_drops": "explode_innards", "death_function": { "message": "The %s explodes in a shower of gore!", "corpse_type": "NO_CORPSE", @@ -72,6 +75,7 @@ "weight": "450 kg", "hp": 600, "upgrades": { "age_grow": 1, "into_group": "GROUP_COCOON_LARGE", "multiple_spawns": true, "spawn_range": 5 }, + "death_drops": "explode_innards", "death_function": { "message": "The %s explodes in a shower of gore!", "corpse_type": "NO_CORPSE", diff --git a/data/json/monsters/zed_children.json b/data/json/monsters/zed_children.json index e5205cbdfce46..8100e464829bf 100644 --- a/data/json/monsters/zed_children.json +++ b/data/json/monsters/zed_children.json @@ -181,8 +181,12 @@ "//grab": "Half as grabby as a base zombie", "grab_strength": 10, "special_attacks": [ { "id": "grab" } ], - "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_children_clothes", 100 ], [ "child_items_pockets", 65 ] ] }, - "death_function": { "effect": { "id": "death_boomer", "hit_self": true }, "message": "The %s explodes!", "corpse_type": "NO_CORPSE" }, + "death_drops": "explode_innards_small", + "death_function": { + "effect": { "id": "death_boomer_child", "hit_self": true }, + "message": "The %s explodes!", + "corpse_type": "NO_CORPSE" + }, "burn_into": "mon_zombie_child_scorched", "fungalize_into": "mon_zombie_child_fungus", "flags": [ "SEES", "HEARS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ], diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index 8a9dbbb3bca39..c90a3303a1401 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -1202,6 +1202,7 @@ "harvest": "zombie_meatslug", "grab_strength": 20, "special_attacks": [ { "id": "grab" }, { "id": "scratch_humanoid" }, { "id": "stretch_bite" }, { "id": "stretch_attack", "cooldown": 5 } ], + "death_drops": "zed_skin", "death_function": { "message": "The %s splits in two!", "corpse_type": "NO_CORPSE", From 2a7212f7c4909234451b8ec064409def0324842b Mon Sep 17 00:00:00 2001 From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com> Date: Sun, 25 Feb 2024 12:22:01 -0500 Subject: [PATCH 06/11] Revert Boomer Clothes Dirtying Attempts --- data/json/harvest.json | 2 +- data/json/items/comestibles/carnivore.json | 14 ++ .../monster_deaths.json | 130 +----------------- data/json/monsterdrops/zombie.json | 7 +- data/json/monsters/fungus_zombie.json | 12 +- data/json/monsters/zed_children.json | 9 +- data/json/monsters/zed_explosive.json | 16 +-- data/json/monsters/zed_fusion.json | 2 +- 8 files changed, 43 insertions(+), 149 deletions(-) diff --git a/data/json/harvest.json b/data/json/harvest.json index b3f9b36f7f3b5..3d9d4d5af4465 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -1581,7 +1581,7 @@ }, { "id": "zombie_humanoid_multiple", - "//": "your bog standard humanoid zombie", + "//": "multiple humanoid zombies fused together", "type": "harvest", "message": "", "entries": [ diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 9f2506461cd85..f8b209b674848 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -1673,6 +1673,20 @@ "description": "A carefully folded poisonous raw skin harvested from an unnatural creature. You can cure it for storage and tanning.", "price": 0 }, + { + "type": "COMESTIBLE", + "id": "raw_tainted_leather_scraps", + "copy-from": "raw_leather", + "name": { "str_sp": "tainted skin scraps" }, + "weight": "1 g", + "volume": "5 ml", + "spoils_in": "3 hours", + "calories": 3, + "use_action": [ "POISON" ], + "price_postapoc": 0, + "description": "Shredded scraps of raw skin from an unnatural creature. It can't have much use.", + "price": 0 + }, { "type": "COMESTIBLE", "id": "raw_hleather", diff --git a/data/json/monster_special_attacks/monster_deaths.json b/data/json/monster_special_attacks/monster_deaths.json index 9621a9e7c5a3c..52193d5adf5db 100644 --- a/data/json/monster_special_attacks/monster_deaths.json +++ b/data/json/monster_special_attacks/monster_deaths.json @@ -26,28 +26,12 @@ "shape": "blast", "effect": "upgrade" }, - { - "id": "boomer_clothes", - "type": "SPELL", - "name": { "str": "Boomer Clothes" }, - "description": "Triggers EoC to drop filthy clothing.", - "shape": "blast", - "valid_targets": [ "ground" ], - "flags": [ "SILENT", "NO_EXPLOSION_SFX" ], - "effect": "effect_on_condition", - "effect_str": "EOC_BOOMER_CLOTHING" - }, - { - "type": "effect_on_condition", - "id": "EOC_BOOMER_CLOTHING", - "effect": [ { "map_spawn_item": "default_zombie_death_drops", "use_item_group": true, "flags": [ "FILTHY" ] } ] - }, { "id": "necro_boomer_death", "type": "SPELL", "name": { "str": "Necro Boomer Death" }, "description": "Revives and then upgrades zombies in a large area.", - "valid_targets": [ "ground", "ally", "self" ], + "valid_targets": [ "ground", "ally" ], "shape": "blast", "effect": "noise", "flags": [ "NO_EXPLOSION_SFX" ], @@ -56,27 +40,7 @@ "sound_type": "combat", "sound_id": "explosion", "sound_variant": "small", - "extra_effects": [ - { "id": "necro_boomer_revive", "hit_self": true }, - { "id": "necro_boomer_upgrade", "hit_self": true }, - { "id": "boomer_clothes", "hit_self": true } - ] - }, - { - "id": "boomer_clothes_child", - "type": "SPELL", - "name": { "str": "Boomer Child Clothes" }, - "description": "Triggers EoC to drop filthy clothing.", - "shape": "blast", - "valid_targets": [ "ground" ], - "flags": [ "SILENT", "NO_EXPLOSION_SFX" ], - "effect": "effect_on_condition", - "effect_str": "EOC_BOOMER_CHILD_CLOTHING" - }, - { - "type": "effect_on_condition", - "id": "EOC_BOOMER_CHILD_CLOTHING", - "effect": [ { "map_spawn_item": "default_zombie_children_clothes", "use_item_group": true, "flags": [ "FILTHY" ] } ] + "extra_effects": [ { "id": "necro_boomer_revive", "hit_self": true }, { "id": "necro_boomer_upgrade", "hit_self": true } ] }, { "id": "death_guilt", @@ -280,17 +244,6 @@ "effect_str": "emit_toxic_blast", "extra_effects": [ { "id": "death_explosion", "hit_self": true } ] }, - { - "id": "death_gas_clothes", - "type": "SPELL", - "name": { "str": "Gas Explosion With Clothes" }, - "description": "Causes a small explosion of toxic gas and leave clothing.", - "flags": [ "NO_EXPLOSION_SFX" ], - "valid_targets": [ "self" ], - "effect": "noise", - "shape": "blast", - "extra_effects": [ { "id": "death_gas", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] - }, { "id": "death_smokeburst", "type": "SPELL", @@ -315,17 +268,6 @@ "effect_str": "emit_tear_gas_blast", "extra_effects": [ { "id": "death_explosion", "hit_self": true } ] }, - { - "id": "death_tear_boomer", - "type": "SPELL", - "name": { "str": "Teargas Boomer Death" }, - "description": "Calls a small explosion of teargas and boomer clothes.", - "flags": [ "NO_EXPLOSION_SFX" ], - "valid_targets": [ "self" ], - "effect": "noise", - "shape": "blast", - "extra_effects": [ { "id": "death_tearburst", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] - }, { "id": "death_relax_gas", "type": "SPELL", @@ -338,17 +280,6 @@ "effect_str": "emit_relax_gas_blast", "extra_effects": [ { "id": "death_explosion", "hit_self": true } ] }, - { - "id": "death_relax_boomer", - "type": "SPELL", - "name": { "str": "Relaxation Gas Boomer Death" }, - "description": "Calls a small explosion of relaxation gas and boomer clothes.", - "flags": [ "NO_EXPLOSION_SFX" ], - "valid_targets": [ "self" ], - "shape": "blast", - "effect": "noise", - "extra_effects": [ { "id": "death_relax_gas", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] - }, { "id": "death_fungalburst", "type": "SPELL", @@ -362,17 +293,6 @@ "effect_str": "emit_fungal_blast", "extra_effects": [ { "id": "death_explosion", "hit_self": true } ] }, - { - "id": "death_fungalburst_clothes", - "type": "SPELL", - "name": { "str": "Fungal Explosion with Clothes" }, - "description": "Causes a small explosion of fungus and leaves boomer clothes.", - "valid_targets": [ "self" ], - "flags": [ "NO_EXPLOSION_SFX" ], - "shape": "blast", - "effect": "noise", - "extra_effects": [ { "id": "death_fungalburst", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] - }, { "id": "death_pouf", "type": "SPELL", @@ -404,17 +324,6 @@ "shape": "blast", "extra_effects": [ { "id": "death_pouf", "hit_self": true } ] }, - { - "id": "death_fungus_boomer", - "type": "SPELL", - "name": { "str": "Fungal Boomer Death" }, - "description": "Calls death fungus and boomer clothes.", - "valid_targets": [ "self" ], - "flags": [ "SILENT", "NO_EXPLOSION_SFX" ], - "shape": "blast", - "effect": "noise", - "extra_effects": [ { "id": "death_fungus", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] - }, { "id": "death_darkman", "type": "SPELL", @@ -478,16 +387,6 @@ { "id": "death_conflagration", "hit_self": true } ] }, - { - "id": "death_fire_boomer", - "type": "SPELL", - "name": { "str": "Gasoline Boomer Death" }, - "valid_targets": [ "self" ], - "description": "Calls Conflagration Death and Boomer Clothes", - "effect": "noise", - "shape": "blast", - "extra_effects": [ { "id": "death_conflagration" }, { "id": "boomer_clothes" } ] - }, { "id": "death_conflagration", "type": "SPELL", @@ -613,30 +512,7 @@ "max_field_intensity": 2, "min_field_intensity": 2, "affected_body_parts": [ "eyes" ], - "extra_effects": [ { "id": "death_explosion", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ] - }, - { - "id": "death_boomer_child", - "type": "SPELL", - "name": { "str": "Boomer Child Death" }, - "description": "Vomitous explosion.", - "valid_targets": [ "ground", "hostile", "ally", "self" ], - "flags": [ "NO_EXPLOSION_SFX", "LIQUID" ], - "min_aoe": 1, - "max_aoe": 2, - "aoe_increment": 1, - "max_level": 1, - "min_duration": 2400, - "max_duration": 2400, - "shape": "blast", - "effect": "attack", - "effect_str": "boomered", - "field_chance": 1, - "field_id": "fd_bile", - "max_field_intensity": 2, - "min_field_intensity": 2, - "affected_body_parts": [ "eyes" ], - "extra_effects": [ { "id": "death_explosion", "hit_self": true }, { "id": "boomer_clothes_child", "hit_self": true } ] + "extra_effects": [ { "id": "death_explosion", "hit_self": true } ] }, { "id": "death_boomer_glow", diff --git a/data/json/monsterdrops/zombie.json b/data/json/monsterdrops/zombie.json index e236e210c06c4..d8424e8b060d8 100644 --- a/data/json/monsterdrops/zombie.json +++ b/data/json/monsterdrops/zombie.json @@ -145,7 +145,12 @@ "type": "item_group", "id": "zed_skin", "subtype": "collection", - "entries": [ { "item": "raw_tainted_leather", "count": [ 5, 12 ] } ] + "entries": [ + { "item": "raw_tainted_leather_scraps", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 12 ] }, + { "item": "fat_tainted", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 4 ] }, + { "item": "bone_tainted", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 4 ] }, + { "item": "sinew", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 2 ] } + ] }, { "type": "item_group", diff --git a/data/json/monsters/fungus_zombie.json b/data/json/monsters/fungus_zombie.json index 4e961e1e6bc63..0f4bd98a4fd86 100644 --- a/data/json/monsters/fungus_zombie.json +++ b/data/json/monsters/fungus_zombie.json @@ -65,7 +65,7 @@ "emit_fields": [ { "emit_id": "emit_fungal_leak", "delay": "1 s" } ], "special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ], "death_drops": "explode_zed_fungal", - "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungalburst_clothes", "hit_self": true } }, + "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungalburst", "hit_self": true } }, "flags": [ "SEES", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "FILTHY" ], "armor": { "electric": 4 } }, @@ -102,7 +102,7 @@ "emit_fields": [ { "emit_id": "emit_fungal_haze_plume", "delay": "1 s" } ], "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "scratch", 15 ] ], "death_drops": "explode_zed_fungal", - "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus_boomer", "hit_self": true } }, + "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } }, "flags": [ "SEES", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "HARDTOSHOOT", "NO_BREATHE", "PUSH_MON", "FILTHY" ], "armor": { "heat": 5, "electric": 5 } }, @@ -125,7 +125,7 @@ "special_attacks": [ [ "FUNGUS", 200 ] ], "harvest": "moldy_bones", "death_drops": "explode_zed_fungal_bone", - "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus_boomer", "hit_self": true } }, + "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } }, "armor": { "bash": 0, "electric": 5 } }, { @@ -147,7 +147,7 @@ }, "harvest": "moldy_bones", "death_drops": "explode_zed_fungal_bone", - "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus_boomer", "hit_self": true } } + "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } } }, { "id": "mon_skeleton_hulk_fungus", @@ -180,7 +180,7 @@ "harvest": "big_mr_bones", "special_attacks": [ { "id": "smash", "throw_strength": 54 } ], "death_drops": "explode_zed_fungal_bone", - "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus_boomer", "hit_self": true } }, + "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } }, "burn_into": "mon_zombie_fiend", "flags": [ "HEARS", "STUMBLES", "WARM", "BASHES", "DESTROYS", "POISON", "NO_BREATHE", "PUSH_MON", "PUSH_VEH", "FILTHY" ], "armor": { "bash": 20, "cut": 45, "bullet": 36, "electric": 8 } @@ -254,7 +254,7 @@ "harvest": "zombie_humanoid", "special_attacks": [ [ "FUNGUS", 100 ], [ "BOOMER", 20 ], [ "scratch", 20 ] ], "death_drops": "explode_zed_fungal", - "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus_boomer", "hit_self": true } }, + "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } }, "burn_into": "mon_zombie_scorched", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "PUSH_MON", "FILTHY" ], "armor": { "bash": 2, "electric": 4 } diff --git a/data/json/monsters/zed_children.json b/data/json/monsters/zed_children.json index 8100e464829bf..a7fbefa4c4f2e 100644 --- a/data/json/monsters/zed_children.json +++ b/data/json/monsters/zed_children.json @@ -181,12 +181,11 @@ "//grab": "Half as grabby as a base zombie", "grab_strength": 10, "special_attacks": [ { "id": "grab" } ], - "death_drops": "explode_innards_small", - "death_function": { - "effect": { "id": "death_boomer_child", "hit_self": true }, - "message": "The %s explodes!", - "corpse_type": "NO_CORPSE" + "death_drops": { + "subtype": "collection", + "groups": [ [ "default_zombie_children_clothes", 100 ], [ "child_items_pockets", 65 ], [ "explode_innards_small", 100 ] ] }, + "death_function": { "effect": { "id": "death_boomer", "hit_self": true }, "message": "The %s explodes!", "corpse_type": "NO_CORPSE" }, "burn_into": "mon_zombie_child_scorched", "fungalize_into": "mon_zombie_child_fungus", "flags": [ "SEES", "HEARS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ], diff --git a/data/json/monsters/zed_explosive.json b/data/json/monsters/zed_explosive.json index ad8ebcb5141cf..f7616056facb5 100644 --- a/data/json/monsters/zed_explosive.json +++ b/data/json/monsters/zed_explosive.json @@ -132,7 +132,11 @@ "grab_strength": 30, "special_attacks": [ { "id": "grab" }, { "id": "scratch_humanoid" }, { "id": "bite_humanoid" } ], "death_drops": "explode_zed", - "death_function": { "effect": { "id": "death_fire_boomer", "hit_self": true }, "message": "The %s explodes!", "corpse_type": "NO_CORPSE" }, + "death_function": { + "effect": { "id": "death_conflagration", "hit_self": true }, + "message": "The %s explodes!", + "corpse_type": "NO_CORPSE" + }, "flags": [ "SEES", "HEARS", @@ -179,7 +183,7 @@ "emit_fields": [ { "emit_id": "emit_toxic_leak", "delay": "1 s" } ], "special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ], "death_drops": "explode_zed", - "death_function": { "message": "The %s explodes!", "effect": { "id": "death_gas_clothes", "hit_self": true }, "corpse_type": "NO_CORPSE" }, + "death_function": { "message": "The %s explodes!", "effect": { "id": "death_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" }, "fungalize_into": "mon_zombie_gasbag_fungus", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ], "armor": { "electric": 1 } @@ -213,11 +217,7 @@ "emit_fields": [ { "emit_id": "emit_relax_gas_leak", "delay": "1 s" } ], "special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ], "death_drops": "explode_zed", - "death_function": { - "message": "The %s explodes!", - "effect": { "id": "death_relax_boomer", "hit_self": true }, - "corpse_type": "NO_CORPSE" - }, + "death_function": { "message": "The %s explodes!", "effect": { "id": "death_relax_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" }, "fungalize_into": "mon_zombie_gasbag_fungus", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "NO_BREATHE", "REVIVES", "FILTHY" ], "armor": { "electric": 1 } @@ -251,7 +251,7 @@ "emit_fields": [ { "emit_id": "emit_tear_gas_leak", "delay": "1 s" } ], "special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ], "death_drops": "explode_zed", - "death_function": { "message": "The %s explodes!", "effect": { "id": "death_tear_boomer", "hit_self": true }, "corpse_type": "NO_CORPSE" }, + "death_function": { "message": "The %s explodes!", "effect": { "id": "death_tearburst", "hit_self": true }, "corpse_type": "NO_CORPSE" }, "fungalize_into": "mon_zombie_gasbag_fungus", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "NO_BREATHE", "REVIVES", "FILTHY" ], "armor": { "electric": 1 } diff --git a/data/json/monsters/zed_fusion.json b/data/json/monsters/zed_fusion.json index 68ff3afaee4e7..5e24b80390214 100644 --- a/data/json/monsters/zed_fusion.json +++ b/data/json/monsters/zed_fusion.json @@ -205,7 +205,7 @@ "vision_night": 3, "harvest": "exempt", "special_attacks": [ [ "SUICIDE", 20 ] ], - "death_drops": "explode_gasbag", + "death_drops": { "subtype": "collection", "groups": [ "default_zombie_death_drops", "explode_gasbag" ] }, "upgrades": { "half_life": 24, "into": "mon_zombie_gasbag_crawler" }, "death_function": { "message": "The %s explodes!", "effect": { "id": "death_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" }, "flags": [ "SEES", "HEARS", "IMMOBILE", "WARM", "POISON", "NO_BREATHE", "FILTHY" ], From e925759fc226a1c40e96b0749b938108be4fadd4 Mon Sep 17 00:00:00 2001 From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com> Date: Sun, 25 Feb 2024 14:19:55 -0500 Subject: [PATCH 07/11] Restore Clothes Drops and Clean Up Harvest Entries --- data/json/harvest.json | 13 +++++++------ data/json/monsterdrops/zombie.json | 11 +++++++++-- data/json/monsters/fungus_zombie.json | 12 ++++++------ data/json/monsters/zed_explosive.json | 16 ++++++++-------- data/json/monsters/zed_misc.json | 4 ++-- 5 files changed, 32 insertions(+), 24 deletions(-) diff --git a/data/json/harvest.json b/data/json/harvest.json index 3d9d4d5af4465..4183ac6671f4f 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -1177,6 +1177,7 @@ "type": "harvest", "message": "You messily hack apart the hulking mass of fused, rancid flesh, taking note of anything that stands out.", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "base_num": [ 0, 2 ] }, { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 }, { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.01 }, { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, @@ -1192,11 +1193,11 @@ "type": "harvest", "message": "You messily hack apart the colossal mass of fused, rancid flesh, taking note of anything that stands out.", "entries": [ - { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 0, 3 ] }, - { "drop": "skull_moose_tusked", "type": "bone", "scale_num": [ 0, 1 ] }, - { "drop": "skull_cervine_spideer", "type": "bone", "scale_num": [ 0, 1 ] }, - { "drop": "skull_canis_triclopean", "type": "bone", "scale_num": [ 0, 1 ] }, - { "drop": "skull_rodent", "type": "bone", "scale_num": [ 0, 6 ] }, + { "drop": "skull_human_tainted", "type": "bone", "base_num": [ 0, 3 ] }, + { "drop": "skull_moose", "type": "bone", "base_num": [ 0, 1 ] }, + { "drop": "skull_cervine_spideer", "type": "bone", "base_num": [ 0, 1 ] }, + { "drop": "skull_canis_triclopean", "type": "bone", "base_num": [ 0, 1 ] }, + { "drop": "skull_rodent", "type": "bone", "base_num": [ 0, 6 ] }, { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 }, { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, @@ -1585,7 +1586,7 @@ "type": "harvest", "message": "", "entries": [ - { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 2, 5 ] }, + { "drop": "skull_human_tainted", "type": "bone", "base_num": [ 2, 5 ] }, { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 }, diff --git a/data/json/monsterdrops/zombie.json b/data/json/monsterdrops/zombie.json index d8424e8b060d8..427aa1cce19f7 100644 --- a/data/json/monsterdrops/zombie.json +++ b/data/json/monsterdrops/zombie.json @@ -166,6 +166,7 @@ { "item": "bone_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, { "item": "tainted_marrow", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 5 ] }, { "item": "tainted_innards", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, + { "item": "raw_tainted_leather_scraps", "prob": 50, "damage": [ 2, 3 ], "count": [ 2, 5 ] }, { "item": "sinew", "prob": 50, "damage": [ 2, 3 ], "count": [ 5, 10 ] } ] }, @@ -183,6 +184,7 @@ { "item": "bone_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, { "item": "tainted_marrow", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 5 ] }, { "item": "veggy_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, + { "item": "raw_tainted_leather_scraps", "prob": 50, "damage": [ 2, 3 ], "count": [ 2, 5 ] }, { "item": "sinew", "prob": 50, "damage": [ 2, 3 ], "count": [ 5, 10 ] } ] }, @@ -200,6 +202,7 @@ { "item": "bone_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 15, 25 ] }, { "item": "tainted_marrow", "prob": 50, "damage": [ 2, 3 ], "count": [ 10, 15 ] }, { "item": "veggy_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, + { "item": "raw_tainted_leather_scraps", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 3 ] }, { "item": "sinew", "prob": 50, "damage": [ 2, 3 ], "count": [ 5, 10 ] } ] }, @@ -210,7 +213,7 @@ "entries": [ { "item": "leg_zed", "prob": 80, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, { "item": "leg_zed", "prob": 40, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, - { "item": "raw_tainted_leather", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, + { "item": "raw_tainted_leather_scraps", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, { "item": "blood_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, { "item": "meat_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, { "item": "fat_tainted", "prob": 80, "damage": [ 2, 3 ], "count": [ 1, 5 ] }, @@ -233,6 +236,7 @@ { "item": "bone_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, { "item": "tainted_marrow", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, { "item": "tainted_innards", "prob": 100, "damage": [ 2, 3 ], "count": [ 3, 7 ] }, + { "item": "raw_tainted_leather_scraps", "prob": 80, "damage": [ 2, 3 ], "count": [ 2, 5 ] }, { "item": "sinew", "prob": 50, "damage": [ 2, 3 ], "count": [ 3, 7 ] } ] }, @@ -247,6 +251,7 @@ { "item": "bone_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 1, 3 ] }, { "item": "tainted_marrow", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, { "item": "tainted_innards", "prob": 100, "damage": [ 2, 3 ], "count": [ 12, 24 ] }, + { "item": "raw_tainted_leather_scraps", "prob": 80, "damage": [ 2, 3 ], "count": [ 2, 5 ] }, { "item": "sinew", "prob": 100, "damage": [ 2, 3 ], "count": [ 8, 15 ] } ] }, @@ -261,6 +266,7 @@ { "item": "bone_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 1, 3 ] }, { "item": "tainted_marrow", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, { "item": "tainted_innards", "prob": 100, "damage": [ 2, 3 ], "count": [ 1, 3 ] }, + { "item": "raw_tainted_leather_scraps", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 3 ] }, { "item": "sinew", "prob": 100, "damage": [ 2, 3 ], "count": [ 1, 3 ] } ] }, @@ -269,7 +275,7 @@ "id": "explode_toad", "subtype": "collection", "entries": [ - { "item": "arm_zed", "prob": 60, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, + { "item": "leg_zed", "prob": 60, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, { "item": "leg_zed", "prob": 80, "damage": [ 2, 3 ], "count": [ 1, 2 ] }, { "item": "blood_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, { "item": "meat_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, @@ -281,6 +287,7 @@ { "item": "mutant_lung", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 5 ] }, { "item": "mutant_liver", "prob": 70, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, { "item": "tainted_innards", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, + { "item": "raw_tainted_leather_scraps", "prob": 100, "damage": [ 2, 3 ], "count": [ 2, 5 ] }, { "item": "stomach_large", "prob": 80, "damage": [ 2, 3 ] } ] } diff --git a/data/json/monsters/fungus_zombie.json b/data/json/monsters/fungus_zombie.json index 0f4bd98a4fd86..bbe470d500b38 100644 --- a/data/json/monsters/fungus_zombie.json +++ b/data/json/monsters/fungus_zombie.json @@ -64,7 +64,7 @@ "harvest": "exempt", "emit_fields": [ { "emit_id": "emit_fungal_leak", "delay": "1 s" } ], "special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ], - "death_drops": "explode_zed_fungal", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed_fungal", 100 ] ] }, "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungalburst", "hit_self": true } }, "flags": [ "SEES", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "FILTHY" ], "armor": { "electric": 4 } @@ -101,7 +101,7 @@ "harvest": "zombie_humanoid_mushroom", "emit_fields": [ { "emit_id": "emit_fungal_haze_plume", "delay": "1 s" } ], "special_attacks": [ { "type": "bite", "cooldown": 5 }, [ "scratch", 15 ] ], - "death_drops": "explode_zed_fungal", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed_fungal", 100 ] ] }, "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } }, "flags": [ "SEES", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "HARDTOSHOOT", "NO_BREATHE", "PUSH_MON", "FILTHY" ], "armor": { "heat": 5, "electric": 5 } @@ -124,7 +124,7 @@ }, "special_attacks": [ [ "FUNGUS", 200 ] ], "harvest": "moldy_bones", - "death_drops": "explode_zed_fungal_bone", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed_fungal_bone", 100 ] ] }, "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } }, "armor": { "bash": 0, "electric": 5 } }, @@ -146,7 +146,7 @@ "families": [ "prof_wp_skeleton" ] }, "harvest": "moldy_bones", - "death_drops": "explode_zed_fungal_bone", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed_fungal_bone", 100 ] ] }, "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } } }, { @@ -179,7 +179,7 @@ "vision_night": 5, "harvest": "big_mr_bones", "special_attacks": [ { "id": "smash", "throw_strength": 54 } ], - "death_drops": "explode_zed_fungal_bone", + "death_drops": { "subtype": "collection", "groups": [ [ "mon_zombie_hulk_death_drops", 100 ], [ "explode_zed_fungal_bone", 100 ] ] }, "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } }, "burn_into": "mon_zombie_fiend", "flags": [ "HEARS", "STUMBLES", "WARM", "BASHES", "DESTROYS", "POISON", "NO_BREATHE", "PUSH_MON", "PUSH_VEH", "FILTHY" ], @@ -253,7 +253,7 @@ "vision_night": 3, "harvest": "zombie_humanoid", "special_attacks": [ [ "FUNGUS", 100 ], [ "BOOMER", 20 ], [ "scratch", 20 ] ], - "death_drops": "explode_zed_fungal", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed_fungal", 100 ] ] }, "death_function": { "corpse_type": "NO_CORPSE", "effect": { "id": "death_fungus", "hit_self": true } }, "burn_into": "mon_zombie_scorched", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "GROUP_BASH", "POISON", "NO_BREATHE", "PUSH_MON", "FILTHY" ], diff --git a/data/json/monsters/zed_explosive.json b/data/json/monsters/zed_explosive.json index f7616056facb5..07a56c2d39525 100644 --- a/data/json/monsters/zed_explosive.json +++ b/data/json/monsters/zed_explosive.json @@ -27,7 +27,7 @@ "harvest": "exempt", "grab_strength": 25, "special_attacks": [ [ "BOOMER", 20 ], { "id": "grab" }, { "id": "bite_humanoid" }, { "id": "scratch_humanoid" } ], - "death_drops": "explode_zed", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed", 100 ] ] }, "death_function": { "effect": { "id": "death_boomer", "hit_self": true }, "message": "The %s explodes!", "corpse_type": "NO_CORPSE" }, "upgrades": { "half_life": 42, "into_group": "GROUP_ZOMBIE_BOOMER_UPGRADE" }, "fungalize_into": "mon_boomer_fungus", @@ -78,7 +78,7 @@ "fungalize_into": "mon_boomer_fungus", "grab_strength": 30, "special_attacks": [ [ "BOOMER_GLOW", 20 ], { "id": "grab" }, { "id": "bite_humanoid" }, { "id": "scratch_humanoid" } ], - "death_drops": "explode_zed", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed", 100 ] ] }, "death_function": { "effect": { "id": "death_boomer_glow", "hit_self": true, "min_level": 1 }, "message": "A %s explodes!", @@ -131,7 +131,7 @@ "//grab": "Big lad", "grab_strength": 30, "special_attacks": [ { "id": "grab" }, { "id": "scratch_humanoid" }, { "id": "bite_humanoid" } ], - "death_drops": "explode_zed", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed", 100 ] ] }, "death_function": { "effect": { "id": "death_conflagration", "hit_self": true }, "message": "The %s explodes!", @@ -182,7 +182,7 @@ "harvest": "exempt", "emit_fields": [ { "emit_id": "emit_toxic_leak", "delay": "1 s" } ], "special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ], - "death_drops": "explode_zed", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed", 100 ] ] }, "death_function": { "message": "The %s explodes!", "effect": { "id": "death_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" }, "fungalize_into": "mon_zombie_gasbag_fungus", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ], @@ -216,7 +216,7 @@ "harvest": "exempt", "emit_fields": [ { "emit_id": "emit_relax_gas_leak", "delay": "1 s" } ], "special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ], - "death_drops": "explode_zed", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed", 100 ] ] }, "death_function": { "message": "The %s explodes!", "effect": { "id": "death_relax_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" }, "fungalize_into": "mon_zombie_gasbag_fungus", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "NO_BREATHE", "REVIVES", "FILTHY" ], @@ -250,7 +250,7 @@ "harvest": "exempt", "emit_fields": [ { "emit_id": "emit_tear_gas_leak", "delay": "1 s" } ], "special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ], - "death_drops": "explode_zed", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed", 100 ] ] }, "death_function": { "message": "The %s explodes!", "effect": { "id": "death_tearburst", "hit_self": true }, "corpse_type": "NO_CORPSE" }, "fungalize_into": "mon_zombie_gasbag_fungus", "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "NO_BREATHE", "REVIVES", "FILTHY" ], @@ -299,7 +299,7 @@ "monster_message": "The glutton vomits sludge!" } ], - "death_drops": "explode_zed", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed", 100 ] ] }, "death_function": { "effect": { "id": "death_boomer", "hit_self": true }, "message": "The %s explodes!", "corpse_type": "NO_CORPSE" }, "flags": [ "SEES", @@ -347,7 +347,7 @@ "monster_message": "A bombardier boomer explodes!" } ], - "death_drops": "explode_zed", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 100 ], [ "explode_zed", 100 ] ] }, "death_function": { "effect": { "id": "death_boomer", "hit_self": true }, "message": "The %s explodes!", "corpse_type": "NO_CORPSE" }, "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ], "armor": { "bash": 10, "cut": 5, "bullet": 5, "electric": 2 } diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index c90a3303a1401..ecb52b30bd690 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -638,7 +638,7 @@ "vision_night": 2, "weakpoint_sets": [ "wps_humanoid_body_headless" ], "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie", "prof_wp_hulk" ], - "harvest": "zombie_humanoid", + "harvest": "zombie_humanoid_headless", "grab_strength": 50, "special_attacks": [ { "id": "grab", "cooldown": 7 }, { "id": "scratch_humanoid" } ], "death_drops": "default_zombie_death_drops", @@ -1492,7 +1492,7 @@ "description": "At first this creature looks like nothing more than a grotesque and oleaginous husk, bloated and punctured by jet-black pustules. When approached, its glowing red eyes and an aching grin take form; its skin tears and its guts teem with unmatched fecundity, as its gaze inspires fear of nothing less than cosmic, inhuman ecstasy.", "copy-from": "mon_zombie_necro", "diff": 25, - "death_drops": "zed_dust", + "death_drops": { "subtype": "collection", "groups": [ [ "default_zombie_death_drops", 65 ], [ "zed_dust", 100 ] ] }, "death_function": { "effect": { "id": "necro_boomer_death", "hit_self": true }, "corpse_type": "NO_CORPSE", From 25d309cce188c5413671a0017a7bf842e00a7763 Mon Sep 17 00:00:00 2001 From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com> Date: Sun, 25 Feb 2024 16:14:34 -0500 Subject: [PATCH 08/11] Rebuild Tainted Limbs Remove copy_from from tainted limbs to avoid vitamin inheritance. --- data/json/items/comestibles/mutagen.json | 32 +++++++++++++++++++----- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/data/json/items/comestibles/mutagen.json b/data/json/items/comestibles/mutagen.json index dbfb32885115d..fdaefc1328c92 100644 --- a/data/json/items/comestibles/mutagen.json +++ b/data/json/items/comestibles/mutagen.json @@ -963,27 +963,47 @@ { "type": "COMESTIBLE", "id": "arm_zed", + "category": "other", "name": { "str": "tainted limb" }, "description": "A rotted and then shredded arm. Not much use unless you want to scrape the meat from the bones.", - "copy-from": "arm", "snippet_category": "arm_zed_desc", - "use_action": [ "POISON" ], "color": "red", + "symbol": "%", "material": [ "flesh" ], + "weight": "3767 g", + "volume": "4500 ml", + "comestible_type": "FOOD", + "use_action": [ "POISON" ], + "healthy": -8, + "calories": 278, + "fun": -20, "vitamins": [ ], - "extend": { "flags": [ "NO_REPAIR" ] } + "spoils_in": "2 days", + "price": 0, + "price_postapoc": 0, + "flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE", "NO_REPAIR" ] }, { "type": "COMESTIBLE", "id": "leg_zed", + "category": "other", "name": { "str": "tainted limb" }, "description": "What's left of some zombie's limb. Most likely a leg based on the proportions. Though it's rotted, there is quite a bit of meat still on it.", - "copy-from": "leg", "snippet_category": "leg_zed_desc", - "use_action": [ "POISON" ], "color": "red", + "symbol": "%", "material": [ "flesh" ], + "weight": "11071 g", + "volume": "12 L", + "comestible_type": "FOOD", + "use_action": [ "POISON" ], + "healthy": -12, + "calories": 399, + "fun": -20, "vitamins": [ ], - "extend": { "flags": [ "NO_REPAIR" ] } + "spoils_in": "2 days", + "price": 0, + "price_postapoc": 0, + "flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE", "NO_REPAIR" ] } ] From a5710a24db8ab59601f4aa273623b288c88c70eb Mon Sep 17 00:00:00 2001 From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com> Date: Sun, 25 Feb 2024 17:13:02 -0500 Subject: [PATCH 09/11] Add Recipes -Adds tainted human skull as a component option for skull bowls. -Adds tainted innards as a component option for base mutagen. --- data/json/recipes/chem/mutagens.json | 1 + data/json/recipes/tools/containers.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/chem/mutagens.json b/data/json/recipes/chem/mutagens.json index 69906fab33c6e..b696b60edd9b5 100644 --- a/data/json/recipes/chem/mutagens.json +++ b/data/json/recipes/chem/mutagens.json @@ -30,6 +30,7 @@ [ "tallow_tainted", 2 ], [ "meat_tainted", 3 ], [ "dry_meat_tainted", 3 ], + [ "tainted_innards", 4 ], [ "fetus", 1 ], [ "arm", 2 ], [ "leg", 2 ] diff --git a/data/json/recipes/tools/containers.json b/data/json/recipes/tools/containers.json index 205961e780222..26e378af6e977 100644 --- a/data/json/recipes/tools/containers.json +++ b/data/json/recipes/tools/containers.json @@ -840,7 +840,7 @@ "autolearn": true, "qualities": [ { "id": "CUT", "level": 2 } ], "proficiencies": [ { "proficiency": "prof_carving" } ], - "components": [ [ [ "skull_human", 1 ] ] ] + "components": [ [ [ "skull_human", 1 ], [ "skull_human_tainted", 1 ] ] ] }, { "type": "recipe", From fa647a71ebda173588ae1663388c284ab6992ee7 Mon Sep 17 00:00:00 2001 From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com> Date: Sun, 25 Feb 2024 18:36:04 -0500 Subject: [PATCH 10/11] Move tainted limbs --- data/json/items/comestibles/carnivore.json | 46 ++++++++++++++++++++++ data/json/items/comestibles/mutagen.json | 46 ---------------------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index f8b209b674848..ab9341f82e7a3 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -1487,6 +1487,52 @@ "flags": [ "TRADER_AVOID", "SMOKABLE", "NUTRIENT_OVERRIDE", "RAW" ], "smoking_result": "dry_meat_tainted" }, + { + "type": "COMESTIBLE", + "id": "arm_zed", + "category": "other", + "name": { "str": "tainted limb" }, + "description": "A rotted and then shredded arm. Not much use unless you want to scrape the meat from the bones.", + "snippet_category": "arm_zed_desc", + "color": "red", + "symbol": "%", + "material": [ "flesh" ], + "weight": "3767 g", + "volume": "4500 ml", + "comestible_type": "FOOD", + "use_action": [ "POISON" ], + "healthy": -8, + "calories": 278, + "fun": -20, + "vitamins": [ ], + "spoils_in": "2 days", + "price": 0, + "price_postapoc": 0, + "flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE", "NO_REPAIR" ] + }, + { + "type": "COMESTIBLE", + "id": "leg_zed", + "category": "other", + "name": { "str": "tainted limb" }, + "description": "What's left of some zombie's limb. Most likely a leg based on the proportions. Though it's rotted, there is quite a bit of meat still on it.", + "snippet_category": "leg_zed_desc", + "color": "red", + "symbol": "%", + "material": [ "flesh" ], + "weight": "11071 g", + "volume": "12 L", + "comestible_type": "FOOD", + "use_action": [ "POISON" ], + "healthy": -12, + "calories": 399, + "fun": -20, + "vitamins": [ ], + "spoils_in": "2 days", + "price": 0, + "price_postapoc": 0, + "flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE", "NO_REPAIR" ] + }, { "id": "blood_tainted", "type": "COMESTIBLE", diff --git a/data/json/items/comestibles/mutagen.json b/data/json/items/comestibles/mutagen.json index fdaefc1328c92..36c96e21c118a 100644 --- a/data/json/items/comestibles/mutagen.json +++ b/data/json/items/comestibles/mutagen.json @@ -959,51 +959,5 @@ "volume": "12 L", "fun": -20, "vitamins": [ [ "mutagenic_slurry", 10 ] ] - }, - { - "type": "COMESTIBLE", - "id": "arm_zed", - "category": "other", - "name": { "str": "tainted limb" }, - "description": "A rotted and then shredded arm. Not much use unless you want to scrape the meat from the bones.", - "snippet_category": "arm_zed_desc", - "color": "red", - "symbol": "%", - "material": [ "flesh" ], - "weight": "3767 g", - "volume": "4500 ml", - "comestible_type": "FOOD", - "use_action": [ "POISON" ], - "healthy": -8, - "calories": 278, - "fun": -20, - "vitamins": [ ], - "spoils_in": "2 days", - "price": 0, - "price_postapoc": 0, - "flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE", "NO_REPAIR" ] - }, - { - "type": "COMESTIBLE", - "id": "leg_zed", - "category": "other", - "name": { "str": "tainted limb" }, - "description": "What's left of some zombie's limb. Most likely a leg based on the proportions. Though it's rotted, there is quite a bit of meat still on it.", - "snippet_category": "leg_zed_desc", - "color": "red", - "symbol": "%", - "material": [ "flesh" ], - "weight": "11071 g", - "volume": "12 L", - "comestible_type": "FOOD", - "use_action": [ "POISON" ], - "healthy": -12, - "calories": 399, - "fun": -20, - "vitamins": [ ], - "spoils_in": "2 days", - "price": 0, - "price_postapoc": 0, - "flags": [ "TRADER_AVOID", "NUTRIENT_OVERRIDE", "NO_REPAIR" ] } ] From 4e0876bce059c6a3e2ff984672595da40b8a3e99 Mon Sep 17 00:00:00 2001 From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com> Date: Sun, 25 Feb 2024 20:22:40 -0500 Subject: [PATCH 11/11] Remove Healthy Values --- data/json/items/comestibles/carnivore.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index ab9341f82e7a3..8b77c2212192d 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -1501,7 +1501,6 @@ "volume": "4500 ml", "comestible_type": "FOOD", "use_action": [ "POISON" ], - "healthy": -8, "calories": 278, "fun": -20, "vitamins": [ ], @@ -1524,7 +1523,6 @@ "volume": "12 L", "comestible_type": "FOOD", "use_action": [ "POISON" ], - "healthy": -12, "calories": 399, "fun": -20, "vitamins": [ ],