From cefcb0aaef0b9192bf0a72fedb07d05f7019180d Mon Sep 17 00:00:00 2001 From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com> Date: Thu, 22 Feb 2024 22:29:42 -0500 Subject: [PATCH] Boomers Leave Gibs (#71862) * Add tainted offal, monster drops for exploding zeds -Add tainted offal as a catch-all for zombie guts other innards -Create monsterdrop for gibs left by boomers -Assign to all death explosion zeds -Give fungal versions NO_CORPSE * Zombie Guts to Harvest and Necro Dusting -Rename tainted offal to tainted innards -Add it to harvest list -Give necro-boomers a unique death drop -Give fungals a unique explode death drop -Assign those new death drops to monsters * Add description snippets for tainted innards * Apply to Collapsed Tower Enemies -Adds two new 'explode' death_drops -Applies them to the following enemies: -gangrenous flesh -gangrenous impaler -gangrenous crawler -scissorlimbs -hanging innards -trapped tendril * Misc. Harvest Add.s -give zapping zombfrog more specific harvest entry -give meatslug harvest to spasming lump and flesh wall (currently only butcher for a single piece of butchery refuse) -reduce ratio for tainted innards in zombie meatslug harvest; the note says no organs but these are not explicitly organs * Add tainted skull and tainted limbs -Add tainted human skull, tainted arm, and tainted leg -Distribute them to death drops and harvest -Gives tainted limbs a disassemble recipe * Include the trench pig Add another death_drop group for zombie beasts that explode and give it to the trench pig. * Update mutagen.json Make shredded zombie limbs non-repairable * Linting * Update mutagen.json Adjust volumes of "arm" and "leg" items to hopefully fix density * Update mutagen.json * Adjust limb materials Simplify tainted limb materials to hopefully fix density issues. * Update known_bad_density.json Test report notes density is fixed for 'arm' and 'leg'. Clearing from log. --- data/json/harvest.json | 45 +++++++++ data/json/items/comestibles/carnivore.json | 12 +++ data/json/items/comestibles/mutagen.json | 28 ++++- data/json/items/generic/skulls.json | 7 ++ data/json/monsterdrops/zombie.json | 101 ++++++++++++++++++- data/json/monsters/fungus_zombie.json | 9 +- data/json/monsters/zanimal_upgrade.json | 1 + data/json/monsters/zed_explosive.json | 16 +-- data/json/monsters/zed_fusion.json | 11 +- data/json/monsters/zed_misc.json | 2 + data/json/recipes/recipe_deconstruction.json | 18 ++++ data/json/snippets/zombie_anatomy.json | 26 +++++ data/mods/TEST_DATA/known_bad_density.json | 2 - 13 files changed, 258 insertions(+), 20 deletions(-) diff --git a/data/json/harvest.json b/data/json/harvest.json index 970035d82174e..803016934721c 100644 --- a/data/json/harvest.json +++ b/data/json/harvest.json @@ -476,6 +476,7 @@ "type": "harvest", "message": "You search for any salvageable hardware in what's left of this flesh and metal monster. Much of it is just scrap metal, but some of the electronics look surprisingly intact.", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.1 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.04 }, @@ -1179,6 +1180,7 @@ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 }, { "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 }, { "drop": "flesh_golem_heart", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 3, "type": "offal" } ] }, @@ -1190,6 +1192,7 @@ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 }, { "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 }, { "drop": "jabberwock_heart", "base_num": [ 0, 1 ], "scale_num": [ 0.6, 0.9 ], "max": 3, "type": "offal" } ], "//": "what, you thought jabberwocks only had one heart?" @@ -1467,6 +1470,7 @@ "entries": [ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, @@ -1482,6 +1486,7 @@ "entries": [ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, @@ -1497,6 +1502,7 @@ "entries": [ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, @@ -1521,9 +1527,11 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "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 } @@ -1535,9 +1543,11 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "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 } @@ -1552,6 +1562,7 @@ { "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 } @@ -1563,9 +1574,11 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 }, { "drop": "blood_acid", "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 } @@ -1579,6 +1592,7 @@ "entries": [ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 }, { "drop": "blood_acid", "type": "blood", "mass_ratio": 0.1 }, { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, @@ -1593,6 +1607,7 @@ "entries": [ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 }, { "drop": "blood_acid", "type": "blood", "mass_ratio": 0.1 }, { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, @@ -1605,9 +1620,11 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.15 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.03 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.1 }, { "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 } @@ -1619,9 +1636,11 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "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 } @@ -1633,9 +1652,11 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "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 } @@ -1650,6 +1671,7 @@ { "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 } @@ -1661,9 +1683,11 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "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 } @@ -1675,9 +1699,11 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "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": "veggy_tainted", "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 } @@ -1692,6 +1718,7 @@ { "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": "veggy_tainted", "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 } @@ -1703,9 +1730,11 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "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 } @@ -1717,9 +1746,11 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.18 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.8 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.06 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.08 }, { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.003 }, { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.08 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 } @@ -1734,6 +1765,7 @@ { "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 } @@ -1747,6 +1779,7 @@ "entries": [ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 }, { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 }, { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, @@ -1760,9 +1793,11 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "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 } @@ -1774,9 +1809,11 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.18 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.8 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.06 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.08 }, { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.003 }, { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.07 }, { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 } @@ -1789,6 +1826,7 @@ "entries": [ { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.2 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.05 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.08 }, { "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 }, @@ -1801,8 +1839,10 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 }, { "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 }, @@ -1819,8 +1859,10 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 }, { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 }, + { "drop": "tainted_innards", "type": "offal", "mass_ratio": 0.15 }, { "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 }, @@ -1859,6 +1901,7 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "drop": "bone_tainted", "type": "flesh", "mass_ratio": 0.5 }, { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.01 }, @@ -1871,6 +1914,7 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "drop": "bone_tainted", "type": "flesh", "mass_ratio": 0.5 }, { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.01 }, @@ -1907,6 +1951,7 @@ "type": "harvest", "message": "", "entries": [ + { "drop": "skull_human_tainted", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 }, { "drop": "bone_tainted", "type": "flesh", "mass_ratio": 0.5 }, { "drop": "tainted_marrow", "type": "bone", "mass_ratio": 0.005 }, { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.01 }, diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 113e92aab75a2..9f2506461cd85 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -743,6 +743,18 @@ "fun": -5, "flags": [ "EATEN_HOT" ] }, + { + "id": "tainted_innards", + "copy-from": "offal", + "type": "COMESTIBLE", + "name": { "str_sp": "tainted innards" }, + "description": "An unidentifiable selection of rotted innards that barely hold their form. It is revolting and certainly no longer healthy to eat.", + "snippet_category": "tainted_innards_desc", + "spoils_in": "4 hours", + "use_action": [ "POISON" ], + "price_postapoc": 0, + "fun": -25 + }, { "id": "mutant_bug_organs", "type": "COMESTIBLE", diff --git a/data/json/items/comestibles/mutagen.json b/data/json/items/comestibles/mutagen.json index d347db7a0ea69..6b34f607a9e80 100644 --- a/data/json/items/comestibles/mutagen.json +++ b/data/json/items/comestibles/mutagen.json @@ -935,7 +935,7 @@ "price": 0, "price_postapoc": 0, "material": [ "hflesh" ], - "volume": "2 L", + "volume": "4500 ml", "fun": -20, "vitamins": [ [ "mutagenic_slurry", 10 ] ] }, @@ -956,8 +956,32 @@ "price": 0, "price_postapoc": 0, "material": [ "hflesh" ], - "volume": "5 L", + "volume": "12 L", "fun": -20, "vitamins": [ [ "mutagenic_slurry", 10 ] ] + }, + { + "type": "COMESTIBLE", + "id": "arm_zed", + "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", + "use_action": [ "POISON" ], + "color": "red", + "material": [ "flesh" ], + "vitamins": [ ], + "extend": { "flags": [ "NO_REPAIR" ] } + }, + { + "type": "COMESTIBLE", + "id": "leg_zed", + "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", + "use_action": [ "POISON" ], + "color": "red", + "material": [ "flesh" ], + "vitamins": [ ], + "extend": { "flags": [ "NO_REPAIR" ] } } ] diff --git a/data/json/items/generic/skulls.json b/data/json/items/generic/skulls.json index f38cd25f067af..b77820068a9a4 100644 --- a/data/json/items/generic/skulls.json +++ b/data/json/items/generic/skulls.json @@ -22,6 +22,13 @@ "copy-from": "skull_abstract", "extend": { "flags": [ "CANNIBALISM" ] } }, + { + "type": "GENERIC", + "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" + }, { "type": "GENERIC", "id": "skull_canis_small", diff --git a/data/json/monsterdrops/zombie.json b/data/json/monsterdrops/zombie.json index f38b1d8e65bf2..6b2c3ecd8907d 100644 --- a/data/json/monsterdrops/zombie.json +++ b/data/json/monsterdrops/zombie.json @@ -131,18 +131,117 @@ { "item": "sharksuit", "prob": 50, "damage": [ 2, 3 ] } ] }, + { + "type": "item_group", + "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 ] } + ] + }, + { + "type": "item_group", + "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 ] }, + { "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": [ 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": "sinew", "prob": 50, "damage": [ 2, 3 ], "count": [ 5, 10 ] } + ] + }, + { + "type": "item_group", + "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 ] }, + { "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": [ 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": "sinew", "prob": 50, "damage": [ 2, 3 ], "count": [ 5, 10 ] } + ] + }, + { + "type": "item_group", + "id": "explode_zed_beast", + "subtype": "collection", + "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": "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": [ 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": "sinew", "prob": 50, "damage": [ 2, 3 ], "count": [ 5, 10 ] } + ] + }, + { + "type": "item_group", + "id": "explode_gasbag", + "subtype": "collection", + "entries": [ + { "item": "arm_zed", "prob": 10, "damage": [ 2, 3 ] }, + { "item": "leg_zed", "prob": 10, "damage": [ 2, 3 ] }, + { "item": "blood_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 3, 7 ] }, + { "item": "meat_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 3, 7 ] }, + { "item": "fat_tainted", "prob": 80, "damage": [ 2, 3 ], "count": [ 1, 3 ] }, + { "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": "sinew", "prob": 50, "damage": [ 2, 3 ], "count": [ 3, 7 ] } + ] + }, + { + "type": "item_group", + "id": "explode_innards", + "subtype": "collection", + "entries": [ + { "item": "blood_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 8, 15 ] }, + { "item": "meat_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 8, 15 ] }, + { "item": "fat_tainted", "prob": 80, "damage": [ 2, 3 ], "count": [ 3, 8 ] }, + { "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": "sinew", "prob": 100, "damage": [ 2, 3 ], "count": [ 8, 15 ] } + ] + }, { "type": "item_group", "id": "explode_toad", "subtype": "collection", "entries": [ + { "item": "arm_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 ] }, { "item": "fat_tainted", "prob": 80, "damage": [ 2, 3 ], "count": [ 1, 5 ] }, { "item": "bone_tainted", "prob": 100, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, { "item": "tainted_marrow", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 5 ] }, { "item": "sinew", "prob": 50, "damage": [ 2, 3 ], "count": [ 5, 10 ] }, - { "item": "mutant_brain", "prob": 50, "damage": [ 2, 3 ], "count": [ 1, 5 ] }, + { "item": "mutant_brain", "prob": 20, "damage": [ 2, 3 ], "count": [ 1, 3 ] }, + { "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": "stomach_large", "prob": 80, "damage": [ 2, 3 ] } ] } diff --git a/data/json/monsters/fungus_zombie.json b/data/json/monsters/fungus_zombie.json index 94b08fcd833e0..28ede14e21c47 100644 --- a/data/json/monsters/fungus_zombie.json +++ b/data/json/monsters/fungus_zombie.json @@ -64,8 +64,8 @@ "harvest": "exempt", "emit_fields": [ { "emit_id": "emit_fungal_leak", "delay": "1 s" } ], "special_attacks": [ [ "SUICIDE", 20 ], [ "scratch", 15 ] ], - "death_drops": "default_zombie_items", - "death_function": { "effect": { "id": "death_fungalburst", "hit_self": true } }, + "death_drops": "explode_zed_fungal", + "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,6 +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_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 } @@ -250,8 +251,8 @@ "vision_night": 3, "harvest": "zombie_humanoid", "special_attacks": [ [ "FUNGUS", 100 ], [ "BOOMER", 20 ], [ "scratch", 20 ] ], - "death_drops": "default_zombie_items", - "death_function": { "effect": { "id": "death_fungus", "hit_self": true } }, + "death_drops": "explode_zed_fungal", + "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/zanimal_upgrade.json b/data/json/monsters/zanimal_upgrade.json index 53e6331c57039..ec1ad7bc6292c 100644 --- a/data/json/monsters/zanimal_upgrade.json +++ b/data/json/monsters/zanimal_upgrade.json @@ -241,6 +241,7 @@ "harvest": "exempt", "emit_fields": [ { "emit_id": "emit_tear_gas_stream", "delay": "1 s" } ], "death_function": { "effect": { "id": "death_tearburst", "hit_self": true }, "message": "The %s explodes!", "corpse_type": "NO_CORPSE" }, + "death_drops": "explode_zed_beast", "special_attacks": [ { "id": "impale" } ], "extend": { "flags": [ "HIT_AND_RUN" ] } }, diff --git a/data/json/monsters/zed_explosive.json b/data/json/monsters/zed_explosive.json index 428931f3e09fa..f7616056facb5 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": "default_zombie_items", + "death_drops": "explode_zed", "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": "default_zombie_items", + "death_drops": "explode_zed", "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": "default_zombie_items", + "death_drops": "explode_zed", "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": "default_zombie_items", + "death_drops": "explode_zed", "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": "default_zombie_items", + "death_drops": "explode_zed", "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": "default_zombie_items", + "death_drops": "explode_zed", "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": "default_zombie_items", + "death_drops": "explode_zed", "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": "default_zombie_items", + "death_drops": "explode_zed", "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_fusion.json b/data/json/monsters/zed_fusion.json index 5c9d8b5394fc0..63b1eeaa169bd 100644 --- a/data/json/monsters/zed_fusion.json +++ b/data/json/monsters/zed_fusion.json @@ -175,6 +175,7 @@ "grab_strength": 100, "special_attacks": [ [ "FLESH_TENDRIL", 1 ], { "id": "grab" }, { "id": "ranged_pull", "grab_data": { "pull_weight_ratio": 100 } } ], "death_function": { "message": "The %s explodes!", "effect": { "id": "death_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" }, + "death_drops": { "subtype": "collection", "groups": [ "explode_gasbag", "explode_innards", "explode_innards" ] }, "flags": [ "SEES", "HEARS", "SMELLS", "IMMOBILE", "WARM", "POISON", "IMMOBILE", "NO_BREATHE", "FILTHY" ], "armor": { "bash": 10, "cut": 20, "bullet": 16, "electric": 5 } }, @@ -204,7 +205,7 @@ "vision_night": 3, "harvest": "exempt", "special_attacks": [ [ "SUICIDE", 20 ] ], - "death_drops": "default_zombie_items", + "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" ], @@ -239,6 +240,7 @@ "harvest": "exempt", "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 5, "allow_no_target": true }, [ "scratch", 5 ] ], "death_function": { "message": "The %s explodes!", "effect": { "id": "death_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" }, + "death_drops": "explode_gasbag", "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "POISON", "CLIMBS", "NO_BREATHE", "CLIMBS", "HARDTOSHOOT", "NEVER_WANDER" ], "armor": { "bash": 6, "cut": 6, "bullet": 5, "electric": 1 } }, @@ -282,6 +284,7 @@ [ "scratch", 5 ] ], "death_function": { "message": "The %s explodes!", "effect": { "id": "death_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" }, + "death_drops": "explode_gasbag", "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "POISON", "CLIMBS", "NO_BREATHE", "CLIMBS", "HARDTOSHOOT" ], "armor": { "bash": 6, "cut": 6, "bullet": 5, "electric": 1 } }, @@ -312,6 +315,7 @@ "vision_day": 1, "special_attacks": [ { "type": "leap", "cooldown": 5, "max_range": 3, "allow_no_target": true }, [ "scratch", 5 ] ], "death_function": { "message": "The %s explodes!", "effect": { "id": "death_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" }, + "death_drops": { "subtype": "collection", "groups": [ "explode_gasbag", "explode_gasbag" ] }, "flags": [ "SEES", "HEARS", "GOODHEARING", "WARM", "POISON", "CLIMBS", "NO_BREATHE", "CLIMBS", "HARDTOSHOOT", "NEVER_WANDER" ], "armor": { "bash": 2, "cut": 10, "bullet": 10, "electric": 2 } }, @@ -343,6 +347,7 @@ "vision_night": 2, "harvest": "exempt", "death_function": { "message": "The %s explodes!", "effect": { "id": "death_gas", "hit_self": true }, "corpse_type": "NO_CORPSE" }, + "death_drops": { "subtype": "collection", "groups": [ "explode_gasbag", "explode_innards" ] }, "//grab": "High weight ratio since it's not *really* 81kg", "grab_strength": 35, "special_attacks": [ @@ -372,7 +377,7 @@ "vision_night": 60, "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ], "bleed_rate": 50, - "harvest": "exempt", + "harvest": "zombie_meatslug", "flags": [ "SEES", "HEARS", "IMMOBILE", "WARM", "POISON", "IMMOBILE", "NO_BREATHE", "FILTHY" ], "armor": { "bash": 25, "cut": 25, "bullet": 20, "electric": 5 } }, @@ -396,7 +401,7 @@ "vision_night": 60, "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ], "bleed_rate": 0, - "harvest": "exempt", + "harvest": "zombie_meatslug", "flags": [ "SEES", "HEARS", "IMMOBILE", "WARM", "POISON", "IMMOBILE", "NO_BREATHE", "FILTHY" ], "armor": { "bash": 15, "cut": 15, "bullet": 10, "electric": 6 } } diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index 07ef63c2de1e7..528279c8bd78d 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -227,6 +227,7 @@ "dodge": 2, "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_amphibian", "prof_wp_zombie", "prof_electromagnetics" ], "weakpoint_sets": [ "wps_amphibian_body", "wps_amphibian_frog", "wps_amphibian_electric" ], + "harvest": "zombie_animal_electric", "luminance": 16, "attack_cost": 50, "special_attacks": [ @@ -1490,6 +1491,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_function": { "effect": { "id": "necro_boomer_death", "hit_self": true }, "corpse_type": "NO_CORPSE", diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 9e29afaac4b7c..e514d5e4aea40 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -7842,5 +7842,23 @@ [ [ "steel_chunk", 3 ] ], [ [ "plastic_chunk", 10 ] ] ] + }, + { + "result": "arm_zed", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "skill_used": "survival", + "time": "2 m", + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "meat_tainted", 3 ] ], [ [ "bone_tainted", 2 ] ], [ [ "sinew", 1 ] ] ] + }, + { + "result": "leg_zed", + "type": "uncraft", + "activity_level": "LIGHT_EXERCISE", + "skill_used": "survival", + "time": "4 m", + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "meat_tainted", 6 ] ], [ [ "bone_tainted", 3 ] ], [ [ "sinew", 2 ] ] ] } ] diff --git a/data/json/snippets/zombie_anatomy.json b/data/json/snippets/zombie_anatomy.json index 5f4228972ead0..824fd2b54f616 100644 --- a/data/json/snippets/zombie_anatomy.json +++ b/data/json/snippets/zombie_anatomy.json @@ -1,4 +1,30 @@ [ + { + "type": "snippet", + "category": "tainted_innards_desc", + "text": [ + { + "id": "tainted_innards_1", + "text": "An unidentifiable selection of rotted innards that barely hold their form. It is revolting and certainly no longer healthy to eat." + }, + { + "id": "tainted_innards_2", + "text": "This looks like a stomach and length of intestine, if they were made of lung tissue. Every now and then you notice it expanding or contracting slightly. It looks dangerous to eat, maybe even to handle." + }, + { + "id": "tainted_innards_3", + "text": "A clump of rotten entrails. The sallow membranes that link these lobes of flesh together are lined with blackened veins and capillaries. A caul of slime coats them all in a greasy sheen. You should not put this anywhere near your mouth." + }, + { + "id": "tainted_innards_4", + "text": "Zombie guts. Your appetite may have been spoiled by one look at the twisted, compacted tubes and sacs that form this clump of foul entrails. Why then does it make you think of frozen spaghetti and meatballs?" + }, + { + "id": "tainted_innards_5", + "text": "The inner contents of the walking dead. It's hard to tell exactly what kind of tissue this may have once been. Several structures appear to have molded together." + } + ] + }, { "type": "snippet", "category": "", diff --git a/data/mods/TEST_DATA/known_bad_density.json b/data/mods/TEST_DATA/known_bad_density.json index 4cd0c8a312a50..30f1466c491e5 100644 --- a/data/mods/TEST_DATA/known_bad_density.json +++ b/data/mods/TEST_DATA/known_bad_density.json @@ -101,7 +101,6 @@ "tailor_japanese", "dandelionburdock_tea", "craft", - "arm", "light_atomic_battery_cell", "frozen_lemonade", "glowstick_dead", @@ -340,7 +339,6 @@ "k_gambeson_vest_xs_loose", "car_wide_headlight", "hickory_root", - "leg", "milkshake_deluxe", "hotdogs_newyork", "confit_meat",