a whole bunch of practice fixes and bug fixes

Author: maxnut

cmake/gdr.cmake

@@ -3,7 +3,7 @@ include(FetchContent)
 FetchContent_Declare(
     gdr
     GIT_REPOSITORY https://github.com/maxnut/GDReplayFormat.git
-    GIT_TAG        0b803b44a3769a9c450c113ef1aa028f2c960127
+    GIT_TAG        af2eafe478968835dde3e9e9837db27a72632d7c
     GIT_PROGRESS TRUE
 )
 message("Fetching gdr")

mod.json

@@ -3,7 +3,7 @@
 	"gd": {
 		"win": "2.204"
     },
-	"version": "v2.5.1",
+	"version": "v2.5.2",
 	"id": "maxnu.gd_mega_overlay",
 	"name": "GD Mega Overlay",
 	"developer": "maxnu & SpaghettDev",

res/default_windows.json

@@ -6,7 +6,7 @@
         "y": 40.0
     },
     "Creator": {
-        "h": 200.0,
+        "h": 120.0,
         "w": 200.0,
         "x": 1340.0,
         "y": 40.0
@@ -15,7 +15,7 @@
         "h": 120.0,
         "w": 200.0,
         "x": 1600.0,
-        "y": 340.0
+        "y": 400.0
     },
     "General": {
         "h": 270.0,
@@ -30,13 +30,13 @@
         "y": 40.0
     },
     "Labels": {
-        "h": 310.0,
+        "h": 370.0,
         "w": 200.0,
         "x": 1340.0,
-        "y": 280.0
+        "y": 200.0
     },
     "Level": {
-        "h": 380.0,
+        "h": 410.0,
         "w": 200.0,
         "x": 560.0,
         "y": 40.0
@@ -45,13 +45,13 @@
         "h": 330.0,
         "w": 200.0,
         "x": 60.0,
-        "y": 340.0
+        "y": 360.0
     },
     "Menu Settings": {
         "h": 350.0,
         "w": 200.0,
-        "x": 1600.0,
-        "y": 500.0
+        "x": 800.0,
+        "y": 400.0
     },
     "Player": {
         "h": 320.0,
@@ -66,7 +66,7 @@
         "y": 380.0
     },
     "Shortcuts": {
-        "h": 270.0,
+        "h": 350.0,
         "w": 200.0,
         "x": 1600.0,
         "y": 40.0

src/Common.cpp

@@ -187,18 +187,7 @@ void Common::updateCheating()
 		return;
 	}
 
-	float tps = 240.f;
-
-	if (Settings::get<bool>("general/tps/enabled"))
-		tps = Settings::get<float>("general/tps/value", 240.f);
-	else
-		tps = 240.f;
-
-	if(Macrobot::playerMode == Macrobot::PLAYBACK)
-		tps = Macrobot::macro.framerate;
-
-	if(tps < 1.f)
-		tps = 1.f;
+	float tps = getTPS();
 
 	PlayLayer* pl = GameManager::get()->getPlayLayer();
 

src/Hacks/Labels.cpp

@@ -170,6 +170,14 @@ class $modify(PlayLayer)
 			this
 		);
 
+		setupLabel(
+			"Attempts",
+			[&](cocos2d::CCLabelBMFont* pointer) {
+				pointer->setString(fmt::format("{} Attempts", this->m_level->m_attempts.value()).c_str());
+			},
+			this
+		);
+
 		//keep this at the bottom :)
 		setupLabel(
 			"Macro Info",
@@ -482,5 +490,7 @@ void Labels::renderWindow()
 
 	settingsForLabel("Best Run", [] { });
 
+	settingsForLabel("Attempts", [] { });
+
 	settingsForLabel("Macro Info", [] { });
 }

src/Hacks/ShowHitboxes.cpp

@@ -55,14 +55,15 @@ void ShowHitboxes::forceDraw(GJBaseGameLayer* self, bool editor)
 
     getDrawNode()->setVisible(show || editor);
 
-    GameManager::get()->setGameVariable("0045", show);
+    bool onDeath = Settings::get<bool>("level/show_hitbox/on_death", false);
+
+    GameManager::get()->setGameVariable("0045", show && !onDeath);
 
     if(!show)
         return;
-
-    bool onDeath = Settings::get<bool>("level/show_hitbox/on_death", false);
+    
      if(onDeath)
