Liquid attacks can do damage, apply flags, apply effects

data/json/damage_types.json

@@ -100,8 +100,8 @@
     "//": "corrosive damage, e.g. acid",
     "id": "acid",
     "type": "damage_type",
-    "physical": false,
-    "environmental": true,
+    "physical": true,
+    "env": true,
     "magic_color": "light_green",
     "name": "acid",
     "//2": "derived from cut only for monster defs",
@@ -112,7 +112,7 @@
   {
     "id": "acid",
     "type": "damage_info_order",
-    "info_display": "basic",
+    "info_display": "detailed",
     "verb": "corroding",
     "bionic_info": { "order": 500, "show_type": true },
     "protection_info": { "order": 800, "show_type": true },
@@ -145,7 +145,7 @@
     "id": "heat",
     "type": "damage_type",
     "physical": false,
-    "environmental": true,
+    "env": true,
     "magic_color": "red",
     "name": "fire",
     "material_required": true,

data/json/effects.json

@@ -2034,16 +2034,35 @@
     "id": "boomered",
     "name": [ "Boomered" ],
     "desc": [ "Your vision is obscured by a disgusting splatter of bile." ],
-    "apply_message": "You're covered in bile!",
+    "apply_message": "Bile gets in your eyes!",
     "rating": "bad",
-    "base_mods": { "per_mod": [ -3 ], "vomit_chance": [ 500 ] },
+    "resist_traits": [ "SAPROVORE", "SAPROPHAGE", "EATDEAD" ],
+    "base_mods": {
+      "per_mod": [ -3, -3 ],
+      "vomit_chance": [ 500, 0 ],
+      "health_chance": [ 1 ],
+      "health_min": [ -1 ],
+      "health_chance_bot": [ 300, 0 ]
+    },
     "max_duration": "30 s",
     "limb_score_mods": [
       { "limb_score": "vision", "modifier": 0.1 },
       { "limb_score": "night_vis", "modifier": 0.0 },
       { "limb_score": "reaction", "modifier": 0.2 }
     ],
-    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+    "flags": [ "EFFECT_LIMB_SCORE_MOD", "BILE_AFFLICTED" ]
+  },
+  {
+    "type": "effect_type",
+    "id": "bile",
+    "name": [ "Bile Splashed" ],
+    "desc": [ "You're splattered with a greasy layer of liquified putrescence." ],
+    "apply_message": "You're covered in bile!",
+    "rating": "bad",
+    "resist_traits": [ "SAPROVORE", "SAPROPHAGE", "EATDEAD" ],
+    "base_mods": { "vomit_chance": [ 500, 0 ], "health_chance": [ 1 ], "health_min": [ -1 ], "health_chance_bot": [ 300, 0 ] },
+    "max_duration": "30 s",
+    "flags": [ "BILE_AFFLICTED" ]
   },
   {
     "type": "effect_type",
@@ -3715,16 +3734,37 @@
   {
     "type": "effect_type",
     "id": "corroding",
-    "name": [ "Corroding" ],
-    "desc": [ "You're covered in acid!" ],
+    "name": [ "Acid Splattered", "Acid Splashed", "Acid Showered", "Acid Soaked", "Acid Drenched" ],
+    "desc": [
+      "You've got a little bit of acid on you.",
+      "You've got a small amount of acid on you.",
+      "There's a fair amount of acid on you.",
+      "You're covered in an alarming amount of acid!",
+      "You're bathed in acid!"
+    ],
     "apply_message": "You're covered in acid!",
     "rating": "bad",
+    "resist_traits": [ "SLIMY" ],
+    "immune_flags": [ "ACID_IMMUNE" ],
     "max_duration": "30 s",
     "max_intensity": 5,
     "int_dur_factor": "5 s",
-    "base_mods": { "hurt_min": [ 1 ], "hurt_chance": [ 1 ], "hurt_chance_bot": [ 10 ] },
-    "scaling_mods": { "hurt_chance": [ 1 ] },
-    "show_in_info": true
+    "//": "Decreases lifestyle score via acidosis. Don't get strange chemicals on you!",
+    "base_mods": {
+      "hurt_min": [ 1 ],
+      "hurt_chance": [ 1 ],
+      "hurt_max": [ 2 ],
+      "pain_min": [ 1 ],
+      "pain_chance": [ 1 ],
+      "pain_chance_bot": [ 2, 8 ],
+      "health_chance": [ 1 ],
+      "health_min": [ -1 ],
+      "hurt_chance_bot": [ 2, 8 ],
+      "health_chance_bot": [ 900, 3600 ]
+    },
+    "scaling_mods": { "hurt_amount": [ 0.3 ], "health_chance": [ 1 ] },
+    "show_in_info": true,
+    "flags": [ "ACID_AFFLICTED" ]
   },
   {
     "type": "effect_type",

data/json/effects_on_condition/effects_eocs.json

@@ -16,6 +16,78 @@
     ],
     "false_effect": [ { "u_lose_morale": "morale_bad_protein_bar" } ]
   },
