you saw nothing

Author: BlueWitherer

src/hooks/PlayLayer/BlackScreen.cpp

@@ -15,12 +15,9 @@ class $modify(BlackScreenPlayLayer, PlayLayer) {
     void setupHasCompleted() {
         PlayLayer::setupHasCompleted();
 
-        int rnd = randng::get(5);
-        log::info("playlayer init called {}", rnd);
-
         if (m_fields->enabled) {
             // random delay between 0 and 5 seconds
-            float delay = static_cast<float>(rnd);
+            auto delay = randng::get(5.f);
             log::debug("Black screen will appear after {} seconds", delay);
 
             scheduleOnce(schedule_selector(BlackScreenPlayLayer::showBlackScreen), delay);
@@ -34,17 +31,16 @@ class $modify(BlackScreenPlayLayer, PlayLayer) {
             auto const winSize = CCDirector::sharedDirector()->getWinSize();
 
             auto blackScreen = CCScale9Sprite::create("square02_001.png");
+            blackScreen->setID("black_screen"_spr);
             blackScreen->setContentSize({ winSize.width + 10.f, winSize.height + 10.f });
             blackScreen->setPosition(winSize / 2.f);
-            blackScreen->setID("black_screen"_spr);
 
             m_uiLayer->addChild(blackScreen, 99);
 
             // Schedule removal after 0.5 seconds, then schedule to show again after a random delay
-            blackScreen->runAction(CCSequence::create(
+            blackScreen->runAction(CCSequence::createWithTwoActions(
                 CCDelayTime::create(0.25f),
-                CCCallFuncN::create(this, callfuncN_selector(BlackScreenPlayLayer::removeBlackScreen)),
-                nullptr
+                CCCallFuncN::create(this, callfuncN_selector(BlackScreenPlayLayer::removeBlackScreen))
             ));
         };
     };

src/hooks/PlayLayer/Confetti.cpp

@@ -37,7 +37,9 @@ class $modify(ConfettiPlayLayer, PlayLayer) {
 
         this->template addEventListener<OptionEventFilter>(
             [this, f](OptionEvent* ev) {
-                unscheduleAllSelectors();
+                unschedule(schedule_selector(ConfettiPlayLayer::confetti));
+                unschedule(schedule_selector(ConfettiPlayLayer::nextConfetti));
+
                 f->enabled = ev->getToggled();
 
                 if (f->enabled) scheduleOnce(schedule_selector(ConfettiPlayLayer::nextConfetti), randng::get(0.125f));

src/hooks/PlayLayer/Math.cpp

@@ -20,6 +20,19 @@ class $modify(MathPlayLayer, PlayLayer) {
 
         auto f = m_fields.self();
 
+        this->template addEventListener<OptionEventFilter>(
+            [this, f](OptionEvent* ev) {
+                unschedule(schedule_selector(MathPlayLayer::doQuiz));
+
+                f->enabled = ev->getToggled();
+
+                if (f->enabled) scheduleOnce(schedule_selector(MathPlayLayer::doQuiz), randng::get(30.f, 5.f) * chanceToDelayPct(m_fields->chance));
+
+                return ListenerResult::Propagate;
+            },
+            "math_quiz"
+        );
+
         if (f->enabled) nextQuiz();
     };
 

src/hooks/PlayLayer/Motivation.cpp

@@ -107,7 +107,8 @@ class $modify(MotivationPlayLayer, PlayLayer) {
 
         this->template addEventListener<OptionEventFilter>(
             [this, f](OptionEvent* ev) {
-                unscheduleAllSelectors();
+                unschedule(schedule_selector(MotivationPlayLayer::showMessage));
+
                 f->enabled = ev->getToggled();
 
                 if (f->enabled) scheduleOnce(schedule_selector(MotivationPlayLayer::showMessage), randng::get(10.f, 3.f));

src/hooks/PlayLayer/Spam.cpp

@@ -20,6 +20,19 @@ class $modify(SpamPlayLayer, PlayLayer) {
 
         auto f = m_fields.self();
 
+        this->template addEventListener<OptionEventFilter>(
+            [this, f](OptionEvent* ev) {
+                unschedule(schedule_selector(SpamPlayLayer::doSpam));
+
+                f->enabled = ev->getToggled();
+
+                if (f->enabled) scheduleOnce(schedule_selector(SpamPlayLayer::doSpam), randng::get(30.f, 5.f) * chanceToDelayPct(m_fields->chance));
+
+                return ListenerResult::Propagate;
+            },
+            "spam"
+        );
+
         if (f->enabled) nextSpam();
     };