forked from CleverRaven/Cataclysm-DDA
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from GuardianDll/MindOverMatter_lint
Now it should work
- Loading branch information
Showing
85 changed files
with
8,934 additions
and
8,045 deletions.
There are no files selected for viewing
149 changes: 76 additions & 73 deletions
149
data/mods/MindOverMatter/effectoncondition/eoc_matrix_awakening.json
Large diffs are not rendered by default.
Oops, something went wrong.
833 changes: 489 additions & 344 deletions
833
data/mods/MindOverMatter/effectoncondition/eoc_portal_awakening.json
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,45 @@ | ||
| [ | ||
| { | ||
| "type": "effect_type", | ||
| "id": "taint", | ||
| "name": [ "Touched Mind", "Touched Mind", "Tainted Mind", "Badly Tainted Mind" ], | ||
| "miss_messages": [ [ "Your sense of reality warps!", 3 ] ], | ||
| "speed_name": "Tainted", | ||
| "desc": [ | ||
| "You are disoriented as strange visions flash through your mind.", | ||
| "You are overwhelmed by the disturbing imagery and concepts you're flooded with.", | ||
| "You can't comprehend the things around you…", | ||
| "You don't know what is and isn't real anymore…" | ||
| ], | ||
| "rating": "bad", | ||
| "max_intensity": 4, | ||
| "max_duration": "2 h", | ||
| "int_add_val": 1, | ||
| "int_dur_factor": "5 m", | ||
| "base_mods": { "speed_mod": [ -20 ], "str_mod": [ 0 ], "dex_mod": [ -1 ], "per_mod": [ -2 ], "vomit_chance": [ 20 ] }, | ||
| "scaling_mods": { "speed_mod": [ -10 ], "int_mod": [ -2 ], "str_mod": [ -1 ], "dex_mod": [ -1 ], "per_mod": [ -2 ] }, | ||
| "limb_score_mods": [ | ||
| { "limb_score": "reaction", "modifier": 0.8, "scaling": -0.2 }, | ||
| { "limb_score": "block", "modifier": 0.8, "scaling": -0.2 }, | ||
| { "limb_score": "vision", "modifier": 0.9, "scaling": -0.1 }, | ||
| { "limb_score": "night_vis", "modifier": 0.9, "scaling": -0.1 } | ||
| ], | ||
| "flags": [ "EFFECT_LIMB_SCORE_MOD" ], | ||
| "immune_flags": [ "TEEPSHIELD" ] | ||
| }, | ||
| { | ||
| "id": "tindrift", | ||
| "type": "effect_type", | ||
| "immune_flags": [ "TEEPSHIELD", "TELESTOP" ] | ||
| }, | ||
| { | ||
| "id": "attention", | ||
| "type": "effect_type", | ||
| "immune_flags": [ "TEEPSHIELD", "TELESTOP" ] | ||
| }, | ||
| { | ||
| "id": "teleglow", | ||
| "type": "effect_type", | ||
| "immune_flags": [ "TELESTOP" ] | ||
| } | ||
| ] | ||
|
|
||
| [ | ||
| { | ||
| "type": "effect_type", | ||
| "id": "taint", | ||
| "name": [ "Touched Mind", "Touched Mind", "Tainted Mind", "Badly Tainted Mind" ], | ||
| "miss_messages": [ [ "Your sense of reality warps!", 3 ] ], | ||
| "speed_name": "Tainted", | ||
| "desc": [ | ||
| "You are disoriented as strange visions flash through your mind.", | ||
| "You are overwhelmed by the disturbing imagery and concepts you're flooded with.", | ||
| "You can't comprehend the things around you…", | ||
| "You don't know what is and isn't real anymore…" | ||
| ], | ||
| "rating": "bad", | ||
| "max_intensity": 4, | ||
| "max_duration": "2 h", | ||
| "int_add_val": 1, | ||
| "int_dur_factor": "5 m", | ||
| "base_mods": { "speed_mod": [ -20 ], "str_mod": [ 0 ], "dex_mod": [ -1 ], "per_mod": [ -2 ], "vomit_chance": [ 20 ] }, | ||
| "scaling_mods": { "speed_mod": [ -10 ], "int_mod": [ -2 ], "str_mod": [ -1 ], "dex_mod": [ -1 ], "per_mod": [ -2 ] }, | ||
| "limb_score_mods": [ | ||
| { "limb_score": "reaction", "modifier": 0.8, "scaling": -0.2 }, | ||
| { "limb_score": "block", "modifier": 0.8, "scaling": -0.2 }, | ||
| { "limb_score": "vision", "modifier": 0.9, "scaling": -0.1 }, | ||
| { "limb_score": "night_vis", "modifier": 0.9, "scaling": -0.1 } | ||
| ], | ||
| "flags": [ "EFFECT_LIMB_SCORE_MOD" ], | ||
| "immune_flags": [ "TEEPSHIELD" ] | ||
| }, | ||
| { | ||
| "id": "tindrift", | ||
| "type": "effect_type", | ||
| "immune_flags": [ "TEEPSHIELD", "TELESTOP" ] | ||
| }, | ||
| { | ||
| "id": "attention", | ||
| "type": "effect_type", | ||
| "immune_flags": [ "TEEPSHIELD", "TELESTOP" ] | ||
| }, | ||
| { | ||
| "id": "teleglow", | ||
| "type": "effect_type", | ||
| "immune_flags": [ "TELESTOP" ] | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,50 @@ | ||
| [ | ||
| { | ||
| "type": "effect_type", | ||
| "id": "effect_riftwalker_teleport", | ||
| "name": [ "Dimensionally Unstable" ], | ||
| "desc": [ "You feel like you're barely part of the world." ], | ||
| "apply_message": "", | ||
| "remove_message": "With a jolt you feel more solid again.", | ||
| "rating": "bad", | ||
| "enchantments": [ "enchant_riftwalker_teleport" ], | ||
| "immune_flags": [ "TELESTOP", "DIMENSIONAL_ANCHOR" ] | ||
| }, | ||
| { | ||
| "type": "effect_type", | ||
| "id": "effect_vitakinetic_health_down", | ||
| "name": [ "Feeling Unwell" ], | ||
| "desc": [ "You feel weak and shaky." ], | ||
| "apply_message": "", | ||
| "remove_message": "The feeling of weakness fades away.", | ||
| "rating": "bad", | ||
| "max_duration": "12 hours", | ||
| "base_mods": { "str_mod": [ -2 ], "h_mod_min": [ -2 ], "h_mod_chance": [ 1 ], "h_mod_chance_bot": [ 5 ], "h_mod_tick": [ 600 ], "healing_rate": [ 0.75 ] } | ||
| }, | ||
| { | ||
| "type": "effect_type", | ||
| "id": "effect_vitakinetic_healing_down", | ||
| "name": [ "Feeling Very Unwell" ], | ||
| "desc": [ "You feel fatigued and shaky." ], | ||
| "apply_message": "", | ||
| "remove_message": "The feeling of weakness fades away.", | ||
| "rating": "bad", | ||
| "max_duration": "18 hours", | ||
| "base_mods": { "str_mod": [ -2 ], "h_mod_min": [ -2 ], "h_mod_chance": [ 1 ], "h_mod_chance_bot": [ 4 ], "h_mod_tick": [ 500 ], "healing_rate": [ 0.5 ] }, | ||
| "vitamins": [ | ||
| { | ||
| "vitamin": "iron", | ||
| "rate": [ [-10, -10] ], | ||
| "tick": [ "1 m" ] | ||
| } | ||
| ] | ||
| } | ||
| { | ||
| "type": "effect_type", | ||
| "id": "effect_riftwalker_teleport", | ||
| "name": [ "Dimensionally Unstable" ], | ||
| "desc": [ "You feel like you're barely part of the world." ], | ||
| "apply_message": "", | ||
| "remove_message": "With a jolt you feel more solid again.", | ||
| "rating": "bad", | ||
| "enchantments": [ "enchant_riftwalker_teleport" ], | ||
| "immune_flags": [ "TELESTOP", "DIMENSIONAL_ANCHOR" ] | ||
| }, | ||
| { | ||
| "type": "effect_type", | ||
| "id": "effect_vitakinetic_health_down", | ||
| "name": [ "Feeling Unwell" ], | ||
| "desc": [ "You feel weak and shaky." ], | ||
| "apply_message": "", | ||
| "remove_message": "The feeling of weakness fades away.", | ||
| "rating": "bad", | ||
| "max_duration": "12 hours", | ||
| "base_mods": { | ||
| "str_mod": [ -2 ], | ||
| "h_mod_min": [ -2 ], | ||
| "h_mod_chance": [ 1 ], | ||
| "h_mod_chance_bot": [ 5 ], | ||
| "h_mod_tick": [ 600 ], | ||
| "healing_rate": [ 0.75 ] | ||
| } | ||
| }, | ||
| { | ||
| "type": "effect_type", | ||
| "id": "effect_vitakinetic_healing_down", | ||
| "name": [ "Feeling Very Unwell" ], | ||
| "desc": [ "You feel fatigued and shaky." ], | ||
| "apply_message": "", | ||
| "remove_message": "The feeling of weakness fades away.", | ||
| "rating": "bad", | ||
| "max_duration": "18 hours", | ||
| "base_mods": { | ||
| "str_mod": [ -2 ], | ||
| "h_mod_min": [ -2 ], | ||
| "h_mod_chance": [ 1 ], | ||
| "h_mod_chance_bot": [ 4 ], | ||
| "h_mod_tick": [ 500 ], | ||
| "healing_rate": [ 0.5 ] | ||
| }, | ||
| "vitamins": [ { "vitamin": "iron", "rate": [ [ -10, -10 ] ], "tick": [ "1 m" ] } ] | ||
| } | ||
| ] |
Oops, something went wrong.