diff --git a/data/mods/MindOverMatter/effects/effects_nether_attunement.json b/data/mods/MindOverMatter/effects/effects_nether_attunement.json index d8a4c7bbb0fe0..533f771c876d3 100644 --- a/data/mods/MindOverMatter/effects/effects_nether_attunement.json +++ b/data/mods/MindOverMatter/effects/effects_nether_attunement.json @@ -14,12 +14,29 @@ [ "", "mixed" ], [ "", "mixed" ], [ "", "mixed" ], + [ "Your mind thrums with power. It's intoxicating, but growing increasingly harder to control.", "mixed" ], [ "", "mixed" ], [ "", "mixed" ], [ "", "mixed" ], [ "", "mixed" ], [ "", "mixed" ], + [ + "Your whole body pulses with a raging torrent of energy. It's taking almost all of your concentration to hold on.", + "mixed" + ], + [ "", "mixed" ] + ], + "decay_messages": [ + [ "", "mixed" ], + [ "", "mixed" ], + [ "", "mixed" ], + [ "The constant hum of power fades, just a little. It's easier to think now.", "mixed" ], + [ "", "mixed" ], + [ "", "mixed" ], + [ "", "mixed" ], + [ "", "mixed" ], [ "", "mixed" ], + [ "The roar of the Nether subsides. You can finally hear your own thoughts again.", "mixed" ], [ "", "mixed" ], [ "", "mixed" ] ], diff --git a/data/mods/MindOverMatter/jmath.json b/data/mods/MindOverMatter/jmath.json index 68c454b94e462..9ed259d975711 100644 --- a/data/mods/MindOverMatter/jmath.json +++ b/data/mods/MindOverMatter/jmath.json @@ -52,7 +52,7 @@ "id": "concentration_trait_bonuses", "num_args": 0, "//": "Effects with an intelligence penalty have not been included below to avoid double counting", - "return": "(u_has_trait('CONCENTRATION_GOOD')) + (u_has_trait('CONCENTRATION_BAD') ? -1 : 0) + (u_has_trait('INT_ALPHA')) + (u_has_trait('NOMAD2') ? -1 : 0) + (u_has_trait('NOMAD3') ? -1 : 0) + (u_has_trait('CONCENTRATION_DEBUG') ? 50 : 0) + (u_has_proficiency('prof_concentration_basic')) + (u_has_proficiency('prof_concentration_intermediate')) + (u_has_proficiency('prof_concentration_master') * 2) + (u_effect_intensity('hallu') > 0 ? -1 : 0) + (u_effect_intensity('winded') > 0 ? -2 : 0) + (u_effect_intensity('nausea') > 0 ? -1 : 0) + (u_effect_intensity('nausea') > 3 ? -1 : 0) + (u_effect_intensity('cold') > 1 ? -1 : 0) + (u_effect_intensity('hot') > 1 ? -1 : 0) + (u_effect_intensity('asthma') > 0 ? -3 : 0) + (u_effect_intensity('datura') > 0 ? -3 : 0) + (u_effect_intensity('dazed') > 0 ? -2 : 0) + (u_effect_intensity('psi_dazed') > 0 ? -2 : 0) + (u_effect_intensity('psi_dazed_zap') > 0 ? -1 : 0) + (u_effect_intensity('downed') > 0 ? -2 : 0) + (u_effect_intensity('boomered') > 0 ? -1 : 0) + (u_effect_intensity('conjunctivitis') > 0 ? -1 : 0) + (u_effect_intensity('teargas') > 0 ? -3 : 0) + (u_effect_intensity('smoke_eyes') > 0 ? -1 : 0) + (u_effect_intensity('smoke_lungs') > 0 ? -2 : 0)" + "return": "(u_has_trait('CONCENTRATION_GOOD')) + (u_has_trait('CONCENTRATION_BAD') ? -1 : 0) + (u_has_trait('INT_ALPHA')) + (u_has_trait('NOMAD2') ? -1 : 0) + (u_has_trait('NOMAD3') ? -1 : 0) + (u_has_trait('CONCENTRATION_DEBUG') ? 50 : 0) + (u_has_proficiency('prof_concentration_basic')) + (u_has_proficiency('prof_concentration_intermediate')) + (u_has_proficiency('prof_concentration_master') * 2) + (u_effect_intensity('effect_disease_psionic_drain') > 4 ? -1 : 0) + (u_effect_intensity('effect_disease_psionic_drain') > 10 ? -1 : 0) + (u_effect_intensity('hallu') > 0 ? -1 : 0) + (u_effect_intensity('winded') > 0 ? -2 : 0) + (u_effect_intensity('nausea') > 0 ? -1 : 0) + (u_effect_intensity('nausea') > 3 ? -1 : 0) + (u_effect_intensity('cold') > 1 ? -1 : 0) + (u_effect_intensity('hot') > 1 ? -1 : 0) + (u_effect_intensity('asthma') > 0 ? -3 : 0) + (u_effect_intensity('datura') > 0 ? -3 : 0) + (u_effect_intensity('dazed') > 0 ? -2 : 0) + (u_effect_intensity('psi_dazed') > 0 ? -2 : 0) + (u_effect_intensity('psi_dazed_zap') > 0 ? -1 : 0) + (u_effect_intensity('downed') > 0 ? -2 : 0) + (u_effect_intensity('boomered') > 0 ? -1 : 0) + (u_effect_intensity('conjunctivitis') > 0 ? -1 : 0) + (u_effect_intensity('teargas') > 0 ? -3 : 0) + (u_effect_intensity('smoke_eyes') > 0 ? -1 : 0) + (u_effect_intensity('smoke_lungs') > 0 ? -2 : 0)" }, { "type": "jmath_function",