Allow guest accounts to be used in quick chat lobbies

Author: g0aty

README.md

@@ -2,7 +2,7 @@
    <img src="SickoBanner.png">
   </p>
 
-<h1 align="center">👺 SickoMenu v4.3</h1>
+<h1 align="center">👺 SickoMenu v4.3.1</h1>
 A powerful utility for Among Us designed to enrich your game experience with custom features!
 
 **⚠️ Intended for educational and experimental use only.**

gui/tabs/settings_tab.cpp

@@ -297,36 +297,39 @@ namespace SettingsTab {
 			if (CustomListBoxInt(" ", &State.BroadcastedMod, MODS, 100.f * State.dpiScale)) State.Save();
 		}
 		if (openSpoofing) {
-			if (ToggleButton("Spoof Guest Account", &State.SpoofGuestAccount)) {
+			/*if (ToggleButton("Spoof Guest Account", &State.SpoofGuestAccount)) {
 				State.Save();
 			}
 			if (State.SpoofGuestAccount) {
 				ImGui::SameLine();
-				if (ToggleButton("Use Custom Guest Friend Code", &State.UseGuestFriendCode)) {
+				if (ToggleButton("Use Custom Guest Friend Code", &State.UseNewFriendCode)) {
 					State.Save();
 				}
-				if (State.UseGuestFriendCode) {
-					if (InputString("Guest Friend Code", &State.GuestFriendCode)) {
+				if (State.UseNewFriendCode) {
+					if (InputString("Guest Friend Code", &State.NewFriendCode)) {
 						State.Save();
 					}
 					ImGui::Text("Guest friend code should be <= 10 characters long and cannot have a hashtag.");
 				}
 				ImGui::TextColored(ImVec4(0.f, 1.f, 0.f, 1.f), "Pro Tip: You can bypass the free chat restriction using a space after your custom friend");
 				ImGui::TextColored(ImVec4(0.f, 1.f, 0.f, 1.f), "code!");
-
-				/*if (ToggleButton("Use Custom Guest PUID", &State.UseGuestPuid)) {
-					State.Save();
-				}
-				if (State.UseGuestPuid) {
-					ImGui::SameLine();
-					if (InputString("Guest PUID", &State.GuestPuid)) {
-						State.Save();
-					}
-				}*/
-			}
+			}*/
 			/*if (ImGui::Button("Force Login as Guest")) {
 				State.ForceLoginAsGuest = true;
 			}*/
+			if (ToggleButton("Spoof Guest Account (Quick Chat ONLY)", &State.SpoofGuestAccount)) {
+				State.Save();
+			}
+			if (ToggleButton("Use Custom Friend Code (For New/Guest Account ONLY)", &State.UseNewFriendCode)) {
+				State.Save();
+			}
+			if (State.UseNewFriendCode) {
+				ImGui::SetNextItemWidth(150 * State.dpiScale); // Adjust the width of the input box
+				if (InputString("Friend Code (For New/Guest Account ONLY)", &State.NewFriendCode)) {
+					State.Save();
+				}
+				ImGui::Text("This new friend code should be <= 10 characters long and cannot have spaces.");
+			}
 			if (ToggleButton("Spoof Level", &State.SpoofLevel)) {
 				State.Save();
 			}

hooks/EOSManager.cpp

@@ -3,7 +3,7 @@
 #include "logger.h"
 #include "state.hpp"
 
-static bool isRestrictedGuestAccount = false;
+static bool isGuestAccount = false;
 
 void fakeSuccessfulLogin(EOSManager* eosManager)
 {
@@ -27,7 +27,7 @@ void dEOSManager_StartInitialLoginFlow(EOSManager* __this, MethodInfo* method) {
 		return;
 	}
 	EOSManager_StartTempAccountFlow(__this, method);
-	isRestrictedGuestAccount = true;
+	isGuestAccount = true;
 	EOSManager_CloseStartupWaitScreen(__this, method);
 }
 
