From 68fc19d830676fc0f1a61c01eb43d83cac55aeed Mon Sep 17 00:00:00 2001 From: matcool <26722564+matcool@users.noreply.github.com> Date: Sun, 4 Feb 2024 23:10:50 -0300 Subject: [PATCH] maybe fix weeklies. idk i cant test properly --- mod.json | 2 +- src/EditorPauseLayer.cpp | 2 +- src/LevelCell.cpp | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/mod.json b/mod.json index 67e81ce..9629960 100644 --- a/mod.json +++ b/mod.json @@ -4,7 +4,7 @@ "win": "2.204", "android": "2.205" }, - "version": "v1.2.1", + "version": "v1.2.2", "id": "geode.node-ids", "name": "Node IDs", "developer": "Geode Team", diff --git a/src/EditorPauseLayer.cpp b/src/EditorPauseLayer.cpp index 580569e..de09985 100644 --- a/src/EditorPauseLayer.cpp +++ b/src/EditorPauseLayer.cpp @@ -20,7 +20,7 @@ class GuidelinesButton : public CCMenuItemSpriteExtra { spr, nullptr, nullptr, this, nullptr )) return false; - // TODO: i was also gonna call this on windows but it just crashes and i cant figure out why + // TODO: this function is cursed on windows, only takes 1 arg #else if (!CCMenuItemSpriteExtra::init( spr, diff --git a/src/LevelCell.cpp b/src/LevelCell.cpp index 6bfc4f3..eff8277 100644 --- a/src/LevelCell.cpp +++ b/src/LevelCell.cpp @@ -190,12 +190,17 @@ struct LevelCellIDs : Modify { bool hasCompletedLevel = m_level->m_dailyID > 0 ? m_level->m_orbCompletion > 99 : GameStatsManager::sharedState()->hasCompletedLevel(m_level); auto savedLevel = GameLevelManager::sharedState()->getSavedLevel(m_level->m_levelID); - if(hasCompletedLevel) { + if (hasCompletedLevel) { getChildOfType(m_mainLayer, spriteOffset)->setID("completed-icon"); spriteOffset++; - } else if(savedLevel && savedLevel->m_normalPercent.value() != 0) { - getChildOfType(m_mainLayer, labelOffset)->setID("percentage-label"); - labelOffset++; + } else if (savedLevel && savedLevel->m_normalPercent.value() != 0) { + // TODO: this is very incorrect. on weeklies it will fetch the + // GJGameLevel for the regular level, and get the normalPercent of that + auto* node = getChildOfType(m_mainLayer, labelOffset); + if (node) { + node->setID("percentage-label"); + labelOffset++; + } } if(m_level->m_originalLevel > 0) {