Gaming/blizzless-diiis
Gaming/blizzless-diiis
3
0
Fork 1
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

MethodTrace replaced with CallerMemberName

Browse Source
This commit is contained in:
Lucca Faria Ferri 2023-01-28 08:10:04 -08:00
parent ef393fb6c0
commit 8b126a9aa7
22 changed files with 81 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DiIiS-NA/BGS-Server/AccountsSystem/AccountManager.cs
View File

@ -142,7 +142,7 @@ namespace DiIiS_NA.LoginServer.AccountsSystem
return null;
}
Logger.MethodTrace(MethodBase.GetCurrentMethod(), $"id - {dbAcc.First().Id}");
Logger.MethodTrace($"id - {dbAcc.First().Id}");
return GetAccountByDBAccount(dbAcc.First());
}
}

4
src/DiIiS-NA/BGS-Server/FriendsSystem/UserManager.cs
View File

@ -67,7 +67,7 @@ namespace DiIiS_NA.LoginServer.FriendsSystem
private static void AddIgnoreToDB(Account owner, Account target)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), ": owner {0}, target {1}", owner.PersistentID, target.PersistentID);
Logger.MethodTrace($": owner {owner.PersistentID}, target {target.PersistentID}");
try
{
if (DBSessions.SessionQueryWhere<DBAccountLists>(dbl => dbl.ListOwner.Id == owner.PersistentID && dbl.ListTarget.Id == target.PersistentID && dbl.Type == "IGNORE").Count() > 0) return;
@ -88,7 +88,7 @@ namespace DiIiS_NA.LoginServer.FriendsSystem
private static void RemoveIgnoreFromDB(Account owner, Account target)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), ": owner {0}, target {1}", owner.PersistentID, target.PersistentID);
Logger.MethodTrace($": owner {owner.PersistentID}, target {target.PersistentID}");
try
{
var blockRecords = DBSessions.SessionQueryWhere<DBAccountLists>(dbl => dbl.ListOwner.Id == owner.PersistentID && dbl.ListTarget.Id == target.PersistentID && dbl.Type == "IGNORE");

2
src/DiIiS-NA/BGS-Server/GamesSystem/GameDescriptor.cs
View File

@ -75,7 +75,7 @@ namespace DiIiS_NA.LoginServer.GamesSystem
public void StartGame(List<BattleClient> clients, ulong objectId)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), ": objectId: {0}", objectId);
Logger.MethodTrace($"objectId: {objectId}");
var owner = this.Owner.Account.GameAccount.CurrentToon.DBToon;
if (Program.BattleBackend.GameServers.Count == 0) return;

6
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ChannelService.cs
View File

@ -29,7 +29,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void RemoveMember(Google.ProtocolBuffers.IRpcController controller, bgs.protocol.channel.v1.RemoveMemberRequest request, Action<bgs.protocol.NoData> done)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod());
Logger.MethodTrace("");
var channel = ChannelManager.GetChannelByDynamicId((((HandlerController) controller).LastCallHeader).ObjectId);
var gameAccount = GameAccountManager.GetAccountByPersistentID(request.MemberId.Low);
@ -78,7 +78,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
//*/
Channel channel = ChannelManager.GetChannelByDynamicId((((HandlerController) controller).LastCallHeader).ObjectId);
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0}", request.ToString());
Logger.MethodTrace(request.ToString());
foreach (bgs.protocol.Attribute attribute in request.StateChange.AttributeList)
{
@ -314,7 +314,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
}
else
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "Unknown attribute: {0}", attribute.Name);
Logger.MethodTrace($"Unknown attribute: {attribute.Name}");
}
}

4
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/FriendService.cs
View File

