fix that damn bug

Author: RayDeeUx

changelog.md

@@ -1,4 +1,8 @@
 # DeathScreenTweaks Changelog
+## v1.8.1
+- Use sprites for the coins shown in `Show Collected Coins`.
+  - To restore past behavior, toggle `Use ASCII Art for Coins Instead`.
+- Fix a rather mission-critical bug related to finding/locating the "New Best!" node.
 ## v1.8.0
 - Added iOS JIT-less support.
 - Added `Customize Position` and `Customize Rotation`.

mod.json

@@ -240,7 +240,13 @@
 		},
 		"showCollectedCoins": {
 			"name": "Show Collected Coins",
-			"description": "Shows the coins you had collected during an attempt before dying.\n\nColor of the label adapts to the coin type.",
+			"description": "Shows the coins you had collected during an attempt before dying.\n\nIf \"Use ASCII Art for Coins Instead\" is enabled, the color of the label adapts to the coin type.",
+			"type": "bool",
+			"default": false
+		},
+		"useASCIIArtForCoins": {
+			"name": "Use ASCII Art for Coins Instead",
+			"description": "Use `[C]` and `[  ]` to indicate collected and uncollected coins instead of in-game sprites.",
 			"type": "bool",
 			"default": false
 		},

src/Manager.hpp

@@ -61,4 +61,23 @@ class Manager {
 		return instance;
 	}
 
+	// something or someone has forced my hand to include this code in this mod of all places... ugh.
+	// if only robtop made a unique fucking class for "New Best!" so i wouldnt have to suffer rn. >:(
+	// code yoinked from devtools as always
+	static std::string getNodeName(CCObject* node) {
+        #ifdef GEODE_IS_WINDOWS
+		return typeid(*node).name() + 6;
+        #else
+		std::string ret;
+
+		int status = 0;
+		auto demangle = abi::__cxa_demangle(typeid(*node).name(), 0, 0, &status);
+		if (status == 0) {
+			ret = demangle;
+		}
+		free(demangle);
+
+		return ret;
+        #endif
+	}
 };

src/PlayLayer.cpp

