From 50a95ab41d12532ab7db004ae529e978c692a685 Mon Sep 17 00:00:00 2001 From: Lucca Faria Ferri Date: Fri, 27 Jan 2023 12:51:20 -0800 Subject: [PATCH] Update --- src/DiIiS-NA/Core/Logging/AnsiTarget.cs | 34 +++++++++---------- .../GSSystem/ActorSystem/BossPortal.cs | 1 + 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/DiIiS-NA/Core/Logging/AnsiTarget.cs b/src/DiIiS-NA/Core/Logging/AnsiTarget.cs index 2bc5dc8..b4866c8 100644 --- a/src/DiIiS-NA/Core/Logging/AnsiTarget.cs +++ b/src/DiIiS-NA/Core/Logging/AnsiTarget.cs @@ -87,17 +87,17 @@ public class AnsiTarget : LogTarget return; if (IncludeTimeStamps) _table.AddRow( - new Markup(DateTime.Now.ToString("dd/MM/yyyy HH:mm:ss.fff"), GetStyleByLevel(level)), - new Markup(level.ToString(), GetStyleByLevel(level)), - new Markup(logger, GetStyleByLevel(level)), - new Markup(Cleanup(message), GetStyleByLevel(level)), - new Markup("N/A")); + new Markup(DateTime.Now.ToString("dd/MM/yyyy HH:mm:ss.fff"), GetStyleByLevel(level)), + new Markup(level.ToString(), GetStyleByLevel(level)).RightJustified(), + new Markup(logger, GetStyleByLevel(level)).LeftJustified(), + new Markup(Cleanup(message), GetStyleByLevel(level)).LeftJustified(), + new Markup("", new Style(foreground: Color.Green3_1)).Centered()); else _table.AddRow( - new Markup(level.ToString()), - new Markup(logger, GetStyleByLevel(level)), - new Markup(Cleanup(message), GetStyleByLevel(level)), - new Markup("N/A")); + new Markup(level.ToString()).RightJustified(), + new Markup(logger, GetStyleByLevel(level)).LeftJustified(), + new Markup(Cleanup(message), GetStyleByLevel(level)).LeftJustified(), + new Markup("", new Style(foreground: Color.Green3_1)).Centered()); } public override void LogException(Logger.Level level, string logger, string message, Exception exception) @@ -107,16 +107,16 @@ public class AnsiTarget : LogTarget if (IncludeTimeStamps) _table.AddRow( new Markup(DateTime.Now.ToString("dd/MM/yyyy HH:mm:ss.fff"), GetStyleByLevel(level)), - new Markup(level.ToString(), GetStyleByLevel(level)), - new Markup(logger, GetStyleByLevel(level)), - new Markup(Cleanup(message), GetStyleByLevel(level)), - new Markup($"[underline red3_1 on white]{exception.GetType().Name}[/]\n" + Cleanup(exception.Message), new Style(foreground: Color.Red3_1))); + new Markup(level.ToString(), GetStyleByLevel(level)).RightJustified(), + new Markup(logger, GetStyleByLevel(level)).LeftJustified(), + new Markup(Cleanup(message), GetStyleByLevel(level)).LeftJustified(), + new Markup($"[underline red3_1 on white]{exception.GetType().Name}[/]\n" + Cleanup(exception.Message), new Style(foreground: Color.Red3_1)).Centered()); else _table.AddRow( - new Markup(level.ToString()), - new Markup(logger, GetStyleByLevel(level)), - new Markup(message, GetStyleByLevel(level)), - new Markup($"[underline red3_1 on white]{exception.GetType().Name}[/]\n" + Cleanup(exception.Message), new Style(foreground: Color.Red3_1))); + new Markup(level.ToString()).RightJustified(), + new Markup(logger, GetStyleByLevel(level)).LeftJustified(), + new Markup(message, GetStyleByLevel(level)).LeftJustified(), + new Markup($"[underline red3_1 on white]{exception.GetType().Name}[/]\n" + Cleanup(exception.Message), new Style(foreground: Color.Red3_1)).Centered()); } private static Style GetStyleByLevel(Logger.Level level) diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/ActorSystem/BossPortal.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/ActorSystem/BossPortal.cs index 6e9573b..68d8819 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/ActorSystem/BossPortal.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/ActorSystem/BossPortal.cs @@ -15,6 +15,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using DiIiS_NA.GameServer.MessageSystem.Message.Definitions.Portal; namespace DiIiS_NA.GameServer.GSSystem.ActorSystem {