[Commands] Cleanup #shownpcgloballoot and #showzonegloballoot Commands (#3440)

# Notes
- Cleanup messages and logic.
- Utilize Dialogue Window tables.

zone/global_loot_manager.cpp

@@ -2,6 +2,7 @@
 #include "npc.h"
 #include "client.h"
 #include "zone.h"
+#include "dialogue_window.h"
 
 extern Zone *zone;
 
@@ -21,62 +22,77 @@ std::vector<int> GlobalLootManager::GetGlobalLootTables(NPC *mob) const
 	return tables;
 }
 
-void GlobalLootManager::ShowZoneGlobalLoot(Client *to) const
+void GlobalLootManager::ShowZoneGlobalLoot(Client *c) const
 {
-	int table_number = 1;
+	std::string global_loot_table;
+
+	global_loot_table += DialogueWindow::TableRow(
+		fmt::format(
+			"{}{}{}",
+			DialogueWindow::TableCell("ID"),
+			DialogueWindow::TableCell("Table Name"),
+			DialogueWindow::TableCell("Loottable ID")
+		)
+	);
 
 	for (auto &e : m_entries) {
-		to->Message(
+		global_loot_table += DialogueWindow::TableRow(
-			Chat::White,
 			fmt::format(
-				"Table {} | Name: {}",
+				"{}{}{}",
-				table_number,
+				DialogueWindow::TableCell(Strings::Commify(e.GetID())),
-				e.GetDescription()
+				DialogueWindow::TableCell(e.GetDescription()),
-			).c_str()
+				DialogueWindow::TableCell(Strings::Commify(e.GetLootTableID()))
+			)
 		);
-
-		to->Message(
-			Chat::White,
-			fmt::format(
-				"Table {} | Global Table ID: {} Loot Table ID: {}",
-				table_number,
-				e.GetID(),
-				e.GetLootTableID()
-			).c_str()
-		);
-
-		table_number++;
 	}
+
+	global_loot_table = DialogueWindow::Table(global_loot_table);
+
+	c->SendPopupToClient(
+		fmt::format(
+			"Global Loot for {} ({})",
+			zone->GetLongName(),
+			zone->GetZoneID()
+		).c_str(),
+		global_loot_table.c_str()
+	);
 }
 
-void GlobalLootManager::ShowNPCGlobalLoot(Client *to, NPC *who) const
+void GlobalLootManager::ShowNPCGlobalLoot(Client *c, NPC *t) const
 {
-	int table_number = 1;
+	std::string global_loot_table;
+
+	global_loot_table += DialogueWindow::TableRow(
+		fmt::format(
+			"{}{}{}",
+			DialogueWindow::TableCell("ID"),
+			DialogueWindow::TableCell("Table Name"),
+			DialogueWindow::TableCell("Loottable ID")
+		)
+	);
 
 	for (auto &e : m_entries) {
-		if (e.PassesRules(who)) {
+		if (e.PassesRules(t)) {
-			to->Message(
+			global_loot_table += DialogueWindow::TableRow(
-				Chat::White,
 				fmt::format(
-					"Table {} | Name: {}",
+					"{}{}{}",
-					table_number,
+					DialogueWindow::TableCell(Strings::Commify(e.GetID())),
-					e.GetDescription()
+					DialogueWindow::TableCell(e.GetDescription()),
-				).c_str()
+					DialogueWindow::TableCell(Strings::Commify(e.GetLootTableID()))
+				)
 			);
-
-			to->Message(
-				Chat::White,
-				fmt::format(
-					"Table {} | Global Table ID: {} Loot Table ID: {}",
-					table_number,
-					e.GetID(),
-					e.GetLootTableID()
-				).c_str()
-			);
-
-			table_number++;
 		}
 	}
+
+	global_loot_table = DialogueWindow::Table(global_loot_table);
+
+	c->SendPopupToClient(
+		fmt::format(
+			"Global Loot for {}",
+			c->GetTargetDescription(t)
+		).c_str(),
+		global_loot_table.c_str()
+	);
 }
 
 bool GlobalLootEntry::PassesRules(NPC *mob) const

zone/gm_commands/shownpcgloballoot.cpp

@@ -7,17 +7,8 @@ void command_shownpcgloballoot(Client *c, const Seperator *sep)
 		return;
 	}
 
-	auto target = c->GetTarget()->CastToNPC();
+	const auto t = c->GetTarget()->CastToNPC();
 
-	c->Message(
+	zone->ShowNPCGlobalLoot(c, t);
-		Chat::White,
-		fmt::format(
-			"Global loot for {} ({}).",
-			target->GetCleanName(),
-			target->GetNPCTypeID()
-		).c_str()
-	);
-
-	zone->ShowNPCGlobalLoot(c, target);
 }
 

zone/gm_commands/showzonegloballoot.cpp

@@ -2,15 +2,6 @@
 
 void command_showzonegloballoot(Client *c, const Seperator *sep)
 {
-	c->Message(
-		Chat::White,
-		fmt::format(
-			"Global loot for {} ({}).",
-			zone->GetLongName(),
-			zone->GetZoneID()
-		).c_str()
-	);
-
 	zone->ShowZoneGlobalLoot(c);
 }
 

zone/zone.h

@@ -177,8 +177,8 @@ public:
 	inline Timer *GetInstanceTimer() { return Instance_Timer; }
 	inline void AddGlobalLootEntry(GlobalLootEntry &in) { return m_global_loot.AddEntry(in); }
 	inline void SetZoneHasCurrentTime(bool time) { zone_has_current_time = time; }
-	inline void ShowNPCGlobalLoot(Client *to, NPC *who) { m_global_loot.ShowNPCGlobalLoot(to, who); }
+	inline void ShowNPCGlobalLoot(Client *c, NPC *t) { m_global_loot.ShowNPCGlobalLoot(c, t); }
-	inline void ShowZoneGlobalLoot(Client *to) { m_global_loot.ShowZoneGlobalLoot(to); }
+	inline void ShowZoneGlobalLoot(Client *c) { m_global_loot.ShowZoneGlobalLoot(c); }
 	int GetZoneTotalBlockedSpells() { return zone_total_blocked_spells; }
 	int SaveTempItem(uint32 merchantid, uint32 npcid, uint32 item, int32 charges, bool sold = false);
 	int32 MobsAggroCount() { return aggroedmobs; }