-        getDrawNode()->setVisible(dead);
+        getDrawNode()->setVisible(dead || editor);
 
     if(onDeath && !dead)
         return;

src/Macrobot/Clickpacks.cpp

@@ -6,6 +6,8 @@
 #include "../Settings.hpp"
 #include <portable-file-dialogs.h>
 #include <filesystem>
+#include <algorithm>
+#include <cctype>
 
 #include <Geode/Geode.hpp>
 #include <Geode/binding/FMODAudioEngine.hpp>
@@ -32,12 +34,17 @@ std::optional<Clickpack> Clickpack::fromPath(const fs::path& pathString)
 			return;
 
 		for (const auto& entry : fs::directory_iterator(folder))
-			if (entry.is_regular_file() && (entry.path().extension() == ".wav"))
+		{
+			std::string ext = entry.path().extension().string();
+			 std::transform(ext.begin(), ext.end(), ext.begin(),
+                   [](unsigned char c) { return std::tolower(c); });
+			if (entry.is_regular_file() && ext == ".wav")
 			{
 				FMOD::Sound* s = nullptr;
 				FMODAudioEngine::sharedEngine()->m_system->createSound(string::wideToUtf8(entry.path().wstring()).c_str(), FMOD_LOOP_OFF, 0, &s);
 				vector.push_back(s);
 			}
+		}
 	};
 
 	addFromPath(pack.clicks, clickPath);

src/Macrobot/Macrobot.cpp

@@ -54,13 +54,14 @@ class $modify(PlayLayer)
 		if (checkpoints.contains(checkpoint) && playerMode != DISABLED && GameManager::get()->getPlayLayer())
 		{
 			CheckpointData checkpointData = checkpoints[checkpoint];
-			const auto check = [&](const Action &action) -> bool { return action.frame >= checkpointData.frame; };
+			const auto check = [&](const Action &action) -> bool { return action.frame > checkpointData.frame; };
 			macro.inputs.erase(std::remove_if (macro.inputs.begin(), macro.inputs.end(), check), macro.inputs.end());
 			PlayLayer::loadFromCheckpoint(checkpoint);
 
 			gameTime = checkpointData.time;
 			checkpointData.p1.apply(this->m_player1, true);
-			checkpointData.p2.apply(this->m_player2, true);
+			if(MBO(bool, this, 878))
+				checkpointData.p2.apply(this->m_player2, true);
 		}
 		else
 			PlayLayer::loadFromCheckpoint(checkpoint);
@@ -109,12 +110,13 @@ class $modify(PlayLayer)
 					this->m_player1->pushButton(PlayerButton::Left);
 			}
 
+			//TODO only do this when necessary
 			bool isDual = MBO(bool, this, 878);
 
 			gameTime += (1.0 / (double)Common::getTPS()) + 0.00000001;
-			this->handleButton(false, 1, true);
+			Macrobot::recordAction(PlayerButton::Jump, gameTime, false, true);
 			if(isDual)
-				this->handleButton(false, 1, false);
+				Macrobot::recordAction(PlayerButton::Jump, gameTime, false, false);
 			gameTime -= (1.0 / (double)Common::getTPS()) + 0.00000001;
 		}
 		else
