Core/Misc: Move TalentSpecialization together with other db2 enums and rename it to ChrSpecialization
Port From (https://github.com/TrinityCore/TrinityCore/commit/d2784d4c65ec987fe587718d96b2feb885905e13)
This commit is contained in:
@@ -1126,6 +1126,48 @@ namespace Framework.Constants
|
|||||||
Dps = 2
|
Dps = 2
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum ChrSpecialization
|
||||||
|
{
|
||||||
|
MageArcane = 62,
|
||||||
|
MageFire = 63,
|
||||||
|
MageFrost = 64,
|
||||||
|
PaladinHoly = 65,
|
||||||
|
PaladinProtection = 66,
|
||||||
|
PaladinRetribution = 70,
|
||||||
|
WarriorArms = 71,
|
||||||
|
WarriorFury = 72,
|
||||||
|
WarriorProtection = 73,
|
||||||
|
DruidBalance = 102,
|
||||||
|
DruidFeral = 103,
|
||||||
|
DruidGuardian = 104,
|
||||||
|
DruidRestoration = 105,
|
||||||
|
DeathKnightBlood = 250,
|
||||||
|
DeathKnightFrost = 251,
|
||||||
|
DeathKnightUnholy = 252,
|
||||||
|
HunterBeastMastery = 253,
|
||||||
|
HunterMarksmanship = 254,
|
||||||
|
HunterSurvival = 255,
|
||||||
|
PriestDiscipline = 256,
|
||||||
|
PriestHoly = 257,
|
||||||
|
PriestShadow = 258,
|
||||||
|
RogueAssassination = 259,
|
||||||
|
RogueOutlaw = 260,
|
||||||
|
RogueSubtely = 261,
|
||||||
|
ShamanElemental = 262,
|
||||||
|
ShamanEnhancement = 263,
|
||||||
|
ShamanRestoration = 264,
|
||||||
|
WarlockAffliction = 265,
|
||||||
|
WarlockDemonology = 266,
|
||||||
|
WarlockDestruction = 267,
|
||||||
|
MonkBrewmaster = 268,
|
||||||
|
MonkWindwalker = 269,
|
||||||
|
MonkMistweaver = 270,
|
||||||
|
DemonHunterHavoc = 577,
|
||||||
|
DemonHunterVengeance = 581,
|
||||||
|
EvokerDevastation = 1467,
|
||||||
|
EvokerPreservation = 1468
|
||||||
|
}
|
||||||
|
|
||||||
public enum ContentTuningCalcType
|
public enum ContentTuningCalcType
|
||||||
{
|
{
|
||||||
Base = 0,
|
Base = 0,
|
||||||
|
|||||||
@@ -154,45 +154,6 @@ namespace Framework.Constants
|
|||||||
Smashed = 3
|
Smashed = 3
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum TalentSpecialization // talent tabs
|
|
||||||
{
|
|
||||||
MageArcane = 62,
|
|
||||||
MageFire = 63,
|
|
||||||
MageFrost = 64,
|
|
||||||
PaladinHoly = 65,
|
|
||||||
PaladinProtection = 66,
|
|
||||||
PaladinRetribution = 70,
|
|
||||||
WarriorArms = 71,
|
|
||||||
WarriorFury = 72,
|
|
||||||
WarriorProtection = 73,
|
|
||||||
DruidBalance = 102,
|
|
||||||
DruidFeralCombat = 103,
|
|
||||||
DruidRestoration = 104,
|
|
||||||
DeathKnightBlood = 250,
|
|
||||||
DeathKnightFrost = 251,
|
|
||||||
DeathKnightUnholy = 252,
|
|
||||||
HunterBeastMastery = 253,
|
|
||||||
HunterMarksman = 254,
|
|
||||||
HunterSurvival = 255,
|
|
||||||
PriestDiscipline = 256,
|
|
||||||
PriestHoly = 257,
|
|
||||||
PriestShadow = 258,
|
|
||||||
RogueAssassination = 259,
|
|
||||||
RogueCombat = 260,
|
|
||||||
RogueSubtlety = 261,
|
|
||||||
ShamanElemental = 262,
|
|
||||||
ShamanEnhancement = 263,
|
|
||||||
ShamanRestoration = 264,
|
|
||||||
WarlockAffliction = 265,
|
|
||||||
WarlockDemonology = 266,
|
|
||||||
WarlockDestruction = 267,
|
|
||||||
MonkBrewmaster = 268,
|
|
||||||
MonkBattledancer = 269,
|
|
||||||
MonkMistweaver = 270,
|
|
||||||
DemonHunterHavoc = 577,
|
|
||||||
DemonHunterVengeance = 581
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum SpecResetType
|
public enum SpecResetType
|
||||||
{
|
{
|
||||||
Talents = 0,
|
Talents = 0,
|
||||||
|
|||||||
@@ -4021,7 +4021,7 @@ namespace Scripts.Spells.Items
|
|||||||
if (!target)
|
if (!target)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
void updateAuraIfInCorrectSpec(TalentSpecialization spec, AmalgamsSeventhSpineSpellIds aura)
|
void updateAuraIfInCorrectSpec(ChrSpecialization spec, AmalgamsSeventhSpineSpellIds aura)
|
||||||
{
|
{
|
||||||
if (target.GetPrimarySpecialization() != (uint)spec)
|
if (target.GetPrimarySpecialization() != (uint)spec)
|
||||||
target.RemoveAurasDueToSpell((uint)aura);
|
target.RemoveAurasDueToSpell((uint)aura);
|
||||||
@@ -4032,20 +4032,20 @@ namespace Scripts.Spells.Items
|
|||||||
switch (target.GetClass())
|
switch (target.GetClass())
|
||||||
{
|
{
|
||||||
case Class.Monk:
|
case Class.Monk:
|
||||||
updateAuraIfInCorrectSpec(TalentSpecialization.MonkMistweaver, AmalgamsSeventhSpineSpellIds.FragileEchoesMonk);
|
updateAuraIfInCorrectSpec(ChrSpecialization.MonkMistweaver, AmalgamsSeventhSpineSpellIds.FragileEchoesMonk);
|
||||||
break;
|
break;
|
||||||
case Class.Shaman:
|
case Class.Shaman:
|
||||||
updateAuraIfInCorrectSpec(TalentSpecialization.ShamanRestoration, AmalgamsSeventhSpineSpellIds.FragileEchoesShaman);
|
updateAuraIfInCorrectSpec(ChrSpecialization.ShamanRestoration, AmalgamsSeventhSpineSpellIds.FragileEchoesShaman);
|
||||||
break;
|
break;
|
||||||
case Class.Priest:
|
case Class.Priest:
|
||||||
updateAuraIfInCorrectSpec(TalentSpecialization.PriestDiscipline, AmalgamsSeventhSpineSpellIds.FragileEchoesPriestDiscipline);
|
updateAuraIfInCorrectSpec(ChrSpecialization.PriestDiscipline, AmalgamsSeventhSpineSpellIds.FragileEchoesPriestDiscipline);
|
||||||
updateAuraIfInCorrectSpec(TalentSpecialization.PriestHoly, AmalgamsSeventhSpineSpellIds.FragileEchoesPriestHoly);
|
updateAuraIfInCorrectSpec(ChrSpecialization.PriestHoly, AmalgamsSeventhSpineSpellIds.FragileEchoesPriestHoly);
|
||||||
break;
|
break;
|
||||||
case Class.Paladin:
|
case Class.Paladin:
|
||||||
updateAuraIfInCorrectSpec(TalentSpecialization.PaladinHoly, AmalgamsSeventhSpineSpellIds.FragileEchoesPaladin);
|
updateAuraIfInCorrectSpec(ChrSpecialization.PaladinHoly, AmalgamsSeventhSpineSpellIds.FragileEchoesPaladin);
|
||||||
break;
|
break;
|
||||||
case Class.Druid:
|
case Class.Druid:
|
||||||
updateAuraIfInCorrectSpec(TalentSpecialization.DruidRestoration, AmalgamsSeventhSpineSpellIds.FragileEchoesDruid);
|
updateAuraIfInCorrectSpec(ChrSpecialization.DruidRestoration, AmalgamsSeventhSpineSpellIds.FragileEchoesDruid);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -310,7 +310,7 @@ namespace Scripts.Spells.Paladin
|
|||||||
if (caster != null)
|
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
|
// 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);
|
caster.CastSpell(caster, SpellIds.ConsecrationProtectionAura);
|
||||||
|
|
||||||
if (caster.IsValidAttackTarget(unit))
|
if (caster.IsValidAttackTarget(unit))
|
||||||
|
|||||||
@@ -537,7 +537,7 @@ namespace Scripts.Spells.Shaman
|
|||||||
Player player = GetCaster().ToPlayer();
|
Player player = GetCaster().ToPlayer();
|
||||||
byte slot = EquipmentSlot.MainHand;
|
byte slot = EquipmentSlot.MainHand;
|
||||||
|
|
||||||
if (player.GetPrimarySpecialization() == (uint)TalentSpecialization.ShamanEnhancement)
|
if (player.GetPrimarySpecialization() == (uint)ChrSpecialization.ShamanEnhancement)
|
||||||
slot = EquipmentSlot.OffHand;
|
slot = EquipmentSlot.OffHand;
|
||||||
|
|
||||||
Item targetItem = player.GetItemByPos(InventorySlots.Bag0, slot);
|
Item targetItem = player.GetItemByPos(InventorySlots.Bag0, slot);
|
||||||
|
|||||||
@@ -696,7 +696,7 @@ namespace Scripts.Spells.Warrior
|
|||||||
|
|
||||||
void HandleOnProc(AuraEffect aurEff, ProcEventInfo procInfo)
|
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();
|
PreventDefaultAction();
|
||||||
|
|
||||||
procInfo.GetActor().GetSpellHistory().ResetCooldown(SpellIds.ImpendingVictory, true);
|
procInfo.GetActor().GetSpellHistory().ResetCooldown(SpellIds.ImpendingVictory, true);
|
||||||
|
|||||||
Reference in New Issue
Block a user