Boomers Actually Do Something

data/json/effects.json

@@ -2643,8 +2643,9 @@
     "id": "formication",
     "name": [ "Itchy Skin", "Writhing Skin", "Bugs in Skin" ],
     "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 ] },
@@ -2795,6 +2796,72 @@
     "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,
+    "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,
+    "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 eye leaks a filmy discharge.",
+    "rating": "bad",
+    "resist_effects": [ "took_antihistamine", "took_flumed" ],
+    "resist_traits": [ "INFRESIST", "PER_SLIME_OK" ],
+    "immune_flags": [ "NO_DISEASE", "SEESLEEP" ],
+    "int_dur_factor": "50 m",
+    "base_mods": { "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 eye leaks a filmy discharge.",
+    "rating": "bad",
+    "resist_effects": [ "took_antihistamine", "took_flumed" ],
+    "resist_traits": [ "INFRESIST", "PER_SLIME_OK" ],
+    "immune_flags": [ "NO_DISEASE", "SEESLEEP" ],
+    "int_dur_factor": "50 m",
+    "base_mods": { "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",
@@ -2812,6 +2879,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",
@@ -2835,7 +2910,9 @@
       "infected",
       "asthma",
       "common_cold",
-      "flu"
+      "flu",
+      "conjunctivitis_viral",
+      "conjunctivitis_bacterial"
     ],
     "base_mods": { "pkill_min": [ 5 ] }
   },

data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json

@@ -226,8 +226,29 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_RASHY_SKIN",
-    "recurrence": [ "2 hour", "24 hours" ],
+    "recurrence": [ "2 hours", "24 hours" ],
     "condition": { "and": [ { "u_has_trait": "SKIN_RASHY" }, { "not": { "u_has_effect": "formication" } } ] },
     "effect": [ { "u_add_effect": "formication", "duration": "10 minutes", "target_part": "random" } ]
+  },
+  {
+    "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" } ]
   }
 ]

data/json/field_type.json

@@ -24,6 +24,7 @@
     "is_splattering": true,
     "half_life": "1 days",
     "phase": "liquid",
+    "slippery": true,
     "accelerated_decay": true,
     "display_field": true,
     "looks_like": "fd_acid"
@@ -186,6 +187,7 @@
     "is_splattering": true,
     "half_life": "1 days",
     "phase": "liquid",
+    "slippery": true,
     "accelerated_decay": true,
     "display_field": true,
     "looks_like": "fd_blood_veggy"

data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json

@@ -227,6 +227,7 @@
       { "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",

data/json/itemgroups/collections_domestic.json

@@ -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 },
@@ -1491,6 +1492,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",

data/json/itemgroups/stashes.json

@@ -56,6 +56,7 @@
     "id": "stash_drugs",
     "items": [
       { "prob": 15, "group": "pills_sleep_bottle_plastic_pill_prescription_1_10" },
+      { "prob": 10, "group": "antihistamine_bottle_plastic_pill_supplement_1_30" },
       { "prob": 5, "group": "melatonin_tablet_bottle_plastic_pill_supplement_1_30" },
       { "prob": 4, "group": "oxycodone_bottle_plastic_pill_prescription_1_10" },
       { "item": "morphine", "prob": 4, "count": [ 1, 4 ] },

data/json/items/comestibles/med.json

@@ -913,6 +913,30 @@
     "addiction_type": "sleeping pill",
     "use_action": [ "FLUSLEEP" ]
   },
