new setting and i shouldve tested before pushing to prod but fuckit

Author: RayDeeUx

mod.json

@@ -145,6 +145,17 @@
 			"type": "bool",
 			"default": false
 		},
+		"showTotalAttemptsAndJumps": {
+			"name": "Show Total Attempts + Jumps",
+			"description": "Shows your total attempt/jump count for each level, even Platformer levels (if <cl>\"Plat. Attempts + Jumps\"</c> is enabled).\n\n- Disabled: This feature is disabled. Not much to say there.\n-Fully Replace: Fully replaces the displayed attempt/jump count with the total attempt/jump count instead.\n-Show as Addt'l Info: Shows the total attempt/jump count next to the displayed attempt/jump count.",
+			"type": "string",
+			"default": "Disabled",
+			"one-of": [
+				"Disabled",
+				"Fully Replace",
+				"Show As Addt'l Info"
+			]
+		},
 		"classicFlukedFrom": {
 			"name": "Classic \"Fluked From\" %",
 			"description": "<cl>Original idea by yolodomo.</c>\n\nShows your last best percentage on the \"Level Complete\" screen when completing Classic levels.\n\n<cy>To disable, set this setting to \"[Disabled]\". Otherwise, choose a prefix for this label to enable this feature.</c>\n\n<cr>I am not responsible if some of these prefix options will overlap past the borders of the endscreen or the level completion rewards; go experiment on your own.</c>",

src/EndLevelLayer.cpp

@@ -1,7 +1,4 @@
 #include <Geode/modify/EndLevelLayer.hpp>
-#include <vector>
-#include <algorithm>
-#include <random>
 #include "Manager.hpp"
 
 #define managerMacro Manager::getSharedInstance()
@@ -169,10 +166,10 @@ class $modify(MyEndLevelLayer, EndLevelLayer) {
 	}
 	void applyPlatAttemptsAndJumpsOrFlukedFromPercent(GJGameLevel* theLevel) {
 		Manager* manager = managerMacro;
-		manager->isCompactEndscreen = Loader::get()->isModLoaded("suntle.compactendscreen");
-		const auto playLayer = PlayLayer::get();
-		if (!m_mainLayer|| !playLayer) return;
-		const bool isPlat = theLevel->isPlatformer();
+		// manager->isCompactEndscreen = Loader::get()->isModLoaded("suntle.compactendscreen");
+		const auto playLayer = m_playLayer;
+		if (!m_mainLayer || !playLayer) return;
+		const bool isPlat = theLevel->isPlatformer() && playLayer->m_isPlatformer;
 		if (getModBool("platAttemptsAndJumps") && isPlat) {
 			const auto timeLabel = getChildByIDRecursive("time-label");
 			if (!timeLabel) return;
@@ -202,6 +199,36 @@ class $modify(MyEndLevelLayer, EndLevelLayer) {
 			m_mainLayer->addChild(flukedFromLabel);
 		}
 	}
+	void applyTotalAttemptAndJumpCount(GJGameLevel* level) {
+		const std::string_view showTotalAttemptsAndJumps = geode::utils::string::toLower(getModString("showTotalAttemptsAndJumps"));
+		if (showTotalAttemptsAndJumps != "fully replace" && showTotalAttemptsAndJumps != "show as addt'l info") return;
+		if (!getModBool("enabled") || showTotalAttemptsAndJumps == "disabled" || !level) return;
+
+		const bool isPlat = level->isPlatformer() && m_playLayer->m_isPlatformer;
+		if (isPlat && !getModBool("platAttemptsAndJumps")) return;
+
+		CCLabelBMFont* attemptLabel = nullptr;
+		CCLabelBMFont* jumpsLabel = nullptr;
+		if (isPlat) {
+			attemptLabel = static_cast<CCLabelBMFont*>(m_mainLayer->getChildByID("attempts-label"_spr));
+			jumpsLabel = static_cast<CCLabelBMFont*>(m_mainLayer->getChildByID("jumps-label"_spr));
+		} else {
+			attemptLabel = static_cast<CCLabelBMFont*>(m_mainLayer->getChildByID("attempts-label"));
+			jumpsLabel = static_cast<CCLabelBMFont*>(m_mainLayer->getChildByID("jumps-label"));
+		}
+
+		if (!attemptLabel || !jumpsLabel) return;
+
+		const std::string& totalAttemptsString = fmt::format(std::locale("en_US.UTF-8"), "{:L}", level->m_attempts).c_str();
+		const std::string& totalJumpsString = fmt::format(std::locale("en_US.UTF-8"), "{:L}", level->m_jumps).c_str();
+		if (showTotalAttemptsAndJumps == "fully replace") {
+			attemptLabel->setString(fmt::format(std::locale("en_US.UTF-8"), "Total Attempts: {}", totalAttemptsString).c_str());
+			jumpsLabel->setString(fmt::format(std::locale("en_US.UTF-8"), "Total Jumps: {}", totalJumpsString).c_str());
+		} else if (showTotalAttemptsAndJumps == "show as addt'l info") {
+			attemptLabel->setString(fmt::format("{} ({})", static_cast<std::string>(attemptLabel->getString()), totalAttemptsString).c_str());
+			jumpsLabel->setString(fmt::format("{} ({})", static_cast<std::string>(jumpsLabel->getString()), totalJumpsString).c_str());
+		}
+	}
 	void applyCustomLevelCompleteText(const std::string_view matchPlayLayer) {
 		if (!getModBool("customLevelCompleteText") || !getModBool("enabled") || !m_playLayer) return;
 		const auto lvlCompleteText = typeinfo_cast<CCSprite*>(getChildByIDRecursive("level-complete-text"));
@@ -348,6 +375,7 @@ class $modify(MyEndLevelLayer, EndLevelLayer) {
 		MyEndLevelLayer::applyHideChainsBackground();
 		MyEndLevelLayer::applySpaceUK();
 		MyEndLevelLayer::applyPlatAttemptsAndJumpsOrFlukedFromPercent(m_playLayer->m_level);
+		MyEndLevelLayer::applyTotalAttemptAndJumpCount(m_playLayer->m_level);
 		MyEndLevelLayer::addLoadedModsList();
 	}
 	void customSetup() {

src/main.cpp

@@ -1,4 +1,3 @@
-#include <fstream>
 #include "Manager.hpp"
 #include "Settings.hpp"
 #include "boilerplate.hpp"