Merge pull request #77880 from Karol1223/daytripper-destruction

Sanity pass on the fungal acidic zombie

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",

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",

data/json/monsters/fungus_zombie.json

@@ -701,8 +701,8 @@
   {
     "id": "mon_zombie_fungus_acidic",
     "type": "MONSTER",
-    "name": { "str": "day tripper" },
-    "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.",
+    "name": { "str": "acidic fungal zombie" },
+    "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" ],
@@ -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",