+  {
+    "type": "effect_on_condition",
+    "id": "bile_in_eyes",
+    "recurrence": [ "1 seconds", "1 seconds" ],
+    "condition": {
+      "and": [
+        { "u_has_effect": "bile", "bodypart": "eyes" },
+        {
+          "and": [
+            { "not": { "u_has_trait": "COMPOUND_EYES" } },
+            { "not": { "u_has_trait": "PER_SLIME_OK" } },
+            { "not": { "u_has_bionics": "bio_armor_eyes" } }
+          ]
+        }
+      ]
+    },
+    "effect": [
+      { "u_add_effect": "boomered", "target_part": "eyes", "duration": "6 seconds" },
+      { "u_lose_effect": "bile", "target_part": "eyes" }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "acid_in_eyes",
+    "recurrence": [ "1 seconds", "1 seconds" ],
+    "condition": {
+      "and": [
+        { "u_has_effect": "corroding", "bodypart": "eyes" },
+        {
+          "and": [
+            { "not": { "u_has_flag": "ACIDPROOF" } },
+            { "not": { "u_has_trait": "PER_SLIME_OK" } },
+            { "not": { "u_has_bionics": "bio_armor_eyes" } }
+          ]
+        }
+      ]
+    },
+    "effect": [ { "u_add_effect": "blind", "target_part": "eyes", "duration": "5 seconds" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "bile_stink",
+    "recurrence": [ "1 seconds", "1 seconds" ],
+    "condition": { "and": [ { "u_has_flag": "BILE_AFFLICTED" }, { "not": { "u_has_trait": "BILE_STINK" } } ] },
+    "effect": [ { "u_add_trait": "BILE_STINK" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "bile_unstink",
+    "recurrence": [ "3 minutes", "10 minutes" ],
+    "condition": { "not": { "u_has_flag": "BILE_AFFLICTED" } },
+    "effect": [ { "u_lose_trait": "BILE_STINK" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "acid_wash_off_check",
+    "recurrence": [ "2 seconds", "4 seconds" ],
+    "condition": { "and": [ "u_is_underwater", { "or": [ { "u_has_flag": "ACID_AFFLICTED" }, { "u_has_flag": "BILE_AFFLICTED" } ] } ] },
+    "effect": [
+      {
+        "foreach": "ids",
+        "var": { "context_val": "id" },
+        "target": "bodypart",
+        "effect": [
+          { "u_message": "The noxious substances are washed from your body.", "type": "good" },
+          { "u_lose_effect": "corroding", "target_part": { "context_val": "id" } },
+          { "u_lose_effect": "bile", "target_part": { "context_val": "id" } },
+          { "u_lose_effect": "boomered", "target_part": { "context_val": "id" } }
+        ]
+      }
+    ]
+  },
   {
     "type": "effect_on_condition",
     "id": "eoc_social_satisfied",