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

Core/Battlegrounds: Clean up some Team/TeamId parameters to use enums instead of raw integer types

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/1ef0c045202a6af33fb991f2ff765fa183ce976f)
This commit is contained in:
hondacrx
2024-02-04 16:31:49 -05:00
parent 00de526f7d
commit 5972f3b8a1
32 changed files with 360 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/World/WorldManager.cs
+15 -15
View File
@@ -1254,8 +1254,8 @@ namespace Game
public void SetForcedWarModeFactionBalanceState(int team, int reward = 0)
{
Global.WorldStateMgr.SetValueAndSaveInDb(WorldStates.WarModeHordeBuffValue, 10 + (team == TeamId.Alliance ? reward : 0), false, null);
Global.WorldStateMgr.SetValueAndSaveInDb(WorldStates.WarModeAllianceBuffValue, 10 + (team == TeamId.Horde ? reward : 0), false, null);
Global.WorldStateMgr.SetValueAndSaveInDb(WorldStates.WarModeHordeBuffValue, 10 + (team == BatttleGroundTeamId.Alliance ? reward : 0), false, null);
Global.WorldStateMgr.SetValueAndSaveInDb(WorldStates.WarModeAllianceBuffValue, 10 + (team == BatttleGroundTeamId.Horde ? reward : 0), false, null);
}
public void DisableForcedWarModeFactionBalanceState()
@@ -1574,13 +1574,13 @@ namespace Game
}
// Send a packet to all players (or players selected team) in the zone (except self if mentioned)
public bool SendZoneMessage(uint zone, ServerPacket packet, WorldSession self = null, uint team = 0)
public bool SendZoneMessage(uint zone, ServerPacket packet, WorldSession self = null, Team team = 0)
{
bool foundPlayerToSend = false;
foreach (var session in m_sessions.Values)
{
if (session != null && session.GetPlayer() != null && session.GetPlayer().IsInWorld &&
session.GetPlayer().GetZoneId() == zone && session != self && (team == 0 || (uint)session.GetPlayer().GetTeam() == team))
session.GetPlayer().GetZoneId() == zone && session != self && (team == 0 || session.GetPlayer().GetTeam() == team))
{
session.SendPacket(packet);
foundPlayerToSend = true;
@@ -1591,7 +1591,7 @@ namespace Game
}
// Send a System Message to all players in the zone (except self if mentioned)
public void SendZoneText(uint zone, string text, WorldSession self = null, uint team = 0)
public void SendZoneText(uint zone, string text, WorldSession self = null, Team team = 0)
{
ChatPkt data = new();
data.Initialize(ChatMsg.System, Language.Universal, null, null, text);
@@ -2487,9 +2487,9 @@ namespace Game
if (raceFaction != null)
{
if ((raceFaction.FactionGroup & (byte)FactionMasks.Alliance) != 0)
warModeEnabledFaction[TeamId.Alliance] += result.Read<long>(1);
warModeEnabledFaction[BatttleGroundTeamId.Alliance] += result.Read<long>(1);
else if ((raceFaction.FactionGroup & (byte)FactionMasks.Horde) != 0)
warModeEnabledFaction[TeamId.Horde] += result.Read<long>(1);
warModeEnabledFaction[BatttleGroundTeamId.Horde] += result.Read<long>(1);
}
}
@@ -2497,19 +2497,19 @@ namespace Game
}
int dominantFaction = TeamId.Alliance;
int dominantFaction = BatttleGroundTeamId.Alliance;
int outnumberedFactionReward = 0;
if (warModeEnabledFaction.Any(val => val != 0))
{
long dominantFactionCount = warModeEnabledFaction[TeamId.Alliance];
if (warModeEnabledFaction[TeamId.Alliance] < warModeEnabledFaction[TeamId.Horde])
long dominantFactionCount = warModeEnabledFaction[BatttleGroundTeamId.Alliance];
if (warModeEnabledFaction[BatttleGroundTeamId.Alliance] < warModeEnabledFaction[BatttleGroundTeamId.Horde])
{
dominantFactionCount = warModeEnabledFaction[TeamId.Horde];
dominantFaction = TeamId.Horde;
dominantFactionCount = warModeEnabledFaction[BatttleGroundTeamId.Horde];
dominantFaction = BatttleGroundTeamId.Horde;
}
double total = warModeEnabledFaction[TeamId.Alliance] + warModeEnabledFaction[TeamId.Horde];
double total = warModeEnabledFaction[BatttleGroundTeamId.Alliance] + warModeEnabledFaction[BatttleGroundTeamId.Horde];
double pct = dominantFactionCount / total;
if (pct >= WorldConfig.GetFloatValue(WorldCfg.CallToArms20Pct))
@@ -2520,8 +2520,8 @@ namespace Game
outnumberedFactionReward = 5;
}
Global.WorldStateMgr.SetValueAndSaveInDb(WorldStates.WarModeHordeBuffValue, 10 + (dominantFaction == TeamId.Alliance ? outnumberedFactionReward : 0), false, null);
Global.WorldStateMgr.SetValueAndSaveInDb(WorldStates.WarModeAllianceBuffValue, 10 + (dominantFaction == TeamId.Horde ? outnumberedFactionReward : 0), false, null);
Global.WorldStateMgr.SetValueAndSaveInDb(WorldStates.WarModeHordeBuffValue, 10 + (dominantFaction == BatttleGroundTeamId.Alliance ? outnumberedFactionReward : 0), false, null);
Global.WorldStateMgr.SetValueAndSaveInDb(WorldStates.WarModeAllianceBuffValue, 10 + (dominantFaction == BatttleGroundTeamId.Horde ? outnumberedFactionReward : 0), false, null);
}
public uint GetVirtualRealmAddress()