Merge pull request #64 from JozielBorges/V2_recode

Temp fix for random crashes during the game while using ESP

lib/private/ClientHelper.cpp

@@ -21,6 +21,28 @@ bool IsHost()
 	return app::BoltNetwork_get_IsServer(NULL);
 }
 
+app::Survival* GetSurvivalObject()
+{
+	static app::Survival* cachedSurvival = nullptr;
+
+	if (cachedSurvival == nullptr || Object::IsNull((app::Object_1*)cachedSurvival)) {
+		cachedSurvival = Object::FindObjectOfType<app::Survival>("Survival");
+	}
+
+	return cachedSurvival;
+}
+
+app::OptionsHelpers* GetOptionsHelpersObject()
+{
+	static app::OptionsHelpers* cachedOptionsHelpers = nullptr;
+
+	if (cachedOptionsHelpers == nullptr || Object::IsNull((app::Object_1*)cachedOptionsHelpers)) {
+		cachedOptionsHelpers = Object::FindObjectOfType<app::OptionsHelpers>("OptionsHelpers");
+	}
+
+	return cachedOptionsHelpers;
+}
+
 bool IsLocalPlayer(app::NolanBehaviour* player)
 {
 	auto boltEntity = app::EntityBehaviour_get_entity((app::EntityBehaviour*)player, NULL);
@@ -59,7 +81,7 @@ bool IsPlayerCrawling(app::GameObject* go)
 
 bool IsInGame()
 {
-	app::OptionsHelpers* optionsHelpers = Object::FindObjectOfType<app::OptionsHelpers>("OptionsHelpers");
+	app::OptionsHelpers* optionsHelpers = GetOptionsHelpersObject();
 
 	if (optionsHelpers)
 		return optionsHelpers->fields._inGame_k__BackingField;
@@ -69,17 +91,18 @@ bool IsInGame()
 
 bool IsSequencePlaying()
 {
-	app::Survival* survival = Object::FindObjectOfType<app::Survival>("Survival");
+	app::Survival* survival = GetSurvivalObject();
 
 	// Return false if the object was not found.
 	if (survival == nullptr) return false;
 
-	bool isEndingPlaying = app::Survival_IsEndingPlaying(survival, nullptr);
+	// Check if any of the sequences are playing and return the result directly.
-	bool isJumpScarePlaying = app::Survival_IsJumpScarePlaying(survival, nullptr);
+	if (app::Survival_IsEndingPlaying && app::Survival_IsEndingPlaying(survival, nullptr)) return true;
-	bool isStartingToPlayFailEnding = app::Survival_StartingToPlayFailEnding(survival, nullptr);
+	if (app::Survival_IsJumpScarePlaying && app::Survival_IsJumpScarePlaying(survival, nullptr)) return true;
+	if (app::Survival_StartingToPlayFailEnding && app::Survival_StartingToPlayFailEnding(survival, nullptr)) return true;
 
-	// Return true if any sequence is playing.
+	// If none of the sequences are playing, return false.
-	return isEndingPlaying || isJumpScarePlaying || isStartingToPlayFailEnding;
+	return false;
 }
 
 app::GameObject* GetAzazel(app::Survival* survival)
@@ -94,6 +117,7 @@ app::GameObject* GetAzazel(app::Survival* survival)
 }
 
 
+
 std::string SceneName()
 {
 	if (app::SaveHelpers_get_singleton != nullptr) {
@@ -110,6 +134,18 @@ std::string SceneName()
 	return std::string("");
 }
 
+std::string GetAzazelName()
+{
+	if (IsInGame()) {
+		app::InGameHelpers* inGameHelpers = app::InGameHelpers_get_singleton(nullptr);
+
+		if (inGameHelpers)
+			return il2cppi_to_string(app::InGameHelpers_GetAzazelName(inGameHelpers, nullptr));
+	}
+
+	return std::string("Azazel");
+}
+
 
 float Time_DeltaTime()
 {

lib/public/ClientHelper.h

@@ -4,13 +4,14 @@
 bool IsSinglePlayer();
 bool IsOnline();
 bool IsHost();
+app::Survival* GetSurvivalObject();
+app::OptionsHelpers* GetOptionsHelpersObject();
 bool IsLocalPlayer(app::NolanBehaviour* player);
 bool IsPlayerCrawling();
 bool IsPlayerCrawling(app::GameObject* go);
 bool IsInGame();
 bool IsSequencePlaying();
-
 app::GameObject* GetAzazel(app::Survival* survival);
-
 std::string SceneName();
+std::string GetAzazelName();
 float Time_DeltaTime();

lib/public/UnityEngine/Transform.h

@@ -20,6 +20,10 @@ namespace Transform {
 	{
 		if (!component) return nullptr;
 
-		return app::Component_get_transform((app::Component*)component, nullptr);
+		if (app::Component_get_transform != nullptr) {
+			return app::Component_get_transform((app::Component*)component, nullptr);
+		}
+
+		return nullptr;
 	}
 }

user/features/esp/esp.cpp

@@ -16,7 +16,7 @@ static void DrawBox(float x, float y, float w, float h, ImColor color, float thi
 	drawlist->AddLine(ImVec2{ x, y }, ImVec2{ x + w, y }, color, thickness);
 	drawlist->AddLine(ImVec2{ x, y }, ImVec2{ x, y + h }, color, thickness);
 	drawlist->AddLine(ImVec2{ x + w, y }, ImVec2{ x + w, y + h }, color, thickness);
-	drawlist->AddLine(ImVec2{ x, y + h }, ImVec2{ x + w, y + h}, color, thickness);
+	drawlist->AddLine(ImVec2{ x, y + h }, ImVec2{ x + w, y + h }, color, thickness);
 }
 
 static void DrawString(ImVec2 pos, ImColor color, std::string label)
@@ -26,7 +26,7 @@ static void DrawString(ImVec2 pos, ImColor color, std::string label)
 	drawlist->AddText(pos, color, label.c_str());
 }
 
-static void DrawBoxESP(app::GameObject *it, float footOffset, float headOffset, std::string name, ImColor color, ImColor snapcolor, bool snapline = false, bool esp = false, float nameOffset = -0.5f, float widthOffset = 2.0f)
+static void DrawBoxESP(app::GameObject* it, float footOffset, float headOffset, std::string name, ImColor color, ImColor snapcolor, bool snapline = false, bool esp = false, float nameOffset = -0.5f, float widthOffset = 2.0f)
 {
 	ImGuiIO& io = ImGui::GetIO();
 	app::Camera* cam = app::Camera_get_main(nullptr);
@@ -36,12 +36,12 @@ static void DrawBoxESP(app::GameObject *it, float footOffset, float headOffset,
 	app::Transform* _transform = Transform::GetTransform(it);
 	if (_transform == nullptr)
 		return;
-		
+
 	app::Vector3 pos = Transform::GetPosition(_transform);
 
-	app::Vector3 footpos = app::Camera_WorldToScreenPoint_1(cam, app::Vector3{pos.x, pos.y + footOffset, pos.z}, NULL);
+	app::Vector3 footpos = app::Camera_WorldToScreenPoint_1(cam, app::Vector3{ pos.x, pos.y + footOffset, pos.z }, NULL);
-	app::Vector3 headpos = app::Camera_WorldToScreenPoint_1(cam, app::Vector3{pos.x, pos.y + headOffset, pos.z}, NULL);
+	app::Vector3 headpos = app::Camera_WorldToScreenPoint_1(cam, app::Vector3{ pos.x, pos.y + headOffset, pos.z }, NULL);
-	app::Vector3 namepos = app::Camera_WorldToScreenPoint_1(cam, app::Vector3{pos.x, pos.y + nameOffset, pos.z}, NULL);
+	app::Vector3 namepos = app::Camera_WorldToScreenPoint_1(cam, app::Vector3{ pos.x, pos.y + nameOffset, pos.z }, NULL);
 
 	if (esp && footpos.z > 0.0f) {
 		float height = (headpos.y - footpos.y);
@@ -77,8 +77,8 @@ void DrawNameESP(app::Vector3 pos, std::string name, ImColor color)
 
 void ComputePositionAndDrawESP(app::Object_1__Array* ents, ImColor color, bool use_prefab = false, std::string name = "") {
 	for (int i = 0; i < ents->max_length; i++) {
-		app::Object_1 *ent = ents->vector[i];
+		app::Object_1* ent = ents->vector[i];
-		if (ent == nullptr)
+		if (Object::IsNull(ent))
 			continue;
 
 		app::Transform* _transform = Transform::GetTransform(ent);
@@ -101,23 +101,34 @@ void ComputePositionAndDrawESP(app::Object_1__Array* ents, ImColor color, bool u
 		}
 
 		DrawNameESP(pos, name, color);
- 	}
+	}
+}
+
+// TEMP FIX #60
+app::Object_1__Array* ESP::RefreshEntList(app::Object_1__Array* ent, const char* className, const char* classNamespace) {
+	if (time_counter < time_refresh) return ent;
+	return Object::FindObjectsOfType(className, classNamespace);
 }
 
 void ESP::RunAzazelESP() {
-	app::GameObject__Array* ents = Object::FindGameObjectsWithTag("Azazel");
+
+	if (time_counter < (time_refresh - 1)) {
+		ents_azazel = Object::FindGameObjectsWithTag("Azazel");
+	}
+	app::GameObject__Array* ents = ents_azazel;
+
 
 	if (ents == NULL)
 		return;
 
 	for (int i = 0; i < ents->max_length; i++) {
-		app::GameObject* ent = (app::GameObject *)ents->vector[i];
+		app::GameObject* ent = (app::GameObject*)ents->vector[i];
 
 		if (ent == nullptr)
 			continue;
-	
+
-		DrawBoxESP(ent, -0.25, 2.0f, "Azazel", ImColor{settings::azazel_esp_color[0], settings::azazel_esp_color[1], settings::azazel_esp_color[2], settings::azazel_esp_color[3]},
+		DrawBoxESP(ent, -0.25, 2.0f, "Azazel", ImColor{ settings::azazel_esp_color[0], settings::azazel_esp_color[1], settings::azazel_esp_color[2], settings::azazel_esp_color[3] },
-			ImColor{ settings::azazel_snaplines_color[0], settings::azazel_snaplines_color[1], settings::azazel_snaplines_color[2], settings::azazel_snaplines_color[3]}, settings::azazel_snaplines, settings::azazel_esp);
+			ImColor{ settings::azazel_snaplines_color[0], settings::azazel_snaplines_color[1], settings::azazel_snaplines_color[2], settings::azazel_snaplines_color[3] }, settings::azazel_snaplines, settings::azazel_esp);
 	}
 }
 
@@ -129,7 +140,7 @@ void ESP::RunDemonESP() {
 	for (std::string& class_ : demons_c) {
 		if (SceneName() != "Menu")
 			return;
-		app::Object_1__Array *ents = Object::FindObjectsOfType(class_.c_str(), "");
+		app::Object_1__Array* ents = Object::FindObjectsOfType(class_.c_str(), "");
 		if (ents == nullptr)
 			continue;
 
@@ -140,28 +151,35 @@ void ESP::RunDemonESP() {
 	}
 }
 
+
 void ESP::RunItemsESP() {
 	ImColor col = ImColor{ settings::item_esp_color[0], settings::item_esp_color[1], settings::item_esp_color[2], settings::item_esp_color[3] };
 
-	app::Object_1__Array *ents = Object::FindObjectsOfType("SurvivalInteractable", "");
+	ents_item = RefreshEntList(ents_item, "SurvivalInteractable");
-	if (ents != nullptr && ents->vector[0] != nullptr) {
+	if (ents_item == nullptr) return;
+
+	app::Object_1__Array* ents = ents_item;
+
+
+	if (ents != nullptr || !Object::IsNull(ents->vector[0])) {
 		ComputePositionAndDrawESP(ents, col, true);
 	}
 
 	if (SceneName() != "Menu")
 		return;
 	ents = Object::FindObjectsOfType("KeyBehaviour", "");
-	if (ents != nullptr && ents->vector[0] != nullptr) {
+	if (ents != nullptr || !Object::IsNull(ents->vector[0])) {
 		ComputePositionAndDrawESP(ents, col, false, "Key");
 	}
 }
 
 void ESP::RunGoatsESP() {
-	app::Object_1__Array *goats = Object::FindObjectsOfType("GoatBehaviour", "");
+
-	
+	app::Object_1__Array* goats = ESP::ents_goat;
-	if (goats == nullptr || goats->vector[0] == nullptr)
+
+	if (goats == nullptr || Object::IsNull(goats->vector[0]))
 		return;
-	
+
 	ComputePositionAndDrawESP(goats, ImColor{ settings::goat_esp_color[0], settings::goat_esp_color[1], settings::goat_esp_color[2], settings::goat_esp_color[3] });
 }
 
@@ -176,8 +194,8 @@ void ESP::RunPlayersESP() {
 
 		if (ent == nullptr || ent == Player::GetLocalPlayer())
 			continue;
-	
+
-		DrawBoxESP(ent, -0.25, 1.75, "Player", ImColor{settings::player_esp_color[0], settings::player_esp_color[1], settings::player_esp_color[2], settings::player_esp_color[3]},
+		DrawBoxESP(ent, -0.25, 1.75, "Player", ImColor{ settings::player_esp_color[0], settings::player_esp_color[1], settings::player_esp_color[2], settings::player_esp_color[3] },
-			ImColor{ settings::player_snaplines_color[0], settings::player_snaplines_color[1], settings::player_snaplines_color[2], settings::player_snaplines_color[3]}, settings::player_snaplines, settings::player_esp);
+			ImColor{ settings::player_snaplines_color[0], settings::player_snaplines_color[1], settings::player_snaplines_color[2], settings::player_snaplines_color[3] }, settings::player_snaplines, settings::player_esp);
 	}
 }

user/features/esp/esp.hpp

@@ -2,7 +2,19 @@
 
 #include "settings/settings.hpp"
 
+
+
 namespace ESP {
+	// TEMP FIX #60
+	inline app::GameObject__Array* ents_azazel = NULL;
+	inline app::Object_1__Array* ents_item;
+	inline app::Object_1__Array* ents_goat;
+
+	inline int time_refresh = 100;
+	inline int time_counter = 0;
+
+	app::Object_1__Array* RefreshEntList(app::Object_1__Array* ent,const char* className, const char* classNamespace = "");
+
 	void RunPlayersESP();
 	void RunGoatsESP();
 	void RunItemsESP();

user/features/menu.cpp

@@ -319,15 +319,15 @@ void DrawMiscTab() {
 	if (ImGui::Button("Make random noise")) {
 		//Misc::PlayRandomSound();
 	}
-
 	
 	ImGui::Checkbox("Walk in lobby", &settings::walk_in_lobby);
 
 	ImGui::Checkbox("Auto respawn", &settings::auto_respawn);
+	*/
 
 	ImGui::Checkbox("Spoof level", &settings::spoof_level);
 	ImGui::InputInt("New level", &settings::new_level);
-	*/
+	
 
 	ImGui::Checkbox("EXP Modifier", &settings::exp_modifier);
 	ImGui::SliderInt("Amount", &settings::new_exp, 0, 5000);

user/features/misc/misc.cpp

@@ -94,7 +94,7 @@ void Misc::InstantWin()
 
 	std::string _scene = SceneName();
 
-	if (_scene == std::string("Menu") && !IsHost() && !Player::GetLocalPlayer()) return;
+	if (_scene == std::string("Menu") || !IsHost() || !Player::GetLocalPlayer()) return;
 
 	int32_t progress = 10;
 
@@ -104,7 +104,6 @@ void Misc::InstantWin()
 		if (_MapController) {
 
 			// DO_APP_FUNC(0x00930CD0, void, MapController_SetProgressTo, (MapController * __this, int32_t progress, MethodInfo * method));
-
 			if (app::MapController_SetProgressTo != nullptr) {
 				app::MapController_SetProgressTo(_MapController, progress, nullptr);
 			}
@@ -116,7 +115,6 @@ void Misc::InstantWin()
 		if (_SlaughterhouseAltarController) {
 
 			// DO_APP_FUNC(0x0050DEB0, void, SlaughterhouseAltarController_SkipToGoat, (SlaughterhouseAltarController * __this, int32_t number, MethodInfo * method));
-
 			if (app::SlaughterhouseAltarController_SkipToGoat != nullptr) {
 				app::SlaughterhouseAltarController_SkipToGoat(_SlaughterhouseAltarController, progress, nullptr);
 			}
@@ -128,7 +126,6 @@ void Misc::InstantWin()
 
 		if (_SurvivalObjectBurnController) {
 			// DO_APP_FUNC(0x00562590, void, SurvivalObjectBurnController_SkipToGoat, (SurvivalObjectBurnController * __this, int32_t number, MethodInfo * method));
-
 			if (app::SurvivalObjectBurnController_SkipToGoat != nullptr) {
 				app::SurvivalObjectBurnController_SkipToGoat(_SurvivalObjectBurnController, progress, nullptr);
 			}

user/hooks/hooks.cpp

@@ -94,6 +94,15 @@ typedef void(__stdcall* TNolanBehaviour_Update)(app::NolanBehaviour*, MethodInfo
 TNolanBehaviour_Update oNolanBehaviour_Update = NULL;
 void __stdcall hNolanBehaviour_Update(app::NolanBehaviour* __this, MethodInfo* method) {
 
+	// TEMP FIX #60
+	if (SceneName() != "Menu") {
+		ESP::ents_goat = Object::FindObjectsOfType("GoatBehaviour", "");
+	}
+
+	if (settings::spoof_level && IsLocalPlayer(__this)) {
+		Misc::RankSpoofer(settings::new_level);
+	}
+
 	if (settings::fly && IsLocalPlayer(__this)) {
 
 		float speed = settings::fly_speed;
@@ -159,7 +168,7 @@ typedef void(__stdcall* TNolanBehaviour_FixedUpdate)(app::NolanBehaviour*, Metho
 TNolanBehaviour_FixedUpdate oNolanBehaviour_FixedUpdate = NULL;
 void __stdcall hNolanBehaviour_FixedUpdate(app::NolanBehaviour* __this, MethodInfo* method) {
 
-	if (settings::freeze_azazel && IsHost()) {
+	if (settings::freeze_azazel && IsHost() && IsInGame()) {
 		app::GameObject* goAzazel = __this->fields.m_Survival->fields.m_Azazel;
 
 		if (goAzazel) {
@@ -762,17 +771,33 @@ HRESULT __stdcall hookD3D11Present(IDXGISwapChain* pSwapChain, UINT SyncInterval
 	if (settings::player_esp)
 		ESP::RunPlayersESP();
 
-	if (settings::goat_esp && SceneName() != "Menu")
+	if (IsInGame() && !IsSequencePlaying()) {
-		ESP::RunGoatsESP();
+		if (settings::goat_esp && SceneName() != "Menu")
+			ESP::RunGoatsESP();
 
-	if (settings::item_esp && SceneName() != "Menu")
+		if (settings::item_esp && SceneName() != "Menu")
-		ESP::RunItemsESP();
+			ESP::RunItemsESP();
 
-	if (settings::demon_esp)
+		if (settings::demon_esp)
-		ESP::RunDemonESP();
+			ESP::RunDemonESP();
+
+		if (settings::azazel_esp && SceneName() != "Menu")
+			ESP::RunAzazelESP();
+
+		ESP::time_counter += 1;
+
+		if (ESP::time_counter > ESP::time_refresh) {
+			ESP::time_counter = 0;
+		}
+	}
+	if (!IsInGame() && SceneName() == "Menu") {
+		if (settings::item_esp) {
+			ESP::ents_azazel	= nullptr;
+			ESP::ents_item		= nullptr;
+			ESP::ents_goat		= nullptr;
+		}
+	}
 
-	if (settings::azazel_esp && SceneName() != "Menu")
-		ESP::RunAzazelESP();
 
 	ImGui::GetIO().MouseDrawCursor = open_menu;