Add conjunctivitis from boomer bile

data/json/effects.json

@@ -1961,12 +1961,7 @@
   {
     "type": "effect_type",
     "id": "smoke_eyes",
-    "name": [
-      "Little Eye Irritation (Smoke)",
-      "Minor Eye Irritation (Smoke)",
-      "Huge Eye Irritation (Smoke)",
-      "Bad Eye Irritation (Smoke)"
-    ],
+    "name": [ "Little Eye Irritation", "Minor Eye Irritation", "Huge Eye Irritation", "Bad Eye Irritation" ],
     "desc": [
       "Your eyes are mildly irritated.",
       "Your eyes are watering.",
@@ -1982,7 +1977,7 @@
         "bad"
       ]
     ],
-    "miss_messages": [ [ "Your eyes sting and tear from the smoke.", 1 ] ],
+    "miss_messages": [ [ "Your eyes sting and tear from the irritation.", 1 ] ],
     "max_duration": "3 m",
     "max_intensity": 4,
     "int_decay_tick": 40,
@@ -2104,6 +2099,21 @@
     "max_duration": "2 minutes",
     "removes_effects": [ "skunk_spray" ]
   },
+  {
+    "type": "effect_type",
+    "id": "conjunctivitis",
+    "name": [ "Conjunctivitis" ],
+    "desc": [ "Your eyes are inflamed." ],
+    "apply_message": "The chemical irritant damaged your eyes!",
+    "rating": "bad",
+    "resist_traits": [ "POISRESIST", "PER_SLIME_OK" ],
+    "immune_flags": [ "POISIMMUNE", "SEESLEEP" ],
+    "int_dur_factor": "50 m",
+    "base_mods": { "per_mod": [ -1 ], "pain_min": [ 1 ], "pain_chance": [ 400, 1000 ] },
+    "limb_score_mods": [ { "limb_score": "vision", "modifier": 0.85, "resist_modifier": 0.925 } ],
+    "miss_messages": [ [ "It feels like there's sand in your eye.", 1 ] ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+  },
   {
     "type": "effect_type",
     "id": "invisibility",

data/json/effects_on_condition/effects_eocs.json

@@ -63,5 +63,33 @@
       }
     ],
     "false_effect": [ { "u_lose_morale": "morale_asocial_dissatisfied" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "eoc_conjunctivitis_itch",
+    "recurrence": [ "10 minutes", "45 minutes" ],
+    "condition": {
+      "and": [
+        { "u_has_effect": "conjunctivitis", "bodypart": "eyes" },
+        { "not": { "u_has_effect": "formication" } },
+        { "not": { "u_has_effect": "took_antihistamine" } },
+        { "not": { "u_has_effect": "sleep" } }
+      ]
+    },
+    "effect": [ { "u_add_effect": "formication", "duration": 300, "target_part": "head" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "eoc_conjunctivitis_sting",
+    "recurrence": [ "10 minutes", "45 minutes" ],
+    "condition": { "and": [ { "u_has_effect": "conjunctivitis", "bodypart": "eyes" }, { "not": { "u_has_effect": "sleep" } } ] },
+    "effect": [
+      {
+        "u_add_effect": "smoke_eyes",
+        "duration": 180,
+        "intensity": { "math": [ "u_effect_intensity('smoke_eyes', 'bodypart': 'eyes') + 1" ] },
+        "target_part": "eyes"
+      }
+    ]
   }
 ]

data/json/effects_on_condition/misc_effect_on_condition.json

@@ -192,5 +192,41 @@
         ]
       }
     ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "eoc_boomered_apply_conjunctivitis",
+    "eoc_type": "EVENT",
+    "required_event": "character_gains_effect",
+    "condition": {
+      "and": [
+        { "compare_string": [ "boomered", { "context_val": "effect" } ] },
+        { "compare_string": [ "eyes", { "context_val": "bodypart" } ] },
+        { "not": { "u_has_effect": "conjunctivitis" } },
+        { "not": { "math": ["u_coverage('eyes')", ">=", "90"] } },
+        { "not": { "u_has_trait": "COMPOUND_EYES" } },
+        { "not": { "u_has_trait": "SEESLEEP" } },
+        { "not": { "u_has_bionics": "armor_bio_eyes" } },
+        {
+          "or": [
+            { "x_in_y_chance": { "x": 1, "y": 12 } },
+            {
+              "and": [
+                {
+                  "or": [
+                    { "u_has_effect": "contacts" },
+                    { "u_has_effect": "transition_contacts" },
+                    { "u_has_effect": "transition_contacts_plano" },
+                    { "u_has_flag": "EYE_MEMBRANE" }
+                  ]
+                },
+                { "x_in_y_chance": { "x": 1, "y": 12 } }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "effect": [ { "u_add_effect": "conjunctivitis", "duration": { "math": [ "rand(259200) + 172800" ] }, "target_part": "eyes" } ]
   }
 ]