[MoM] Monster_takes_damage updates (#77044)

* Initial commit * Add specific photokinetic invisibility melee cancel * Update EoCs
CleverRaven · Oct 15, 2024 · 61076ba · 61076ba
1 parent ec0b796
commit 61076ba
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 100 deletions.
diff --git a/data/mods/MindOverMatter/effectoncondition/conditions_for_eocs.json b/data/mods/MindOverMatter/effectoncondition/conditions_for_eocs.json
@@ -144,50 +144,40 @@
  "id": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT",
  "condition": {
  "or": [
- { "u_has_effect": "effect_clair_speed_reader" },
- { "u_has_effect": "effect_clair_see_auras" },
- { "u_has_effect": "effect_clair_craft_bonus" },
- { "u_has_effect": "effect_clair_perfect_shot" },
- { "u_has_effect": "effect_photokin_light_local" },
- { "u_has_item": "pyrokinetic_fire_tool" },
- { "u_has_item": "pyrokinetic_fire_tool_four_arms" },
- { "u_has_item": "pyrokinetic_fire_tool_six_arms" },
- { "u_has_item": "pyrokinetic_fire_tool_eight_arms" },
- { "u_has_item": "pyrokinetic_torch_weld" },
- { "u_has_effect": "effect_telekinetic_strength" },
- { "u_has_item": "telekin_lifting_jack_1" },
- { "u_has_item": "telekin_lifting_jack_2" },
- { "u_has_item": "telekin_lifting_jack_3" },
- { "u_has_item": "telekin_lifting_jack_4" },
- { "u_has_item": "telekin_lifting_jack_5" },
- { "u_has_item": "telekin_lifting_jack_6" },
- { "u_has_item": "telekin_lifting_jack_7" },
- { "u_has_item": "telekin_lifting_jack_8" },
- { "u_has_item": "telekin_lifting_jack_9" },
- { "u_has_item": "telekin_lifting_jack_10" },
- { "u_has_item": "telekin_lifting_jack_11" },
- { "u_has_item": "telekin_lifting_jack_12" },
- { "u_has_item": "telekin_lifting_jack_13" },
- { "u_has_item": "telekin_lifting_jack_14" },
- { "u_has_item": "telekin_lifting_jack_15" },
- { "u_has_item": "telekin_lifting_jack_16" },
- { "u_has_item": "telekin_lifting_jack_17" },
- { "u_has_item": "telekin_lifting_jack_18" },
- { "u_has_item": "telekin_lifting_jack_19" },
- { "u_has_item": "telekin_lifting_jack_20" },
- { "u_has_effect": "effect_telekinetic_levitation" },
- { "u_has_effect": "effect_telepathic_learning_bonus" },
- { "u_has_effect": "telepathic_ignorance_self" }
+ { "npc_has_effect": "effect_clair_speed_reader" },
+ { "npc_has_effect": "effect_clair_see_auras" },
+ { "npc_has_effect": "effect_clair_craft_bonus" },
+ { "npc_has_effect": "effect_clair_perfect_shot" },
+ { "npc_has_effect": "effect_photokin_light_local" },
+ { "npc_has_effect": "effect_pyrokinetic_fire_tool" },
+ { "npc_has_item": "pyrokinetic_torch_weld" },
+ { "npc_has_effect": "effect_telekinetic_strength" },
+ { "npc_has_item": "telekin_lifting_jack_1" },
+ { "npc_has_item": "telekin_lifting_jack_2" },
+ { "npc_has_item": "telekin_lifting_jack_3" },
+ { "npc_has_item": "telekin_lifting_jack_4" },
+ { "npc_has_item": "telekin_lifting_jack_5" },
+ { "npc_has_item": "telekin_lifting_jack_6" },
+ { "npc_has_item": "telekin_lifting_jack_7" },
+ { "npc_has_item": "telekin_lifting_jack_8" },
+ { "npc_has_item": "telekin_lifting_jack_9" },
+ { "npc_has_item": "telekin_lifting_jack_10" },
+ { "npc_has_item": "telekin_lifting_jack_11" },
+ { "npc_has_item": "telekin_lifting_jack_12" },
+ { "npc_has_item": "telekin_lifting_jack_13" },
+ { "npc_has_item": "telekin_lifting_jack_14" },
+ { "npc_has_item": "telekin_lifting_jack_15" },
+ { "npc_has_item": "telekin_lifting_jack_16" },
+ { "npc_has_item": "telekin_lifting_jack_17" },
+ { "npc_has_item": "telekin_lifting_jack_18" },
+ { "npc_has_item": "telekin_lifting_jack_19" },
+ { "npc_has_item": "telekin_lifting_jack_20" },
+ { "npc_has_effect": "effect_telekinetic_levitation" },
+ { "npc_has_effect": "effect_telepathic_learning_bonus" }
  ]
  },
  "effect": [ ]
  },
