soam challange

Author: BlueWitherer

mod.json

@@ -233,6 +233,23 @@
                 "big-arrow-step": 20
             }
         },
+        "spam-chance": {
+            "type": "int",
+            "name": "Spam Challenge Chance",
+            "description": "<cj>Spam Challenge!</c> - Chance of the spam challenge appearing.",
+            "default": 50,
+            "min": 0,
+            "max": 100,
+            "control": {
+                "input": true,
+                "slider": true,
+                "slider-step": 1,
+                "arrows": true,
+                "arrow-step": 10,
+                "big-arrows": true,
+                "big-arrow-step": 20
+            }
+        },
         "achieve-chance": {
             "type": "int",
             "name": "Achievement Sound Chance",

src/Keybinds.cpp

@@ -1,13 +1,12 @@
+#if !defined(GEODE_IS_IOS)
 #include <Utils.hpp>
 
 #include <Geode/Geode.hpp>
 
-using namespace geode::prelude;
-using namespace horrible;
-
-#if !defined(GEODE_IS_IOS)
 #include <geode.custom-keybinds/include/Keybinds.hpp>
 
+using namespace geode::prelude;
+using namespace horrible;
 using namespace keybinds;
 
 $execute{

src/Utils.hpp

@@ -12,8 +12,8 @@
 #include <classes/Randng.hpp>
 
 #include <classes/ui/MathQuiz.hpp>
-#include <classes/ui/RandomAdPopup.hpp>
-#include <classes/ui/SpamJumps.hpp>
+#include <classes/ui/RandomAd.hpp>
+#include <classes/ui/SpamChallenge.hpp>
 
 using namespace geode::prelude;
 
@@ -72,7 +72,7 @@ namespace horrible {
          SillyTier::High},
         {"math_quiz",
          "Richard's Math Quiz!",
-         "When playing a level in practice mode, there's a chance Richard will pop out and give you a quick math quiz. Answer correctly to continue, or restart the level from the beginning.\n<cy>Credit: CyanBoi</c>",
+         "When playing a level in Practice mode, there's a chance Richard will pop out and give you a quick math quiz. Answer correctly to continue, or restart the level from the beginning.\n<cy>Credit: CyanBoi</c>",
          category::obstructive,
          SillyTier::High},
         {"mock",
@@ -89,8 +89,8 @@ namespace horrible {
          category::randoms,
          SillyTier::Medium},
         {"spam",
-         "Spam Jumps!",
-         "Forces you to spam an input sometimes while playing a level.\n<cy>Credit: Cheeseworks</c>",
+         "Spam Challenge!",
+         "Sometimes forces a challenge on you to mercilessly spam an input sometimes while playing a level in Normal mode.\n<cy>Credit: Cheeseworks</c>",
          category::obstructive,
          SillyTier::High},
         {"achieve",

src/classes/ui/MathQuiz.hpp

@@ -36,8 +36,8 @@ namespace horrible {
     public:
         static MathQuiz* create();
 
-        void setCallback(std::function<void(bool)> cb);
-        void setWasCorrectFlag(bool v);
+        void setCallback(std::function<void(bool)> const& cb);
+        void setCorrect(bool v);
 
         void closePopup();
     };

src/classes/ui/RandomAdPopup.hpp src/classes/ui/RandomAd.hppsrc/classes/ui/RandomAdPopup.hpp renamed to src/classes/ui/RandomAd.hpp

@@ -6,13 +6,13 @@ using namespace geode::prelude;
 
 namespace horrible {
     // Popup that displays a random level thumbnail
-    class RandomAdPopup : public Popup<> {
+    class RandomAd : public Popup<> {
     protected:
         void onPlayBtn(CCObject*);
 
         bool setup() override;
 
     public:
-        static RandomAdPopup* create();
+        static RandomAd* create();
     };
 };

src/classes/ui/SpamChallenge.hpp

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <Geode/Geode.hpp>
+
+using namespace geode::prelude;
+
+namespace horrible {
+    class SpamChallenge : public CCBlockLayer, public FLAlertLayerProtocol {
+    private:
+        class Impl;
+        std::unique_ptr<Impl> m_impl;
+
+    protected:
+        SpamChallenge();
+        virtual ~SpamChallenge();
+
+        void closeAfterFeedback(float);
+        void setSuccess(bool v);
+
+        void keyBackClicked() override;
+        void update(float dt) override;
+
+        bool init() override;
+
+    public:
+        static SpamChallenge* create();
+
+        bool ccTouchBegan(CCTouch* touch, CCEvent* event) override;
+
+        void setCallback(std::function<void(bool)> const& cb);
+    };
+};