Begin updating to 2021.11.9s, fix some incompatibilities

Author: StarGate01

AUMInjector/deobfuscate/unobfuscated.h

@@ -21,8 +21,7 @@ using ModManager = ModManager;
 __declspec(selectany) InnerNetClient_GameState__Enum InnerNetClient_GameState__Enum_Joined = InnerNetClient_GameStates__Enum::Joined;
 __declspec(selectany) InnerNetClient_GameState__Enum InnerNetClient_GameState__Enum_Started = InnerNetClient_GameStates__Enum::Started;
 __declspec(selectany) InnerNetClient_GameState__Enum InnerNetClient_GameState__Enum_Ended = InnerNetClient_GameStates__Enum::Ended;
-__declspec(selectany) bool GameData_PlayerInfo__Fields::* IsImposter = &GameData_PlayerInfo__Fields::IsImpostor;
-__declspec(selectany) int32_t GameData_PlayerInfo__Fields::* ColorId = &GameData_PlayerInfo__Fields::ColorId;
+
 __declspec(selectany) Color32__Array* Palette__StaticFields::* PlayerColors = &Palette__StaticFields::PlayerColors;
 __declspec(selectany) LightSource* PlayerControl__Fields::* MyLight = &PlayerControl__Fields::myLight;
 

AUMInjector/deobfuscate/version.h

@@ -14,8 +14,9 @@
 #define GAME_VERSION_2021_5_25s 202105250
 #define GAME_VERSION_2021_6_15s 202106150
 #define GAME_VERSION_2021_6_30s 202106300
+#define GAME_VERSION_2021_11_9s 202111090
 #ifndef GAME_VERSION
-	#define GAME_VERSION GAME_VERSION_2021_6_30s
+	#define GAME_VERSION GAME_VERSION_2021_11_9s
 #endif
 
 #if GAME_VERSION == GAME_VERSION_2020_9_22s
@@ -50,6 +51,8 @@
 	#define version_text "2021.6.15s"
 #elif GAME_VERSION == GAME_VERSION_2021_6_30s
 	#define version_text "2021.6.30s"
+#elif GAME_VERSION == GAME_VERSION_2021_11_9s
+	#define version_text "2021.11.9s"
 #else
 	#error Unknown game version!
 #endif

AUMInjector/user/GameData.cpp

@@ -33,6 +33,7 @@ namespace AUM
 		return *iter;
 	}
 
+#ifdef DEV_TOOLS
 
 	Color Game::GetColor(PlayerControl* control)
 	{
@@ -55,6 +56,8 @@ namespace AUM
 		return GetColor(control);
 	}
 
+#endif
+
 	Vec2 Game::GetPosition(PlayerControl* control)
 	{
 		Vector2 pos = PlayerControl_GetTruePosition_Trampoline(control, NULL);

AUMInjector/user/GameData.h

@@ -26,10 +26,15 @@ namespace AUM
 		// Get current list of player controls in game
 		static std::vector<PlayerControl*> GetControls();
 
+#ifdef DEV_TOOLS
+
 		// Get color from existing player control
 		static Color GetColor(PlayerControl* control);
 		// Get updated player control from Net ID and then grab color
 		static Color GetColor(int netID);
+
+#endif
+
 		// Get position from existing player control
 		static Vec2 GetPosition(PlayerControl* control);
 		// Get updated player control from Net ID and then grab position

AUMInjector/user/main.cpp

@@ -75,7 +75,7 @@ void PlayerControl_FixedUpdate_Hook(PlayerControl* __this, MethodInfo* method)
         // From Player Control, get the Player Data
         PlayerInfo* Data = PlayerControl_GetData_Trampoline(__this, NULL);
         // And now we can get if we are imposter.
-        bool isImposter = Data->fields.*IsImposter;
+        bool isImposter = (int32_t)Data->fields.Role->fields.TeamType & (int32_t)RoleTeamTypes__Enum::Impostor;
         mumblePlayer.SetImposter(isImposter);
 
         // Set if player is using radio

README.md

@@ -20,7 +20,7 @@ Patch versions refer to unmarked Steam updates where the game version did not ch
 
 **Use the installer:** Download: [Latest release](https://github.com/StarGate01/AmongUs-Mumble/releases/download/v1.0.0.14/AmongUs-Mumble-Installer.exe)
 
-**Latest mod version:**  Release 2021.6.30s, Mod manual download: [1.0.0.22](https://github.com/StarGate01/AmongUs-Mumble/releases/tag/v1.0.0.22)
+**Latest mod version:**  Release 2021.11.9s, Mod manual download: [1.0.0.23](https://github.com/StarGate01/AmongUs-Mumble/releases/tag/v1.0.0.23)
 
 **Older versions:** [Versions table](https://github.com/StarGate01/AmongUs-Mumble/wiki/Versions)
 

setup.bat.example

@@ -4,7 +4,7 @@ REM set the path to your game folder
 SET "AMONGUS=C:\Steam\steamapps\common\Among Us"
 
 REM set the version of the generated deobfuscations
-SET "AMONGUS_VERSION=2021_6_30s"
+SET "AMONGUS_VERSION=2021_11_9s"
 
 REM set the path of tools
 SET "IL2CPPINSPECTOR=C:\Users\Christoph\Documents\GitHub\Il2CppInspector\Il2CppInspector.CLI\bin\Release\netcoreapp3.1\win-x64\publish\Il2CppInspector.exe"