Better Boomer Barf (#69555)

* try again * fixes * more updates * Fixes * Update effects.json * Update src/creature.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/creature.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/character_body.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/character.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/character.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/effects_on_condition/misc_effect_on_condition.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/effects_on_condition/misc_effect_on_condition.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/effects.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/effects.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/effects_on_condition/misc_effect_on_condition.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/field_type.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/field_type.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/field_type.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/field_type.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/field_type.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/field_type.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * rebase fix uggghh * Update effects.json * Update src/creature.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/creature.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/creature.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/creature.h Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/iuse.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/monster.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/monster.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/monster.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/monster.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/creature.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update mutation_effect_eocs.json * Update field_type.json * Update stashes.json * Update eyewear.json * Update data/mods/CrazyCataclysm/crazy_effect_on_condition.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/CrazyCataclysm/crazy_effect_on_condition.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update med.json * Update src/character.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/character.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/character.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/character.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update collections_domestic.json * Update src/character.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/creature.h Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update drugs.json * Update npc.cpp * Update monster.cpp * Update creature.h * Update creature.cpp * Update character_body.cpp * Update crazy_effect_on_condition.json * Update character.h * Update src/character_body.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update iuse.cpp * Not everyone has skin, not all itching is a bug delusion * footing instead of reaction * mild int penalty (pinkeye is distracting) * alphabetize * change int to float to stop the thing complaining * redundant parentheses * redundant parentheses * Update src/creature.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * minor rebase error * changed to infection_immune * Update misc_effect_on_condition.json * Minor fixes * make checks stop complaining --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Maleclypse <[email protected]>
CleverRaven · Nov 30, 2023 · de8de66 · de8de66
1 parent da58c5b
commit de8de66
Show file tree

Hide file tree

Showing 19 changed files with 480 additions and 29 deletions.
diff --git a/data/json/effects.json b/data/json/effects.json
@@ -1910,7 +1910,7 @@
     "type": "effect_type",
     "id": "boomered",
     "name": [ "Boomered" ],
-    "desc": [ "Range of Sight: 1; You are covered in magenta bile!" ],
+    "desc": [ "Your vision is obscured by a disgusting splatter of bile." ],
     "apply_message": "You're covered in bile!",
     "rating": "bad",
     "base_mods": { "per_mod": [ -3 ], "vomit_chance": [ 500 ] },
@@ -2655,10 +2655,11 @@
   {
     "type": "effect_type",
     "id": "formication",
-    "name": [ "Itchy Skin", "Writhing Skin", "Bugs in Skin" ],
+    "name": [ "Itchy", "Very Itchy", "Terribly Itchy" ],
     "desc": [ "You stop to scratch yourself frequently; high INT helps you resist the urge." ],
-    "apply_message": "Your skin feels extremely itchy!",
+    "apply_message": "You feel extremely itchy!",
     "rating": "bad",
+    "resist_effects": [ "took_flumed", "took_antihistamine" ],
     "main_parts_only": true,
     "max_intensity": 3,
     "base_mods": { "str_mod": [ -0.34 ], "int_mod": [ -1 ] },
@@ -2809,6 +2810,74 @@
     "max_duration": 14515200,
     "dur_add_perc": 50
   },
+  {
+    "//": "For player, indistinguishable from pre_conjunctivitis_bacterial, but separate here to allow for separate resistances from antibiotics.",
+    "type": "effect_type",
+    "id": "pre_conjunctivitis_viral",
+    "show_in_info": false,
+    "immune_flags": [ "INFECTION_IMMUNE", "SEESLEEP" ],
+    "blood_analysis_description": "Viral Infection",
+    "max_duration": "71 h"
+  },
+  {
+    "//": "For player, indistinguishable from pre_conjunctivitis_viral, but separate here to allow for separate resistances from antibiotics.",
+    "type": "effect_type",
+    "id": "pre_conjunctivitis_bacterial",
+    "show_in_info": false,
+    "immune_flags": [ "INFECTION_IMMUNE", "SEESLEEP" ],
+    "blood_analysis_description": "Bacterial Infection",
+    "max_duration": "71 h"
+  },
+  {
+    "//": "For player, indistinguishable from conjunctivitis_bacterial, but separate here to allow for separate resistances from antibiotics.",
+    "type": "effect_type",
+    "id": "conjunctivitis_viral",
+    "name": [ "Conjunctivitis" ],
+    "desc": [
+      "Commonly known as pinkeye, this minor infection can be treated with antihistamines.  If it's bacterial, antibiotics may help, but you can't tell without a lab analysis."
+    ],
+    "apply_memorial_log": "Got pinkeye.",
+    "remove_memorial_log": "Got over a pinkeye infection.",
+    "apply_message": "Your itchy eye leaks a filmy discharge.",
+    "rating": "bad",
+    "resist_effects": [ "took_antihistamine", "took_flumed" ],
+    "resist_traits": [ "INFRESIST", "PER_SLIME_OK" ],
+    "immune_flags": [ "INFECTION_IMMUNE", "SEESLEEP" ],
+    "int_dur_factor": "50 m",
+    "base_mods": { "int_mod": [ -1 ], "per_mod": [ -2 ], "pain_min": [ 1 ], "pain_chance": [ 400, 1000 ] },
+    "limb_score_mods": [
+      { "limb_score": "vision", "modifier": 0.8, "resist_modifier": 0.9 },
+      { "limb_score": "night_vis", "modifier": 0.8, "resist_modifier": 0.9 }
+    ],
+    "miss_messages": [ [ "It feels like there's sand in your eye.", 1 ] ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ],
+    "blood_analysis_description": "Viral Infection"
+  },
+  {
+    "//": "For player, indistinguishable from conjunctivitis_bacterial, but separate here to allow for separate resistances from antibiotics.",
+    "type": "effect_type",
+    "id": "conjunctivitis_bacterial",
+    "name": [ "Conjunctivitis" ],
+    "desc": [
+      "Commonly known as pinkeye, this minor infection can be treated with antihistamines.  If it's bacterial, antibiotics may help, but you can't tell without a lab analysis."
+    ],
+    "apply_memorial_log": "Got pinkeye.",
+    "remove_memorial_log": "Got over a pinkeye infection.",
+    "apply_message": "Your itchy eye leaks a filmy discharge.",
+    "rating": "bad",
+    "resist_effects": [ "took_antihistamine", "took_flumed" ],
+    "resist_traits": [ "INFRESIST", "PER_SLIME_OK" ],
+    "immune_flags": [ "INFECTION_IMMUNE", "SEESLEEP" ],
+    "int_dur_factor": "50 m",
+    "base_mods": { "int_mod": [ -1 ], "per_mod": [ -2 ], "pain_min": [ 1 ], "pain_chance": [ 400, 1000 ] },
+    "miss_messages": [ [ "It feels like there's sand in your eye.", 1 ] ],
+    "limb_score_mods": [
+      { "limb_score": "vision", "modifier": 0.8, "resist_modifier": 0.9 },
+      { "limb_score": "night_vis", "modifier": 0.8, "resist_modifier": 0.9 }
+    ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ],
+    "blood_analysis_description": "Bacterial Infection"
+  },
   {
     "type": "effect_type",
     "id": "prophylactic_antivenom",
@@ -2826,6 +2895,14 @@
     "max_duration": 86400,
     "blood_analysis_description": "Antiasthmatics"
   },
+  {
+    "type": "effect_type",
+    "id": "took_antihistamine",
+    "name": [ "Took Antihistamine Drugs" ],
+    "desc": [ "You have taken an antihistamine drug recently." ],
+    "rating": "good",
+    "blood_analysis_description": "Antihistamines"
+  },
   {
     "type": "effect_type",
     "id": "cureall",
@@ -2849,7 +2926,11 @@
       "infected",
       "asthma",
       "common_cold",
-      "flu"
+      "flu",
+      "pre_conjunctivitis_viral",
+      "pre_conjunctivitis_bacterial",
+      "conjunctivitis_viral",
+      "conjunctivitis_bacterial"
     ],
     "base_mods": { "pkill_min": [ 5 ] }
   },
