Merge branch 'master' of https://github.com/CypherCore/CypherCore
This commit is contained in:
@@ -536,7 +536,7 @@ namespace Scripts.EasternKingdoms.BlackrockMountain.BlackwingLair.VictorNefarius
|
||||
Talk(TextIds.SayRogue);
|
||||
DoCast(me, SpellIds.Rogue);
|
||||
break;
|
||||
case Class.Deathknight:
|
||||
case Class.DeathKnight:
|
||||
Talk(TextIds.SayDeathKnight);
|
||||
DoCast(me, SpellIds.DeathKnight);
|
||||
break;
|
||||
|
||||
@@ -175,8 +175,7 @@ namespace Scripts.Pets.Generic
|
||||
|
||||
Unit owner = GetUnitOwner();
|
||||
|
||||
List<TempSummon> minionList = new();
|
||||
owner.GetAllMinionsByEntry(minionList, NpcLichPet);
|
||||
List<TempSummon> minionList = owner.GetAllMinionsByEntry(NpcLichPet);
|
||||
foreach (TempSummon minion in minionList)
|
||||
owner.CastSpell(minion, SpellLichPetAuraOnkill, true);
|
||||
}
|
||||
|
||||
@@ -1183,11 +1183,11 @@ namespace Scripts.World.NpcsSpecial
|
||||
case TournamentPennantIds.NpcArgentWarhorse:
|
||||
{
|
||||
if (player.HasAchieved(TournamentPennantIds.AchievementChapionAlliance) || player.HasAchieved(TournamentPennantIds.AchievementChapionHorde))
|
||||
return player.GetClass() == Class.Deathknight ? TournamentPennantIds.SpellEbonBladeChapion : TournamentPennantIds.SpellArgentCrusadeChapion;
|
||||
return player.GetClass() == Class.DeathKnight ? TournamentPennantIds.SpellEbonBladeChapion : TournamentPennantIds.SpellArgentCrusadeChapion;
|
||||
else if (player.HasAchieved(TournamentPennantIds.AchievementArgentValor))
|
||||
return player.GetClass() == Class.Deathknight ? TournamentPennantIds.SpellEbonBladeValiant : TournamentPennantIds.SpellArgentCrusadeValiant;
|
||||
return player.GetClass() == Class.DeathKnight ? TournamentPennantIds.SpellEbonBladeValiant : TournamentPennantIds.SpellArgentCrusadeValiant;
|
||||
else
|
||||
return player.GetClass() == Class.Deathknight ? TournamentPennantIds.SpellEbonBladeAspirant : TournamentPennantIds.SpellArgentCrusadeAspirant;
|
||||
return player.GetClass() == Class.DeathKnight ? TournamentPennantIds.SpellEbonBladeAspirant : TournamentPennantIds.SpellArgentCrusadeAspirant;
|
||||
}
|
||||
default:
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user