Useful additions for mods

Author: g0aty

appdata/il2cpp-functions.h

@@ -175,7 +175,6 @@ DO_APP_FUNC(MessageWriter*, InnerNetClient_StartRpcImmediately, (InnerNetClient*
 DO_APP_FUNC(void, InnerNetClient_FinishRpcImmediately, (InnerNetClient* __this, MessageWriter* msg, MethodInfo* method), "Assembly-CSharp, System.Void InnerNet.InnerNetClient::FinishRpcImmediately(Hazel.MessageWriter)");
 
 DO_APP_FUNC(void, MessageExtensions_WriteNetObject, (MessageWriter* self, InnerNetObject* obj, MethodInfo* method), "Assembly-CSharp, System.Void InnerNet.MessageExtensions::WriteNetObject(Hazel.MessageWriter, InnerNet.InnerNetObject)");
-DO_APP_FUNC(PlayerControl*, MessageExtensions_ReadNetObject_1, (MessageReader* self, MethodInfo* method), "Assembly-CSharp, PlayerControl InnerNet.MessageExtensions::ReadNetObject(Hazel.MessageReader)");
 
 //DO_APP_FUNC(bool, Constants_1_ShouldFlipSkeld, (MethodInfo* method), "Assembly-CSharp, System.Boolean Constants::ShouldFlipSkeld()");
 //this causes issues with dleks

gui/tabs/settings_tab.cpp

@@ -257,6 +257,7 @@ namespace SettingsTab {
 			if (showMessage) {
 				float currentTime = static_cast<float>(ImGui::GetTime());
 				if (currentTime - timer < 4.0f) {
+					ImGui::SameLine();
 					if (State.UnlockCosmetics)
 						ImGui::TextColored(ImVec4(0.0f, 1.0f, 0.0f, 1.0f), "Unlocked All Cosmetics!");
 					else
@@ -267,7 +268,6 @@ namespace SettingsTab {
 				}
 			}
 
-
 			if (Achievements::IsSupported())
 			{
 				ImGui::SameLine();
@@ -278,6 +278,24 @@ namespace SettingsTab {
 			if (ToggleButton("Safe Mode", &State.SafeMode)) {
 				State.Save();
 			}
+
+			static float timer1 = 0.0f;
+			static bool showMessage1 = false;
+
+			if (showMessage1) {
+				float currentTime = static_cast<float>(ImGui::GetTime());
+				if (currentTime - timer1 < 4.0f) {
+					ImGui::SameLine();
+					if (State.UnlockCosmetics)
+						ImGui::TextColored(ImVec4(0.0f, 1.0f, 0.0f, 1.0f), "Unlocked All Cosmetics!");
+					else
+						ImGui::TextColored(ImVec4(1.0f, 0.0f, 0.0f, 1.0f), "Disabled Unlock Cosmetics!");
+				}
+				else {
+					showMessage1 = false;
+				}
+			}
+
 			static int modToShow = 0;
 
 			if (ToggleButton("Allow other mod users to see you're using", &State.ModDetection)) {

hooks/InnerNetClient.cpp

@@ -763,6 +763,7 @@ void dInnerNetClient_Update(InnerNetClient* __this, MethodInfo* method)
                 if ((IsInLobby() || IsInGame()) && (State.OverloadEveryone || State.overloadedPlayers.size() != 0 ||
                     State.LagEveryone || State.laggedPlayers.size() != 0) && overloadDelay <= 0 && (IsHost() || !State.SafeMode || !State.PatchProtect)) {
                     bool lag = State.LagEveryone || State.laggedPlayers.size() != 0;
+                    uint8_t count = 0;
                     for (auto p : GetAllPlayerControl()) {
                         if (State.Destruct_IgnoreWhitelist && std::find(State.WhitelistFriendCodes.begin(), State.WhitelistFriendCodes.end(),
                             convert_from_string(GetPlayerData(p)->fields.FriendCode)) != State.WhitelistFriendCodes.end()) continue;
@@ -772,13 +773,15 @@ void dInnerNetClient_Update(InnerNetClient* __this, MethodInfo* method)
                             p->fields.PlayerId) == State.laggedPlayers.end()) continue;
                         if (p != *Game::pLocalPlayer) {
                             for (int i = 0; i < (lag ? 169 : 25); ++i) {
-                                auto writer = InnerNetClient_StartRpcImmediately((InnerNetClient*)(*Game::pAmongUsClient), (*Game::pLocalPlayer)->fields._.NetId, 0xb4 -
-                                    0x87, SendOption__Enum::None, p->fields._.OwnerId, NULL);
+                                auto writer = InnerNetClient_StartRpcImmediately((InnerNetClient*)(*Game::pAmongUsClient), (*Game::pLocalPlayer)->fields._.NetId, 
+                                    (uint8_t)RpcCalls__Enum::ProtectPlayer, SendOption__Enum::None, p->fields._.OwnerId, NULL);
+                                MessageWriter_WriteString(writer, convert_to_string("This string is written so that other mods can detect overloading easily."), NULL);
                                 InnerNetClient_FinishRpcImmediately((InnerNetClient*)(*Game::pAmongUsClient), writer, NULL);
                             }
+                            count++;
                         }
                     }
-                    overloadDelay = int((lag ? 0.2 : 0.1) * GetFps());
+                    overloadDelay = int((lag ? 0.3 : 0.1) * GetFps());
                 }
                 else overloadDelay--;
 

hooks/PlayerControl.cpp

@@ -1003,6 +1003,10 @@ void dPlayerControl_StartMeeting(PlayerControl* __this, NetworkedPlayerInfo* tar
 
 void dPlayerControl_HandleRpc(PlayerControl* __this, uint8_t callId, MessageReader* reader, MethodInfo* method) {
 	if (State.ShowHookLogs) LOG_DEBUG("Hook dPlayerControl_HandleRpc executed");
+	if (callId == 45 && MessageReader_ReadString(reader, NULL) != NULL) {
+		SMAC_OnCheatDetected(__this, "Overloading");
+		return;
+	}
 	try {
 		HandleRpc(__this, callId, reader);
 		SMAC_HandleRpc(__this, callId, reader);
@@ -1162,6 +1166,7 @@ void dPlayerControl_Shapeshift(PlayerControl* __this, PlayerControl* target, boo
 }
 
 void dPlayerControl_ProtectPlayer(PlayerControl* __this, PlayerControl* target, int32_t colorId, MethodInfo* method) {
+	if (target == NULL) return;
 	if (State.ShowHookLogs) LOG_DEBUG("Hook dPlayerControl_ProtectPlayer executed");
 	try {
 		if (SYNCHRONIZED(Replay::replayEventMutex); target != nullptr) {

user/utility.cpp

@@ -1577,6 +1577,7 @@ void UpdatePoints(NetworkedPlayerInfo* playerData, float points) {
 }
 
 void SMAC_OnCheatDetected(PlayerControl* pCtrl, std::string reason) {
+	if (reason == "Overloading" && !(IsHost() && State.SMAC_HostPunishment >= 2)) return; // Don't spam logs for overloading, that causes overload as well
 	if (pCtrl == *Game::pLocalPlayer || (!IsInLobby() && !IsInMultiplayerGame())) return; // Avoid detecting yourself and practice mode dummies
 	if (reason == "Bad Sabotage" && !IsHost()) return; // Without host, we cannot detect who sent UpdateSystem rpc properly