@@ -4396,5 +4477,20 @@
         ]
       }
     ]
+  },
+  {
+    "id": "slippery_terrain",
+    "type": "effect_type",
+    "max_duration": "1 s",
+    "name": [ "Slick Surface", "Slippery Terrain", "Dangerously Slippery" ],
+    "desc": [
+      "There's a slippery surface here, running may be a bad idea.",
+      "It's quite slippery, it may not be safe to stand here.",
+      "This area is extremely slippery."
+    ],
+    "rating": "bad",
+    "show_intensity": true,
+    "resist_traits": [ "GASTROPOD_BALANCE" ],
+    "show_in_info": true
   }
 ]
diff --git a/data/json/effects_on_condition/misc_effect_on_condition.json b/data/json/effects_on_condition/misc_effect_on_condition.json
@@ -118,5 +118,61 @@
     "type": "effect_on_condition",
     "id": "add_effect",
     "effect": { "u_add_effect": { "context_val": "effect" }, "duration": { "context_val": "duration" } }
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PRE_CONJUNCTIVITIS_VIRAL",
+    "recurrence": [ "24 hours", "72 hours" ],
+    "condition": {
+      "and": [
+        { "u_has_effect": "pre_conjunctivitis_viral" },
+        { "not": { "u_has_effect": "conjunctivitis_bacterial" } },
+        { "not": { "u_has_effect": "conjunctivitis_viral" } },
+        { "not": { "u_has_trait": "SEESLEEP" } },
+        { "not": { "u_has_bionics": "armor_bio_eyes" } }
+      ]
+    },
+    "effect": [
+      { "u_add_effect": "conjunctivitis_viral", "duration": { "math": [ "rand(259200) + 432000" ] }, "target_part": "eyes" },
+      { "u_lose_effect": "pre_conjunctivitis_bacterial" },
+      { "u_lose_effect": "pre_conjunctivitis_viral" }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_PRE_CONJUNCTIVITIS_BACTERIAL",
+    "recurrence": [ "24 hours", "72 hours" ],
+    "condition": {
+      "and": [
+        { "u_has_effect": "pre_conjunctivitis_bacterial" },
+        { "not": { "u_has_effect": "conjunctivitis_bacterial" } },
+        { "not": { "u_has_effect": "conjunctivitis_viral" } },
+        { "not": { "u_has_trait": "SEESLEEP" } },
+        { "not": { "u_has_bionics": "armor_bio_eyes" } }
+      ]
+    },
+    "effect": [
+      {
+        "u_add_effect": "conjunctivitis_bacterial",
+        "duration": { "math": [ "rand(259200) + 432000" ] },
+        "target_part": "eyes"
+      },
+      { "u_lose_effect": "pre_conjunctivitis_viral" },
+      { "u_lose_effect": "pre_conjunctivitis_bacterial" }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_CONJUNCTIVITIS",
+    "recurrence": [ "10 minutes", "45 minutes" ],
+    "condition": {
+      "and": [
+        { "or": [ { "u_has_effect": "conjunctivitis_viral" }, { "u_has_effect": "conjunctivitis_bacterial" } ] },
+        { "not": { "u_has_effect": "formication" } },
+        { "not": { "u_has_effect": "took_antihistamine" } },
+        { "not": { "u_has_effect": "sleep" } }
+      ]
+    },
+    "effect": [ { "u_add_effect": "formication", "duration": "5 minutes", "target_part": "head" } ]
   }
 ]
