Core/Misc: Misc Fixes/Cleanups
This commit is contained in:
@@ -27,7 +27,7 @@ namespace Framework.Collections
|
|||||||
_str = new string[size];
|
_str = new string[size];
|
||||||
|
|
||||||
for (var i = 0; i < size; ++i)
|
for (var i = 0; i < size; ++i)
|
||||||
_str[i] = "";
|
_str[i] = string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
public StringArray(string str, params string[] separator)
|
public StringArray(string str, params string[] separator)
|
||||||
@@ -54,6 +54,5 @@ namespace Framework.Collections
|
|||||||
public int Length { get { return _str.Length; } }
|
public int Length { get { return _str.Length; } }
|
||||||
|
|
||||||
string[] _str;
|
string[] _str;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ namespace Game.BattleFields
|
|||||||
|
|
||||||
m_TimeForAcceptInvite = 20;
|
m_TimeForAcceptInvite = 20;
|
||||||
m_StartGroupingTimer = 15 * Time.Minute * Time.InMilliseconds;
|
m_StartGroupingTimer = 15 * Time.Minute * Time.InMilliseconds;
|
||||||
|
m_tenacityTeam = TeamId.Neutral;
|
||||||
|
|
||||||
KickPosition = new WorldLocation(m_MapId, 5728.117f, 2714.346f, 697.733f, 0);
|
KickPosition = new WorldLocation(m_MapId, 5728.117f, 2714.346f, 697.733f, 0);
|
||||||
|
|
||||||
@@ -707,6 +708,7 @@ namespace Game.BattleFields
|
|||||||
player.RemoveAurasDueToSpell(WGSpells.AllianceControlsFactoryPhaseShift);
|
player.RemoveAurasDueToSpell(WGSpells.AllianceControlsFactoryPhaseShift);
|
||||||
player.RemoveAurasDueToSpell(WGSpells.HordeControlPhaseShift);
|
player.RemoveAurasDueToSpell(WGSpells.HordeControlPhaseShift);
|
||||||
player.RemoveAurasDueToSpell(WGSpells.AllianceControlPhaseShift);
|
player.RemoveAurasDueToSpell(WGSpells.AllianceControlPhaseShift);
|
||||||
|
UpdateTenacity();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnPlayerLeaveZone(Player player)
|
public override void OnPlayerLeaveZone(Player player)
|
||||||
@@ -921,7 +923,6 @@ namespace Game.BattleFields
|
|||||||
|
|
||||||
void UpdateTenacity()
|
void UpdateTenacity()
|
||||||
{
|
{
|
||||||
int teamIndex = TeamId.Neutral;
|
|
||||||
int alliancePlayers = m_PlayersInWar[TeamId.Alliance].Count;
|
int alliancePlayers = m_PlayersInWar[TeamId.Alliance].Count;
|
||||||
int hordePlayers = m_PlayersInWar[TeamId.Horde].Count;
|
int hordePlayers = m_PlayersInWar[TeamId.Horde].Count;
|
||||||
int newStack = 0;
|
int newStack = 0;
|
||||||
@@ -937,16 +938,11 @@ namespace Game.BattleFields
|
|||||||
if (newStack == m_tenacityStack)
|
if (newStack == m_tenacityStack)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (m_tenacityStack > 0 && newStack <= 0) // old buff was on alliance
|
|
||||||
teamIndex = TeamId.Alliance;
|
|
||||||
else if (newStack >= 0) // old buff was on horde
|
|
||||||
teamIndex = TeamId.Horde;
|
|
||||||
|
|
||||||
m_tenacityStack = (uint)newStack;
|
m_tenacityStack = (uint)newStack;
|
||||||
// Remove old buff
|
// Remove old buff
|
||||||
if (teamIndex != TeamId.Neutral)
|
if (m_tenacityTeam != TeamId.Neutral)
|
||||||
{
|
{
|
||||||
foreach (var guid in m_players[teamIndex])
|
foreach (var guid in m_players[m_tenacityTeam])
|
||||||
{
|
{
|
||||||
Player player = Global.ObjAccessor.FindPlayer(guid);
|
Player player = Global.ObjAccessor.FindPlayer(guid);
|
||||||
if (player)
|
if (player)
|
||||||
@@ -954,7 +950,7 @@ namespace Game.BattleFields
|
|||||||
player.RemoveAurasDueToSpell(WGSpells.Tenacity);
|
player.RemoveAurasDueToSpell(WGSpells.Tenacity);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var guid in m_vehicles[teamIndex])
|
foreach (var guid in m_vehicles[m_tenacityTeam])
|
||||||
{
|
{
|
||||||
Creature creature = GetCreature(guid);
|
Creature creature = GetCreature(guid);
|
||||||
if (creature)
|
if (creature)
|
||||||
@@ -965,7 +961,7 @@ namespace Game.BattleFields
|
|||||||
// Apply new buff
|
// Apply new buff
|
||||||
if (newStack != 0)
|
if (newStack != 0)
|
||||||
{
|
{
|
||||||
teamIndex = newStack > 0 ? TeamId.Alliance : TeamId.Horde;
|
m_tenacityTeam = newStack > 0 ? TeamId.Alliance : TeamId.Horde;
|
||||||
|
|
||||||
if (newStack < 0)
|
if (newStack < 0)
|
||||||
newStack = -newStack;
|
newStack = -newStack;
|
||||||
@@ -980,14 +976,14 @@ namespace Game.BattleFields
|
|||||||
if (newStack < 5)
|
if (newStack < 5)
|
||||||
buff_honor = 0;
|
buff_honor = 0;
|
||||||
|
|
||||||
foreach (var guid in m_PlayersInWar[teamIndex])
|
foreach (var guid in m_PlayersInWar[m_tenacityTeam])
|
||||||
{
|
{
|
||||||
Player player = Global.ObjAccessor.FindPlayer(guid);
|
Player player = Global.ObjAccessor.FindPlayer(guid);
|
||||||
if (player)
|
if (player)
|
||||||
player.SetAuraStack(WGSpells.Tenacity, player, (uint)newStack);
|
player.SetAuraStack(WGSpells.Tenacity, player, (uint)newStack);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var guid in m_vehicles[teamIndex])
|
foreach (var guid in m_vehicles[m_tenacityTeam])
|
||||||
{
|
{
|
||||||
Creature creature = GetCreature(guid);
|
Creature creature = GetCreature(guid);
|
||||||
if (creature)
|
if (creature)
|
||||||
@@ -996,14 +992,14 @@ namespace Game.BattleFields
|
|||||||
|
|
||||||
if (buff_honor != 0)
|
if (buff_honor != 0)
|
||||||
{
|
{
|
||||||
foreach (var guid in m_PlayersInWar[teamIndex])
|
foreach (var guid in m_PlayersInWar[m_tenacityTeam])
|
||||||
{
|
{
|
||||||
Player player = Global.ObjAccessor.FindPlayer(guid);
|
Player player = Global.ObjAccessor.FindPlayer(guid);
|
||||||
if (player)
|
if (player)
|
||||||
player.CastSpell(player, buff_honor, true);
|
player.CastSpell(player, buff_honor, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var guid in m_vehicles[teamIndex])
|
foreach (var guid in m_vehicles[m_tenacityTeam])
|
||||||
{
|
{
|
||||||
Creature creature = GetCreature(guid);
|
Creature creature = GetCreature(guid);
|
||||||
if (creature)
|
if (creature)
|
||||||
@@ -1011,6 +1007,8 @@ namespace Game.BattleFields
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
m_tenacityTeam = TeamId.Neutral;
|
||||||
}
|
}
|
||||||
|
|
||||||
public GameObject GetRelic() { return GetGameObject(m_titansRelicGUID); }
|
public GameObject GetRelic() { return GetGameObject(m_titansRelicGUID); }
|
||||||
@@ -1035,6 +1033,7 @@ namespace Game.BattleFields
|
|||||||
List<ObjectGuid>[] m_vehicles = new List<ObjectGuid>[SharedConst.BGTeamsCount];
|
List<ObjectGuid>[] m_vehicles = new List<ObjectGuid>[SharedConst.BGTeamsCount];
|
||||||
List<ObjectGuid> CanonList = new List<ObjectGuid>();
|
List<ObjectGuid> CanonList = new List<ObjectGuid>();
|
||||||
|
|
||||||
|
int m_tenacityTeam;
|
||||||
uint m_tenacityStack;
|
uint m_tenacityStack;
|
||||||
uint m_saveTimer;
|
uint m_saveTimer;
|
||||||
|
|
||||||
|
|||||||
@@ -65,8 +65,6 @@ namespace Game.Entities
|
|||||||
packet.Duration = duration;
|
packet.Duration = duration;
|
||||||
packet.SpellID = GetUInt32Value(UnitFields.CreatedBySpell);
|
packet.SpellID = GetUInt32Value(UnitFields.CreatedBySpell);
|
||||||
owner.ToPlayer().SendPacket(packet);
|
owner.ToPlayer().SendPacket(packet);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// set display id depending on caster's race
|
// set display id depending on caster's race
|
||||||
|
|||||||
Reference in New Issue
Block a user