From 88d77cc79f63397d2ceb0dbee29266a8ca279b95 Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Fri, 15 Nov 2024 12:44:07 +0100
Subject: [PATCH 1/2] among us

---
 data/json/harvest.json                        |  7 +++++++
 data/json/monster_special_attacks/spells.json | 20 -------------------
 data/json/monsters/fungus_zombie.json         | 17 +++++-----------
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/data/json/harvest.json b/data/json/harvest.json
index 177310cf20f38..86f29f52b73d1 100644
--- a/data/json/harvest.json
+++ b/data/json/harvest.json
@@ -1724,6 +1724,13 @@
       ]
     }
   },
+  {
+    "id": "zombie_humanoid_mushroom_acid",
+    "type": "harvest",
+    "copy-from": "zombie_humanoid_mushroom",
+    "delete": { "entries": [ { "drop": "blood_tainted", "type": "blood", "mass_ratio": 0.1 } ] },
+    "extend": { "entries": [ { "drop": "blood_acid", "type": "blood", "mass_ratio": 0.1 } ] }
+  },
   {
     "id": "zombie_animal_mushroom",
     "//": "moldy animal zombie - fungus chunks replace a part of the innards",
diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json
index be22d635c6e80..d51832a7c630f 100644
--- a/data/json/monster_special_attacks/spells.json
+++ b/data/json/monster_special_attacks/spells.json
@@ -566,26 +566,6 @@
     "min_field_intensity": 2,
     "max_field_intensity": 2
   },
-  {
-    "type": "SPELL",
-    "id": "spread_fungal_acid",
-    "name": { "str": "Spread Hallucinogenic Acid", "//~": "NO_I18N" },
-    "description": { "str": "Splatters hallucinogenic acid in the air in blasts.", "//~": "NO_I18N" },
-    "valid_targets": [ "hostile", "ground" ],
-    "flags": [ "NO_EXPLOSION_SFX" ],
-    "min_aoe": 2,
-    "max_aoe": 3,
-    "base_casting_time": 100,
-    "min_range": 1,
-    "max_range": 1,
-    "effect": "attack",
-    "effect_str": "emit_hallucinogenic_spores_blast",
-    "shape": "blast",
-    "field_id": "fd_hallucinogenic_spores",
-    "field_chance": 2,
-    "min_field_intensity": 1,
-    "max_field_intensity": 2
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_random_mutate",
diff --git a/data/json/monsters/fungus_zombie.json b/data/json/monsters/fungus_zombie.json
index fb30465f9895d..04b84a2bce305 100644
--- a/data/json/monsters/fungus_zombie.json
+++ b/data/json/monsters/fungus_zombie.json
@@ -701,7 +701,7 @@
   {
     "id": "mon_zombie_fungus_acidic",
     "type": "MONSTER",
-    "name": { "str": "day tripper" },
+    "name": { "str": "acidic fungal zombie" },
     "description": "The air around this stumbling fungal coated corpse seems to constantly warp and shift; colors and shapes visibly distort, making it impossible to discern finer details of what's causing this anomaly.  Your nose clogs as the smell of damp carpet and mold assaults it, even from afar.",
     "default_faction": "fungus",
     "bodytype": "human",
@@ -720,22 +720,14 @@
     "melee_dice": 2,
     "melee_dice_sides": 3,
     "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "dodge": 2,
     "bleed_rate": 0,
     "vision_day": 5,
     "vision_night": 3,
     "weakpoint_sets": [ "wps_humanoid_body" ],
     "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ],
-    "harvest": "zombie_humanoid_mushroom",
-    "special_attacks": [
-      {
-        "type": "spell",
-        "spell_data": { "id": "spread_fungal_acid", "min_level": 1 },
-        "cooldown": 3,
-        "monster_message": "the %s spews hallucinogenic gas!"
-      }
-    ],
-    "emit_fields": [ { "emit_id": "emit_hallucinogenic_spores", "delay": "2 s" } ],
+    "harvest": "zombie_humanoid_mushroom_acid",
+    "special_attacks": [ [ "ACID_BARF", 10 ] ],
+    "death_function": { "message": "The %s's body leaks acid.", "effect": { "id": "death_acid", "hit_self": true } },
     "death_drops": "default_zombie_death_drops",
     "burn_into": "mon_zombie_scorched",
     "flags": [
@@ -747,6 +739,7 @@
       "GROUP_BASH",
       "POISON",
       "NO_FUNG_DMG",
+      "ACID_BLOOD",
       "ACIDPROOF",
       "NO_BREATHE",
       "PUSH_MON",

From 285bbd5cf543e098dcfc14f61229bc611b6c52f4 Mon Sep 17 00:00:00 2001
From: Karol1223 <68503002+Karol1223@users.noreply.github.com>
Date: Fri, 15 Nov 2024 13:05:17 +0100
Subject: [PATCH 2/2] new description

Co-Authored-By: themaster567 <8242023+themaster567@users.noreply.github.com>
---
 data/json/monsters/fungus_zombie.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monsters/fungus_zombie.json b/data/json/monsters/fungus_zombie.json
index 04b84a2bce305..c0aa317666417 100644
--- a/data/json/monsters/fungus_zombie.json
+++ b/data/json/monsters/fungus_zombie.json
@@ -702,7 +702,7 @@
     "id": "mon_zombie_fungus_acidic",
     "type": "MONSTER",
     "name": { "str": "acidic fungal zombie" },
-    "description": "The air around this stumbling fungal coated corpse seems to constantly warp and shift; colors and shapes visibly distort, making it impossible to discern finer details of what's causing this anomaly.  Your nose clogs as the smell of damp carpet and mold assaults it, even from afar.",
+    "description": "A grotesque fusion of rot and mycelium, this zombie's flesh is pocked with open sores that lazily drool a strange yellow-green acid.  Pale fungal stalks have burst through its corroded skin, their slimy caps dripping with what seems to be the same fluid.  The air around it is thick with the scent of rot and acrid chemicals.",
     "default_faction": "fungus",
     "bodytype": "human",
     "species": [ "FUNGUS" ],