Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scripts/Spells: Fix Heroic Leap

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/62e2eb1dfcc440ae182acefc995bd95c0a39bd4a)
This commit is contained in:
Hondacrx
2025-10-13 16:26:23 -04:00
parent 9734e9ab8c
commit 14c3b846ea
1 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Spells/Warrior.cs
+26 -16
View File
@@ -18,6 +18,8 @@ namespace Scripts.Spells.Warrior
public const uint Bladestorm = 227847; public const uint Bladestorm = 227847;
public const uint BladestormPeriodicWhirlwind = 50622; public const uint BladestormPeriodicWhirlwind = 50622;
public const uint BloodthirstHeal = 117313; public const uint BloodthirstHeal = 117313;
public const uint BoundingStrideAura = 202163;
public const uint BoundingStride = 202164;
public const uint Charge = 34846; public const uint Charge = 34846;
public const uint ChargeDropFirePeriodic = 126661; public const uint ChargeDropFirePeriodic = 126661;
public const uint ChargeEffect = 198337; public const uint ChargeEffect = 198337;
@@ -40,6 +42,7 @@ namespace Scripts.Spells.Warrior
public const uint GlyphOfHeroicLeapBuff = 133278; public const uint GlyphOfHeroicLeapBuff = 133278;
public const uint GushingWound = 385042; public const uint GushingWound = 385042;
public const uint HeroicLeapJump = 178368; public const uint HeroicLeapJump = 178368;
public const uint HeroicLeapDamage = 52174;
public const uint IgnorePain = 190456; public const uint IgnorePain = 190456;
public const uint ImprovedRagingBlow = 383854; public const uint ImprovedRagingBlow = 383854;
public const uint ImprovedWhirlwind = 12950; public const uint ImprovedWhirlwind = 12950;
@@ -799,7 +802,7 @@ namespace Scripts.Spells.Warrior
{ {
public override bool Validate(SpellInfo spellInfo) public override bool Validate(SpellInfo spellInfo)
{ {
return ValidateSpellInfo(SpellIds.HeroicLeapJump); return ValidateSpellInfo(SpellIds.HeroicLeapDamage, SpellIds.Taunt);
} }
SpellCastResult CheckElevation() SpellCastResult CheckElevation()
@@ -820,7 +823,8 @@ namespace Scripts.Spells.Warrior
bool result = generatedPath.CalculatePath(dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ(), false); bool result = generatedPath.CalculatePath(dest.GetPositionX(), dest.GetPositionY(), dest.GetPositionZ(), false);
if (generatedPath.GetPathType().HasAnyFlag(PathType.Short)) if (generatedPath.GetPathType().HasAnyFlag(PathType.Short))
return SpellCastResult.OutOfRange; return SpellCastResult.OutOfRange;
else if (!result || generatedPath.GetPathType().HasAnyFlag(PathType.NoPath))
if (!result || generatedPath.GetPathType().HasAnyFlag(PathType.NoPath))
return SpellCastResult.NoPath; return SpellCastResult.NoPath;
} }
else if (dest.GetPositionZ() > GetCaster().GetPositionZ() + 4.0f) else if (dest.GetPositionZ() > GetCaster().GetPositionZ() + 4.0f)
@@ -832,39 +836,45 @@ namespace Scripts.Spells.Warrior
return SpellCastResult.NoValidTargets; return SpellCastResult.NoValidTargets;
} }
void HandleDummy(uint effIndex) void HandleCast()
{ {
WorldLocation dest = GetHitDest(); Player playerCaster = GetCaster().ToPlayer();
if (dest != null) if (playerCaster != null && playerCaster.GetPrimarySpecialization() == ChrSpecialization.WarriorProtection)
GetCaster().CastSpell(dest, SpellIds.HeroicLeapJump, true); playerCaster.GetSpellHistory().ResetCooldown(SpellIds.Taunt);
} }
public override void Register() public override void Register()
{ {
OnCast.Add(new(HandleCast));
OnCheckCast.Add(new(CheckElevation)); OnCheckCast.Add(new(CheckElevation));
OnEffectHit.Add(new(HandleDummy, 0, SpellEffectName.Dummy));
} }
} }
[Script] // Heroic Leap (triggered by Heroic Leap (6544)) - 178368 [Script] // 52174 - Heroic Leap (Damage)
class spell_warr_heroic_leap_jump : SpellScript class spell_warr_heroic_leap_damage : SpellScript
{ {
public override bool Validate(SpellInfo spellInfo) public override bool Validate(SpellInfo spellInfo)
{ {
return ValidateSpellInfo(SpellIds.GlyphOfHeroicLeap, SpellIds.GlyphOfHeroicLeapBuff, SpellIds.ImprovedHeroicLeap, SpellIds.Taunt); return ValidateSpellInfo(SpellIds.BoundingStrideAura, SpellIds.BoundingStride);
} }
void AfterJump(uint effIndex) public override bool Load()
{ {
if (GetCaster().HasAura(SpellIds.GlyphOfHeroicLeap)) return GetCaster().HasAura(SpellIds.BoundingStrideAura);
GetCaster().CastSpell(GetCaster(), SpellIds.GlyphOfHeroicLeapBuff, true); }
if (GetCaster().HasAura(SpellIds.ImprovedHeroicLeap))
GetCaster().GetSpellHistory().ResetCooldown(SpellIds.Taunt, true); void HandleCast()
{
GetCaster().CastSpell(GetCaster(), SpellIds.BoundingStride, new CastSpellExtraArgs()
{
TriggeringSpell = GetSpell()
});
} }
public override void Register() public override void Register()
{ {
OnEffectHit.Add(new(AfterJump, 1, SpellEffectName.JumpDest)); OnCast.Add(new(HandleCast));
} }
} }