diff --git a/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json b/data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json
@@ -226,8 +226,14 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_RASHY_SKIN",
-    "recurrence": [ "2 hour", "24 hours" ],
-    "condition": { "and": [ { "u_has_trait": "SKIN_RASHY" }, { "not": { "u_has_effect": "formication" } } ] },
+    "recurrence": [ "2 hours", "24 hours" ],
+    "condition": {
+      "and": [
+        { "u_has_trait": "SKIN_RASHY" },
+        { "not": { "u_has_effect": "took_antihistamine" } },
+        { "not": { "u_has_effect": "formication" } }
+      ]
+    },
     "effect": [ { "u_add_effect": "formication", "duration": "10 minutes", "target_part": "random" } ]
   }
 ]
diff --git a/data/json/field_type.json b/data/json/field_type.json
@@ -17,12 +17,51 @@
     "id": "fd_bile",
     "type": "field_type",
     "legacy_enum_id": 2,
-    "intensity_levels": [ { "name": "bile splatter", "color": "pink" }, { "name": "bile stain" }, { "name": "puddle of bile" } ],
+    "intensity_levels": [
+      {
+        "name": "bile splatter",
+        "sym": "}",
+        "color": "pink",
+        "effects": [
+          {
+            "effect_id": "slippery_terrain",
+            "intensity": 1,
+            "min_duration": "1 second",
+            "immune_in_vehicle": true,
+            "is_environmental": false
+          }
+        ]
+      },
+      {
+        "name": "bile stain",
+        "effects": [
+          {
+            "effect_id": "slippery_terrain",
+            "intensity": 2,
+            "min_duration": "1 second",
+            "immune_in_vehicle": true,
+            "is_environmental": false
+          }
+        ]
+      },
+      {
+        "name": "puddle of bile",
+        "effects": [
+          {
+            "effect_id": "slippery_terrain",
+            "intensity": 3,
+            "min_duration": "1 second",
+            "immune_in_vehicle": true,
+            "is_environmental": false
+          }
+        ]
+      }
+    ],
     "description_affix": "covered_in",
     "underwater_age_speedup": "25 minutes",
     "decay_amount_factor": 2,
     "is_splattering": true,
-    "half_life": "1 days",
+    "half_life": "30 minutes",
     "phase": "liquid",
     "accelerated_decay": true,
     "display_field": true,
