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

More refactoring of code.

Browse Source
This commit is contained in:
hondacrx
2019-09-23 21:41:13 -04:00
parent 2418715800
commit 570aebce26
176 changed files with 2261 additions and 2265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/DungeonFinding/LFGManager.cs
+9 -9
View File
@@ -252,7 +252,7 @@ namespace Game.DungeonFinding
public void Update(uint diff)
{
if (!isOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
if (!IsOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
return;
long currTime = Time.UnixTime;
@@ -363,7 +363,7 @@ namespace Game.DungeonFinding
LfgJoinResultData joinData = new LfgJoinResultData();
List<ObjectGuid> players = new List<ObjectGuid>();
uint rDungeonId = 0;
bool isContinue = grp && grp.isLFGGroup() && GetState(gguid) != LfgState.FinishedDungeon;
bool isContinue = grp && grp.IsLFGGroup() && GetState(gguid) != LfgState.FinishedDungeon;
// Do not allow to change dungeon in the middle of a current dungeon
if (isContinue)
@@ -400,7 +400,7 @@ namespace Game.DungeonFinding
else
{
byte memberCount = 0;
for (GroupReference refe = grp.GetFirstMember(); refe != null && joinData.result == LfgJoinResult.Ok; refe = refe.next())
for (GroupReference refe = grp.GetFirstMember(); refe != null && joinData.result == LfgJoinResult.Ok; refe = refe.Next())
{
Player plrg = refe.GetSource();
if (plrg)
@@ -524,7 +524,7 @@ namespace Game.DungeonFinding
SetState(gguid, LfgState.Rolecheck);
// Send update to player
LfgUpdateData updateData = new LfgUpdateData(LfgUpdateType.JoinQueue, dungeons);
for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.next())
for (GroupReference refe = grp.GetFirstMember(); refe != null; refe = refe.Next())
{
Player plrg = refe.GetSource();
if (plrg)
@@ -1201,7 +1201,7 @@ namespace Game.DungeonFinding
LFGDungeonData dungeon = null;
Group group = player.GetGroup();
if (group && group.isLFGGroup())
if (group && group.IsLFGGroup())
dungeon = GetLFGDungeon(GetDungeon(group.GetGUID()));
if (dungeon == null)
@@ -1244,7 +1244,7 @@ namespace Game.DungeonFinding
if (!fromOpcode)
{
// Select a player inside to be teleported to
for (GroupReference refe = group.GetFirstMember(); refe != null && mapid == 0; refe = refe.next())
for (GroupReference refe = group.GetFirstMember(); refe != null && mapid == 0; refe = refe.Next())
{
Player plrg = refe.GetSource();
if (plrg && plrg != player && plrg.GetMapId() == dungeon.map)
@@ -1855,7 +1855,7 @@ namespace Game.DungeonFinding
QueuesStore.Clear();
}
public bool isOptionEnabled(LfgOptions option)
public bool IsOptionEnabled(LfgOptions option)
{
return m_options.HasAnyFlag(option);
}
@@ -1924,7 +1924,7 @@ namespace Game.DungeonFinding
AddPlayerToGroup(gguid, guid);
}
public bool selectedRandomLfgDungeon(ObjectGuid guid)
public bool SelectedRandomLfgDungeon(ObjectGuid guid)
{
if (GetState(guid) != LfgState.None)
{
@@ -1940,7 +1940,7 @@ namespace Game.DungeonFinding
return false;
}
public bool inLfgDungeonMap(ObjectGuid guid, uint map, Difficulty difficulty)
public bool InLfgDungeonMap(ObjectGuid guid, uint map, Difficulty difficulty)
{
if (!guid.IsParty())
guid = GetGroup(guid);
Source/Game/DungeonFinding/LFGScripts.cs
+11 -11
View File
@@ -30,7 +30,7 @@ namespace Game.DungeonFinding
// Player Hooks
public override void OnLogout(Player player)
{
if (!Global.LFGMgr.isOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
if (!Global.LFGMgr.IsOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
return;
if (!player.GetGroup())
@@ -41,7 +41,7 @@ namespace Game.DungeonFinding
public override void OnLogin(Player player)
{
if (!Global.LFGMgr.isOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
if (!Global.LFGMgr.IsOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
return;
// Temporal: Trying to determine when group data and LFG data gets desynched
@@ -67,7 +67,7 @@ namespace Game.DungeonFinding
{
Map map = player.GetMap();
if (Global.LFGMgr.inLfgDungeonMap(player.GetGUID(), map.GetId(), map.GetDifficultyID()))
if (Global.LFGMgr.InLfgDungeonMap(player.GetGUID(), map.GetId(), map.GetDifficultyID()))
{
Group group = player.GetGroup();
// This function is also called when players log in
@@ -84,14 +84,14 @@ namespace Game.DungeonFinding
return;
}
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.next())
for (GroupReference refe = group.GetFirstMember(); refe != null; refe = refe.Next())
{
Player member = refe.GetSource();
if (member)
player.GetSession().SendNameQuery(member.GetGUID());
}
if (Global.LFGMgr.selectedRandomLfgDungeon(player.GetGUID()))
if (Global.LFGMgr.SelectedRandomLfgDungeon(player.GetGUID()))
player.CastSpell(player, SharedConst.LFGSpellLuckOfTheDraw, true);
}
else
@@ -117,7 +117,7 @@ namespace Game.DungeonFinding
// Group Hooks
public override void OnAddMember(Group group, ObjectGuid guid)
{
if (!Global.LFGMgr.isOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
if (!Global.LFGMgr.IsOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
return;
ObjectGuid gguid = group.GetGUID();
@@ -147,13 +147,13 @@ namespace Game.DungeonFinding
public override void OnRemoveMember(Group group, ObjectGuid guid, RemoveMethod method, ObjectGuid kicker, string reason)
{
if (!Global.LFGMgr.isOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
if (!Global.LFGMgr.IsOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
return;
ObjectGuid gguid = group.GetGUID();
Log.outDebug(LogFilter.Lfg, "LFGScripts.OnRemoveMember [{0}]: remove [{1}] Method: {2} Kicker: {3} Reason: {4}", gguid, guid, method, kicker, reason);
bool isLFG = group.isLFGGroup();
bool isLFG = group.IsLFGGroup();
if (isLFG && method == RemoveMethod.Kick) // Player have been kicked
{
@@ -204,7 +204,7 @@ namespace Game.DungeonFinding
public override void OnDisband(Group group)
{
if (!Global.LFGMgr.isOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
if (!Global.LFGMgr.IsOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
return;
ObjectGuid gguid = group.GetGUID();
@@ -215,7 +215,7 @@ namespace Game.DungeonFinding
public override void OnChangeLeader(Group group, ObjectGuid newLeaderGuid, ObjectGuid oldLeaderGuid)
{
if (!Global.LFGMgr.isOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
if (!Global.LFGMgr.IsOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
return;
ObjectGuid gguid = group.GetGUID();
@@ -226,7 +226,7 @@ namespace Game.DungeonFinding
public override void OnInviteMember(Group group, ObjectGuid guid)
{
if (!Global.LFGMgr.isOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
if (!Global.LFGMgr.IsOptionEnabled(LfgOptions.EnableDungeonFinder | LfgOptions.EnableRaidBrowser))
return;
ObjectGuid gguid = group.GetGUID();