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

Core/PacketIO: Update opcodes and packet structures to 8.2.5

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/ee2e49429f4383732b4e0f39b493470b9c1dd10c)
This commit is contained in:
hondacrx
2019-10-28 14:33:43 -04:00
parent 1e2ce61e5c
commit c6e53b2ba7
34 changed files with 1792 additions and 1280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/BattleGrounds/Zones/ArathiBasin.cs
+2 -2
View File
@@ -837,8 +837,8 @@ namespace Game.BattleGrounds.Zones
{
base.BuildPvPLogPlayerDataPacket(out playerData);
playerData.Stats.Add(BasesAssaulted);
playerData.Stats.Add(BasesDefended);
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)ABObjectives.AssaultBase, BasesAssaulted));
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)ABObjectives.DefendBase, BasesDefended));
}
public override uint GetAttr1() { return BasesAssaulted; }
Source/Game/BattleGrounds/Zones/EyeofStorm.cs
+1 -1
View File
@@ -1003,7 +1003,7 @@ namespace Game.BattleGrounds.Zones
{
base.BuildPvPLogPlayerDataPacket(out playerData);
playerData.Stats.Add(FlagCaptures);
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)EotSMisc.ObjectiveCaptureFlag, FlagCaptures));
}
public override uint GetAttr1() { return FlagCaptures; }
Source/Game/BattleGrounds/Zones/StrandofAncients.cs
+27 -2
View File
@@ -1088,6 +1088,25 @@ namespace Game.BattleGrounds.Zones
return true;
}
public override bool UpdatePlayerScore(Player player, ScoreType type, uint value, bool doAddHonor = true)
{
if (!base.UpdatePlayerScore(player, type, value, doAddHonor))
return false;
switch (type)
{
case ScoreType.DestroyedDemolisher:
player.UpdateCriteria(CriteriaTypes.BgObjectiveCapture, (uint)SAObjectives.DemolishersDestroyed);
break;
case ScoreType.DestroyedWall:
player.UpdateCriteria(CriteriaTypes.BgObjectiveCapture, (uint)SAObjectives.GatesDestroyed);
break;
default:
break;
}
return true;
}
SAGateInfo GetGate(uint entry)
{
foreach (var gate in SAMiscConst.Gates)
@@ -1157,8 +1176,8 @@ namespace Game.BattleGrounds.Zones
{
base.BuildPvPLogPlayerDataPacket(out playerData);
playerData.Stats.Add(DemolishersDestroyed);
playerData.Stats.Add(GatesDestroyed);
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)SAObjectives.DemolishersDestroyed, DemolishersDestroyed));
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat((int)SAObjectives.GatesDestroyed, GatesDestroyed));
}
public override uint GetAttr1() { return DemolishersDestroyed; }
@@ -1643,5 +1662,11 @@ namespace Game.BattleGrounds.Zones
public const int CentralCapturableGy = 4;
public const int Max = 5;
}
enum SAObjectives
{
GatesDestroyed = 231,
DemolishersDestroyed = 232
}
#endregion
}
Source/Game/BattleGrounds/Zones/WarsongGluch.cs
+9 -4
View File
@@ -789,10 +789,10 @@ namespace Game.BattleGrounds.Zones
switch (type)
{
case ScoreType.FlagCaptures: // flags captured
player.UpdateCriteria(CriteriaTypes.BgObjectiveCapture, 42);
player.UpdateCriteria(CriteriaTypes.BgObjectiveCapture, WSObjectives.CaptureFlag);
break;
case ScoreType.FlagReturns: // flags returned
player.UpdateCriteria(CriteriaTypes.BgObjectiveCapture, 44);
player.UpdateCriteria(CriteriaTypes.BgObjectiveCapture, WSObjectives.ReturnFlag);
break;
default:
break;
@@ -970,8 +970,8 @@ namespace Game.BattleGrounds.Zones
{
base.BuildPvPLogPlayerDataPacket(out playerData);
playerData.Stats.Add(FlagCaptures);
playerData.Stats.Add(FlagReturns);
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat(WSObjectives.CaptureFlag, FlagCaptures));
playerData.Stats.Add(new PVPLogData.PVPMatchPlayerPVPStat(WSObjectives.ReturnFlag, FlagReturns));
}
public override uint GetAttr1() { return FlagCaptures; }
@@ -1115,5 +1115,10 @@ namespace Game.BattleGrounds.Zones
public const uint AllianceFlagReturned = 9808;
public const uint HordeFlagReturned = 9809;
}
struct WSObjectives
{
public const int CaptureFlag = 42;
public const int ReturnFlag = 44;
}
#endregion
}