@@ -176,15 +215,50 @@
     "type": "field_type",
     "legacy_enum_id": 6,
     "intensity_levels": [
-      { "name": "slime trail", "color": "light_green" },
-      { "name": "slime stain" },
-      { "name": "puddle of slime", "color": "green" }
+      {
+        "name": "slime trail",
+        "color": "light_green",
+        "effects": [
+          {
+            "effect_id": "slippery_terrain",
+            "intensity": 1,
+            "min_duration": "1 second",
+            "immune_in_vehicle": true,
+            "is_environmental": false
+          }
+        ]
+      },
+      {
+        "name": "slime stain",
+        "effects": [
+          {
+            "effect_id": "slippery_terrain",
+            "intensity": 2,
+            "min_duration": "1 second",
+            "immune_in_vehicle": true,
+            "is_environmental": false
+          }
+        ]
+      },
+      {
+        "name": "puddle of slime",
+        "color": "green",
+        "effects": [
+          {
+            "effect_id": "slippery_terrain",
+            "intensity": 3,
+            "min_duration": "1 second",
+            "immune_in_vehicle": true,
+            "is_environmental": false
+          }
+        ]
+      }
     ],
     "description_affix": "covered_in",
     "decay_amount_factor": 2,
     "apply_slime_factor": 10,
     "is_splattering": true,
-    "half_life": "1 days",
+    "half_life": "25 minutes",
     "phase": "liquid",
     "accelerated_decay": true,
     "display_field": true,

diff --git a/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json b/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
@@ -219,14 +219,15 @@
       { "group": "cotton_ball_bag_full", "prob": 5 },
       { "group": "used_1st_aid", "prob": 35 },
       { "item": "saline", "prob": 25, "charges": [ 1, 5 ] },
-      { "item": "contacts", "prob": 10, "count": 6 },
+      [ "contacts", 10 ],
       { "prob": 75, "group": "vitamins_bottle_plastic_pill_supplement_1_20" },
       { "item": "gummy_vitamins", "prob": 25, "count": [ 1, 10 ] },
       { "prob": 75, "group": "calcium_tablet_bottle_plastic_pill_supplement_1_20" },
       { "prob": 85, "group": "aspirin_bottle_plastic_pill_painkiller_1_20" },
       { "prob": 25, "group": "caffeine_bottle_plastic_pill_supplement_1_10" },
       { "prob": 15, "group": "pills_sleep_bottle_plastic_pill_prescription_1_10" },
       { "prob": 10, "group": "melatonin_tablet_bottle_plastic_pill_supplement_1_30" },
+      { "prob": 15, "group": "antihistamine_bottle_plastic_pill_supplement_1_30" },
       { "prob": 5, "group": "iodine_bottle_plastic_pill_supplement_1_10" },
       { "prob": 5, "group": "prussian_blue_bottle_plastic_pill_supplement_1_10" },
       { "item": "dayquil", "prob": 70, "charges": [ 1, 5 ] },
@@ -585,6 +586,13 @@
     "container-item": "bottle_plastic_pill_prescription",
     "entries": [ { "item": "melatonin_tablet", "container-item": "null", "count": 30 } ]
   },
+  {
+    "type": "item_group",
+    "id": "antihistamine_bottle_full",
+    "subtype": "collection",
+    "container-item": "bottle_plastic_pill_prescription",
+    "entries": [ { "item": "antihistamine", "container-item": "null", "count": 30 } ]
+  },
   {
     "type": "item_group",
     "id": "protein_bottle_full",

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -260,7 +260,7 @@
       [ "glasses_bifocal", 20 ],
       { "group": "cotton_ball_bag_used", "prob": 20 },
       { "group": "cotton_ball_bag_full", "prob": 3 },
-      { "item": "contacts", "prob": 20, "count": 6 },
+      [ "contacts", 20 ],
       { "item": "pride_flag", "prob": 5 },
       { "item": "national_flag", "prob": 1 },
       { "prob": 20, "group": "vitamins_bottle_plastic_pill_supplement_1_20" },
@@ -277,6 +277,7 @@
       [ "holy_symbol", 5 ],
       [ "pills_sleep", 5 ],
       { "prob": 3, "group": "melatonin_tablet_bottle_plastic_pill_supplement_1_30" },
+      { "prob": 5, "group": "antihistamine_bottle_plastic_pill_supplement_1_30" },
       { "item": "nyquil", "prob": 5, "charges": [ 1, 5 ] },
       { "group": "mansion_guns", "prob": 3 },
       { "group": "harddrugs", "prob": 1 },
@@ -1509,6 +1510,13 @@
     "container-item": "bottle_plastic_pill_supplement",
     "entries": [ { "item": "melatonin_tablet", "container-item": "null", "count": [ 1, 30 ] } ]
   },
+  {
+    "type": "item_group",
+    "id": "antihistamine_bottle_plastic_pill_supplement_1_30",
+    "subtype": "collection",
+    "container-item": "bottle_plastic_pill_supplement",
+    "entries": [ { "item": "antihistamine", "container-item": "null", "count": [ 1, 30 ] } ]
+  },
   {
     "type": "item_group",
     "id": "coke_bag_zipper_1_8",