From 1118d8a785f2b84a3c41b2ab8c30a8dc22b0b6c7 Mon Sep 17 00:00:00 2001 From: Lucca Faria Ferri Date: Fri, 27 Jan 2023 11:35:18 -0800 Subject: [PATCH] FileTarget.cs remove file limit; added HasFollower to QuestProgress.cs --- src/DiIiS-NA/Core/Logging/AnsiTarget.cs | 6 +++--- src/DiIiS-NA/Core/Logging/FileTarget.cs | 10 ++-------- .../GSSystem/QuestSystem/QuestProgress.cs | 5 +++++ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/DiIiS-NA/Core/Logging/AnsiTarget.cs b/src/DiIiS-NA/Core/Logging/AnsiTarget.cs index d3d127f..2bc5dc8 100644 --- a/src/DiIiS-NA/Core/Logging/AnsiTarget.cs +++ b/src/DiIiS-NA/Core/Logging/AnsiTarget.cs @@ -125,9 +125,9 @@ public class AnsiTarget : LogTarget { Logger.Level.RenameAccountLog => new Style(Color.DarkSlateGray3),// Logger.Level.ChatMessage => new Style(Color.DarkSlateGray2),// - Logger.Level.Debug => new Style(Color.Purple4),// - Logger.Level.MethodTrace => new Style(Color.Purple4_1),// - Logger.Level.Trace => new Style(Color.Purple),// + Logger.Level.Debug => new Style(Color.Olive),// + Logger.Level.MethodTrace => new Style(Color.Purple),// + Logger.Level.Trace => new Style(Color.BlueViolet),// Logger.Level.Info => new Style(Color.White), Logger.Level.Success => new Style(Color.Green3_1), Logger.Level.Warn => new Style(Color.Yellow),// diff --git a/src/DiIiS-NA/Core/Logging/FileTarget.cs b/src/DiIiS-NA/Core/Logging/FileTarget.cs index 5496eb7..32279dc 100644 --- a/src/DiIiS-NA/Core/Logging/FileTarget.cs +++ b/src/DiIiS-NA/Core/Logging/FileTarget.cs @@ -99,14 +99,8 @@ namespace DiIiS_NA.Core.Logging var timeStamp = this.IncludeTimeStamps ? "[" + DateTime.Now.ToString("dd.MM.yyyy HH:mm:ss.fff") + "] " : ""; if (!this._disposed) // make sure we're not disposed. { - if (this._fileStream.Length >= 20971520) //20 MB limit - { - System.IO.File.Move(this._filePath, string.Format("{0}.{1}", this._filePath, this._fileIndex)); - this._fileIndex++; - this._fileStream = new FileStream(_filePath, FileMode.Create, FileAccess.Write, FileShare.Read); // init the file stream. - this._logStream = new StreamWriter(this._fileStream) { AutoFlush = true }; // init the stream writer. - } - this._logStream.WriteLine(string.Format("{0}[{1}] [{2}]: {3} - [Exception] {4}", timeStamp, level.ToString().PadLeft(5), logger, message, exception)); + this._logStream.WriteLine( + $"{timeStamp}[{level.ToString(),5}] [{logger}]: {message} - [Exception] {exception}"); } }); } diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/QuestProgress.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/QuestProgress.cs index 3d037b3..4ab8242 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/QuestProgress.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/QuestSystem/QuestProgress.cs @@ -285,6 +285,11 @@ namespace DiIiS_NA.GameServer.GSSystem.QuestSystem return true; } + public bool HasFollower(ActorSno sno) + { + return Game.Players.Values.First().Followers.Any(x => x.Value == sno); + } + public void AddFollower(World world, ActorSno sno) { if (Game.Players.Count > 0)