Core/PacketIO: Renamed a bunch of opcodes based on more research (only those added after 6.0)
Port From (https://github.com/TrinityCore/TrinityCore/commit/f922c6e7a46a7c712daaaef9b1a72ca865fbe94b)
This commit is contained in:
@@ -691,12 +691,12 @@ namespace Game.BattleGrounds
|
||||
//we must set it this way, because end time is sent in packet!
|
||||
SetRemainingTime(BattlegroundConst.AutocloseBattleground);
|
||||
|
||||
PVPMatchEnd pvpMatchEnd = new PVPMatchEnd();
|
||||
pvpMatchEnd.Winner = (byte)GetWinner();
|
||||
pvpMatchEnd.Duration = (int)Math.Max(0, (GetElapsedTime() - (int)BattlegroundStartTimeIntervals.Delay2m) / Time.InMilliseconds);
|
||||
pvpMatchEnd.LogData.HasValue = true;
|
||||
BuildPvPLogDataPacket(out pvpMatchEnd.LogData.Value);
|
||||
pvpMatchEnd.Write();
|
||||
PVPMatchComplete pvpMatchComplete = new PVPMatchComplete();
|
||||
pvpMatchComplete.Winner = (byte)GetWinner();
|
||||
pvpMatchComplete.Duration = (int)Math.Max(0, (GetElapsedTime() - (int)BattlegroundStartTimeIntervals.Delay2m) / Time.InMilliseconds);
|
||||
pvpMatchComplete.LogData.HasValue = true;
|
||||
BuildPvPLogDataPacket(out pvpMatchComplete.LogData.Value);
|
||||
pvpMatchComplete.Write();
|
||||
|
||||
foreach (var pair in m_Players)
|
||||
{
|
||||
@@ -793,7 +793,7 @@ namespace Game.BattleGrounds
|
||||
|
||||
BlockMovement(player);
|
||||
|
||||
player.SendPacket(pvpMatchEnd);
|
||||
player.SendPacket(pvpMatchComplete);
|
||||
|
||||
player.UpdateCriteria(CriteriaTypes.CompleteBattleground, player.GetMapId());
|
||||
}
|
||||
@@ -993,20 +993,20 @@ namespace Game.BattleGrounds
|
||||
playerJoined.Guid = player.GetGUID();
|
||||
SendPacketToTeam(team, playerJoined, player);
|
||||
|
||||
PVPMatchInit pvpMatchState = new PVPMatchInit();
|
||||
pvpMatchState.MapID = GetMapId();
|
||||
PVPMatchInitialize pvpMatchInitialize = new PVPMatchInitialize();
|
||||
pvpMatchInitialize.MapID = GetMapId();
|
||||
switch (GetStatus())
|
||||
{
|
||||
case BattlegroundStatus.None:
|
||||
case BattlegroundStatus.WaitQueue:
|
||||
pvpMatchState.State = PVPMatchInit.MatchState.Inactive;
|
||||
pvpMatchInitialize.State = PVPMatchInitialize.MatchState.Inactive;
|
||||
break;
|
||||
case BattlegroundStatus.WaitJoin:
|
||||
case BattlegroundStatus.InProgress:
|
||||
pvpMatchState.State = PVPMatchInit.MatchState.InProgress;
|
||||
pvpMatchInitialize.State = PVPMatchInitialize.MatchState.InProgress;
|
||||
break;
|
||||
case BattlegroundStatus.WaitLeave:
|
||||
pvpMatchState.State = PVPMatchInit.MatchState.Complete;
|
||||
pvpMatchInitialize.State = PVPMatchInitialize.MatchState.Complete;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@@ -1014,15 +1014,15 @@ namespace Game.BattleGrounds
|
||||
|
||||
if (GetElapsedTime() >= (int)BattlegroundStartTimeIntervals.Delay2m)
|
||||
{
|
||||
pvpMatchState.Duration = (int)(GetElapsedTime() - (int)BattlegroundStartTimeIntervals.Delay2m) / Time.InMilliseconds;
|
||||
pvpMatchState.StartTime = GameTime.GetGameTime() - pvpMatchState.Duration;
|
||||
pvpMatchInitialize.Duration = (int)(GetElapsedTime() - (int)BattlegroundStartTimeIntervals.Delay2m) / Time.InMilliseconds;
|
||||
pvpMatchInitialize.StartTime = GameTime.GetGameTime() - pvpMatchInitialize.Duration;
|
||||
}
|
||||
pvpMatchState.ArenaFaction = (byte)(player.GetBGTeam() == Team.Horde ? BattlegroundTeamId.Horde : BattlegroundTeamId.Alliance);
|
||||
pvpMatchState.BattlemasterListID = (uint)GetTypeID();
|
||||
pvpMatchState.Registered = false;
|
||||
pvpMatchState.AffectsRating = IsRated();
|
||||
pvpMatchInitialize.ArenaFaction = (byte)(player.GetBGTeam() == Team.Horde ? BattlegroundTeamId.Horde : BattlegroundTeamId.Alliance);
|
||||
pvpMatchInitialize.BattlemasterListID = (uint)GetTypeID();
|
||||
pvpMatchInitialize.Registered = false;
|
||||
pvpMatchInitialize.AffectsRating = IsRated();
|
||||
|
||||
player.SendPacket(pvpMatchState);
|
||||
player.SendPacket(pvpMatchInitialize);
|
||||
|
||||
player.RemoveAurasByType(AuraType.Mounted);
|
||||
|
||||
@@ -1238,13 +1238,13 @@ namespace Game.BattleGrounds
|
||||
return GetPlayersSize() < GetMaxPlayers();
|
||||
}
|
||||
|
||||
public virtual void BuildPvPLogDataPacket(out PVPLogData pvpLogData)
|
||||
public virtual void BuildPvPLogDataPacket(out PVPMatchStatistics pvpLogData)
|
||||
{
|
||||
pvpLogData = new PVPLogData();
|
||||
pvpLogData = new PVPMatchStatistics();
|
||||
|
||||
foreach (var score in PlayerScores)
|
||||
{
|
||||
PVPLogData.PVPMatchPlayerStatistics playerData;
|
||||
PVPMatchStatistics.PVPMatchPlayerStatistics playerData;
|
||||
|
||||
score.Value.BuildPvPLogPlayerDataPacket(out playerData);
|
||||
|
||||
@@ -1704,9 +1704,9 @@ namespace Game.BattleGrounds
|
||||
|
||||
BlockMovement(player);
|
||||
|
||||
PVPLogDataMessage pvpLogData = new PVPLogDataMessage();
|
||||
BuildPvPLogDataPacket(out pvpLogData.Data);
|
||||
player.SendPacket(pvpLogData);
|
||||
PVPMatchStatisticsMessage pvpMatchStatistics = new PVPMatchStatisticsMessage();
|
||||
BuildPvPLogDataPacket(out pvpMatchStatistics.Data);
|
||||
player.SendPacket(pvpMatchStatistics);
|
||||
}
|
||||
|
||||
public uint GetAlivePlayersCountByTeam(Team Team)
|
||||
|
||||
@@ -57,9 +57,9 @@ namespace Game.BattleGrounds
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void BuildPvPLogPlayerDataPacket(out PVPLogData.PVPMatchPlayerStatistics playerData)
|
||||
public virtual void BuildPvPLogPlayerDataPacket(out PVPMatchStatistics.PVPMatchPlayerStatistics playerData)
|
||||
{
|
||||
playerData = new PVPLogData.PVPMatchPlayerStatistics();
|
||||
playerData = new PVPMatchStatistics.PVPMatchPlayerStatistics();
|
||||
playerData.PlayerGUID = PlayerGuid;
|
||||
playerData.Kills = KillingBlows;
|
||||
playerData.Faction = (byte)TeamId;
|
||||
|
||||
@@ -833,12 +833,12 @@ namespace Game.BattleGrounds.Zones
|
||||
}
|
||||
}
|
||||
|
||||
public override void BuildPvPLogPlayerDataPacket(out PVPLogData.PVPMatchPlayerStatistics playerData)
|
||||
public override void BuildPvPLogPlayerDataPacket(out PVPMatchStatistics.PVPMatchPlayerStatistics playerData)
|
||||
{
|
||||
base.BuildPvPLogPlayerDataPacket(out playerData);
|
||||
|
||||
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)ABObjectives.AssaultBase, BasesAssaulted));
|
||||
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)ABObjectives.DefendBase, BasesDefended));
|
||||
playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat((int)ABObjectives.AssaultBase, BasesAssaulted));
|
||||
playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat((int)ABObjectives.DefendBase, BasesDefended));
|
||||
}
|
||||
|
||||
public override uint GetAttr1() { return BasesAssaulted; }
|
||||
|
||||
@@ -1033,11 +1033,11 @@ namespace Game.BattleGrounds.Zones
|
||||
}
|
||||
}
|
||||
|
||||
public override void BuildPvPLogPlayerDataPacket(out PVPLogData.PVPMatchPlayerStatistics playerData)
|
||||
public override void BuildPvPLogPlayerDataPacket(out PVPMatchStatistics.PVPMatchPlayerStatistics playerData)
|
||||
{
|
||||
base.BuildPvPLogPlayerDataPacket(out playerData);
|
||||
|
||||
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)EotSMisc.ObjectiveCaptureFlag, FlagCaptures));
|
||||
playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat((int)EotSMisc.ObjectiveCaptureFlag, FlagCaptures));
|
||||
}
|
||||
|
||||
public override uint GetAttr1() { return FlagCaptures; }
|
||||
|
||||
@@ -1172,12 +1172,12 @@ namespace Game.BattleGrounds.Zones
|
||||
}
|
||||
}
|
||||
|
||||
public override void BuildPvPLogPlayerDataPacket(out PVPLogData.PVPMatchPlayerStatistics playerData)
|
||||
public override void BuildPvPLogPlayerDataPacket(out PVPMatchStatistics.PVPMatchPlayerStatistics playerData)
|
||||
{
|
||||
base.BuildPvPLogPlayerDataPacket(out playerData);
|
||||
|
||||
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)SAObjectives.DemolishersDestroyed, DemolishersDestroyed));
|
||||
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)SAObjectives.GatesDestroyed, GatesDestroyed));
|
||||
playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat((int)SAObjectives.DemolishersDestroyed, DemolishersDestroyed));
|
||||
playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat((int)SAObjectives.GatesDestroyed, GatesDestroyed));
|
||||
}
|
||||
|
||||
public override uint GetAttr1() { return DemolishersDestroyed; }
|
||||
|
||||
@@ -964,12 +964,12 @@ namespace Game.BattleGrounds.Zones
|
||||
}
|
||||
}
|
||||
|
||||
public override void BuildPvPLogPlayerDataPacket(out PVPLogData.PVPMatchPlayerStatistics playerData)
|
||||
public override void BuildPvPLogPlayerDataPacket(out PVPMatchStatistics.PVPMatchPlayerStatistics playerData)
|
||||
{
|
||||
base.BuildPvPLogPlayerDataPacket(out playerData);
|
||||
|
||||
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat(WSObjectives.CaptureFlag, FlagCaptures));
|
||||
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat(WSObjectives.ReturnFlag, FlagReturns));
|
||||
playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat(WSObjectives.CaptureFlag, FlagCaptures));
|
||||
playerData.Stats.Add(new PVPMatchStatistics.PVPMatchPlayerPVPStat(WSObjectives.ReturnFlag, FlagReturns));
|
||||
}
|
||||
|
||||
public override uint GetAttr1() { return FlagCaptures; }
|
||||
|
||||
Reference in New Issue
Block a user