@@ -317,7 +319,7 @@ void Macrobot::PlayerCheckpoint::fromPlayer(PlayerObject *player, bool fullCaptu
 		return;
 
 	cocos2d::CCPoint position = player->m_position;
-	this->yVel = MBO(double, player, 1936);
+	this->yVel = player->m_yVelocity;
 	this->rotation = player->getRotation();
 	this->xVel = player->m_platformerXVelocity;
 	this->xPos = position.x;
@@ -326,6 +328,8 @@ void Macrobot::PlayerCheckpoint::fromPlayer(PlayerObject *player, bool fullCaptu
 	this->nodeYPos = player->getPositionY();
 	this->rotationRate = player->m_rotationSpeed;
 	this->lastSnappedTo = player->m_objectSnappedTo;
+	this->isOnSlope = player->m_isOnSlope;
+	this->wasOnSlope = player->m_wasOnSlope;
 
 	if (fullCapture)
 	{
@@ -354,15 +358,15 @@ void Macrobot::PlayerCheckpoint::apply(PlayerObject* player, bool fullRestore)
 	{
 		// 🗣️ 🔥 🗣️ 🔥 🗣️ 🔥 🗣️ 🔥 🗣️ 🔥 🗣️ 🔥
 		// no but seriously this has no right of working so well
-		for (int i = 1410; i < 1600; i++)
+		for (int i = 1410; i < 1700; i++)
 		{
 			if (this->randomProperties[i] < 10000 && this->randomProperties[i] > -10000)
 			{
 				*reinterpret_cast<float *>(reinterpret_cast<uintptr_t>(player) + 160 + i) = this->randomProperties[i];
 			}
 		}
 
-		for (int i = 1800; i < 2265; i++)
+		for (int i = 1794; i < 2265; i++)
 		{
 			if (this->randomProperties[i] < 10000 && this->randomProperties[i] > -10000)
 			{
@@ -383,7 +387,7 @@ void Macrobot::PlayerCheckpoint::apply(PlayerObject* player, bool fullRestore)
 
 	player->m_objectSnappedTo = this->lastSnappedTo;
 
-	MBO(double, player, 1936) = this->yVel; //remove this when geode fixes the offset
+	player->m_yVelocity = this->yVel;//remove this when geode fixes the offset
 	player->setRotation(this->rotation);
 
 	player->setPositionX(this->nodeXPos);
@@ -395,6 +399,14 @@ void Macrobot::PlayerCheckpoint::apply(PlayerObject* player, bool fullRestore)
 	player->m_platformerXVelocity = this->xVel;
 
 	player->m_rotationSpeed = this->rotationRate;
+
+	player->m_isOnSlope = this->isOnSlope;
+	player->m_wasOnSlope = this->wasOnSlope;
+
+	//TODO: spamming checkpoints on slopes changes slope start time
+
+	/* double slopeTime = MBO(double, self->m_player1, 2144);
+	double slopeStartTime = MBO(double, self->m_player1, 1240);*/
 }
 
 void Macrobot::save(const std::string& file)
@@ -486,6 +498,11 @@ void Macrobot::drawWindow()
 			PhysicsBypass::calculateTickrate();
 			if (GameManager::get()->getPlayLayer())
 				GameManager::get()->getPlayLayer()->resetLevelFromStart();
+
+			macro.framerate = 240.f;
+
+			if (Settings::get<bool>("general/tps/enabled"))
+				macro.framerate = Settings::get<float>("general/tps/value", 240.f);
 		}
 		if (ImGui::RadioButton("Play", (int*)&Macrobot::playerMode, (int)PLAYBACK))
 		{

src/Macrobot/Macrobot.h

@@ -31,6 +31,9 @@ namespace Macrobot
 		float rotationRate;
 		GameObject* lastSnappedTo = nullptr;
 
+		bool isOnSlope;
+		bool wasOnSlope;
+
 		std::vector<float> randomProperties;
 
 		void apply(PlayerObject* player, bool fullRestore);

src/main.cpp

@@ -70,6 +70,9 @@ void initGUI()
 		if (GUI::checkbox("Framerate", "general/fps/enabled"))
 			Common::calculateFramerate();
 
+		if(Macrobot::playerMode == Macrobot::RECORDING || Macrobot::playerMode == Macrobot::PLAYBACK)
+			ImGui::BeginDisabled();
+
 		float tps = Settings::get<float>("general/tps/value", 240.f);
 		if (GUI::inputFloat("##TPSValue", &tps))
 			Mod::get()->setSavedValue<float>("general/tps/value", tps);
@@ -85,6 +88,9 @@ void initGUI()
 		if (GUI::checkbox("Physics Bypass", "general/tps/enabled"))
 			PhysicsBypass::calculateTickrate();
 
+		if(Macrobot::playerMode == Macrobot::RECORDING || Macrobot::playerMode == Macrobot::PLAYBACK)
+			ImGui::EndDisabled();
+
 		float speedhack = Settings::get<float>("general/speedhack/value", 1.f);
 		if (GUI::inputFloat("##SpeedhackValue", &speedhack))
 		{
@@ -348,14 +354,6 @@ void initGUI()
 	recorder.position = {800, 280};
 	recorder.size.y = 450;
 	GUI::addWindow(recorder);
-
-	GUI::Window credits("Credits", [] {
-		GUI::textURL("SpaghettDev", "https://github.com/SpaghettDev");
-		GUI::textURL("TpdEA", "https://github.com/TpdeaX");
-	});
-	credits.position = {1550, 480};
-	credits.size.y = 120;
-	GUI::addWindow(credits);
 }
 
 void render()