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

Small BattlegroundScore refactoring

Browse Source
This commit is contained in:
hondacrx
2017-07-27 17:30:08 -04:00
parent 0aa7df2f53
commit 2ec2dcf043
9 changed files with 112 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/Arenas/Arena.cs
+23 -5
View File
@@ -95,6 +95,23 @@ namespace Game.Arenas
CheckWinConditions();
}
public override void BuildPvPLogDataPacket(out PVPLogData pvpLogData)
{
base.BuildPvPLogDataPacket(out pvpLogData);
if (isRated())
{
pvpLogData.Ratings.HasValue = true;
for (byte i = 0; i < SharedConst.BGTeamsCount; ++i)
{
pvpLogData.Ratings.Value.Postmatch[i] = _arenaTeamScores[i].PostMatchRating;
pvpLogData.Ratings.Value.Prematch[i] = _arenaTeamScores[i].PreMatchRating;
pvpLogData.Ratings.Value.PrematchMMR[i] = _arenaTeamScores[i].PreMatchMMR;
}
}
}
public override void RemovePlayerAtLeave(ObjectGuid guid, bool Transport, bool SendPacket)
{
if (isRated() && GetStatus() == BattlegroundStatus.InProgress)
@@ -177,8 +194,8 @@ namespace Game.Arenas
byte winnerTeam = (byte)(winner == Team.Alliance ? BattlegroundTeamId.Alliance : BattlegroundTeamId.Horde);
byte loserTeam = (byte)(winner == Team.Alliance ? BattlegroundTeamId.Horde : BattlegroundTeamId.Alliance);
_arenaTeamScores[winnerTeam].Assign((int)winnerTeamRating, (int)(winnerTeamRating + winnerChange), winnerMatchmakerRating);
_arenaTeamScores[loserTeam].Assign((int)loserTeamRating, (int)(loserTeamRating + loserChange), loserMatchmakerRating);
_arenaTeamScores[winnerTeam].Assign(winnerTeamRating, (uint)(winnerTeamRating + winnerChange), winnerMatchmakerRating, GetArenaMatchmakerRating(winner));
_arenaTeamScores[loserTeam].Assign(loserTeamRating, (uint)(loserTeamRating + loserChange), loserMatchmakerRating, GetArenaMatchmakerRating(GetOtherTeam(winner)));
Log.outDebug(LogFilter.Arena, "Arena match Type: {0} for Team1Id: {1} - Team2Id: {2} ended. WinnerTeamId: {3}. Winner rating: +{4}, Loser rating: {5}",
GetArenaType(), GetArenaTeamIdByIndex(TeamId.Alliance), GetArenaTeamIdByIndex(TeamId.Horde), winnerArenaTeam.GetId(), winnerChange, loserChange);
@@ -200,9 +217,8 @@ namespace Game.Arenas
// Deduct 16 points from each teams arena-rating if there are no winners after 45+2 minutes
else
{
_arenaTeamScores[(int)BattlegroundTeamId.Alliance].Assign((int)winnerTeamRating, (int)(winnerTeamRating + SharedConst.ArenaTimeLimitPointsLoss), winnerMatchmakerRating);
_arenaTeamScores[(int)BattlegroundTeamId.Horde].Assign((int)loserTeamRating, (int)(loserTeamRating + SharedConst.ArenaTimeLimitPointsLoss), loserMatchmakerRating);
_arenaTeamScores[(int)BattlegroundTeamId.Alliance].Assign(winnerTeamRating, (uint)(winnerTeamRating + SharedConst.ArenaTimeLimitPointsLoss), winnerMatchmakerRating, GetArenaMatchmakerRating(Team.Alliance));
_arenaTeamScores[(int)BattlegroundTeamId.Horde].Assign(loserTeamRating, (uint)(loserTeamRating + SharedConst.ArenaTimeLimitPointsLoss), loserMatchmakerRating, GetArenaMatchmakerRating(Team.Horde));
winnerArenaTeam.FinishGame(SharedConst.ArenaTimeLimitPointsLoss);
loserArenaTeam.FinishGame(SharedConst.ArenaTimeLimitPointsLoss);
@@ -283,6 +299,8 @@ namespace Game.Arenas
// end Battleground
base.EndBattleground(winner);
}
public ArenaTeamScore[] _arenaTeamScores = new ArenaTeamScore[SharedConst.BGTeamsCount];
}
struct ArenaWorldStates
Game/Arenas/ArenaScore.cs
+31 -16
View File
@@ -19,6 +19,7 @@ using Framework.Constants;
using Game.BattleGrounds;
using Game.Entities;
using System.Collections.Generic;
using Game.Network.Packets;
namespace Game.Arenas
{
@@ -29,33 +30,47 @@ namespace Game.Arenas
TeamId = (int)(team == Team.Alliance ? BattlegroundTeamId.Alliance : BattlegroundTeamId.Horde);
}
public override void BuildObjectivesBlock(List<int> stats) { }
void BuildPvPLogPlayerDataPacket(PVPLogData.PlayerData playerData)
{
if (PreMatchRating != 0)
playerData.PreMatchRating.Set(PreMatchRating);
if (PostMatchRating != PreMatchRating)
playerData.RatingChange.Set((int)(PostMatchRating - PreMatchRating));
if (PreMatchMMR != 0)
playerData.PreMatchMMR.Set(PreMatchMMR);
if (PostMatchMMR != PreMatchMMR)
playerData.MmrChange.Set((int)(PostMatchMMR - PreMatchMMR));
}
// For Logging purpose
public override string ToString()
{
return string.Format("Damage done: {0}, Healing done: {1}, Killing blows: {2}", DamageDone, HealingDone, KillingBlows);
return $"Damage done: {DamageDone} Healing done: {HealingDone} Killing blows: {KillingBlows} PreMatchRating: {PreMatchRating} " +
$"PreMatchMMR: {PreMatchMMR} PostMatchRating: {PostMatchRating} PostMatchMMR: {PostMatchMMR}";
}
uint PreMatchRating;
uint PreMatchMMR;
uint PostMatchRating;
uint PostMatchMMR;
}
public class ArenaTeamScore
{
void Reset()
public void Assign(uint preMatchRating, uint postMatchRating, uint preMatchMMR, uint postMatchMMR)
{
OldRating = 0;
NewRating = 0;
MatchmakerRating = 0;
PreMatchRating = preMatchRating;
PostMatchRating = postMatchRating;
PreMatchMMR = preMatchMMR;
PostMatchMMR = postMatchMMR;
}
public void Assign(int oldRating, int newRating, uint matchMakerRating)
{
OldRating = oldRating;
NewRating = newRating;
MatchmakerRating = matchMakerRating;
}
public int OldRating;
public int NewRating;
public uint MatchmakerRating;
public uint PreMatchRating;
public uint PostMatchRating;
public uint PreMatchMMR;
public uint PostMatchMMR;
}
}