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.

Sign up for GitHub

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

Jump to bottom

Add max duration for several effects lacking it #1465

Merged
merged 1 commit into from
Apr 19, 2022
Merged

Add max duration for several effects lacking it #1465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 14 additions & 2 deletions data/json/effects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@
"desc": [ "Your movement is randomized." ],
"apply_message": "You're stunned!",
"rating": "bad",
"max_duration": "30 m",
"show_in_info": true
},
{
Expand All @@ -325,8 +326,8 @@
"apply_message": "The scream dazes you!",
"rating": "bad",
"max_intensity": 10,
"max_duration": "10 m",
"int_add_val": 2,
"max_duration": "10 m",
"base_mods": { "per_mod": [ -5 ], "dex_mod": [ -2 ] },
"scaling_mods": { "speed_mod": [ -3 ] },
"show_in_info": true
Expand Down Expand Up @@ -372,6 +373,7 @@
"apply_message": "You're blinded!",
"remove_message": "Your sight returns!",
"rating": "bad",
"max_duration": "30 m",
"show_in_info": true
},
{
Expand All @@ -396,6 +398,7 @@
"rating": "bad",
"max_intensity": 3,
"int_dur_factor": "100 s",
"max_duration": "24 h",
"base_mods": { "pain_min": [ 1 ], "pain_chance": [ -50 ], "pain_chance_bot": [ 1000 ] },
"scaling_mods": { "pain_max_val": [ 5 ], "pain_chance": [ 150 ] }
},
Expand All @@ -412,6 +415,7 @@
"desc": [ "You have been stung!" ],
"rating": "bad",
"base_mods": { "pain_min": [ 1 ] },
"max_duration": "30 m",
"show_in_info": true,
"blood_analysis_description": "Stung"
},
Expand All @@ -426,6 +430,7 @@
"pain_sizing": true,
"hurt_sizing": true,
"main_parts_only": true,
"max_duration": "30 m",
"base_mods": {
"per_mod": [ -2, -1 ],
"dex_mod": [ -1, -1 ],
Expand All @@ -449,6 +454,7 @@
"pain_sizing": true,
"hurt_sizing": true,
"main_parts_only": true,
"max_duration": "30 m",
"base_mods": {
"per_mod": [ -2 ],
"dex_mod": [ -2 ],
Expand All @@ -471,6 +477,7 @@
"miss_messages": [ [ "Your stomach bothers you.", 1 ] ],
"rating": "bad",
"resist_traits": [ "POISRESIST" ],
"max_duration": "24 h",
"base_mods": {
"per_mod": [ -1 ],
"dex_mod": [ -1 ],
Expand Down Expand Up @@ -510,6 +517,7 @@
"miss_messages": [ [ "You feel stiff.", 3 ] ],
"rating": "bad",
"max_intensity": 20,
"max_duration": "30 m",
"resist_traits": [ "POISRESIST" ],
"int_add_val": 1,
"int_decay_tick": 600,
Expand Down Expand Up @@ -873,6 +881,7 @@
"max_intensity": 3,
"int_decay_tick": 720,
"int_add_val": 1,
"max_duration": "60 m",
"main_parts_only": true,
"base_mods": { "speed_mod": [ -7 ] },
"scaling_mods": { "speed_mod": [ -3 ] }
Expand Down Expand Up @@ -1092,6 +1101,7 @@
"desc": [ "You're coated in sap!" ],
"apply_message": "You're coated in sap!",
"rating": "bad",
"max_duration": "30 m",
"miss_messages": [ [ "The sap's too sticky for you to fight effectively.", 3 ] ],
"base_mods": { "speed_mod": [ -25 ], "dex_mod": [ -3 ] }
},
Expand Down Expand Up @@ -1127,7 +1137,8 @@
},
{
"type": "effect_type",
"id": "evil"
"id": "evil",
"max_duration": "48 h"
},
{
"type": "effect_type",
Expand Down Expand Up @@ -1392,6 +1403,7 @@
"apply_message": "You inhale sweetish gas.",
"remove_message": "The slackness leaves your muscles.",
"rating": "bad",
"max_duration": "30 m",
"base_mods": { "str_mod": [ -3 ], "dex_mod": [ -3 ], "int_mod": [ -2 ], "per_mod": [ -4 ] }
},
{
Expand Down
3 changes: 3 additions & 0 deletions data/json/field_type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
"effects": [
{
"effect_id": "sap",
"body_part": "torso",
"intensity": 1,
"min_duration": "2 seconds",
"max_duration": "2 seconds",
Expand All @@ -159,6 +160,7 @@
"effects": [
{
"effect_id": "sap",
"body_part": "torso",
"intensity": 1,
"min_duration": "4 seconds",
"max_duration": "4 seconds",
Expand All @@ -176,6 +178,7 @@
"effects": [
{
"effect_id": "sap",
"body_part": "torso",
"intensity": 1,
"min_duration": "6 seconds",
"max_duration": "6 seconds",
Expand Down