Merge pull request #65 from JozielBorges/V2_recode

Fix for ESP and Addition of New Functions

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 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 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 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,7 +77,7 @@ 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 (Object::IsNull(ent))
 			continue;
 
@@ -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]},
-			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);
+
+		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);
 	}
 }
 
@@ -126,42 +137,64 @@ void ESP::RunDemonESP() {
 
 	std::vector<std::string> demons_c = { "SurvivalDemonBehaviour", "SpiderBehaviour", "GhostBehaviour", "BoarBehaviour", "CorpseBehaviour" };
 
-	for (std::string& class_ : demons_c) {
-		if (SceneName() != "Menu")
-			return;
-		app::Object_1__Array *ents = Object::FindObjectsOfType(class_.c_str(), "");
-		if (ents == nullptr)
-			continue;
-
-		std::string name = class_;
-		string_replace(name, "Survival", "");
-		string_replace(name, "Behaviour", "");
-		ComputePositionAndDrawESP(ents, col, false, name);
+	// There's might be a better way to do it, but i'm lazy : )
+	if (name_demon == "N/A") {
+		for (std::string& class_ : demons_c) {
+			ents_demon = RefreshEntList(ents_demon, class_.c_str(), "");
+			if (ents_demon && ents_demon->max_length > 0) {
+				name_demon = class_;
+			}
+		}		
 	}
+	else {
+		ents_demon = RefreshEntList(ents_demon, name_demon.c_str(), "");
+	}
+	
+	if (ents_demon == nullptr) return;
+
+	app::Object_1__Array* ents = ents_demon;
+	std::string name = name_demon;
+	string_replace(name, "Survival", "");
+	string_replace(name, "Behaviour", "");
+	ComputePositionAndDrawESP(ents, col, false, name);
 }
 
 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", "");
-	if (ents != nullptr || !Object::IsNull(ents->vector[0])) {
-		ComputePositionAndDrawESP(ents, col, true);
+	ents_item = RefreshEntList(ents_item, "SurvivalInteractable");
+	if (ents_item != nullptr) {
+
+		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", "");
+	
+}
+
+void ESP::RunKeyESP() {
+	ImColor col = ImColor{ settings::key_esp_color[0], settings::key_esp_color[1], settings::key_esp_color[2], settings::key_esp_color[3] };
+
+	app::Object_1__Array* ents = ents_key;
+
+	if (ents_key == nullptr) return;
+
 	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 || 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 +209,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]},
-			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);
+
+		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);
 	}
 }

user/features/esp/esp.hpp

@@ -2,10 +2,27 @@
 
 #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_key;
+	inline app::Object_1__Array* ents_goat;
+	inline app::Object_1__Array* ents_demon;
+
+	inline std::string name_demon = "N/A";
+
+	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();
+	void RunKeyESP();
 	void RunDemonESP();
 	void RunAzazelESP();
 }

user/features/menu.cpp

@@ -115,6 +115,18 @@ void DrawVisualsTab() {
 		ImGui::EndPopup();
 	}
 
+	ImGui::Checkbox("Keys ESP", &settings::key_esp);
+	ImGui::SameLine();
+	bool open_kcolor_popup = ImGui::ColorButton("kespcolor", ImVec4(settings::key_esp_color[0], settings::key_esp_color[1], settings::key_esp_color[2], settings::key_esp_color[3]));
+	if (open_kcolor_popup)
+	{
+		ImGui::OpenPopup("kesppop");
+	}
+	if (ImGui::BeginPopup("kesppop")) {
+		ImGui::ColorPicker4("Key ESP color", (float*)&settings::key_esp_color);
+		ImGui::EndPopup();
+	}
+
 	ImGui::Checkbox("Demon ESP", &settings::demon_esp);
 	ImGui::SameLine();
 	bool open_dcolor_popup = ImGui::ColorButton("despcolor", ImVec4(settings::demon_esp_color[0], settings::demon_esp_color[1], settings::demon_esp_color[2], settings::demon_esp_color[3]));

user/hooks/hooks.cpp

@@ -94,6 +94,12 @@ 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", "");
+		ESP::ents_key = Object::FindObjectsOfType("KeyInteractable", "");
+	}
+
 	if (settings::spoof_level && IsLocalPlayer(__this)) {
 		Misc::RankSpoofer(settings::new_level);
 	}
@@ -766,19 +772,48 @@ HRESULT __stdcall hookD3D11Present(IDXGISwapChain* pSwapChain, UINT SyncInterval
 	if (settings::player_esp)
 		ESP::RunPlayersESP();
 
-	if (IsInGame() && !IsSequencePlaying()) {
-		if (settings::goat_esp && SceneName() != "Menu")
+	if (IsInGame() && !IsSequencePlaying() && SceneName() != "Menu") {
+		if (settings::goat_esp)
 			ESP::RunGoatsESP();
 
-		if (settings::item_esp && SceneName() != "Menu")
+		if (settings::item_esp)
 			ESP::RunItemsESP();
 
+		if (settings::key_esp)
+			ESP::RunKeyESP();
+
 		if (settings::demon_esp)
 			ESP::RunDemonESP();
 
-		if (settings::azazel_esp && SceneName() != "Menu")
+		if (settings::azazel_esp)
 			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_item = nullptr;
+
+		if (settings::goat_esp)
+			ESP::ents_goat = nullptr;
+
+		if (settings::azazel_esp)
+			ESP::ents_azazel = nullptr;
+
+		if (settings::key_esp)
+			ESP::ents_key = nullptr;
+
+		if (settings::demon_esp) {
+			ESP::ents_demon = nullptr;
+			ESP::name_demon = "N/A";
+		};
+
+	}
+
 
 	ImGui::GetIO().MouseDrawCursor = open_menu;
 

user/main.cpp

@@ -23,7 +23,7 @@
 
 #include "players/players.h"
 
-#define CLIENT_VERSION "4.1"
+#define CLIENT_VERSION "4.2"
 
 // Set the name of your log file here
 extern const LPCWSTR LOG_FILE = L"DevourClient.txt";

user/settings/settings.cpp

@@ -25,6 +25,8 @@ namespace settings {
 	float demon_esp_color[4] = { 255.f, 0, 0, 255.f };
 	bool goat_esp = false;
 	float goat_esp_color[4] = { 247.f, 156.f, 37.f, 255.f };
+	bool key_esp = false;
+	float key_esp_color[4] = { 251.f,225.f,104.f,255.f };
 
 	bool chat_spam = false;
 	std::string message = "deez nuts";

user/settings/settings.hpp

@@ -29,6 +29,8 @@ namespace settings {
 	extern float demon_esp_color[4];
 	extern bool goat_esp;
 	extern float goat_esp_color[4];
+	extern bool key_esp;
+	extern float key_esp_color[4];
 	extern bool chat_spam;
 	extern std::string message;
 	extern bool spoof_level;