Skip to content

Commit

Permalink
[MoM/Magiclysm interaction] Synchronize anti-Stare powers, Thought Sh…
Browse files Browse the repository at this point in the history
…ield spell protects from telepathy (#77277)

* Create miscellaneous.json

* Create flags.json

* Acount for TEEPSHIELD

* Create eoc_misc.json

* Add MAGICAL_MIND_PROTECTION to thought shield

* Add mind protection to thought shields

* TEEPSHIELD effect

* Update data/mods/MindOverMatter/mod_interactions/magiclysm/item_overrides.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Fixes

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
Standing-Storm and github-actions[bot] authored Oct 28, 2024
1 parent f08c753 commit bc43970
Show file tree
Hide file tree
Showing 8 changed files with 93 additions and 6 deletions.
16 changes: 16 additions & 0 deletions data/mods/Magiclysm/effect_on_conditions/miscellaneous.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[
{
"type": "effect_on_condition",
"id": "EOC_STARE",
"condition": { "or": [ { "u_has_worn_with_flag": "DIMENSIONAL_ANCHOR" }, { "npc_has_flag": "DIMENSIONAL_ANCHOR" } ] },
"effect": { "u_message": "You feel a strange reverberation across your body.", "type": "warning" },
"false_effect": { "run_eocs": [ "EOC_STARE1" ] }
},
{
"type": "effect_on_condition",
"id": "EOC_STARE1",
"condition": { "u_has_worn_with_flag": "MAGICAL_MIND_PROTECTION" },
"effect": { "u_message": "You sense <npc_name> trying to enter your mind, but your magic protects you!", "type": "warning" },
"false_effect": { "run_eocs": [ "EOC_STARE2" ] }
}
]
7 changes: 5 additions & 2 deletions data/mods/Magiclysm/effects/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -1614,7 +1614,8 @@
{ "u_remove_item_with": "magic_lamp" },
{ "u_remove_item_with": "technomancer_summoned_radio" },
{ "u_remove_item_with": "technomancer_welder" },
{ "u_remove_item_with": "technomancer_far_sight_lens" }
{ "u_remove_item_with": "technomancer_far_sight_lens" },
{ "u_remove_item_with": "thought_shield_item" }
]
},
{
Expand Down Expand Up @@ -1779,7 +1780,9 @@
{ "u_remove_item_with": "force_magical_armor" },
{ "u_remove_item_with": "subzero_talons" },
{ "u_remove_item_with": "aura_cold_energy" },
{ "u_remove_item_with": "pocket_sun" }
{ "u_remove_item_with": "pocket_sun" },
{ "u_remove_item_with": "thought_shield_item" },
{ "u_remove_item_with": "thought_shield_plus_item" }
]
},
{
Expand Down
7 changes: 7 additions & 0 deletions data/mods/Magiclysm/flags.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"id": "MAGICAL_MIND_PROTECTION",
"type": "json_flag",
"info": "Your magic protects your mind against assault."
}
]
6 changes: 4 additions & 2 deletions data/mods/Magiclysm/items/ethereal_items.json
Original file line number Diff line number Diff line change
Expand Up @@ -1235,7 +1235,8 @@
"TRADER_AVOID",
"PSYSHIELD_PARTIAL",
"UNBREAKABLE",
"ALLOWS_NATURAL_ATTACKS"
"ALLOWS_NATURAL_ATTACKS",
"MAGICAL_MIND_PROTECTION"
]
},
{
Expand Down Expand Up @@ -1270,7 +1271,8 @@
"PSYSHIELD_PARTIAL",
"PORTAL_PROOF",
"UNBREAKABLE",
"ALLOWS_NATURAL_ATTACKS"
"ALLOWS_NATURAL_ATTACKS",
"MAGICAL_MIND_PROTECTION"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions data/mods/MindOverMatter/effectoncondition/eoc_misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@
{
"type": "effect_on_condition",
"id": "EOC_STARE1",
"condition": { "u_has_effect": "effect_telepathic_psi_armor" },
"effect": { "u_message": "You sense <npc_name> trying to enter your mind, but you repel!", "type": "warning" },
"condition": { "or": [ { "u_has_effect": "effect_telepathic_psi_armor" }, { "u_has_flag": "TEEPSHIELD" } ] },
"effect": { "u_message": "You sense <npc_name> trying to enter your mind, but you repel it!", "type": "warning" },
"false_effect": { "run_eocs": [ "EOC_STARE2" ] }
},
{
Expand Down
11 changes: 11 additions & 0 deletions data/mods/MindOverMatter/mod_interactions/magiclysm/effects.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[
{
"type": "effect_type",
"id": "effect_item_mind_protection",
"//": "Hidden effect, used as an item buff",
"name": [ "" ],
"desc": [ "" ],
"rating": "good",
"flags": [ "TEEPSHIELD" ]
}
]
16 changes: 16 additions & 0 deletions data/mods/MindOverMatter/mod_interactions/magiclysm/eoc_misc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[
{
"type": "effect_on_condition",
"id": "EOC_STARE1",
"condition": { "u_has_worn_with_flag": "MAGICAL_MIND_PROTECTION" },
"effect": { "u_message": "You sense <npc_name> trying to enter your mind, but your magic protects you!", "type": "warning" },
"false_effect": { "run_eocs": [ "EOC_STARE1_5" ] }
},
{
"type": "effect_on_condition",
"id": "EOC_STARE1_5",
"condition": { "or": [ { "u_has_effect": "effect_telepathic_psi_armor" }, { "u_has_flag": "TEEPSHIELD" } ] },
"effect": { "u_message": "You sense <npc_name> trying to enter your mind, but you repel it!", "type": "warning" },
"false_effect": { "run_eocs": [ "EOC_STARE2" ] }
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[
{
"id": "thought_shield_item",
"name": { "str_sp": "thought shields" },
"type": "TOOL_ARMOR",
"copy-from": "thought_shield_item",
"relic_data": {
"passive_effects": [
{
"has": "WORN",
"condition": "ALWAYS",
"ench_effects": [ { "effect": "effect_item_mind_protection", "intensity": 1 } ]
}
]
}
},
{
"id": "thought_shield_plus_item",
"name": { "str_sp": "thought suit" },
"type": "TOOL_ARMOR",
"copy-from": "thought_shield_plus_item",
"relic_data": {
"passive_effects": [
{
"has": "WORN",
"condition": "ALWAYS",
"ench_effects": [ { "effect": "effect_item_mind_protection", "intensity": 1 } ]
}
]
}
}
]

0 comments on commit bc43970

Please sign in to comment.