- {
- "type": "effect_on_condition",
- "id": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_MELEE_COMBAT_SPECIFICALLY",
- "condition": { "or": [ { "u_has_effect": "effect_photokin_invisibility" } ] },
- "effect": [ ]
- },
  {
  "type": "effect_on_condition",
  "id": "EOC_CONDITION_AWAKENING_X_IN_Y_CHANCE",

diff --git a/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json b/data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json
@@ -24,72 +24,21 @@
  { "u_lose_effect": "effect_clair_perfect_shot" }
  ]
  },
- {
- "type": "effect_on_condition",
- "id": "EOC_POWER_TOGGLE_REMOVE_MELEE_CANCELLABLE_EFFECTS",
- "effect": [ { "run_eocs": [ "EOC_PHOTOKIN_REMOVE_INVISIBILITY" ] } ]
- },
  {
  "type": "effect_on_condition",
  "id": "EOC_MELEE_MONSTER_CANCEL_TOGGLES",
  "eoc_type": "EVENT",
- "required_event": "character_melee_attacks_monster",
- "condition": {
- "or": [
- { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT" },
- { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_MELEE_COMBAT_SPECIFICALLY" }
- ]
- },
- "effect": [
- { "run_eocs": [ "EOC_POWER_TOGGLE_REMOVE_EFFECTS", "EOC_POWER_TOGGLE_REMOVE_MELEE_CANCELLABLE_EFFECTS" ] },
- { "npc_lose_effect": "telepathic_ignorance" }
- ]
- },
- {
- "type": "effect_on_condition",
- "id": "EOC_MELEE_CHARACTER_CANCEL_TOGGLES",
- "eoc_type": "EVENT",
- "required_event": "character_melee_attacks_character",
- "condition": {
- "or": [
- { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT" },
- { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_MELEE_COMBAT_SPECIFICALLY" }
- ]
- },
- "effect": [
- { "run_eocs": [ "EOC_POWER_TOGGLE_REMOVE_EFFECTS", "EOC_POWER_TOGGLE_REMOVE_MELEE_CANCELLABLE_EFFECTS" ] },
- { "npc_lose_effect": "telepathic_ignorance" }
- ]
- },
- {
- "type": "effect_on_condition",
- "id": "EOC_RANGED_MONSTER_CANCEL_TOGGLES",
- "eoc_type": "EVENT",
- "required_event": "character_ranged_attacks_monster",
+ "required_event": "character_takes_damage",
  "condition": { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT" },
- "effect": [ { "run_eocs": [ "EOC_POWER_TOGGLE_REMOVE_EFFECTS" ] }, { "npc_lose_effect": "telepathic_ignorance" } ]
+ "effect": [ { "run_eoc_with": "EOC_POWER_TOGGLE_REMOVE_EFFECTS", "alpha_talker": "npc" } ]
  },
  {
  "type": "effect_on_condition",
- "id": "EOC_RANGED_CHARACTER_CANCEL_TOGGLES",
+ "id": "EOC_PSI_NO_COMBAT_POWER_MONSTER_DAMAGE_CHECK",
  "eoc_type": "EVENT",
- "required_event": "character_ranged_attacks_character",
+ "required_event": "monster_takes_damage",
  "condition": { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT" },
- "effect": [ { "run_eocs": [ "EOC_POWER_TOGGLE_REMOVE_EFFECTS" ] }, { "npc_lose_effect": "telepathic_ignorance" } ]
- },
- {
- "type": "effect_on_condition",
- "id": "EOC_SPELL_CANCEL_TOGGLES",
- "eoc_type": "EVENT",
- "required_event": "spellcasting_finish",
- "condition": {
- "and": [
- { "math": [ "_damage", ">=", "1" ] },
- { "test_eoc": "EOC_CONDITION_LIST_OF_POWERS_CANCELLED_BY_COMBAT" },
- { "test_eoc": "EOC_CONDITION_SPELLCASTING_FINISH_TRAIT_AND_SCHOOL_LIST" }
- ]
- },
- "effect": [ { "run_eocs": [ "EOC_POWER_TOGGLE_REMOVE_EFFECTS" ] } ]
+ "effect": [ { "run_eoc_with": "EOC_POWER_TOGGLE_REMOVE_EFFECTS", "alpha_talker": "npc" } ]
  },
  {
  "type": "effect_on_condition",

diff --git a/data/mods/MindOverMatter/effects/effects_psionic.json b/data/mods/MindOverMatter/effects/effects_psionic.json
@@ -1342,7 +1342,7 @@
  "type": "effect_type",
  "id": "effect_pyrokinetic_fire_tool",
  "name": [ "Banked Flames" ],
- "desc": [ "A firm is burning over one of your palms." ],
+ "desc": [ "A flame is burning over one of your palms." ],
  "rating": "good",
  "max_duration": "7 days"
  },

diff --git a/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json b/data/mods/MindOverMatter/powers/photokinesis_concentration_eoc.json
@@ -422,7 +422,7 @@
  ]
  }
  ],
- "false_effect": [ { "run_eocs": "EOC_PHOTOKIN_INVISIBILITY_DRAIN" } ]
+ "false_effect": [ { "run_eocs": "EOC_PHOTOKIN_REMOVE_INVISIBILITY" } ]
  },
  {
  "type": "effect_on_condition",

diff --git a/data/mods/MindOverMatter/powers/photokinesis_eocs.json b/data/mods/MindOverMatter/powers/photokinesis_eocs.json
@@ -98,5 +98,22 @@
  { "case": 16, "effect": [ { "u_cast_spell": { "id": "photokinetic_create_light_03" }, "targeted": true } ] }
  ]
  }
+ },
+ {
+ "type": "effect_on_condition",
+ "id": "EOC_PHOTOKIN_REMOVE_INVISIBILITY_MELEE_CHARACTER",
+ "//": "This will not prevent invisibility from being removed if you use your psi on someone in melee range, but that is intended--the rippling light distortion from quick movement is what gives you away, and psi doesn't require body movements",
+ "eoc_type": "EVENT",
+ "required_event": "character_melee_attacks_character",
+ "condition": { "u_has_effect": "effect_photokin_invisibility" },
+ "effect": [ { "u_lose_effect": "effect_photokin_invisibility" } ]
+ },
+ {
+ "type": "effect_on_condition",
+ "id": "EOC_PHOTOKIN_REMOVE_INVISIBILITY_MELEE_MONSTER",
+ "eoc_type": "EVENT",
+ "required_event": "character_melee_attacks_monster",
+ "condition": { "u_has_effect": "effect_photokin_invisibility" },
+ "effect": [ { "u_lose_effect": "effect_photokin_invisibility" } ]
  }
 ]
