Core/Auras: Remove aura 490 implementation (purpose unknown, needs more spell examples)
Port From (https://github.com/TrinityCore/TrinityCore/commit/342eefcb361900741c17cc40a48fd10436908175)
This commit is contained in:
@@ -88,6 +88,8 @@ namespace Framework.Constants
|
||||
public const uint SpellAuraPlayerInactive = 43681; // Inactive
|
||||
public const uint SpellHonorableDefender25y = 68652; // +50% Honor When Standing At A Capture Point That You Control, 25yards Radius (Added In 3.2)
|
||||
public const uint SpellHonorableDefender60y = 66157; // +50% Honor When Standing At A Capture Point That You Control, 60yards Radius (Added In 3.2), Probably For 40+ Player Battlegrounds
|
||||
public const uint SpellMercenaryContractHorde = 193472;
|
||||
public const uint SpellMercenaryContractAlliance = 193475;
|
||||
public const uint SpellMercenaryHorde1 = 193864;
|
||||
public const uint SpellMercenaryHordeReactions = 195838;
|
||||
public const uint SpellMercenaryAlliance1 = 193863;
|
||||
|
||||
@@ -77,10 +77,6 @@ namespace Framework.Constants
|
||||
|
||||
//Warmode
|
||||
public const uint WarmodeEnlistedSpellOutside = 269083;
|
||||
|
||||
//Mercenary System
|
||||
public const uint SpellMercenaryContractHorde = 193472;
|
||||
public const uint SpellMercenaryContractAlliance = 193475;
|
||||
}
|
||||
|
||||
public struct MoneyConstants
|
||||
|
||||
@@ -511,7 +511,7 @@ namespace Framework.Constants
|
||||
CosmeticMounted = 487,
|
||||
Unk488 = 488,
|
||||
ModAlternativeDefaultLanguage = 489, // NYI
|
||||
SwitchTeam = 490,
|
||||
Unk490 = 490,
|
||||
Unk491 = 491,
|
||||
Unk492 = 492,
|
||||
Unk493 = 493,
|
||||
|
||||
@@ -448,7 +448,7 @@ namespace Game.Entities
|
||||
m_bgBattlegroundQueueID[i].bgQueueTypeId = val;
|
||||
m_bgBattlegroundQueueID[i].invitedToInstance = 0;
|
||||
m_bgBattlegroundQueueID[i].joinTime = (uint)GameTime.GetGameTime();
|
||||
m_bgBattlegroundQueueID[i].mercenary = HasAura(PlayerConst.SpellMercenaryContractHorde) || HasAura(PlayerConst.SpellMercenaryContractAlliance);
|
||||
m_bgBattlegroundQueueID[i].mercenary = HasAura(BattlegroundConst.SpellMercenaryContractHorde) || HasAura(BattlegroundConst.SpellMercenaryContractAlliance);
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1822,7 +1822,7 @@ namespace Game.Groups
|
||||
|
||||
uint arenaTeamId = reference.GetArenaTeamId((byte)arenaSlot);
|
||||
Team team = reference.GetTeam();
|
||||
bool isMercenary = reference.HasAura(PlayerConst.SpellMercenaryContractHorde) || reference.HasAura(PlayerConst.SpellMercenaryContractAlliance);
|
||||
bool isMercenary = reference.HasAura(BattlegroundConst.SpellMercenaryContractHorde) || reference.HasAura(BattlegroundConst.SpellMercenaryContractAlliance);
|
||||
|
||||
// check every member of the group to be able to join
|
||||
memberscount = 0;
|
||||
@@ -1871,7 +1871,7 @@ namespace Game.Groups
|
||||
// check Freeze debuff
|
||||
if (member.HasAura(9454))
|
||||
return GroupJoinBattlegroundResult.BattlegroundJoinFailed;
|
||||
if (isMercenary != (member.HasAura(PlayerConst.SpellMercenaryContractHorde) || member.HasAura(PlayerConst.SpellMercenaryContractAlliance)))
|
||||
if (isMercenary != (member.HasAura(BattlegroundConst.SpellMercenaryContractHorde) || member.HasAura(BattlegroundConst.SpellMercenaryContractAlliance)))
|
||||
return GroupJoinBattlegroundResult.BattlegroundJoinMercenary;
|
||||
}
|
||||
|
||||
|
||||
@@ -106,10 +106,10 @@ namespace Game
|
||||
// mercenary applies only to unrated battlegrounds
|
||||
if (!bg.IsRated() && !bg.IsArena())
|
||||
{
|
||||
if (_player.HasAura(PlayerConst.SpellMercenaryContractHorde))
|
||||
if (_player.HasAura(BattlegroundConst.SpellMercenaryContractHorde))
|
||||
return Team.Horde;
|
||||
|
||||
if (_player.HasAura(PlayerConst.SpellMercenaryContractAlliance))
|
||||
if (_player.HasAura(BattlegroundConst.SpellMercenaryContractAlliance))
|
||||
return Team.Alliance;
|
||||
}
|
||||
|
||||
|
||||
@@ -5735,17 +5735,6 @@ namespace Game.Spells
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[AuraEffectHandler(AuraType.SwitchTeam)]
|
||||
void HandleSwitchTeam(AuraApplication aurApp, AuraEffectHandleModes mode, bool apply)
|
||||
{
|
||||
if (!mode.HasFlag(AuraEffectHandleModes.Real))
|
||||
return;
|
||||
|
||||
//Player player = aurApp.GetTarget().ToPlayer();
|
||||
//if (player != null)
|
||||
//player.SwitchToOppositeTeam(apply);
|
||||
}
|
||||
|
||||
[AuraEffectHandler(AuraType.SetFFAPvp)]
|
||||
void HandleSetFFAPvP(AuraApplication aurApp, AuraEffectHandleModes mode, bool apply)
|
||||
|
||||
Reference in New Issue
Block a user