Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename fatigue to sleepiness #72708

Merged
merged 14 commits into from
Apr 5, 2024
4 changes: 2 additions & 2 deletions data/core/game_balance.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
},
{
"type": "EXTERNAL_OPTION",
"name": "PLAYER_FATIGUE_RATE",
"info": "Set base fatigue rate per 5 minutes. Default: 1.0",
"name": "PLAYER_SLEEPINESS_RATE",
"info": "Set base sleepiness rate per 5 minutes. Default: 1.0",
"stype": "float",
"value": 1.0
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/artifact/altered_object_active.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,6 @@
"flags": [ "IGNORE_WALLS", "NO_PROJECTILE", "NO_EXPLOSION_SFX" ],
"shape": "blast",
"effect": "remove_field",
"effect_str": "fd_fatigue"
"effect_str": "fd_reality_tear"
}
]
4 changes: 2 additions & 2 deletions data/json/artifact/legacy_artifact_active.json
Original file line number Diff line number Diff line change
Expand Up @@ -379,14 +379,14 @@
},
{
"type": "SPELL",
"id": "AEA_FATIGUE",
"id": "AEA_SLEEPINESS",
"name": { "str": "Artifact Dimensional Fatigue" },
"description": "Creates some dimensional fatigue at a random point within range.",
"valid_targets": [ "ground", "self", "ally", "hostile" ],
"effect": "attack",
"message": "",
"shape": "blast",
"field_id": "fd_fatigue",
"field_id": "fd_reality_tear",
"field_chance": 1,
"min_field_intensity": 2,
"max_field_intensity": 2,
Expand Down
10 changes: 5 additions & 5 deletions data/json/artifact/relic_procgen_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{ "weight": 100, "spell_id": "AEA_NOISE", "base_power": -25 },
{ "weight": 100, "spell_id": "AEA_LIGHT", "base_power": -25 },
{ "weight": 100, "spell_id": "AEA_DIM", "base_power": 0 },
{ "weight": 100, "spell_id": "AEA_FATIGUE", "base_power": -300 },
{ "weight": 100, "spell_id": "AEA_SLEEPINESS", "base_power": -300 },
{ "weight": 100, "spell_id": "AEA_FLASH", "base_power": 150 },
{ "weight": 100, "spell_id": "AEA_PARALYZE", "base_power": -250 },
{ "weight": 100, "spell_id": "AEA_MAP", "base_power": 500 },
Expand Down Expand Up @@ -310,7 +310,7 @@
{ "weight": 100, "spell_id": "AEA_NOISE", "base_power": -25 },
{ "weight": 100, "spell_id": "AEA_LIGHT", "base_power": -25 },
{ "weight": 100, "spell_id": "AEA_DIM", "base_power": -50 },
{ "weight": 100, "spell_id": "AEA_FATIGUE", "base_power": -300 },
{ "weight": 100, "spell_id": "AEA_SLEEPINESS", "base_power": -300 },
{ "weight": 100, "spell_id": "AEA_FLASH", "base_power": 150 },
{ "weight": 100, "spell_id": "AEA_PARALYZE", "base_power": -250 },
{ "weight": 100, "spell_id": "AEA_MAP", "base_power": 500 },
Expand Down Expand Up @@ -593,7 +593,7 @@
{ "weight": 100, "spell_id": "AEA_NOISE", "base_power": -25 },
{ "weight": 100, "spell_id": "AEA_LIGHT", "base_power": -25 },
{ "weight": 100, "spell_id": "AEA_DIM", "base_power": -50 },
{ "weight": 100, "spell_id": "AEA_FATIGUE", "base_power": -300 },
{ "weight": 100, "spell_id": "AEA_SLEEPINESS", "base_power": -300 },
{ "weight": 100, "spell_id": "AEA_FLASH", "base_power": 150 },
{ "weight": 100, "spell_id": "AEA_PARALYZE", "base_power": -250 },
{ "weight": 100, "spell_id": "AEA_MAP", "base_power": 500 },
Expand Down Expand Up @@ -896,7 +896,7 @@
"weight": 100,
"min_value": 0.3,
"max_value": 0.8,
"type": "FATIGUE",
"type": "SLEEPINESS",
"increment": 0.1,
"power_per_increment": -100
}
Expand Down Expand Up @@ -929,7 +929,7 @@
{ "weight": 100, "spell_id": "AEA_ATTENTION", "base_power": -100 },
{ "weight": 100, "spell_id": "AEA_FLASH", "base_power": 150 },
{ "weight": 100, "spell_id": "AEA_HEAL", "base_power": 400 },
{ "weight": 100, "spell_id": "AEA_FATIGUE", "base_power": -500 },
{ "weight": 100, "spell_id": "AEA_SLEEPINESS", "base_power": -500 },
{ "weight": 100, "spell_id": "AEA_PAIN", "base_power": -150 },
{ "weight": 100, "spell_id": "AEA_SHADOWS", "base_power": -50 },
{ "weight": 100, "spell_id": "AEA_LIGHT", "base_power": 100 },
Expand Down
4 changes: 2 additions & 2 deletions data/json/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -1508,7 +1508,7 @@
"id": "bio_sleepy",
"type": "bionic",
"name": { "str": "Endocrine Enervator" },
"description": "Through a combination of psychochemical manipulation and old fashioned electrical nerve stimulation, this malfunctioning bionic alters your brain chemistry in such a way as to cause fatigue. You will find yourself tiring a bit faster than before.",
"description": "Through a combination of psychochemical manipulation and old fashioned electrical nerve stimulation, this malfunctioning bionic alters your brain chemistry in such a way as to cause sleepiness. You will find yourself tiring a bit faster than before.",
"occupied_bodyparts": [ [ "head", 2 ] ],
"flags": [ "BIONIC_FAULTY" ]
},
Expand Down Expand Up @@ -1844,7 +1844,7 @@
"id": "bio_soporific",
"type": "bionic",
"name": { "str": "Soporific Induction" },
"description": "An electrode has been implanted into your brain's ventrolateral preoptic nucleus. It turns on whenever you're trying to fall asleep, creating an artificial but effective sensation of fatigue.",
"description": "An electrode has been implanted into your brain's ventrolateral preoptic nucleus. It turns on whenever you're trying to fall asleep, creating an artificial but effective sensation of sleepiness.",
"occupied_bodyparts": [ [ "head", 1 ] ],
"flags": [ "BIONIC_TOGGLED" ],
"enchantments": [ { "condition": "ACTIVE", "values": [ { "value": "SLEEPY", "add": 30 } ] } ]
Expand Down
109 changes: 60 additions & 49 deletions data/json/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -1837,8 +1837,8 @@
"resist_traits": [ "THRESH_URSINE" ],
"base_mods": {
"str_mod": [ 1 ],
"fatigue_min": [ 1 ],
"fatigue_chance": [ 1100 ],
"sleepiness_min": [ 1 ],
"sleepiness_chance": [ 1100 ],
"hurt_min": [ 1 ],
"hurt_max": [ 2 ],
"hurt_chance": [ -22 ],
Expand All @@ -1852,7 +1852,7 @@
"str_mod": [ 2.5 ],
"per_mod": [ -1 ],
"dex_mod": [ -1 ],
"fatigue_chance": [ -500 ],
"sleepiness_chance": [ -500 ],
"hurt_chance": [ 21, 0 ],
"pain_chance": [ -30 ]
},
Expand Down Expand Up @@ -2317,10 +2317,10 @@
"stamina_min": [ -8, -4 ],
"stamina_max": [ -50, -20 ],
"stamina_chance": [ 3, 10 ],
"fatigue_min": [ 2, 0 ],
"fatigue_max": [ 10, 5 ],
"fatigue_chance": [ 110 ],
"fatigue_max_val": [ 700, 250 ],
"sleepiness_min": [ 2, 0 ],
"sleepiness_max": [ 10, 5 ],
"sleepiness_chance": [ 110 ],
"sleepiness_max_val": [ 700, 250 ],
"healing_rate": [ 0.01, 1 ]
},
"scaling_mods": {
Expand All @@ -2332,8 +2332,8 @@
"stamina_min": [ -6, -4 ],
"stamina_max": [ 15, 4 ],
"stamina_chance": [ -1, -2.5 ],
"fatigue_chance": [ -50 ],
"fatigue_tick": [ 0.5 ]
"sleepiness_chance": [ -50 ],
"sleepiness_tick": [ 0.5 ]
},
"//": "Stamina regen stops completely at int 3, but no stamina loss from then on",
"blood_analysis_description": "Bacterial Infection"
Expand All @@ -2360,10 +2360,10 @@
"speed_mod": [ -5, 0 ],
"stamina_min": [ -8 ],
"stamina_chance": [ 10, 20 ],
"fatigue_min": [ 1, 0 ],
"fatigue_max": [ 5, 3 ],
"fatigue_chance": [ 210 ],
"fatigue_max_val": [ 500, 125 ],
"sleepiness_min": [ 1, 0 ],
"sleepiness_max": [ 5, 3 ],
"sleepiness_chance": [ 210 ],
"sleepiness_max_val": [ 500, 125 ],
"healing_rate": [ 0.5 ]
},
"scaling_mods": {
Expand All @@ -2374,7 +2374,7 @@
"speed_mod": [ -5, -4 ],
"stamina_min": [ -6, -3 ],
"stamina_chance": [ -1, -2.5 ],
"fatigue_chance": [ -60 ]
"sleepiness_chance": [ -60 ]
}
},
{
Expand Down Expand Up @@ -2919,8 +2919,8 @@
"base_mods": {
"thirst_tick": [ 3600 ],
"thirst_min": [ 1 ],
"fatigue_tick": [ 600 ],
"fatigue_min": [ 1 ],
"sleepiness_tick": [ 600 ],
"sleepiness_min": [ 1 ],
"str_mod": [ -1, 0 ],
"cough_chance": [ 600, 0 ]
}
Expand All @@ -2940,8 +2940,8 @@
"base_mods": {
"thirst_tick": [ 3600 ],
"thirst_min": [ 1 ],
"fatigue_tick": [ 600 ],
"fatigue_min": [ 1 ],
"sleepiness_tick": [ 600 ],
"sleepiness_min": [ 1 ],
"str_mod": [ -1, 0 ],
"cough_chance": [ 600, 0 ]
}
Expand All @@ -2961,8 +2961,8 @@
"base_mods": {
"thirst_tick": [ 1800 ],
"thirst_min": [ 1 ],
"fatigue_tick": [ 300 ],
"fatigue_min": [ 1 ],
"sleepiness_tick": [ 300 ],
"sleepiness_min": [ 1 ],
"str_mod": [ -3, -1 ],
"dex_mod": [ -1, 0 ],
"per_mod": [ -1, 0 ],
Expand All @@ -2988,8 +2988,8 @@
"base_mods": {
"thirst_tick": [ 1800 ],
"thirst_min": [ 1 ],
"fatigue_tick": [ 300 ],
"fatigue_min": [ 1 ],
"sleepiness_tick": [ 300 ],
"sleepiness_min": [ 1 ],
"str_mod": [ -4, -2 ],
"dex_mod": [ -2, 0 ],
"per_mod": [ -1, 0 ],
Expand Down Expand Up @@ -3227,8 +3227,8 @@
"dex_mod": [ 1 ],
"int_mod": [ 0.5 ],
"per_mod": [ 1 ],
"fatigue_min": [ 1 ],
"fatigue_tick": [ 9 ],
"sleepiness_min": [ 1 ],
"sleepiness_tick": [ 9 ],
"stamina_min": [ 8 ]
},
"blood_analysis_description": "Methamphetamines"
Expand Down Expand Up @@ -3479,7 +3479,7 @@
"name": [ "Unidentified Illness" ],
"desc": [ "You aren't sure what's wrong with you but you don't feel well." ],
"rating": "bad",
"base_mods": { "pain_chance": [ 256 ], "pain_min": [ 1 ], "pain_max": [ 4 ], "fatigue_chance": [ 256 ], "fatigue_min": [ 1 ] },
"base_mods": { "pain_chance": [ 256 ], "pain_min": [ 1 ], "pain_max": [ 4 ], "sleepiness_chance": [ 256 ], "sleepiness_min": [ 1 ] },
"blood_analysis_description": "Intramuscular Parasites"
},
{
Expand Down Expand Up @@ -3507,9 +3507,9 @@
"stamina_max": [ -100 ],
"stamina_chance": [ 300 ],
"int_mod": [ -1, 0 ],
"fatigue_min": [ 5 ],
"fatigue_max": [ 10 ],
"fatigue_chance": [ 500 ]
"sleepiness_min": [ 5 ],
"sleepiness_max": [ 10 ],
"sleepiness_chance": [ 500 ]
},
"blood_analysis_description": "Streptobacillus moniliformis Infection"
},
Expand Down Expand Up @@ -3728,19 +3728,19 @@
"stamina_min": [ -100 ],
"stamina_max": [ -200 ],
"stamina_chance": [ 900 ],
"fatigue_min": [ 10 ],
"fatigue_max": [ 20 ],
"fatigue_chance": [ 900 ],
"sleepiness_min": [ 10 ],
"sleepiness_max": [ 20 ],
"sleepiness_chance": [ 900 ],
"h_mod_min": [ -1 ],
"h_mod_min_val": [ 0 ],
"h_mod_chance": [ 900 ]
},
"scaling_mods": {
"str_mod": [ -2 ],
"stamina_max": [ -500 ],
"fatigue_max": [ 20 ],
"sleepiness_max": [ 20 ],
"stamina_chance": [ -300 ],
"fatigue_chance": [ -300 ],
"sleepiness_chance": [ -300 ],
"h_mod_min": [ -1 ],
"h_mod_min_val": [ -50 ],
"h_mod_chance": [ -200 ]
Expand All @@ -3762,19 +3762,19 @@
"stamina_min": [ -100 ],
"stamina_max": [ -200 ],
"stamina_chance": [ 900 ],
"fatigue_min": [ 10 ],
"fatigue_max": [ 20 ],
"fatigue_chance": [ 900 ],
"sleepiness_min": [ 10 ],
"sleepiness_max": [ 20 ],
"sleepiness_chance": [ 900 ],
"h_mod_min": [ -1 ],
"h_mod_min_val": [ 0 ],
"h_mod_chance": [ 900 ]
},
"scaling_mods": {
"str_mod": [ -2 ],
"stamina_max": [ -500 ],
"fatigue_max": [ 20 ],
"sleepiness_max": [ 20 ],
"stamina_chance": [ -300 ],
"fatigue_chance": [ -300 ],
"sleepiness_chance": [ -300 ],
"h_mod_min": [ -1 ],
"h_mod_min_val": [ -50 ],
"h_mod_chance": [ -200 ]
Expand All @@ -3798,16 +3798,16 @@
"pain_chance": [ 9000 ],
"pain_min": [ 1 ],
"pain_max": [ 5 ],
"fatigue_chance": [ 900 ],
"fatigue_max_val": [ 500, 200 ],
"fatigue_min": [ 10 ],
"sleepiness_chance": [ 900 ],
"sleepiness_max_val": [ 500, 200 ],
"sleepiness_min": [ 10 ],
"h_mod_min": [ -1 ],
"h_mod_min_val": [ 0 ],
"h_mod_chance": [ 900 ]
},
"scaling_mods": {
"pain_chance": [ -150 ],
"fatigue_chance": [ -200 ],
"sleepiness_chance": [ -200 ],
"h_mod_min": [ -1 ],
"h_mod_min_val": [ -100 ],
"h_mod_chance": [ -300 ],
Expand All @@ -3822,18 +3822,23 @@
"id": "betablock",
"name": [ "Beta blocker" ],
"desc": [
"You are under the influence of a beta blocker. This controls your heart rate, decreasing the influence of stressful events such as pain on it. However, it also lowers blood pressure and induces fatigue."
"You are under the influence of a beta blocker. This controls your heart rate, decreasing the influence of stressful events such as pain on it. However, it also lowers blood pressure and induces sleepiness."
],
"max_intensity": 3,
"base_mods": {
"blood_pressure_tick": [ 250 ],
"blood_pressure_min": [ -2 ],
"blood_pressure_min_val": [ -200 ],
"fatigue_min": [ 4 ],
"fatigue_chance": [ 500 ],
"fatigue_max_val": [ 200 ]
"sleepiness_min": [ 4 ],
"sleepiness_chance": [ 500 ],
"sleepiness_max_val": [ 200 ]
},
"scaling_mods": {
"blood_pressure_min": [ -1 ],
"blood_pressure_min_val": [ -100 ],
"sleepiness_max_val": [ 50 ],
"sleepiness_min": [ 2 ]
},
"scaling_mods": { "blood_pressure_min": [ -1 ], "blood_pressure_min_val": [ -100 ], "fatigue_max_val": [ 50 ], "fatigue_min": [ 2 ] },
"rating": "neutral",
"blood_analysis_description": "Beta Blocker"
},
Expand Down Expand Up @@ -4428,7 +4433,7 @@
"desc": [ "You feel quite full, and a bit sluggish." ],
"apply_message": "You feel quite full, and a bit sluggish.",
"rating": "bad",
"base_mods": { "speed_mod": [ -2 ], "fatigue_amount": [ 1 ] }
"base_mods": { "speed_mod": [ -2 ], "sleepiness_amount": [ 1 ] }
},
{
"type": "effect_type",
Expand All @@ -4437,7 +4442,13 @@
"desc": [ "Your stomach is full to bursting. This was a mistake." ],
"apply_message": "Your stomach is full to bursting. This was a mistake.",
"rating": "bad",
"base_mods": { "speed_mod": [ -10 ], "fatigue_amount": [ 2 ], "vomit_chance": [ 500 ], "vomit_tick": [ 10 ], "pain_amount": [ 3 ] }
"base_mods": {
"speed_mod": [ -10 ],
"sleepiness_amount": [ 2 ],
"vomit_chance": [ 500 ],
"vomit_tick": [ 10 ],
"pain_amount": [ 3 ]
}
},
{
"type": "effect_type",
Expand Down
2 changes: 1 addition & 1 deletion data/json/effects_on_condition/bionic_eocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"recurrence": [ "25 minutes", "1 hours 15 minutes" ],
"condition": { "and": [ { "u_has_bionics": "bio_sleepy" }, { "not": { "u_has_effect": "sleep" } } ] },
"deactivate_condition": { "not": { "u_has_bionics": "bio_sleepy" } },
"effect": { "math": [ "u_val('fatigue')", "++" ] }
"effect": { "math": [ "u_val('sleepiness')", "++" ] }
},
{
"type": "effect_on_condition",
Expand Down
4 changes: 2 additions & 2 deletions data/json/effects_on_condition/misc_effect_on_condition.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
{
"type": "effect_on_condition",
"id": "EOC_SLEEP",
"effect": [ { "u_message": "You feel very sleepy…" }, { "math": [ "u_val('fatigue')", "+=", "40" ] } ]
"effect": [ { "u_message": "You feel very sleepy…" }, { "math": [ "u_val('sleepiness')", "+=", "40" ] } ]
},
{
"type": "effect_on_condition",
"id": "EOC_MINOR_SLEEP",
"effect": [ { "u_message": "You feel sleepy…" }, { "math": [ "u_val('fatigue')", "+=", "20" ] } ]
"effect": [ { "u_message": "You feel sleepy…" }, { "math": [ "u_val('sleepiness')", "+=", "20" ] } ]
},
{
"type": "effect_on_condition",
Expand Down
Loading
Loading