@@ -163,7 +163,7 @@ class $modify(MyPlayLayer, PlayLayer) {
 		}
 	}
 	void findAndModifyTheNewBestNode() {
-		if (!getModBool("enabled") || !m_level || m_level->isPlatformer() || m_isPlatformer) return;
+		if (!getModBool("enabled") || !m_level || m_level->isPlatformer() || m_isPlatformer) return log::info("[MyPlayLayer::findAndModifyTheNewBestNode] aborting mission");
 
 		CCNode* newBestNodeProbably = nullptr;
 		bool hasOrbsLabel = false;
@@ -194,13 +194,14 @@ class $modify(MyPlayLayer, PlayLayer) {
 			if (!theLastCCNode || theLastCCNode == this->m_uiLayer) continue; // skip UILayer
 			if (theLastCCNode->getZOrder() != 100) continue;
 			if (theLastCCNode->getChildrenCount() < 2) continue;
+			if (Manager::getNodeName(theLastCCNode) != "CCNode" && Manager::getNodeName(theLastCCNode) != "cocos2d::CCNode") continue;
 			if (getModBool("noVisibleNewBest")) return theLastCCNode->setVisible(false);
 			if (!isFromZilkoMod) newBestNodeProbably = theLastCCNode;
 			else theLastCCNode->setVisible(false);
 			break;
 		}
 
-		if (!newBestNodeProbably || newBestNodeProbably->getUserObject("modified-already"_spr)) return;
+		if (!newBestNodeProbably || newBestNodeProbably->getUserObject("modified-already"_spr)) return log::info("[MyPlayLayer::findAndModifyTheNewBestNode] found node already");
 		newBestNodeProbably->setUserObject("modified-already"_spr, CCBool::create(true));
 
 		if (!isFromZilkoMod) MyPlayLayer::applyNodeTraitsCustomization(newBestNodeProbably, hasDiamondsOrOrbs);

src/PlayerObject.cpp

@@ -16,14 +16,15 @@ class $modify(MyPlayerObject, PlayerObject) {
 	}
 	void playerDestroyed(bool p0) {
 		PlayerObject::playerDestroyed(p0);
-		if (!m_gameLayer || m_gameLayer == LevelEditorLayer::get()) return;
+		if (!this->m_gameLayer || this->m_gameLayer == LevelEditorLayer::get()) return log::info("[PlayerObject::playerDestroyed] returned because of if (!this->m_gameLayer || this->m_gameLayer == LevelEditorLayer::get())");
 
 		if (!getBool("enabled")) return;
 		const auto pl = PlayLayer::get();
-		if (!pl || this != pl->m_player1) return;
+		if (!pl || this->m_gameLayer != pl || this != pl->m_player1) return log::info("[PlayerObject::playerDestroyed] returned because of if (!pl || this->m_gameLayer != pl || this != pl->m_player1)");
 		const auto theLevel = pl->m_level;
-		if (!theLevel || theLevel->isPlatformer()) return;
-		if (this == pl->m_player2 && theLevel->m_twoPlayerMode) return;
+		if (!theLevel || theLevel->isPlatformer()) return log::info("[PlayerObject::playerDestroyed] returned because of if (!theLevel || theLevel->isPlatformer())");
+		if (this == pl->m_player2 && theLevel->m_twoPlayerMode) return log::info("[PlayerObject::playerDestroyed] returned because of if (this == pl->m_player2 && theLevel->m_twoPlayerMode)");
+		if (this == pl->m_player2 && pl->m_gameState.m_isDualMode) return log::info("[PlayerObject::playerDestroyed] returned because of if (this == pl->m_player2 && pl->m_gameState.m_isDualMode)");
 
 		Manager* manager = Manager::getSharedInstance();
 		const float plCurrentPercent = pl->getCurrentPercent();
@@ -36,10 +37,16 @@ class $modify(MyPlayerObject, PlayerObject) {
 		if (!pl->m_isTestMode && !pl->m_isPracticeMode && getBool("alwaysNewBest") && !isNewBest) qualifiedToShowAFakeNewBest = true;
 		if (getBool("alwaysNewBestPlaytest") && pl->m_isTestMode) qualifiedToShowAFakeNewBest = true;
 		if (getBool("alwaysNewBestPractice") && pl->m_isPracticeMode) qualifiedToShowAFakeNewBest = true;
-		log::info("pl->getCurrentPercentInt() <= pl->m_level->m_normalPercent.value(): {}", pl->getCurrentPercentInt() <= pl->m_level->m_normalPercent.value());
-		log::info("pl->getCurrentPercentInt(): {}", pl->getCurrentPercentInt());
-		log::info("pl->m_level->m_normalPercent.value(): {}", pl->m_level->m_normalPercent.value());
-		if (qualifiedToShowAFakeNewBest) pl->showNewBest(false, 0, 0, false, false, false);
+		log::info("[PlayerObject::playerDestroyed] pl->getCurrentPercentInt() <= pl->m_level->m_normalPercent.value(): {}", pl->getCurrentPercentInt() <= pl->m_level->m_normalPercent.value());
+		log::info("[PlayerObject::playerDestroyed] pl->getCurrentPercentInt(): {}", pl->getCurrentPercentInt());
+		log::info("[PlayerObject::playerDestroyed] pl->m_level->m_normalPercent.value(): {}", pl->m_level->m_normalPercent.value());
+		log::info("[PlayerObject::playerDestroyed] !pl->m_isTestMode && !pl->m_isPracticeMode && getBool(\"alwaysNewBest\") && !isNewBest: {}", !pl->m_isTestMode && !pl->m_isPracticeMode && getBool("alwaysNewBest") && !isNewBest);
+		log::info("[PlayerObject::playerDestroyed] getBool(\"alwaysNewBestPlaytest\") && pl->m_isTestMode: {}", getBool("alwaysNewBestPlaytest") && pl->m_isTestMode);
+		log::info("[PlayerObject::playerDestroyed] getBool(\"alwaysNewBestPractice\") && pl->m_isPracticeMode: {}", getBool("alwaysNewBestPractice") && pl->m_isPracticeMode);
+		if (qualifiedToShowAFakeNewBest) {
+			log::info("showing fake new best");
+			pl->showNewBest(false, 0, 0, false, false, false);
+		}
 		const auto fmod = FMODAudioEngine::get();
 		if (!fmod) return;
 

src/main.cpp

@@ -80,4 +80,8 @@ migration failed, womp womp)";
 	listenForSettingChanges("custom", [](bool unusedVar) {
 		managerReset();
 	});
+
+	listenForSettingChanges("logging", [](bool newLogging) {
+		Mod::get()->setLoggingEnabled(newLogging);
+	});
 }