+  {
+    "id": "antihistamine",
+    "type": "COMESTIBLE",
+    "comestible_type": "MED",
+    "name": { "str_sp": "antihistamine pill" },
+    "description": "Over-the-counter allergy medication.  The label advises taking one a day and warns that they can cause drowsiness.",
+    "//": "Flu meds contain antihistamines among other things, so it's intended that there's some overlap between this and cough syrup.",
+    "weight": "1 g",
+    "volume": "1 ml",
+    "price": "25 cent",
+    "price_postapoc": "25 cent",
+    "symbol": "!",
+    "color": "light_red",
+    "container": "bottle_plastic_pill_supplement",
+    "stim": -6,
+    "flags": [ "IRREPLACEABLE_CONSUMABLE" ],
+    "addiction_potential": 4,
+    "addiction_type": "sleeping pill",
+    "use_action": {
+      "type": "consume_drug",
+      "activation_message": "You take an antihistamine pill.",
+      "effects": [ { "id": "took_antihistamine", "duration": "10 h" } ]
+    }
+  },
   {
     "id": "oxycodone",
     "type": "COMESTIBLE",

src/avatar_action.cpp

@@ -60,6 +60,7 @@
 class gun_mode;
 
 static const efftype_id effect_amigara( "amigara" );
+static const efftype_id effect_downed( "downed" );
 static const efftype_id effect_glowing( "glowing" );
 static const efftype_id effect_harnessed( "harnessed" );
 static const efftype_id effect_hunger_engorged( "hunger_engorged" );
@@ -79,7 +80,12 @@
 
 static const skill_id skill_swimming( "swimming" );
 
+static const trait_id trait_AQUEOUS( "AQUEOUS" );
+static const trait_id trait_CLUMSY( "CLUMSY" );
+static const trait_id trait_DEFT( "DEFT" );
+static const trait_id trait_GASTROPOD_BALANCE( "GASTROPOD_BALANCE" );
 static const trait_id trait_GRAZER( "GRAZER" );
+static const trait_id trait_PROF_SKATER( "PROF_SKATER" );
 static const trait_id trait_RUMINANT( "RUMINANT" );
 static const trait_id trait_SHELL2( "SHELL2" );
 static const trait_id trait_SHELL3( "SHELL3" );

src/character.cpp

@@ -125,7 +125,7 @@
 
 struct dealt_projectile_attack;
 
 static const activity_id ACT_ADV_INVENTORY( "ACT_ADV_INVENTORY" );
 static const activity_id ACT_AUTODRIVE( "ACT_AUTODRIVE" );
 static const activity_id ACT_CONSUME_DRINK_MENU( "ACT_CONSUME_DRINK_MENU" );
 static const activity_id ACT_CONSUME_FOOD_MENU( "ACT_CONSUME_FOOD_MENU" );
@@ -256,6 +256,10 @@
 static const efftype_id effect_pkill1( "pkill1" );
 static const efftype_id effect_pkill2( "pkill2" );
 static const efftype_id effect_pkill3( "pkill3" );
+static const efftype_id effect_pre_conjunctivitis_viral( "pre_conjunctivitis_viral" );
+static const efftype_id effect_pre_conjunctivitis_bacterial( "pre_conjunctivitis_bacterial" );
+static const efftype_id effect_conjunctivitis_viral( "conjunctivitis_viral" );
+static const efftype_id effect_conjunctivitis_bacterial( "conjunctivitis_bacterial" );
 static const efftype_id effect_recently_coughed( "recently_coughed" );
 static const efftype_id effect_recover( "recover" );
 static const efftype_id effect_ridden( "ridden" );
@@ -309,7 +313,7 @@
 static const json_character_flag json_flag_INFECTION_IMMUNE( "INFECTION_IMMUNE" );
 static const json_character_flag json_flag_INFRARED( "INFRARED" );
 static const json_character_flag json_flag_INSECTBLOOD( "INSECTBLOOD" );
-static const json_character_flag json_flag_INVERTERBRATEBLOOD( "INVERTERBRATEBLOOD" );
+static const json_character_flag json_flag_INVERTEBRATEBLOOD( "INVERTEBRATEBLOOD" );
 static const json_character_flag json_flag_INVISIBLE( "INVISIBLE" );
 static const json_character_flag json_flag_MYOPIC( "MYOPIC" );
 static const json_character_flag json_flag_MYOPIC_IN_LIGHT( "MYOPIC_IN_LIGHT" );
@@ -431,6 +435,7 @@
 static const trait_id trait_HEAVYSLEEPER2( "HEAVYSLEEPER2" );
 static const trait_id trait_HIBERNATE( "HIBERNATE" );
 static const trait_id trait_ILLITERATE( "ILLITERATE" );
+static const trait_id trait_INFRESIST( "INFRESIST" );
 static const trait_id trait_INSOMNIA( "INSOMNIA" );
 static const trait_id trait_INT_SLIME( "INT_SLIME" );
 static const trait_id trait_LEG_TENT_BRACE( "LEG_TENT_BRACE" );
@@ -747,7 +752,7 @@
     if( has_flag( json_flag_INSECTBLOOD ) ) {
         return fd_blood_insect;
     }
-    if( has_flag( json_flag_INVERTERBRATEBLOOD ) ) {
+    if( has_flag( json_flag_INVERTEBRATEBLOOD ) ) {
         return fd_blood_invertebrate;
     }
     return fd_blood;
@@ -7982,14 +7987,19 @@
 
     map &here = get_map();
     const optional_vpart_position veh_part = here.veh_at( pos() );
+    const field &fields = get_map().field_at( pos() );
+    bool slippery = false;
+    for( const auto &field : fields ) {
+        slippery = field.first.obj().slippery;
+    }
     bool in_skater_vehicle = in_vehicle && veh_part.part_with_feature( "SEAT_REQUIRES_BALANCE", false );
 
-    if( ( worn_with_flag( flag_REQUIRES_BALANCE ) || in_skater_vehicle ) && !is_on_ground() )  {
+    if( ( ( slippery && here.has_flag( ter_furn_flag::TFLAG_FLAT, pos() ) ) || worn_with_flag( flag_REQUIRES_BALANCE ) || in_skater_vehicle ) && !is_on_ground() )  {
         int rolls = 4;
         if( worn_with_flag( flag_ROLLER_ONE ) && !in_skater_vehicle ) {
             rolls += 2;
         }
-        if( has_trait( trait_PROF_SKATER ) ) {
+        if( !slippery || has_trait( trait_PROF_SKATER ) ) {
             rolls--;
         }
         if( has_trait( trait_DEFT ) ) {
@@ -10706,6 +10716,30 @@
         terminating_effects.pop();
     }
 
+    if ( has_effect( effect_boomered ) && one_in( 30 ) && !has_effect( effect_pre_conjunctivitis_bacterial ) && !has_effect( effect_pre_conjunctivitis_viral ) && !has_effect( effect_conjunctivitis_bacterial ) && !has_effect( effect_conjunctivitis_viral ) && !has_trait_flag( json_flag_INFECTION_IMMUNE ) ) {
+        //Washing your eyes out in time may save you from getting pinkeye.
+        float checked_health = get_lifestyle() + 200.0;
+        //Some animal eyes are more vulnerable to infection.
+        if ( has_trait_flag( json_flag_EYE_MEMBRANE ) ) {
+            checked_health -= 50;
+        }
+        if ( has_trait( trait_INFRESIST ) ) {
+            checked_health += 50;
+        }
+        add_msg( _( "Checked health is %s!" ), checked_health );
+        int pinkeye_chance = round( 4 + 96 * log ( checked_health + 1 ) / log ( 401 ) ); 
+        add_msg( _( "Pinkeye chance is 1 in %s!" ), pinkeye_chance );
+        if( one_in( ( pinkeye_chance ) ) ) {
+            if( one_in( 2 ) ) {
+                add_msg( _( "Got bacterial pinkeye with a probability of 1 in %s!" ), pinkeye_chance );
+                add_effect( effect_pre_conjunctivitis_bacterial, 70_hours );
+            } else {
+                add_msg( _( "Got viral pinkeye with a resistance probability of 1 in %s!" ), pinkeye_chance );
+                add_effect( effect_pre_conjunctivitis_viral, 70_hours );
+            }
+        }
+    }
+
     Creature::process_effects();
 }
 

src/field_type.cpp

@@ -291,6 +291,7 @@ void field_type::load( const JsonObject &jo, const std::string_view )
     optional( jo, was_loaded, "has_acid", has_acid, false );
     optional( jo, was_loaded, "has_elec", has_elec, false );
     optional( jo, was_loaded, "has_fume", has_fume, false );
+    optional( jo, was_loaded, "slippery", slippery, false );
     optional( jo, was_loaded, "priority", priority, 0 );
     optional( jo, was_loaded, "half_life", half_life, 0_turns );
     const auto description_affix_reader = enum_flags_reader<description_affix> { "description affixes" };

src/field_type.h

@@ -205,6 +205,7 @@ struct field_type {
         bool has_acid = false;
         bool has_elec = false;
         bool has_fume = false;
+        bool slippery = false;
         description_affix desc_affix = description_affix::DESCRIPTION_AFFIX_NUM;
         map_bash_info bash_info;
 

src/monattack.cpp

@@ -134,6 +134,8 @@
 static const efftype_id effect_paid( "paid" );
 static const efftype_id effect_paralyzepoison( "paralyzepoison" );
 static const efftype_id effect_pet( "pet" );
+static const efftype_id effect_pre_conjunctivitis_bacterial( "pre_conjunctivitis_bacterial" );
+static const efftype_id effect_pre_conjunctivitis_viral( "pre_conjunctivitis_viral" );
 static const efftype_id effect_raising( "raising" );
 static const efftype_id effect_rat( "rat" );
 static const efftype_id effect_shrieking( "shrieking" );