Spells/Mage: Update Ring of Frost#31781
Open
MoltenCrystal wants to merge 2 commits intoTrinityCore:masterfrom
Open
Spells/Mage: Update Ring of Frost#31781MoltenCrystal wants to merge 2 commits intoTrinityCore:masterfrom
MoltenCrystal wants to merge 2 commits intoTrinityCore:masterfrom
Conversation
mdX7
requested changes
Apr 10, 2026
Comment on lines
+1864
to
+1872
| { | ||
| Unit* unit = target->ToUnit(); | ||
| if (!unit) | ||
| return true; | ||
| return unit->HasAura(SPELL_MAGE_RING_OF_FROST_DUMMY) | ||
| || unit->HasAura(SPELL_MAGE_RING_OF_FROST_FREEZE) | ||
| || unit->GetExactDist(dest) > outRadius | ||
| || unit->GetExactDist(dest) < inRadius; | ||
| }); |
Member
There was a problem hiding this comment.
this entire code block has no changes, revert
| WorldLocation const* dest = GetExplTargetDest(); | ||
| float outRadius = sSpellMgr->AssertSpellInfo(SPELL_MAGE_RING_OF_FROST_SUMMON, GetCastDifficulty())->GetEffect(EFFECT_0).CalcRadius(nullptr, SpellTargetIndex::TargetB); | ||
| float inRadius = 6.5f; | ||
| SpellEffectInfo const& ringEffect = sSpellMgr->GetSpellInfo(SPELL_MAGE_RING_OF_FROST_SUMMON, GetCastDifficulty())->GetEffect(EFFECT_2); |
Member
There was a problem hiding this comment.
AssertSpellInfo to silence static analysis tools
| { | ||
| std::list<TempSummon*> minions; | ||
| GetTarget()->GetAllMinionsByEntry(minions, sSpellMgr->AssertSpellInfo(SPELL_MAGE_RING_OF_FROST_SUMMON, GetCastDifficulty())->GetEffect(EFFECT_0).MiscValue); | ||
| GetTarget()->GetAllMinionsByEntry(minions, sSpellMgr->GetSpellInfo(SPELL_MAGE_RING_OF_FROST_SUMMON, GetCastDifficulty())->GetEffect(EFFECT_0).MiscValue); |
Comment on lines
+1799
to
+1800
| if (ringOfFrost->IsInCombat()) | ||
| ringOfFrost->CombatStop(); |
Member
There was a problem hiding this comment.
is this still required after setting ignore combat static flag?
| return; | ||
|
|
||
| if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE) | ||
| caster->CastSpell(GetTarget(), SPELL_MAGE_RING_OF_FROST_SLOW, CastSpellExtraArgs(TRIGGERED_FULL_MASK)); |
Member
There was a problem hiding this comment.
try to not use TRIGGERED_FULL_MASK directly, usually we only need TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR
Suggested change
| caster->CastSpell(GetTarget(), SPELL_MAGE_RING_OF_FROST_SLOW, CastSpellExtraArgs(TRIGGERED_FULL_MASK)); | |
| caster->CastSpell(GetTarget(), SPELL_MAGE_RING_OF_FROST_SLOW, CastSpellExtraArgsInit{ | |
| .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR | |
| }); |
| if (GetTargetApplication()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE) | ||
| caster->CastSpell(GetTarget(), SPELL_MAGE_RING_OF_FROST_SLOW, CastSpellExtraArgs(TRIGGERED_FULL_MASK)); | ||
|
|
||
| caster->CastSpell(GetTarget(), SPELL_MAGE_RING_OF_FROST_DUMMY, CastSpellExtraArgs(TRIGGERED_FULL_MASK)); |
Member
There was a problem hiding this comment.
same here
Suggested change
| caster->CastSpell(GetTarget(), SPELL_MAGE_RING_OF_FROST_DUMMY, CastSpellExtraArgs(TRIGGERED_FULL_MASK)); | |
| caster->CastSpell(GetTarget(), SPELL_MAGE_RING_OF_FROST_DUMMY, CastSpellExtraArgsInit{ | |
| .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR | |
| }); |
Comment on lines
+1802
to
+1803
| ringOfFrost->CastSpell(ringOfFrost->GetPosition(), SPELL_MAGE_RING_OF_FROST_FREEZE, | ||
| CastSpellExtraArgs(TRIGGERED_FULL_MASK).SetOriginalCaster(GetTarget()->GetGUID())); |
Member
There was a problem hiding this comment.
Suggested change
| ringOfFrost->CastSpell(ringOfFrost->GetPosition(), SPELL_MAGE_RING_OF_FROST_FREEZE, | |
| CastSpellExtraArgs(TRIGGERED_FULL_MASK).SetOriginalCaster(GetTarget()->GetGUID())); | |
| ringOfFrost->CastSpell(ringOfFrost->GetPosition(), SPELL_MAGE_RING_OF_FROST_FREEZE, CastSpellExtraArgsInit{ | |
| .TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR, | |
| .OriginalCaster = GetTarget()->GetGUID() | |
| }); |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes proposed:
Fixes incap upon entering or leaving the ring
Tests performed:
Builds, and incaps targets as expected