From 39b39970f636016138c2d2660a4df3a09dc70bbf Mon Sep 17 00:00:00 2001
From: Kinglykrab <89047260+Kinglykrab@users.noreply.github.com>
Date: Sun, 21 Nov 2021 10:03:31 -0500
Subject: [PATCH] [Commands] Cleanup #ginfo Command. (#1788)

- Cleanup message and logic.
---
 zone/gm_commands/ginfo.cpp | 93 +++++++++++++++++++++++++-------------
 1 file changed, 61 insertions(+), 32 deletions(-)

diff --git a/zone/gm_commands/ginfo.cpp b/zone/gm_commands/ginfo.cpp
index ddec8ba24..53af4fbf6 100755
--- a/zone/gm_commands/ginfo.cpp
+++ b/zone/gm_commands/ginfo.cpp
@@ -3,49 +3,78 @@
 
 void command_ginfo(Client *c, const Seperator *sep)
 {
-	Client *t;
-
+	Client *target = c;
 	if (c->GetTarget() && c->GetTarget()->IsClient()) {
-		t = c->GetTarget()->CastToClient();
-	}
-	else {
-		t = c;
+		target = c->GetTarget()->CastToClient();
 	}
 
-	Group *g = t->GetGroup();
-	if (!g) {
-		c->Message(Chat::White, "This client is not in a group");
+	auto target_group = target->GetGroup();
+	if (!target_group) {
+		c->Message(
+			Chat::White,
+			fmt::format(
+				"{} {} not in a group.",
+				c == target ? "You" : target->GetCleanName(),
+				c == target ? "are" : "is"
+			).c_str()
+		);
 		return;
 	}
 
 	c->Message(
 		Chat::White,
-		"Player: %s is in Group #%lu: with %i members",
-		t->GetName(),
-		(unsigned long) g->GetID(),
-		g->GroupCount());
+		fmt::format(
+			"Group Info for {} | ID: {} Members: {}",
+			c == target ? "Yourself" : target->GetCleanName(),
+			target_group->GetID(),
+			target_group->GroupCount()
+		).c_str()
+	);
 
-	uint32 r;
-	for (r = 0; r < MAX_GROUP_MEMBERS; r++) {
-		if (g->members[r] == nullptr) {
-			if (g->membername[r][0] == '\0') {
-				continue;
-			}
-			c->Message(
-				Chat::White, "...Zoned Member: %s, Roles: %s %s %s", g->membername[r],
-				(g->MemberRoles[r] & RoleAssist) ? "Assist" : "",
-				(g->MemberRoles[r] & RoleTank) ? "Tank" : "",
-				(g->MemberRoles[r] & RolePuller) ? "Puller" : ""
-			);
+	for (int group_member = 0; group_member < MAX_GROUP_MEMBERS; group_member++) {
+		if (target_group->membername[group_member][0] == '\0') {
+			continue;
 		}
-		else {
-			c->Message(
-				Chat::White, "...In-Zone Member: %s (0x%x) Roles: %s %s %s", g->membername[r], g->members[r],
-				(g->MemberRoles[r] & RoleAssist) ? "Assist" : "",
-				(g->MemberRoles[r] & RoleTank) ? "Tank" : "",
-				(g->MemberRoles[r] & RolePuller) ? "Puller" : ""
-			);
+		
+		int member_number = (group_member + 1);
+		bool is_assist = target_group->MemberRoles[group_member] & RoleAssist;
+		bool is_puller = target_group->MemberRoles[group_member] & RolePuller;
+		bool is_tank = target_group->MemberRoles[group_member] & RoleTank;
+		auto member_string = (
+			strcmp(target_group->membername[group_member], c->GetCleanName()) ?
+			(
+				fmt::format(
+					"Name: {} In Zone: {}",
+					target_group->membername[group_member],
+					target_group->members[group_member] ? "Yes" : "No"
+				)
+			) :
+			"You"
+		);
+		c->Message(
+			Chat::White,
+			fmt::format(
+				"Member {} | {}",
+				member_number,
+				member_string
+			).c_str()
+		);
 
+		if (
+			is_assist ||
+			is_puller ||
+			is_tank
+		) {
+			c->Message(
+				Chat::White,
+				fmt::format(
+					"Member {} Roles | Assist: {} Puller: {} Tank: {}",
+					member_number,
+					is_assist ? "Yes" : "No",
+					is_puller ? "Yes" : "No",
+					is_tank ? "Yes" : "No"
+				).c_str()
+			);
 		}
 	}
 }