From 4722c1fdea9381ac14c0ba357aed21ae3abcf675 Mon Sep 17 00:00:00 2001
From: Aaron Kimbre <aronwk.aaron@gmail.com>
Date: Thu, 23 Nov 2023 06:48:55 -0600
Subject: [PATCH] fully define guidl ranks more testing with the guild list

---
 dChatServer/ChatPacketHandler.cpp | 19 +++++++++++++++----
 dCommon/dEnums/eGuildRank.h       |  8 ++++----
 dNet/ClientPackets.cpp            |  2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/dChatServer/ChatPacketHandler.cpp b/dChatServer/ChatPacketHandler.cpp
index 85abeb7b..600f97b6 100644
--- a/dChatServer/ChatPacketHandler.cpp
+++ b/dChatServer/ChatPacketHandler.cpp
@@ -724,21 +724,32 @@ void ChatPacketHandler::HandleGuildGetAll(Packet* packet){
 	bitStream.Write<uint32_t>(69);
 	bitStream.Write<uint32_t>(0);
 	bitStream.Write<uint32_t>(1);
-	bitStream.Write<uint8_t>(0);
-	bitStream.Write<uint8_t>(members.size());
+	bitStream.Write<unsigned short>(0);
+	bitStream.Write<unsigned short>(2); // Size
 	//Member data
 	bitStream.Write1();
 	bitStream.Write1();
 	bitStream.Write<uint16_t>(1200);
 	bitStream.Write<uint16_t>(1);
-	bitStream.Write<uint16_t>(1);
+	bitStream.Write<uint32_t>(1);
+	bitStream.Write<uint32_t>(1);
+	bitStream.Write<unsigned short>(1);
+	bitStream.Write(LUWString(player->playerName, 25));
+	bitStream.Write<wchar_t>(0); //???
+
+	bitStream.Write0();
+	bitStream.Write0();
+	bitStream.Write<uint16_t>(1200);
 	bitStream.Write<uint16_t>(1);
 	bitStream.Write<uint32_t>(1);
+	bitStream.Write<uint32_t>(1);
+	bitStream.Write<unsigned short>(1);
 	bitStream.Write(LUWString(player->playerName, 25));
-	bitStream.Write<uint8_t>(0); //???
+	bitStream.Write<wchar_t>(0); //???
 
 	SystemAddress sysAddr = packet->systemAddress;
 	SEND_PACKET;
+	LOG("Send GUILD DATA");
 }
 
 void ChatPacketHandler::SendTeamInvite(PlayerData* receiver, PlayerData* sender) {
diff --git a/dCommon/dEnums/eGuildRank.h b/dCommon/dEnums/eGuildRank.h
index 3d9c9376..7115f39f 100644
--- a/dCommon/dEnums/eGuildRank.h
+++ b/dCommon/dEnums/eGuildRank.h
@@ -5,10 +5,10 @@
 
 
 enum eGuildRank {
-	FOUNDER = 1,
-	RANK2,
-	RANK3,
-	MEMBER
+	LEADER = 1,
+	OFFICER,
+	VETERAN,
+	RECRUIT
 };
 
 #endif  //!__EGUILDRANK__H__
diff --git a/dNet/ClientPackets.cpp b/dNet/ClientPackets.cpp
index 0ccafdeb..0dec994f 100644
--- a/dNet/ClientPackets.cpp
+++ b/dNet/ClientPackets.cpp
@@ -439,7 +439,7 @@ void ClientPackets::HandleGuildCreation(Packet* packet) {
 		return;
 	}
 	
-	Database::Get()->InsertGuildMember(newGuild->id, character->GetID(), eGuildRank::FOUNDER);
+	Database::Get()->InsertGuildMember(newGuild->id, character->GetID(), eGuildRank::LEADER);
 
 	characterComp->SetGuild(newGuild->id, guildName.string);
 	SendGuildCreateResponse(packet->systemAddress, eGuildCreationResponse::CREATED, newGuild->id, guildName.string);