partly finished update

Author: Kingminer7

mod.json

@@ -1,5 +1,5 @@
 {
-  "geode": "4.6.1",
+  "geode": "4.8.0",
   "gd": {
     "win": "2.2074",
     "android": "2.2074",

src/main.cpp

@@ -1,4 +1,6 @@
 #include <Geode/modify/PauseLayer.hpp>
+#include <Geode/modify/RewardsPage.hpp>
+#include <Geode/modify/ChallengeNode.hpp>
 #include <Geode/binding/ChallengesPage.hpp>
 #include <Geode/binding/MenuLayer.hpp>
 #include <Geode/binding/CCMenuItemSpriteExtra.hpp>
@@ -35,12 +37,43 @@ class $modify(RewardPause, PauseLayer) {
 		auto leftMenu = this->getChildByID("left-button-menu");
 
         auto chest = CCSprite::createWithSpriteFrameName("GJ_dailyRewardBtn_001.png");
+	auto gsm = GameStatsManager::get();
+	if (gsm->m_rewardItems->count() == 0) {
+		GameLevelManager::get()->getGJRewards(0);
+	} else if(chest) {
+		// theres a chance these are backwards
+		auto big = static_cast<GJRewardItem*>(gsm->m_rewardItems->objectForKey(1));
+		auto small = static_cast<GJRewardItem*>(gsm->m_rewardItems->objectForKey(2));
+		if (big && small && (big->m_timeRemaining == 0 || small->m_timeRemaining == 0)) {
+			auto alert = CCSprite::createWithSpriteFrameName("exMark_001.png");
+			if (alert) {
+				alert->setScale(.6f);
+				alert->setID("alert");
+				alert->setPosition(CCPoint{35.f, 35.f});
+				chest->addChild(alert);
+			}
+		}
+	}
         addButton("chests", MenuLayer::onDaily, chest, .65f);
+
         auto quest = CCSprite::create("quests.png"_spr);
+	for (int i = 1; i < 4; i++) {
+		auto c = gsm->getChallenge(i);
+		if(c && c->m_canClaim) {
+			auto alert = CCSprite::createWithSpriteFrameName("exMark_001.png");
+			if (alert) {
+				alert->setScale(.75f);
+				alert->setID("alert");
+				alert->setPosition(CCPoint{40.f, 37.5f});
+				quest->addChild(alert);
+			}
+			break;
+		}
+	}
         addButton("quests", RewardPause::onQuests, quest, .575f);
         auto treasure = CCSprite::createWithSpriteFrameName("chest03_small_001.png");
         addButton("treasure", RewardPause::onTreasureRoom, treasure, .95);
-        auto pathId = GameStatsManager::get()->m_activePath - 29;
+        auto pathId = gsm->m_activePath - 29;
         CCSprite *path;
         if (pathId > 0 && pathId < 11) {
             auto p =  GJPathSprite::create(pathId);
@@ -86,4 +119,55 @@ class $modify(RewardPause, PauseLayer) {
             GameManager::get()->setUGV("5", true);
         }
     }
-};
+};
+
+// indent hell
+class $modify(RewardsPage) {
+	void onClose(CCObject* sender) {
+		RewardsPage::onClose(sender);
+		if (auto pause = CCScene::get()->getChildByType<PauseLayer>(0)) {
+			if (auto btn = pause->getChildByIDRecursive("chests-button"_spr)) {
+				if (auto alert = btn->getChildByIDRecursive("alert")) {
+					auto gsm = GameStatsManager::get();
+					if (gsm->m_rewardItems->count() == 0) return;
+					// theres a chance these are backwards
+					auto big = static_cast<GJRewardItem*>(gsm->m_rewardItems->objectForKey(1));
+					auto small = static_cast<GJRewardItem*>(gsm->m_rewardItems->objectForKey(2));
+					if (big && small && big->m_timeRemaining > 0 && small->m_timeRemaining > 0) {
+						alert->removeFromParent();
+					}
+				}
+			}
+		}
+	}
+};
+
+class $modify(ChallengeNode) {
+	void onClaimReward(CCObject* sender) {
+		auto gsm = GameStatsManager::get();
+		if (auto pause = CCScene::get()->getChildByType<PauseLayer>(0)) {
+			if (auto btn = pause->getChildByIDRecursive("quests-button"_spr)) {
+				if (auto alert = btn->getChildByIDRecursive("alert")) {
+					for (int i = 1; i < 4; i++) {
+						auto c = gsm->getChallenge(i);
+						if(c && c->m_canClaim) return;
+					}
+					alert->removeFromParent();
+				}
+			}
+			auto pos = getPosition() + m_unkPoint;
+			if (this->m_challengesPage && this->m_challengeItem) {
+        			this->m_challengesPage->claimItem(this, this->m_challengeItem, pos);
+    			}
+
+			// play sfx here
+			
+			if (auto node = typeinfo_cast<CCMenuItem*>(sender)) {
+				node->setVisible(false);
+				node->setEnabled(false);
+			}
+		} else {
+			ChallengeNode::onClaimReward(sender);
+		}
+	}
+};