diff --git a/data/mods/MindOverMatter/powers/pyrokinesis.json b/data/mods/MindOverMatter/powers/pyrokinesis.json
@@ -596,7 +596,7 @@
  "damage_type": "heat",
  "min_damage": {
  "math": [
- "( (u_spell_level('pyrokinetic_blast') * 2.5n) + 37) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling"
+ "( (u_spell_level('pyrokinetic_blast') * 2.5) + 37) * (scaling_factor(u_val('intelligence') ) ) * u_nether_attunement_power_scaling"
  ]
  },
  "max_damage": {

diff --git a/data/mods/MindOverMatter/powers/telekinesis.json b/data/mods/MindOverMatter/powers/telekinesis.json
@@ -574,7 +574,7 @@
  "valid_targets": [ "self" ],
  "spell_class": "TELEKINETIC",
  "skill": "metaphysics",
- "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "NO_EXPLOSION_SFX" ],
+ "flags": [ "PSIONIC", "CONCENTRATE", "SILENT", "NO_HANDS", "NO_LEGS", "RANDOM_DURATION", "NO_EXPLOSION_SFX" ],
  "difficulty": 6,
  "max_level": { "math": [ "int_to_level(1)" ] },
  "effect": "effect_on_condition",

diff --git a/data/mods/MindOverMatter/powers/telepathy_eoc.json b/data/mods/MindOverMatter/powers/telepathy_eoc.json
@@ -104,6 +104,22 @@
  }
  ]
  },
+ {
+ "type": "effect_on_condition",
+ "id": "EOC_TELEPATH_OBSCURITY_REMOVAL_CHARACTER",
+ "eoc_type": "EVENT",
+ "required_event": "character_takes_damage",
+ "condition": { "and": [ { "u_has_effect": "telepathic_ignorance" }, { "npc_has_effect": "telepathic_ignorance_self" } ] },
+ "effect": [ { "u_lose_effect": "telepathic_ignorance" } ]
+ },
+ {
+ "type": "effect_on_condition",
+ "id": "EOC_TELEPATH_OBSCURITY_REMOVAL_MONSTER",
+ "eoc_type": "EVENT",
+ "required_event": "monster_takes_damage",
+ "condition": { "and": [ { "u_has_effect": "telepathic_ignorance" }, { "npc_has_effect": "telepathic_ignorance_self" } ] },
+ "effect": [ { "u_lose_effect": "telepathic_ignorance" } ]
+ },
  {
  "type": "effect_on_condition",
  "id": "EOC_TELEPATH_PRIMAL_TERROR",