@ -191,7 +191,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
}
public override void ViewFriends(IRpcController controller, ViewFriendsRequest request, Action<ViewFriendsResponse> done)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0}.", request.ToString());
Logger.MethodTrace(request.ToString());
var builder = ViewFriendsResponse.CreateBuilder();
var friendsIDs = AccountManager.GetAccountByPersistentID(request.TargetId.Low).FriendsIds;
@ -210,7 +210,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
}
public override void UpdateFriendState(IRpcController controller, UpdateFriendStateRequest request, Action<NoData> done)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0}.", request.ToString());
Logger.MethodTrace(request.ToString());
done(NoData.CreateBuilder().Build());
}

14
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/GameUtilitiesService.cs
View File

@ -1185,7 +1185,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private ByteString SearchGuilds(BattleClient client, ByteString data)
{
GuildSearch request = GuildSearch.ParseFrom(data);
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0}", request.ToString());
Logger.MethodTrace(request.ToString());
var builder = D3.Guild.GuildSearchResultList.CreateBuilder();
List<Guild> allGuilds = request.ClanOrGroup == 1 ? GuildManager.GetCommunities() : GuildManager.GetClans();
@ -1261,7 +1261,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private void GuildKickMemberP(BattleClient client, GuildKickMember request)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0}", request.ToString());
Logger.MethodTrace(request.ToString());
var guild = GuildManager.GetGuildById(request.GuildId);
if (guild != null && client.Account.GameAccount.PersistentID == guild.Owner.PersistentID)
@ -1273,7 +1273,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private void GuildDisband(BattleClient client, GuildId request)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0}", request.ToString());
Logger.MethodTrace(request.ToString());
var guild = GuildManager.GetGuildById(request.GuildId_);
if (guild != null && client.Account.GameAccount.PersistentID == guild.Owner.PersistentID)
@ -1289,7 +1289,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private ByteString GuildFetchNews(BattleClient client, GuildFetchNews request)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0}", request.ToString());
Logger.MethodTrace(request.ToString());
var builder = D3.Guild.NewsList.CreateBuilder();
/* news types:
@ -1326,7 +1326,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private ByteString GuildPromoteMember(BattleClient client, GuildPromoteMember request)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0}", request.ToString());
Logger.MethodTrace(request.ToString());
var guild = GuildManager.GetGuildById(request.GuildId);
var account = GameAccountManager.GetAccountByPersistentID(request.MemberId);
@ -1347,7 +1347,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private ByteString GuildDemoteMember(BattleClient client, GuildDemoteMember request)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0}", request.ToString());
Logger.MethodTrace(request.ToString());
var guild = GuildManager.GetGuildById(request.GuildId);
var account = GameAccountManager.GetAccountByPersistentID(request.MemberId);
@ -1511,7 +1511,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
private ByteString CreateCommunity(BattleClient client, ByteString data)
{
var request = GroupCreate.ParseFrom(data);
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0}", request.ToString());
Logger.MethodTrace(request.ToString());
var guild = GuildManager.CreateNewGuild(client.Account.GameAccount, request.Name, "", false,
request.SearchCategory, false, request.Language);

29
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/PresenceService.cs
View File

@ -35,7 +35,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var account = AccountManager.GetAccountByPersistentID(req.Low);
if (account != null)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0} {1}", (((HandlerController)controller).Client), account);
Logger.MethodTrace($"{(((HandlerController)controller).Client)} {account}");
account.AddSubscriber((((HandlerController)controller).Client), request.ObjectId);
response.AddSubscribeFailed(SubscribeResult.CreateBuilder().SetEntityId(req)
.SetResult(0));
@ -47,8 +47,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameAccount = GameAccountManager.GetAccountByPersistentID(req.Low);
if (gameAccount != null)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0} {1}", (((HandlerController)controller).Client),
gameAccount);
Logger.MethodTrace($"{(((HandlerController)controller).Client)} {gameAccount}");
gameAccount.AddSubscriber((((HandlerController)controller).Client), request.ObjectId);
response.AddSubscribeFailed(SubscribeResult.CreateBuilder().SetEntityId(req)
.SetResult(0));
@ -84,9 +83,8 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameAccount = AccountManager.GetAccountByPersistentID(request.EntityId.Low);
foreach (var key in request.KeyList)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(),"{0} {1} - {2}, {3}, {4}", (((HandlerController)controller).Client),
gameAccount, (FieldKeyHelper.Program)key.Program, (FieldKeyHelper.OriginatingClass)key.Group,
key.Field);
Logger.MethodTrace(
$"{(((HandlerController)controller).Client)} {gameAccount} - {(FieldKeyHelper.Program)key.Program}, {(FieldKeyHelper.OriginatingClass)key.Group}, {key.Field}");
var field = gameAccount.QueryField(key);
if (field != null) builder.AddField(field);
}
@ -98,9 +96,8 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameAccount = GameAccountManager.GetAccountByPersistentID(request.EntityId.Low);
foreach (var key in request.KeyList)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0} {1} - {2}, {3}, {4}", (((HandlerController)controller).Client),
gameAccount, (FieldKeyHelper.Program)key.Program,
(FieldKeyHelper.OriginatingClass)key.Group, key.Field);
Logger.MethodTrace(
$"{(((HandlerController)controller).Client)} {gameAccount} - {(FieldKeyHelper.Program)key.Program}, {(FieldKeyHelper.OriginatingClass)key.Group}, {key.Field}");
var field = gameAccount.QueryField(key);
if (field != null) builder.AddField(field);
}
@ -125,7 +122,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameAccount = AccountManager.GetAccountByPersistentID(request.EntityId.Low);
if (gameAccount != null)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0} {1}", (((HandlerController)controller).Client), gameAccount);
Logger.MethodTrace($"{(((HandlerController)controller).Client)} {gameAccount}");
gameAccount.AddSubscriber((((HandlerController)controller).Client), request.ObjectId);
}
}
@ -135,7 +132,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameaccount = GameAccountManager.GetAccountByPersistentID(request.EntityId.Low);
if (gameaccount != null)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0} {1}", (((HandlerController)controller).Client), gameaccount);
Logger.MethodTrace($"{(((HandlerController)controller).Client)} {gameaccount}");
gameaccount.AddSubscriber((((HandlerController)controller).Client), request.ObjectId);
}
}
@ -162,7 +159,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
if (gameAccount != null)
{
gameAccount.RemoveSubscriber((((HandlerController) controller).Client));
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0} {1}", (((HandlerController) controller).Client), gameAccount);
Logger.MethodTrace($"{(((HandlerController)controller).Client)} {gameAccount}");
}
}
break;
@ -171,8 +168,8 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
var gameAccount = GameAccountManager.GetAccountByPersistentID(request.EntityId.Low);
if (gameAccount != null)
{
gameAccount.RemoveSubscriber((((HandlerController) controller).Client));
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0} {1}", (((HandlerController) controller).Client), gameAccount);
gameAccount.RemoveSubscriber((((HandlerController)controller).Client));
Logger.MethodTrace($"{(((HandlerController)controller).Client)} {gameAccount}");
}
}
break;
@ -204,7 +201,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
}
gameAccount.Update(request.FieldOperationList);
Logger.MethodTrace(MethodBase.GetCurrentMethod(), traceData);
Logger.MethodTrace(traceData);
}
break;
case EntityIdHelper.HighIdType.GameAccountId:
@ -221,7 +218,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
}
gameAccount.Update(request.FieldOperationList);
Logger.MethodTrace(MethodBase.GetCurrentMethod(), traceData);
Logger.MethodTrace(traceData);
break;
}
default:

2
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/ResourceService.cs
View File

@ -20,7 +20,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void GetContentHandle(IRpcController controller, ContentHandleRequest request, Action<ContentHandle> done)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "ProgramId: 0x{0:X8} StreamId: 0x{1:X8}", request.Program, request.Stream);
Logger.MethodTrace($"ProgramId: 0x{request.Program:X8} StreamId: 0x{request.Stream:X8}");
if (request.Program == (uint)FieldKeyHelper.Program.BNet)
{
var builder = ContentHandle.CreateBuilder()

2
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/SessionService.cs
View File

@ -39,7 +39,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void DestroySession(IRpcController controller, DestroySessionRequest request, Action<NoData> done)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod());
Logger.MethodTrace("");
Logger.Trace("Destroying game session for client {0}", ((HandlerController) controller).Client);
if (controller is HandlerController handlerController)
{

8
src/DiIiS-NA/BGS-Server/ServicesSystem/Services/UserManagerService.cs
View File

@ -19,7 +19,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void Subscribe(IRpcController controller, SubscribeRequest request, Action<SubscribeResponse> done)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0}", (((HandlerController) controller).Client));
Logger.MethodTrace((((HandlerController) controller).Client).ToString());
UserManager.Instance.AddSubscriber((((HandlerController) controller).Client), request.ObjectId);
@ -42,7 +42,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void AddRecentPlayers(IRpcController controller, AddRecentPlayersRequest request, Action<NoData> done)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod());
Logger.MethodTrace("");
done(NoData.DefaultInstance);
}
@ -53,7 +53,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void BlockPlayer(IRpcController controller, BlockPlayerRequest request, Action<NoData> done)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod());
Logger.MethodTrace("");
done(NoData.CreateBuilder().Build());
UserManager.BlockAccount((((HandlerController) controller).Client), request);
@ -61,7 +61,7 @@ namespace DiIiS_NA.LoginServer.ServicesSystem.Services
public override void UnblockPlayer(IRpcController controller, UnblockPlayerRequest request, Action<NoData> done)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod());
Logger.MethodTrace("");
done(NoData.CreateBuilder().Build());
UserManager.UnblockAccount((((HandlerController) controller).Client), request);

2
src/DiIiS-NA/Core/Helpers/Math/RandomHelper.cs
View File

@ -100,7 +100,7 @@ namespace DiIiS_NA.Core.Helpers.Math
a = (uint)temp;
b = (uint)(temp >> 32);
//Logger.MethodTrace(MethodBase.GetCurrentMethod(), "a {0}, b {1}", a, b);
//Logger.MethodTrace("a {0}, b {1}", a, b);
return (uint)a;
}

8
src/DiIiS-NA/Core/Logging/Logger.cs
View File

@ -2,6 +2,7 @@
using System;
using System.Globalization;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Text;
using DiIiS_NA.Core.Extensions;
using DiIiS_NA.GameServer.MessageSystem;
@ -101,12 +102,7 @@ namespace DiIiS_NA.Core.Logging
public void Trace(string message, params object[] args) => Log(Level.Trace, message, args);
/// <param name="message">The log message.</param>
public void MethodTrace(MethodBase method, string message) => Log(Level.MethodTrace, $"$[olive]${method.Name}()$[/]$: " + message, null);
public void MethodTrace(MethodBase method) => Log(Level.MethodTrace, $"$[olive]${method.Name}()$[/]$", null);
/// <param name="message">The log message.</param>
/// <param name="args">Additional arguments.</param>
public void MethodTrace(MethodBase method, string message, params object[] args) => Log(Level.MethodTrace, $"$[olive]${method.Name}()$[/]$: " +message, args);
public void MethodTrace(string message, [CallerMemberName] string methodName = "") => Log(Level.MethodTrace, $"$[olive]${methodName}()$[/]$: " + message, null);
/// <param name="message">The log message.</param>
public void Debug(string message) => Log(Level.Debug, message, null);

21
src/DiIiS-NA/D3-GameServer/AchievementSystem/AchievementManager.cs
View File

@ -177,7 +177,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
{
lock (client.ServiceLock)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "id {0}", achievementId);
Logger.MethodTrace($"id {achievementId}");
if (client.Account.GameAccount.Achievements.Where(a => a.AchievementId == achievementId && a.Completion != -1).Count() > 0) return;
DBAchievements achievement = null;
var achs = DBSessions.SessionQueryWhere<DBAchievements>(dbi =>
@ -242,7 +242,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
{
lock (client.ServiceLock)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "id {0}", criteriaId);
Logger.MethodTrace($"id {criteriaId}");
D3.AchievementsStaticData.StaticCriteriaDefinition definition = null;
uint UCriteriaId = (uint)criteriaId;
@ -262,7 +262,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
var achievement = new DBAchievements();
if (achs.Count == 0)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "creating new ach data");
Logger.MethodTrace("creating new ach data");
achievement.DBGameAccount = client.Account.GameAccount.DBGameAccount;
achievement.AchievementId = definition.ParentAchievementId;
achievement.IsHardcore = IsHardcore(definition.ParentAchievementId);
@ -271,7 +271,8 @@ namespace DiIiS_NA.GameServer.AchievementSystem
List<uint> crits = new List<uint>();
crits.Add(UCriteriaId);
achievement.Criteria = SerializeBytes(crits);
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0} - {1} - {2} - {3}", client.Account.GameAccount.PersistentID, definition.ParentAchievementId, achievement.CompleteTime, UCriteriaId);
Logger.MethodTrace(
$"{client.Account.GameAccount.PersistentID} - {definition.ParentAchievementId} - {achievement.CompleteTime} - {UCriteriaId}");
DBSessions.SessionSave(achievement);
}
else
@ -279,7 +280,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
achievement = achs.First();
if (!UnserializeBytes(achievement.Criteria).Contains(UCriteriaId))
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "editing ach data, id: {0}", achievement.Id);
Logger.MethodTrace($"editing ach data, id: {achievement.Id}");
List<uint> crits = UnserializeBytes(achievement.Criteria);
crits.Add(UCriteriaId);
achievement.Criteria = SerializeBytes(crits);
@ -288,7 +289,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
else return;
}
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "achievement data updated");
Logger.MethodTrace("achievement data updated");
var record = D3.Achievements.CriteriaUpdateRecord.CreateBuilder()
.SetCriteriaId32AndFlags8(UCriteriaId)
@ -341,7 +342,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
{
achievement = achs.First();
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "editing ach data, id: {0}", achievement.Id);
Logger.MethodTrace($"editing ach data, id: {achievement.Id}");
List<uint> crits = UnserializeBytes(achievement.Criteria);
crits.Add(UCriteriaId);
achievement.Criteria = SerializeBytes(crits);
@ -378,7 +379,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
lock (client.ServiceLock)
{
if (additionalQuantity == 0) return;
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "id {0}", achievementId);
Logger.MethodTrace($"id {achievementId}");
if (client.Account.GameAccount.Achievements.Where(a => a.AchievementId == achievementId && a.Completion != -1).Count() > 0) return;
ulong mainCriteriaId = GetMainCriteria(achievementId);
@ -411,7 +412,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
var achievement = new DBAchievements();
if (achs.Count == 0)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "creating new ach data");
Logger.MethodTrace("creating new ach data");
achievement.DBGameAccount = client.Account.GameAccount.DBGameAccount;
achievement.AchievementId = achievementId;
achievement.IsHardcore = IsHardcore(achievementId);
@ -424,7 +425,7 @@ namespace DiIiS_NA.GameServer.AchievementSystem
else
{
achievement = achs.First();
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "editing ach data, id: {0}", achievement.Id);
Logger.MethodTrace($"editing ach data, id: {achievement.Id}");
achievement.Quantity = (int)newQuantity;
DBSessions.SessionUpdate(achievement);
}

2
src/DiIiS-NA/D3-GameServer/Core/InventoryGrid.cs
View File

@ -167,7 +167,7 @@ namespace DiIiS_NA.GameServer.Core
foreach (var itm in baseItems)
have += itm.Attributes[GameAttribute.ItemStackQuantityLo];
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gbid {0}, count {1}", GBid, have);
Logger.MethodTrace($"gbid {GBid}, count {have}");
return (have >= count);
}

2
src/DiIiS-NA/D3-GameServer/GSSystem/AISystem/Brains/MinionBrain.cs
View File

@ -213,7 +213,7 @@ namespace DiIiS_NA.GameServer.GSSystem.AISystem.Brains
{
if (PresetPowers.ContainsKey(powerSNO))
{
// Logger.MethodTrace(MethodBase.GetCurrentMethod(), "power sno {0} already defined for monster \"{1}\"",
// Logger.MethodTrace("power sno {0} already defined for monster \"{1}\"",
//powerSNO, this.Body.ActorSNO.Name);
return;
}

2
src/DiIiS-NA/D3-GameServer/GSSystem/AISystem/Brains/MonsterBrain.cs
View File

@ -455,7 +455,7 @@ namespace DiIiS_NA.GameServer.GSSystem.AISystem.Brains
if (PresetPowers.ContainsKey(powerSNO))
{
Logger.Debug($"Monster $[red]$\"{Body.Name}\"$[/]$ already has power {powerSNO}.");
// Logger.MethodTrace(MethodBase.GetCurrentMethod(), "power sno {0} already defined for monster \"{1}\"",
// Logger.MethodTrace("power sno {0} already defined for monster \"{1}\"",
//powerSNO, this.Body.ActorSNO.Name);
return;
}

42
src/DiIiS-NA/D3-GameServer/GSSystem/GameSystem/GSBackend.cs
View File

@ -102,129 +102,129 @@ namespace DiIiS_NA.GameServer.GSSystem.GameSystem
public void RegisterGameServer(string ip, int port)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "ip {0}, port {1}", ip, port);
Logger.MethodTrace($"ip {ip}, port {port}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"rngsr|{ip}/{port}"));
}
public void RegisterPvPGameServer(string ip, int port)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "ip {0}, port {1}", ip, port);
Logger.MethodTrace($"ip {ip}, port {port}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"rnpvpgsr|{ip}/{port}"));
}
public void GrantAchievement(ulong gameAccountId, ulong achievementId)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gameAccountId {0}, achievementId {1}", gameAccountId, achievementId);
Logger.MethodTrace($"gameAccountId {gameAccountId}, achievementId {achievementId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"grachi|{gameAccountId}/{achievementId}"));
}
public void GrantCriteria(ulong gameAccountId, ulong criteriaId)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gameAccountId {0}, criteriaId {1}", gameAccountId, criteriaId);
Logger.MethodTrace($"gameAccountId {gameAccountId}, achievementId {criteriaId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"gcrit|{gameAccountId}/{criteriaId}"));
}
public void UpdateAchievementCounter(ulong gameAccountId, int type, uint addCounter, int comparand, ulong achievement = 0)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "type {0}, addCounter {1}, comparand {2}", type, addCounter, comparand);
Logger.MethodTrace($"type {type}, addCounter {addCounter}, comparand {comparand}");
BattleNetSocketSend(Encoding.UTF8.GetBytes(
$"uoacce|{gameAccountId}/{type}/{addCounter}/{comparand}/{achievement}"));
}
public void UpdateSingleAchievementCounter(ulong gameAccountId, ulong achId, uint addCounter)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "type {0}, addCounter {1}", achId, addCounter);
Logger.MethodTrace($"type {achId}, addCounter {addCounter}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"upsnaccr|{gameAccountId}/{achId}/{addCounter}"));
}
public void UpdateQuantity(ulong gameAccountId, ulong achievementId, uint addCounter)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "achievementId {0}, addCounter {1}", achievementId, addCounter);
Logger.MethodTrace($"achievementId {achievementId}, addCounter {addCounter}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"upequt|{gameAccountId}/{achievementId}/{addCounter}"));
}
public void CheckQuestCriteria(ulong gameAccountId, int questId, bool isCoop)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gameAccountId {0}, questId {1}, coop {2}", gameAccountId, questId, isCoop);
Logger.MethodTrace($"gameAccountId {gameAccountId}, questId {questId}, coop {isCoop}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"cqc|{gameAccountId}/{questId}/{(isCoop ? "True" : "False")}"));
}
public void CheckKillMonsterCriteria(ulong gameAccountId, int actorId, int type, bool isHardcore)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gameAccountId {0}, actorId {1}, type {2}, hc {3}", gameAccountId, actorId, type, isHardcore);
Logger.MethodTrace($"gameAccountId {gameAccountId}, actorId {actorId}, type {type}, hc {isHardcore}");
BattleNetSocketSend(Encoding.UTF8.GetBytes(
$"ckmc|{gameAccountId}/{actorId}/{type}/{(isHardcore ? "True" : "False")}"));
}
public void CheckSalvageItemCriteria(ulong gameAccountId, int itemId)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gameAccountId {0}, itemId {1}", gameAccountId, itemId);
Logger.MethodTrace($"gameAccountId {gameAccountId}, itemId {itemId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"csic|{gameAccountId}/{itemId}"));
}
public void CheckLevelCap(ulong gameAccountId)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gameAccountId {0}", gameAccountId);
Logger.MethodTrace($"gameAccountId {gameAccountId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"clc|{gameAccountId}"));
}
public void CheckConversationCriteria(ulong gameAccountId, int convId)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gameAccountId {0}, convId {1}", gameAccountId, convId);
Logger.MethodTrace($"gameAccountId {gameAccountId}, convId {convId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"ccc|{gameAccountId}/{convId}"));
}
public void CheckLevelAreaCriteria(ulong gameAccountId, int laId)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gameAccountId {0}, laId {1}", gameAccountId, laId);
Logger.MethodTrace($"gameAccountId {gameAccountId}, laId {laId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"clac|{gameAccountId}/{laId}"));
}
public void UpdateClient(ulong gameAccountId, int level, int screen)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gameAccountId {0}", gameAccountId);
Logger.MethodTrace($"gameAccountId {gameAccountId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"uc|{gameAccountId}/{level}/{screen}"));
}
public void PlayerJoined(int gameId)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gameId {0}", gameId);
Logger.MethodTrace($"gameId {gameId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"gpj|{gameId}"));
}
public void PlayerLeft(int gameId)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gameId {0}", gameId);
Logger.MethodTrace($"gameId {gameId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"gpl|{gameId}"));
}
public void SetGamePublic(int gameId)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gameId {0}", gameId);
Logger.MethodTrace($"gameId {gameId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"gsp|{gameId}"));
}
public void PvPSaveProgress(ulong gameAccountId, int kills, int wins, int gold)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "game account id {0}", gameAccountId);
Logger.MethodTrace($"game account id {gameAccountId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"pvpsp|{gameAccountId}/{kills}/{wins}/{gold}"));
}
public void ParagonLevelUp(ulong gameAccountId)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "game account id {0}", gameAccountId);
Logger.MethodTrace($"game account id {gameAccountId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"plu|{gameAccountId}"));
}
public void ToonStateChanged(ulong toonId)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "game account id {0}", toonId);
Logger.MethodTrace($"game account id {toonId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"tsc|{toonId}"));
}
public void UniqueItemIdentified(ulong gameAccountId, ulong itemId)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gameAccountId {0}, itemId {1}", gameAccountId, itemId);
Logger.MethodTrace($"gameAccountId {gameAccountId}, itemId {itemId}");
BattleNetSocketSend(Encoding.UTF8.GetBytes($"uii|{gameAccountId}/{itemId}"));
}
}

2
src/DiIiS-NA/D3-GameServer/GSSystem/GameSystem/QuestManager.cs
View File

@ -540,7 +540,7 @@ namespace DiIiS_NA.D3_GameServer.GSSystem.GameSystem
{
if (Game.QuestProgress.QuestTriggers.Count == 1)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), $"{Game.QuestProgress.QuestTriggers.Count} triggers found");
Logger.MethodTrace($"{Game.QuestProgress.QuestTriggers.Count} triggers found");
var trigger = Game.QuestProgress.QuestTriggers.First();
if (trigger.Value.triggerType == QuestStepObjectiveType.InteractWithActor)
foreach (var world in Game.Worlds)

2
src/DiIiS-NA/D3-GameServer/GSSystem/ItemsSystem/Item.cs
View File

@ -1331,7 +1331,7 @@ namespace DiIiS_NA.GameServer.GSSystem.ItemsSystem
return;
}
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "gbid {0} not implemented", GBHandle.GBID);
Logger.MethodTrace($"gbid {GBHandle.GBID} not implemented");
}
private void SwitchWingsBuff(Player player, int powerId)

4
src/DiIiS-NA/D3-GameServer/GSSystem/MapSystem/World.cs
View File

@ -788,7 +788,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
public Item SpawnRandomEquip(Actor source, Player player, int forceQuality = -1, int forceLevel = -1,
GameBalance.ItemTypeTable type = null, bool canBeUnidentified = true, ToonClass toonClass = ToonClass.Unknown)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "quality {0}", forceQuality);
Logger.MethodTrace($"quality {forceQuality}");
if (player != null)
{
int level = (forceLevel > 0 ? forceLevel : source.Attributes[GameAttribute.Level]);
@ -816,7 +816,7 @@ namespace DiIiS_NA.GameServer.GSSystem.MapSystem
}
public void SpawnRandomLegOrSetEquip(Actor source, Player player)
{
//Logger.MethodTrace(MethodBase.GetCurrentMethod(), "quality {0}", forceQuality);
//Logger.MethodTrace("quality {0}", forceQuality);
if (player != null)
{
var item = ItemGenerator.GenerateLegOrSetRandom(player);

6
src/DiIiS-NA/D3-GameServer/GSSystem/PlayerSystem/Player.cs
View File

@ -2888,7 +2888,7 @@ public class Player : Actor, IMessageConsumer, IUpdateable
//*
private void OnHirelingDismiss(GameClient client, PetAwayMessage message)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0}", message.ActorID);
Logger.MethodTrace($"{message.ActorID}");
var petId = World.GetGlobalId(this, message.ActorID);
var pet = World.GetActorByGlobalId(petId);
if (pet is Hireling)
@ -2899,7 +2899,7 @@ public class Player : Actor, IMessageConsumer, IUpdateable
private void OnHirelingRequestLearnSkill(GameClient client, HirelingRequestLearnSkillMessage message)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0} - {1}", message.HirelingID, message.PowerSNOId);
Logger.MethodTrace($"{message.HirelingID} - {message.PowerSNOId}");
var hireling = World.GetActorByGlobalId(World.GetGlobalId(this, message.HirelingID));
if (hireling == null) return;
switch (hireling.Attributes[GameAttribute.Hireling_Class])
@ -4233,7 +4233,7 @@ public class Player : Actor, IMessageConsumer, IUpdateable
public void SaveStats() //Save 6 primary stats into DB for showing on hero screen
{
//Logger.MethodTrace(MethodBase.GetCurrentMethod(), "Strength {0}", this.Inventory.GetItemBonus(GameAttribute.Strength_Item).ToString("F0"));
//Logger.MethodTrace("Strength {0}", this.Inventory.GetItemBonus(GameAttribute.Strength_Item).ToString("F0"));
var damageFromWeapon =
(Inventory.GetItemBonus(GameAttribute.Damage_Weapon_Min_Total, 0) +
Inventory.GetItemBonus(GameAttribute.Damage_Weapon_Delta_Total, 0)) * (1f + PrimaryAttribute / 100f);

2
src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/QuestEvents/StartSideQuest.cs
View File

@ -24,7 +24,7 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem.QuestEvents
public override void Execute(MapSystem.World world)
{
Logger.MethodTrace(MethodBase.GetCurrentMethod(), "{0}", QuestId);
Logger.MethodTrace($"{QuestId}");
world.Game.QuestManager.LaunchSideQuest(QuestId, ForceAbandon);
}
}