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

Core/Misc: Move TalentSpecialization together with other db2 enums and rename it to ChrSpecialization

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/d2784d4c65ec987fe587718d96b2feb885905e13)
This commit is contained in:
hondacrx
2023-09-13 19:49:53 -04:00
parent 7cb343e4f9
commit a8e62cc07d
6 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Scripts/Spells/Items.cs
+7 -7
View File
@@ -4021,7 +4021,7 @@ namespace Scripts.Spells.Items
if (!target)
return;
void updateAuraIfInCorrectSpec(TalentSpecialization spec, AmalgamsSeventhSpineSpellIds aura)
void updateAuraIfInCorrectSpec(ChrSpecialization spec, AmalgamsSeventhSpineSpellIds aura)
{
if (target.GetPrimarySpecialization() != (uint)spec)
target.RemoveAurasDueToSpell((uint)aura);
@@ -4032,20 +4032,20 @@ namespace Scripts.Spells.Items
switch (target.GetClass())
{
case Class.Monk:
updateAuraIfInCorrectSpec(TalentSpecialization.MonkMistweaver, AmalgamsSeventhSpineSpellIds.FragileEchoesMonk);
updateAuraIfInCorrectSpec(ChrSpecialization.MonkMistweaver, AmalgamsSeventhSpineSpellIds.FragileEchoesMonk);
break;
case Class.Shaman:
updateAuraIfInCorrectSpec(TalentSpecialization.ShamanRestoration, AmalgamsSeventhSpineSpellIds.FragileEchoesShaman);
updateAuraIfInCorrectSpec(ChrSpecialization.ShamanRestoration, AmalgamsSeventhSpineSpellIds.FragileEchoesShaman);
break;
case Class.Priest:
updateAuraIfInCorrectSpec(TalentSpecialization.PriestDiscipline, AmalgamsSeventhSpineSpellIds.FragileEchoesPriestDiscipline);
updateAuraIfInCorrectSpec(TalentSpecialization.PriestHoly, AmalgamsSeventhSpineSpellIds.FragileEchoesPriestHoly);
updateAuraIfInCorrectSpec(ChrSpecialization.PriestDiscipline, AmalgamsSeventhSpineSpellIds.FragileEchoesPriestDiscipline);
updateAuraIfInCorrectSpec(ChrSpecialization.PriestHoly, AmalgamsSeventhSpineSpellIds.FragileEchoesPriestHoly);
break;
case Class.Paladin:
updateAuraIfInCorrectSpec(TalentSpecialization.PaladinHoly, AmalgamsSeventhSpineSpellIds.FragileEchoesPaladin);
updateAuraIfInCorrectSpec(ChrSpecialization.PaladinHoly, AmalgamsSeventhSpineSpellIds.FragileEchoesPaladin);
break;
case Class.Druid:
updateAuraIfInCorrectSpec(TalentSpecialization.DruidRestoration, AmalgamsSeventhSpineSpellIds.FragileEchoesDruid);
updateAuraIfInCorrectSpec(ChrSpecialization.DruidRestoration, AmalgamsSeventhSpineSpellIds.FragileEchoesDruid);
break;
default:
break;
Source/Scripts/Spells/Paladin.cs
+1 -1
View File
@@ -310,7 +310,7 @@ namespace Scripts.Spells.Paladin
if (caster != null)
{
// 243597 is also being cast as protection, but CreateObject is not sent, either serverside areatrigger for this aura or unused - also no visual is seen
if (unit == caster && caster.IsPlayer() && caster.ToPlayer().GetPrimarySpecialization() == (uint)TalentSpecialization.PaladinProtection)
if (unit == caster && caster.IsPlayer() && caster.ToPlayer().GetPrimarySpecialization() == (uint)ChrSpecialization.PaladinProtection)
caster.CastSpell(caster, SpellIds.ConsecrationProtectionAura);
if (caster.IsValidAttackTarget(unit))
Source/Scripts/Spells/Shaman.cs
+1 -1
View File
@@ -537,7 +537,7 @@ namespace Scripts.Spells.Shaman
Player player = GetCaster().ToPlayer();
byte slot = EquipmentSlot.MainHand;
if (player.GetPrimarySpecialization() == (uint)TalentSpecialization.ShamanEnhancement)
if (player.GetPrimarySpecialization() == (uint)ChrSpecialization.ShamanEnhancement)
slot = EquipmentSlot.OffHand;
Item targetItem = player.GetItemByPos(InventorySlots.Bag0, slot);
Source/Scripts/Spells/Warrior.cs
+1 -1
View File
@@ -696,7 +696,7 @@ namespace Scripts.Spells.Warrior
void HandleOnProc(AuraEffect aurEff, ProcEventInfo procInfo)
{
if (procInfo.GetActor().GetTypeId() == TypeId.Player && procInfo.GetActor().ToPlayer().GetPrimarySpecialization() == (uint)TalentSpecialization.WarriorFury)
if (procInfo.GetActor().GetTypeId() == TypeId.Player && procInfo.GetActor().ToPlayer().GetPrimarySpecialization() == (uint)ChrSpecialization.WarriorFury)
PreventDefaultAction();
procInfo.GetActor().GetSpellHistory().ResetCooldown(SpellIds.ImpendingVictory, true);