diff --git a/data/mods/MindOverMatter/effects/effects_penalty.json b/data/mods/MindOverMatter/effects/effects_penalty.json index 4ff2cf1cb2791..5372c54fa88f1 100644 --- a/data/mods/MindOverMatter/effects/effects_penalty.json +++ b/data/mods/MindOverMatter/effects/effects_penalty.json @@ -397,5 +397,16 @@ "base_mods": { "stamina_amount": [ -1000 ] }, "limb_score_mods": [ { "limb_score": "breathing", "modifier": 0.8 } ], "flags": [ "EFFECT_LIMB_SCORE_MOD" ] + }, + { + "type": "effect_type", + "id": "severe_hay_fever", + "name": [ "Severe Hay Fever" ], + "desc": [ "Your eyes are burning and your nose is gushing mucus." ], + "rating": "bad", + "resist_effects": [ "took_flumed" ], + "show_in_info": true, + "removes_effects": [ "hay_fever" ], + "base_mods": { "per_mod": [ -4 ], "int_mod": [ -3 ], "stamina_min": [ -75 ], "stamina_max": [ -225 ], "stamina_chance": [ 200 ] } } ] diff --git a/data/mods/MindOverMatter/npcs/dialogue/follower_dialogue.json b/data/mods/MindOverMatter/npcs/dialogue/follower_dialogue.json index dfc5869d07ce0..8f9fa1ab239d1 100644 --- a/data/mods/MindOverMatter/npcs/dialogue/follower_dialogue.json +++ b/data/mods/MindOverMatter/npcs/dialogue/follower_dialogue.json @@ -21,7 +21,9 @@ { "npc_has_trait": "JITTERY" }, { "npc_has_trait": "MOODSWINGS" }, { "npc_has_trait": "WEAKENING" }, - { "npc_has_trait": "NARCOLEPTIC" } + { "npc_has_trait": "NARCOLEPTIC" }, + { "npc_has_trait": "SEASONAL_ALLERGIES" }, + { "npc_has_trait": "SEASONAL_AFFECTIVE" } ] }, { "u_has_trait": "VITAKINETIC" } @@ -72,12 +74,15 @@ }, { "id": [ "TALK_FRIEND_VITAKINETIC_CURE_ILLNESS" ], + "//": "Debug Mind Control will lead to auto-failure due to the formatting below. Be careful when testing!", "type": "talk_topic", "dynamic_line": [ "And?", "Yeah, it is what it is.", "Those storms at the end of world… I was fine before them.", - "You noticed, did you?" + "You noticed, did you?", + "Yeah, I've had it for years at this point. Not much I can do about it now, though.", + "Really wish I had gotten some more treatment before, you know." ], "responses": [ { @@ -130,7 +135,7 @@ } } }, - "responses": [ { "text": "Ah, okay.", "topic": "TALK_NONE" } ] + "responses": [ { "text": "Ah, okay.", "topic": "TALK_FRIEND" } ] }, { "id": [ "TALK_FRIEND_VITAKINETIC_CURE_DISEASE_LUNGS" ], @@ -204,7 +209,7 @@ "trial": { "type": "PERSUADE", "difficulty": 0, "mod": [ [ "TRUST", 6 ], [ "VALUE", 2 ], [ "ANGER", -6 ] ] }, "success": { "topic": "TALK_ACCEPT_VITAKINETIC_HEALING" }, "failure": { - "topic": "TALK_DENY_VITAKINETIC_HEALING", + "topic": "TALK_DENY_VITAKINETIC_HEALING_NON_PERSUADE", "effect": { "npc_add_effect": "asked_to_vitakinetic_heal", "duration": 86400 } } }, @@ -213,7 +218,7 @@ ] }, { - "id": "TALK_DENY_VITAKINETIC_HEALING", + "id": "TALK_DENY_VITAKINETIC_HEALING_NON_PERSUADE", "type": "talk_topic", "dynamic_line": "I don't think so. I know there are zombies out there and the world is all fucked up, but I'd rather keep that fucked-up-ness as far away from me as possible. No offense.", "responses": [ { "text": "Alright, if you insist.", "topic": "TALK_DONE" } ] @@ -474,6 +479,34 @@ { "u_assign_activity": "ACT_VITAKIN_BANISH_FOLLOWER_ILLNESS", "duration": "10 minutes" } ] }, + { + "text": "Hold still. *Remove 's seasonal allergies*", + "topic": "TALK_DONE", + "condition": { "and": [ { "npc_has_trait": "SEASONAL_ALLERGIES" }, { "not": { "u_has_trait": "SEASONAL_ALLERGIES" } } ] }, + "effect": [ + { "npc_lose_trait": "SEASONAL_ALLERGIES" }, + { "u_add_trait": "SEASONAL_ALLERGIES" }, + { + "u_message": "You touch and reach out with your powers, looking for the illness within them. You soon find it, a shadow over their head and lungs, and draw it into yourself.", + "popup": true + }, + { "u_assign_activity": "ACT_VITAKIN_BANISH_FOLLOWER_ILLNESS", "duration": "10 minutes" } + ] + }, + { + "text": "Hold still. *Remove 's seasonal affective disorder*", + "topic": "TALK_DONE", + "condition": { "and": [ { "npc_has_trait": "SEASONAL_AFFECTIVE" }, { "not": { "u_has_trait": "SEASONAL_AFFECTIVE" } } ] }, + "effect": [ + { "npc_lose_trait": "SEASONAL_AFFECTIVE" }, + { "u_add_trait": "SEASONAL_AFFECTIVE" }, + { + "u_message": "You touch and reach out with your powers, looking for the illness within them. You soon find it, a shadow over their mind, and draw it into yourself.", + "popup": true + }, + { "u_assign_activity": "ACT_VITAKIN_BANISH_FOLLOWER_ILLNESS", "duration": "20 minutes" } + ] + }, { "text": "Actually, maybe now's not the best time.", "topic": "TALK_DONE" } ] } diff --git a/data/mods/MindOverMatter/powers/vitakinesis_eoc.json b/data/mods/MindOverMatter/powers/vitakinesis_eoc.json index 5f93df38ca830..992619819dd5e 100644 --- a/data/mods/MindOverMatter/powers/vitakinesis_eoc.json +++ b/data/mods/MindOverMatter/powers/vitakinesis_eoc.json @@ -193,7 +193,8 @@ "EOC_VITAKIN_CURE_DISEASE_VS_COMMON_COLD", "EOC_VITAKIN_CURE_DISEASE_VS_FLU", "EOC_VITAKIN_CURE_DISEASE_VS_CONJUNCTIVITIS_VIRAL", - "EOC_VITAKIN_CURE_DISEASE_VS_CONJUNCTIVITIS_BACTERIA" + "EOC_VITAKIN_CURE_DISEASE_VS_CONJUNCTIVITIS_BACTERIA", + "EOC_VITAKIN_CURE_DISEASE_VS_HAY_FEVER" ] }, { @@ -249,6 +250,16 @@ }, "effect": [ { "u_add_effect": "effect_vita_health_conjunctivitis_bacterial_protection", "duration": "10 days" } ] }, + { + "type": "effect_on_condition", + "id": "EOC_VITAKIN_CURE_DISEASE_VS_HAY_FEVER", + "//": "Hay fever is the immune system overreacting to environmental \"contaminants\". If you supercharge your immune system, it's going to react more strongly.", + "condition": { "u_has_effect": "hay_fever" }, + "effect": [ + { "u_message": "Your eyes burn and your nose is clogged with mucus.", "type": "bad" }, + { "u_add_effect": "severe_hay_fever", "duration": { "math": [ "rand(28800) + 600" ] } } + ] + }, { "type": "effect_on_condition", "id": "EOC_VITAKIN_STOP_INFECTION_SWITCH", @@ -446,6 +457,8 @@ "EOC_VITAKIN_BANISH_ILLNESS_MOODSWINGS", "EOC_VITAKIN_BANISH_ILLNESS_WEAKENING", "EOC_VITAKIN_BANISH_ILLNESS_NARCOLEPTIC", + "EOC_VITAKIN_BANISH_ILLNESS_SEASONAL_ALLERGIES", + "EOC_VITAKIN_BANISH_ILLNESS_SEASONAL_AFFECTIVE", "EOC_PORTAL_NULL_AWAKENING" ], "names": [ @@ -457,9 +470,11 @@ "Purge Mood Swings", "Purge Wasting Sickness", "Purge Narcolepsy", + "Purge Seasonal Allergies", + "Purge Seasonal Affective Disorder", "Nevermind" ], - "keys": [ "1", "2", "3", "4", "5", "6", "7", "8", "9" ], + "keys": [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "a" ], "descriptions": [ "Attempt to cure your minor illnesses.", "Attempt to cure your asthma.", @@ -469,6 +484,8 @@ "Attempt to cure your mood swings", "Attempt to cure your weakening sickness", "Attempt to cure your narcolepsy. This meditation is extremely intensive, and is correspondingly more draining.", + "Attempt to cure your seasonal allergies.", + "Attempt to cure your seasonal affective disorder.", "Do nothing for now." ] } @@ -489,7 +506,7 @@ { "u_has_effect": "conjunctivitis_bacterial" } ] }, - "effect": [ { "u_assign_activity": "ACT_VITAKIN_BANISH_ILLNESS_ASTHMA", "duration": "120 minutes" } ], + "effect": [ { "u_assign_activity": "ACT_VITAKIN_BANISH_ILLNESS_MINOR_AILMENT", "duration": "120 minutes" } ], "false_effect": [ { "u_message": "You're not sick. There is nothing to cure.", "type": "mixed" } ] }, { @@ -749,6 +766,72 @@ { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 50,100 )" ] } ] }, + { + "type": "effect_on_condition", + "id": "EOC_VITAKIN_BANISH_ILLNESS_SEASONAL_ALLERGIES", + "condition": { "u_has_trait": "SEASONAL_ALLERGIES" }, + "effect": [ { "u_assign_activity": "ACT_VITAKIN_BANISH_ILLNESS_SEASONAL_ALLERGIES", "duration": "400 minutes" } ], + "false_effect": [ { "u_message": "You don't have seasonal allergies. There is no need to attempt to cure it.", "type": "mixed" } ] + }, + { + "id": "ACT_VITAKIN_BANISH_ILLNESS_SEASONAL_ALLERGIES", + "type": "activity_type", + "activity_level": "LIGHT_EXERCISE", + "verb": "meditating", + "based_on": "time", + "completion_eoc": "EOC_VITAKIN_BANISH_ILLNESS_SEASONAL_ALLERGIES_RESULT" + }, + { + "type": "effect_on_condition", + "id": "EOC_VITAKIN_BANISH_ILLNESS_SEASONAL_ALLERGIES_RESULT", + "condition": { + "roll_contested": { "math": [ "(rand( u_spell_level('vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, + "difficulty": 14 + }, + "effect": [ + { "u_message": "You take a deep breath and your nose and throat clears.", "type": "good" }, + { "u_lose_trait": "SEASONAL_ALLERGIES" }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 40,80 )" ] } + ], + "false_effect": [ + { "u_message": "The disease proved tenacious. You'll have to try again.", "type": "bad" }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 40,80 )" ] } + ] + }, + { + "type": "effect_on_condition", + "id": "EOC_VITAKIN_BANISH_ILLNESS_SEASONAL_AFFECTIVE", + "condition": { "u_has_trait": "SEASONAL_AFFECTIVE" }, + "effect": [ { "u_assign_activity": "ACT_VITAKIN_BANISH_ILLNESS_SEASONAL_AFFECTIVE", "duration": "550 minutes" } ], + "false_effect": [ + { "u_message": "You don't have seasonal affective disorder. There is no need to attempt to cure it.", "type": "mixed" } + ] + }, + { + "id": "ACT_VITAKIN_BANISH_ILLNESS_SEASONAL_AFFECTIVE", + "type": "activity_type", + "activity_level": "LIGHT_EXERCISE", + "verb": "meditating", + "based_on": "time", + "completion_eoc": "EOC_VITAKIN_BANISH_ILLNESS_SEASONAL_AFFECTIVE_RESULT" + }, + { + "type": "effect_on_condition", + "id": "EOC_VITAKIN_BANISH_ILLNESS_SEASONAL_AFFECTIVE_RESULT", + "condition": { + "roll_contested": { "math": [ "(rand( u_spell_level('vita_banish_illness')) + u_nether_attunement_power_scaling)" ] }, + "difficulty": 15 + }, + "effect": [ + { "u_message": "You genuinely smile for the first time in a while. Maybe it won't be so bad.", "type": "good" }, + { "u_lose_trait": "SEASONAL_AFFECTIVE" }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,90 )" ] } + ], + "false_effect": [ + { "u_message": "The disease proved tenacious. You'll have to try again.", "type": "bad" }, + { "math": [ "u_vitamin('vitamin_psionic_drain')", "+=", "rng( 45,90 )" ] } + ] + }, { "type": "effect_on_condition", "id": "EOC_VITA_SUPER_HEAL_DRAIN",