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.

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

[Magiclysm] Dispel Magic and Disjunction affect summoned items and auras now #71321

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 112 additions & 0 deletions data/mods/Magiclysm/effects/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -1101,6 +1101,54 @@
"effect_thorns_electric"
]
},
{
"type": "effect_on_condition",
"id": "EOC_DISPEL_MAGIC_REMOVE_ITEMS",
"eoc_type": "EVENT",
"required_event": "character_gains_effect",
"//": "Removes all summon item or aura-type buffs with Difficulty 6 or less, no attunement powers, and no permanent effects. Unfortunately, it's unable to distinguish between base spells and Improved spells with higher Difficulty.",
"condition": { "compare_string": [ "effect_dispel_magic", { "context_val": "effect" } ] },
"effect": [
{ "u_remove_item_with": "decaying_boneclub" },
{ "u_remove_item_with": "tentacle_whip" },
{ "u_remove_item_with": "fleshpouch" },
{ "u_remove_item_with": "aura_caustic" },
{ "u_remove_item_with": "item_biomancer_scalpel_fingers" },
{ "u_remove_item_with": "druid_recurve" },
{ "u_remove_item_with": "druid_naturearrows1" },
{ "u_remove_item_with": "druid_quiver" },
{ "u_remove_item_with": "druid_quiver_plus" },
{ "u_remove_item_with": "aura_feral" },
{ "u_remove_item_with": "aura_feral_plus" },
{ "u_remove_item_with": "druid_bandages" },
{ "u_remove_item_with": "arrow_druid" },
{ "u_remove_item_with": "druid_bramble_spear_item" },
{ "u_remove_item_with": "aura_druid_breathing_water" },
{ "u_remove_item_with": "aura_druid_waterwalk" },
{ "u_remove_item_with": "stonefist" },
{ "u_remove_item_with": "aura_stoneskin" },
{ "u_remove_item_with": "eshaper_hammer" },
{ "u_remove_item_with": "eshaper_pickaxe" },
{ "u_remove_item_with": "eshaper_ax" },
{ "u_remove_item_with": "eshaper_knife" },
{ "u_remove_item_with": "eshaper_shovel" },
{ "u_remove_item_with": "finger_firelighter" },
{ "u_remove_item_with": "ice_gliders" },
{ "u_remove_item_with": "shield_ice" },
{ "u_remove_item_with": "armor_frost" },
{ "u_remove_item_with": "flamesword" },
{ "u_remove_item_with": "jar_3l_force" },
{ "u_remove_item_with": "impactsling" },
{ "u_remove_item_with": "stormhammer" },
{ "u_remove_item_with": "stormglove" },
{ "u_remove_item_with": "electric_lighter" },
{ "u_remove_item_with": "flask_ethereal_rebreather" },
{ "u_remove_item_with": "armor_spirit" },
{ "u_remove_item_with": "magic_lamp" },
{ "u_remove_item_with": "technomancer_summoned_radio" },
{ "u_remove_item_with": "technomancer_welder" }
]
},
{
"id": "effect_disjunction",
"type": "effect_type",
Expand Down Expand Up @@ -1176,5 +1224,69 @@
"effect_flame_immunity",
"effect_burning_trail"
]
},
{
"type": "effect_on_condition",
"id": "EOC_DISJUNCTION_REMOVE_ITEMS",
"eoc_type": "EVENT",
"required_event": "character_gains_effect",
"//": "Removes all summon items regardless of source",
"condition": { "compare_string": [ "effect_disjunction", { "context_val": "effect" } ] },
"effect": [
{ "u_remove_item_with": "decaying_boneclub" },
{ "u_remove_item_with": "tentacle_whip" },
{ "u_remove_item_with": "fleshpouch" },
{ "u_remove_item_with": "aura_caustic" },
{ "u_remove_item_with": "item_biomancer_scalpel_fingers" },
{ "u_remove_item_with": "druid_recurve" },
{ "u_remove_item_with": "druid_naturearrows1" },
{ "u_remove_item_with": "druid_quiver" },
{ "u_remove_item_with": "druid_quiver_plus" },
{ "u_remove_item_with": "aura_feral" },
{ "u_remove_item_with": "aura_feral_plus" },
{ "u_remove_item_with": "druid_bandages" },
{ "u_remove_item_with": "arrow_druid" },
{ "u_remove_item_with": "druid_bramble_spear_item" },
{ "u_remove_item_with": "aura_druid_breathing_water" },
{ "u_remove_item_with": "aura_druid_waterwalk" },
{ "u_remove_item_with": "stonefist" },
{ "u_remove_item_with": "aura_stoneskin" },
{ "u_remove_item_with": "eshaper_hammer" },
{ "u_remove_item_with": "eshaper_pickaxe" },
{ "u_remove_item_with": "eshaper_ax" },
{ "u_remove_item_with": "eshaper_knife" },
{ "u_remove_item_with": "eshaper_shovel" },
{ "u_remove_item_with": "finger_firelighter" },
{ "u_remove_item_with": "ice_gliders" },
{ "u_remove_item_with": "shield_ice" },
{ "u_remove_item_with": "armor_frost" },
{ "u_remove_item_with": "flamesword" },
{ "u_remove_item_with": "jar_3l_force" },
{ "u_remove_item_with": "impactsling" },
{ "u_remove_item_with": "stormhammer" },
{ "u_remove_item_with": "stormglove" },
{ "u_remove_item_with": "electric_lighter" },
{ "u_remove_item_with": "flask_ethereal_rebreather" },
{ "u_remove_item_with": "armor_spirit" },
{ "u_remove_item_with": "magic_lamp" },
{ "u_remove_item_with": "technomancer_summoned_radio" },
{ "u_remove_item_with": "technomancer_welder" },
{ "u_remove_item_with": "druid_thorn_skin_item" },
{ "u_remove_item_with": "bonespear" },
{ "u_remove_item_with": "longsword_holy" },
{ "u_remove_item_with": "technomancer_summoned_ups" },
{ "u_remove_item_with": "alchemist_bomb" },
{ "u_remove_item_with": "alchemist_mine" },
{ "u_remove_item_with": "artificer_toolkit" },
{ "u_remove_item_with": "demon_possession_aura" },
{ "u_remove_item_with": "aura_auroral_guard" },
{ "u_remove_item_with": "holy_shield" },
{ "u_remove_item_with": "longsword_judgement" },
{ "u_remove_item_with": "flarewhip" },
{ "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" }
]
}
]
Loading