@@ -51,14 +51,14 @@ void dEOSManager_InitializePlatformInterface(EOSManager* __this, MethodInfo* met
 
 bool dEOSManager_IsFreechatAllowed(EOSManager* __this, MethodInfo* method)
 {
-	bool ret = !isRestrictedGuestAccount || IsInGame() || IsInLobby();
+	bool ret = !isGuestAccount || IsInGame() || IsInLobby();
 	if (State.ShowHookLogs) LOG_DEBUG("Hook dEOSManager_IsFreechatAllowed executed");
 	return ret;
 }
 
 QuickChatModes__Enum dMultiplayerSettingsData_get_ChatMode(MultiplayerSettingsData* __this, QuickChatModes__Enum value, MethodInfo* method) {
 	if (IsInGame() || IsInLobby()) return QuickChatModes__Enum::FreeChatOrQuickChat;
-	return !isRestrictedGuestAccount || IsInGame() || IsInLobby() ? MultiplayerSettingsData_get_ChatMode(__this, value, method) : QuickChatModes__Enum::QuickChatOnly;
+	return !isGuestAccount || IsInGame() || IsInLobby() ? MultiplayerSettingsData_get_ChatMode(__this, value, method) : QuickChatModes__Enum::QuickChatOnly;
 }
 
 bool dEOSManager_IsFriendsListAllowed(EOSManager* __this, MethodInfo* method)
@@ -173,14 +173,13 @@ void dPlatformSpecificData_Serialize(PlatformSpecificData* __this, MessageWriter
 
 void dEditAccountUsername_SaveUsername(EditAccountUsername* __this, MethodInfo* method) {
 	if (State.ShowHookLogs) LOG_DEBUG("Hook dEditAccountUsername_SaveUsername executed");
-	if (State.UseGuestFriendCode && State.GuestFriendCode != "") {
+	if (State.UseNewFriendCode && State.NewFriendCode != "") {
 		std::string newFriendCode = "";
-		for (auto i : State.GuestFriendCode) {
-			newFriendCode += tolower(i);
+		for (auto i : State.NewFriendCode) {
 			if (newFriendCode.ends_with(" ")) {
-				isRestrictedGuestAccount = false;
 				break;
 			}
+			newFriendCode += tolower(i);
 		}
 		TMP_Text_set_text((TMP_Text*)__this->fields.UsernameText, convert_to_string(newFriendCode), NULL);
 	}
@@ -201,7 +200,6 @@ void dEditAccountUsername_SaveUsername(EditAccountUsername* __this, MethodInfo*
 			}
 			TMP_Text_set_text((TMP_Text*)__this->fields.UsernameText, convert_to_string(newFriendCode), NULL);
 		}
-		isRestrictedGuestAccount = true;
 	}
 	EditAccountUsername_SaveUsername(__this, method);
 }

user/state.cpp

@@ -9,7 +9,7 @@
 Settings State;
 
 void Settings::Load() {
-    this->SickoVersion = "v4.3";
+    this->SickoVersion = "v4.3.1";
 
     auto path = getModulePath(hModule);
     auto configPath = path.parent_path() / "sicko-selected-config.json";
@@ -84,10 +84,10 @@ void Settings::Load() {
         JSON_TRYGET("SpoofLevel", this->SpoofLevel);
         JSON_TRYGET("FakeLevel", this->FakeLevel);
         JSON_TRYGET("SpoofFriendCode", this->SpoofFriendCode);
-        JSON_TRYGET("UseGuestFriendCode", this->UseGuestFriendCode);
+        JSON_TRYGET("UseNewFriendCode", this->UseNewFriendCode);
         //JSON_TRYGET("GuestPuid", this->GuestPuid);
         //JSON_TRYGET("UseGuestPuid", this->UseGuestPuid);
-        JSON_TRYGET("GuestFriendCode", this->GuestFriendCode);
+        JSON_TRYGET("NewFriendCode", this->NewFriendCode);
         JSON_TRYGET("FakeFriendCode", this->FakeFriendCode);
         JSON_TRYGET("SpoofPlatform", this->SpoofPlatform);
         JSON_TRYGET("FakePlatform", this->FakePlatform);
@@ -413,8 +413,8 @@ void Settings::Save() {
                 { "SpoofLevel", this->SpoofLevel },
                 { "FakeLevel", this->FakeLevel },
                 { "SpoofFriendCode", this->SpoofFriendCode },
-                { "UseGuestFriendCode", this->UseGuestFriendCode },
-                { "GuestFriendCode", this->GuestFriendCode },
+                { "UseNewFriendCode", this->UseNewFriendCode },
+                { "NewFriendCode", this->NewFriendCode },
                 //{ "UseGuestPuid", this->UseGuestPuid },
                 //{ "GuestPuid", this->GuestPuid },
                 { "FakeFriendCode", this->FakeFriendCode },

user/state.hpp

@@ -55,9 +55,9 @@ class Settings {
     bool ShowKeybinds = true;
     bool KeybindsWhileChatting = true;
     bool SpoofFriendCode = false;
-    bool UseGuestFriendCode = false;
+    bool UseNewFriendCode = false;
     bool UseGuestPuid = false;
-    std::string GuestFriendCode = "";
+    std::string NewFriendCode = "";
     std::string FakeFriendCode = "";
     std::string GuestPuid = "";
     std::string FakePuid = "";