From 396fc3e0f3788d4ea1995a8e9dc7b449ae0f3ebb Mon Sep 17 00:00:00 2001 From: Lucca Faria Ferri Date: Thu, 2 Feb 2023 05:18:59 -0800 Subject: [PATCH] improvement shutdown/item gen --- src/DiIiS-NA/Core/Logging/AnsiTarget.cs | 8 +++++++- .../GSSystem/ItemsSystem/ItemGenerator.cs | 18 +++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/DiIiS-NA/Core/Logging/AnsiTarget.cs b/src/DiIiS-NA/Core/Logging/AnsiTarget.cs index 9652230..192e7ac 100644 --- a/src/DiIiS-NA/Core/Logging/AnsiTarget.cs +++ b/src/DiIiS-NA/Core/Logging/AnsiTarget.cs @@ -49,13 +49,19 @@ public class AnsiTarget : LogTarget } await Task.Delay(100); } - + + _shutdown = true; }); } public static void StopIfRunning() { CancellationTokenSource.Cancel(); + while(!_shutdown) + Thread.Sleep(100); + Thread.Sleep(1000); + AnsiConsole.Clear(); + AnsiConsole.Cursor.SetPosition(0,0); } /// diff --git a/src/DiIiS-NA/D3-GameServer/GSSystem/ItemsSystem/ItemGenerator.cs b/src/DiIiS-NA/D3-GameServer/GSSystem/ItemsSystem/ItemGenerator.cs index fb418e7..09e3b29 100644 --- a/src/DiIiS-NA/D3-GameServer/GSSystem/ItemsSystem/ItemGenerator.cs +++ b/src/DiIiS-NA/D3-GameServer/GSSystem/ItemsSystem/ItemGenerator.cs @@ -56,30 +56,30 @@ namespace DiIiS_NA.GameServer.GSSystem.ItemsSystem static ItemGenerator() { Player.GeneratePLB(); - Logger.Info("Loading Recipes..."); - Logger.Info("Loading Items..."); + Logger.Info("Loading $[underline]$Recipes$[/]$..."); + Logger.Info("Loading $[underline]$Items$[/]$..."); LoadRecipes(); LoadItems(); - Logger.Info("Loading Paragons..."); + Logger.Info("Loading $[underline]$Paragons$[/]$..."); LoadParagonBonuses(); //LoadAffixes(); //just for checking values //LoadPowers(); //LoadQuests(); - Logger.Info("Loading Tutorials..."); + Logger.Info("Loading $[underline]$Tutorials$[/]$..."); Tutorials = MPQStorage.Data.Assets[SNOGroup.Tutorial].Keys.OrderBy(i => i).ToList(); - Logger.Info("Loading Bonuses..."); + Logger.Info("Loading $[underline]$Bonuses$[/]$..."); LoadItemSetBonuses(); LoadGemBonuses(); - Logger.Info("Loading Handlers..."); + Logger.Info("Loading $[underline]$Handlers$[/]$..."); LoadHandlers(); - Logger.Info("Loading Lore..."); + Logger.Info("Loading $[underline]$Lore$[/]$..."); LoadLore(); - Logger.Info("Loading Bounties..."); + Logger.Info("Loading $[underline]$Bounties$[/]$..."); LoadBounties(); //LoadConversations(); //if (Net.GS.Config.Instance.Enabled) - Logger.Info("Loading Worlds..."); + Logger.Info("Loading $[underline]$Worlds$[/]$..."); Scene.PreCacheMarkers(); SetAllowedTypes();