fix stuff

BlueWitherer · BlueWitherer · commit 97f47fa39130 · 2025-12-26T09:15:11.000-05:00
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Disturb the player's accessibility to the gameplay.
 Probably the worst of it all...
 
 > [!WARNING]
-> *Please keep in mind that certain hacks from mod menus may interfere with this mod's functionality.*
+> *Please keep in mind that certain game settings and hacks from mod menus may interfere with parts of this mod's functionality.*
 
 ---
 
diff --git a/about.md b/about.md
@@ -13,7 +13,7 @@ This silly lil' mod adds a mod menu filled to the brim with **over 30 crazy trol
 ### Options
 When <cf>pressing `\` on your keyboard</c> or by <cl>pressing the floating *Horrible Options* button on your screen</c>, a <cg>menu</c> will pop up with <cg>a list of horrible mod options</c> you can <cy>toggle anytime</c> on your game to do some interesting things to your gaming experience. From random mirror portals to game-breaking glitches! You can view more information within the contents of the menu itself.
 
-> ![icon](frame:GJ_infoIcon_001.png?scale=0.5) <cj>*You can customize any keybinds in this mod via the *[Custom Keybinds](mod:geode.custom-keybinds)* mod.*</c>
+> ![ℹ️](frame:GJ_infoIcon_001.png?scale=0.5) <cj>*You can customize any keybinds in this mod via the *[Custom Keybinds](mod:geode.custom-keybinds)* mod.*</c>
 
 #### Player Life
 Give the player a limited health-like meter that must always stay above 0 to prevent the player from dying.
@@ -33,7 +33,7 @@ Disturb the player's accessibility to the gameplay.
 #### Misc
 Probably the worst of it all...
 
-> ![⚠️](frame:geode.loader/info-warning.png?scale=0.375) <cy>*Please keep in mind that certain hacks from mod menus may interfere with this mod's functionality.*</c>
+> ![⚠️](frame:geode.loader/info-warning.png?scale=0.375) <cy>*Please keep in mind that certain game settings and hacks from mod menus may interfere with parts of this mod's functionality.*</c>
 
 ---
 
diff --git a/mod.json b/mod.json
@@ -96,7 +96,7 @@
             "description": "Change the size of the floating button.",
             "default": 1.0,
             "min": 0.5,
-            "max": 3.0,
+            "max": 2.5,
             "control": {
                 "input": true,
                 "slider": true,
diff --git a/src/classes/Randng.hpp b/src/classes/Randng.hpp
@@ -17,7 +17,7 @@ namespace horrible {
             typename T = int,
             typename = std::enable_if_t<std::is_arithmetic_v<T>>
         >
-        inline T get(T max = static_cast<T>(200), T min = static_cast<T>(0)) {
+        inline T get(T max, T min = static_cast<T>(0)) {
             return utils::random::generate<T>(min, max + static_cast<T>(1));
         };
 
@@ -48,7 +48,6 @@ namespace horrible {
             typename = std::enable_if_t<std::is_floating_point_v<F>>
         >
         inline F pc() {
-            // fast<int>() is integral; cast its result to the floating return type
             return static_cast<F>(fast<int>()) / static_cast<F>(100);
         };
     };
diff --git a/src/classes/ui/src/SpamChallenge.cpp b/src/classes/ui/src/SpamChallenge.cpp
@@ -34,7 +34,8 @@ bool SpamChallenge::init() {
 
     setID("spam-jumps"_spr);
 
-    m_impl->m_inputTarget = randng::get(75, 25);
+    // increase spam target for mobile players
+    m_impl->m_inputTarget = randng::get(50, 15) * GEODE_PLATFORM_TARGET & PlatformID::Mobile ? 2 : 1;
 
     auto const winSize = CCDirector::get()->getWinSize();
 
@@ -50,7 +51,8 @@ bool SpamChallenge::init() {
     auto descLabel = CCLabelBMFont::create("Use your mouse button or tap the screen to increase the count.", "chatFont.fnt");
     descLabel->setID("description-label");
     descLabel->setWidth(getScaledContentWidth() - 1.25f);
-    descLabel->setPosition({ winSize.width / 2.f, label->getPositionX() - label->getScaledContentHeight() - 8.75f });
+    descLabel->setPosition({ winSize.width / 2.f, 25.f });
+    descLabel->setAnchorPoint({ 0.5, 0 });
     descLabel->setColor({ 250, 250, 25 });
 
     addChild(descLabel, 1);
@@ -60,8 +62,8 @@ bool SpamChallenge::init() {
     m_impl->m_counter->setScale(2.5f);
     m_impl->m_counter->setPosition({ winSize.width / 2.f, (winSize.height / 2.f) - 6.25f });
 
-    auto moveUp = CCEaseSineInOut::create(CCEaseSineInOut::create(CCMoveBy::create(1.25f, ccp(0, 12.5f))));
-    auto moveDown = CCEaseSineInOut::create(CCEaseSineInOut::create(CCMoveBy::create(1.25f, ccp(0, -12.5f))));
+    auto moveUp = CCEaseSineInOut::create(CCMoveBy::create(1.25f, ccp(0, 12.5f)));
+    auto moveDown = CCEaseSineInOut::create(CCMoveBy::create(1.25f, ccp(0, -12.5f)));
 
     auto seq = CCSequence::createWithTwoActions(moveUp, moveDown);
 
@@ -94,7 +96,7 @@ void SpamChallenge::setCallback(std::function<void(bool)> const& cb) {
 bool SpamChallenge::ccTouchBegan(CCTouch* touch, CCEvent* event) {
     if (m_impl->m_timeRemaining > 0.f && m_impl->m_inputTarget > m_impl->m_inputCount) {
         m_impl->m_inputCount++;
-        if (m_impl->m_counter) m_impl->m_counter->setCString(fmt::format("{} / {}", m_impl->m_inputCount, m_impl->m_inputTarget).data());
+        if (m_impl->m_counter) m_impl->m_counter->setString(fmt::format("{} / {}", m_impl->m_inputCount, m_impl->m_inputTarget).data());
 
         if (m_impl->m_inputCount >= m_impl->m_inputTarget) {
             unscheduleUpdate();
diff --git a/src/hooks/PlayLayer/BlackScreen.cpp b/src/hooks/PlayLayer/BlackScreen.cpp
@@ -19,8 +19,6 @@ class $modify(BlackScreenPlayLayer, PlayLayer) {
         log::info("playlayer init called {}", rnd);
 
         if (m_fields->enabled) {
-            log::debug("black screen enabled, init scheduling black screen");
-
             // random delay between 0 and 5 seconds
             float delay = static_cast<float>(rnd);
             log::debug("Black screen will appear after {} seconds", delay);
@@ -45,11 +43,11 @@ class $modify(BlackScreenPlayLayer, PlayLayer) {
             addChild(blackScreen, 99);
 
             // Schedule removal after 0.5 seconds, then schedule to show again after a random delay
-            blackScreen->runAction(
-                CCSequence::create(
-                    CCDelayTime::create(0.25f),
-                    CCCallFuncN::create(this, callfuncN_selector(BlackScreenPlayLayer::removeBlackScreen)),
-                    nullptr));
+            blackScreen->runAction(CCSequence::create(
+                CCDelayTime::create(0.25f),
+                CCCallFuncN::create(this, callfuncN_selector(BlackScreenPlayLayer::removeBlackScreen)),
+                nullptr
+            ));
         };
     };
 
diff --git a/src/hooks/PlayLayer/Confetti.cpp b/src/hooks/PlayLayer/Confetti.cpp
@@ -32,10 +32,10 @@ class $modify(ConfettiPlayLayer, PlayLayer) {
 
     void setupHasCompleted() {
         PlayLayer::setupHasCompleted();
-        if (m_fields->enabled) nextConfetti();
+        if (m_fields->enabled) scheduleOnce(schedule_selector(ConfettiPlayLayer::nextConfetti), randng::get(0.125f));
     };
 
-    void nextConfetti() {
+    void nextConfetti(float) {
         auto delay = randng::get(10.f, 1.f);
         log::debug("scheduling confetti in {}s", delay);
 
@@ -51,7 +51,7 @@ class $modify(ConfettiPlayLayer, PlayLayer) {
             for (int i = 0; i < randng::get(125, 75); i++) createConfetti();
         };
 
-        nextConfetti();
+        scheduleOnce(schedule_selector(ConfettiPlayLayer::nextConfetti), randng::get(0.125f));;
     };
 
     void createConfetti() {
diff --git a/src/hooks/PlayLayer/Earthquake.cpp b/src/hooks/PlayLayer/Earthquake.cpp
@@ -13,11 +13,11 @@ class $modify(EarthquakePlayLayer, PlayLayer) {
     };
 
     void setupHasCompleted() {
-        if (m_fields->enabled) nextQuake();
+        if (m_fields->enabled) scheduleOnce(schedule_selector(EarthquakePlayLayer::nextQuake), 0.125f);
         PlayLayer::setupHasCompleted();
     };
 
-    void nextQuake() {
+    void nextQuake(float) {
         auto delay = randng::get(3.f, 1.f);
         log::debug("scheduling quake in {}s", delay);
 
@@ -29,12 +29,9 @@ class $modify(EarthquakePlayLayer, PlayLayer) {
             // shake the camera randomly based on intensity
             int rnd = randng::fast();
 
-            auto shakeX = (static_cast<float>(rnd % 25)) * 1.25f;
-            auto shakeY = (static_cast<float>(rnd % 25)) * 1.25f;
-
-            shakeCamera(shakeX, shakeY, 0.1f);
+            shakeCamera(randng::get(5.f, 1.f), randng::get(10.f, 1.f), 0.0125f);
         };
 
-        nextQuake();
+        scheduleOnce(schedule_selector(EarthquakePlayLayer::nextQuake), 0.125f);
     };
 };
diff --git a/src/hooks/PlayLayer/Health.cpp b/src/hooks/PlayLayer/Health.cpp
@@ -85,7 +85,7 @@ class $modify(HealthPlayLayer, PlayLayer) {
                 m_player1->playSpawnEffect();
                 m_player2->playSpawnEffect();
 
-                shakeCamera(1.25f, 5.f, 0.125f);
+                shakeCamera(1.25f, 2.5f, 0.0125f);
 
                 if (m_fields->m_healthLabel) {
                     auto const hp = fmt::format("HP\n{}%", static_cast<int>(m_fields->m_health));
diff --git a/src/hooks/PlayLayer/Motivation.cpp b/src/hooks/PlayLayer/Motivation.cpp
@@ -91,6 +91,12 @@ class $modify(MotivationPlayLayer, PlayLayer) {
             "This is fine.",
             "Still at it, huh?",
             "Nothing beats a Jet2 holiday!",
+            "Beats me...",
+            "Have you ever made an omelette?",
+            "GO!",
+            "Have you made it past 67% yet?",
+            "I think you could use some ASMR.",
+            "You gotta chill...",
         };
     };
 
diff --git a/src/hooks/PlayLayer/RandomMirror.cpp b/src/hooks/PlayLayer/RandomMirror.cpp
@@ -17,7 +17,7 @@ class $modify(RandomMirrorPlayLayer, PlayLayer) {
 
     void setupHasCompleted() {
         PlayLayer::setupHasCompleted();
-        if (m_fields->enabled) scheduleOnce(schedule_selector(RandomMirrorPlayLayer::flipPortal), randng::get(15.f, 3.f) * chanceToDelayPct(m_fields->chance));
+        if (m_fields->enabled) scheduleOnce(schedule_selector(RandomMirrorPlayLayer::nextFlipPortal), 0.125f);
     };
 
     void toggleFlipped(bool p0, bool p1) {
@@ -27,19 +27,15 @@ class $modify(RandomMirrorPlayLayer, PlayLayer) {
         PlayLayer::toggleFlipped(p0, p1);
     };
 
-    void nextFlipPortal() {
+    void nextFlipPortal(float) {
         log::debug("scheduling flip");
         if (m_fields->enabled) scheduleOnce(schedule_selector(RandomMirrorPlayLayer::flipPortal), randng::get(10.f, 1.f) * chanceToDelayPct(m_fields->chance));
     };
 
     void flipPortal(float) {
         if (m_fields->enabled) {
             toggleFlipped(!m_fields->isFlipped, false);
-
-            runAction(CCSequence::createWithTwoActions(
-                CCDelayTime::create(2.5f),
-                CCCallFunc::create(this, callfunc_selector(RandomMirrorPlayLayer::nextFlipPortal))
-            ));
+            scheduleOnce(schedule_selector(RandomMirrorPlayLayer::nextFlipPortal), 2.5f);
         };
     };
 };
diff --git a/src/hooks/PlayerObject/RandomIcon.cpp b/src/hooks/PlayerObject/RandomIcon.cpp
@@ -39,6 +39,7 @@ class $modify(RandomIconPlayerObject, PlayerObject) {
                 int r = randng::get(256);
                 int g = randng::get(256);
                 int b = randng::get(256);
+
                 setColor(ccc3(r, g, b));
                 updatePlayerGlow();
 
diff --git a/src/hooks/PlayerObject/Sleepy.cpp b/src/hooks/PlayerObject/Sleepy.cpp
@@ -26,7 +26,7 @@ class $modify(SleepyPlayerObject, PlayerObject) {
         return true;
     };
 
-    void startSleepTimer() {
+    void startSleepTimer(float) {
         if (m_fields->enabled) scheduleOnce(schedule_selector(SleepyPlayerObject::wakeUpSchedule), randng::get(15.f, 3.f) * chanceToDelayPct(m_fields->chance));
     };
 
@@ -62,7 +62,7 @@ class $modify(SleepyPlayerObject, PlayerObject) {
                 m_fields->savedDefaultSpeed = m_playerSpeed; // capture original speed
                 m_fields->sleepy = true;
 
-                startSleepTimer();
+                scheduleOnce(schedule_selector(SleepyPlayerObject::startSleepTimer), 0.25f);
 
                 // go to sleep, go to sleep, sweet little baby go to sleep
                 schedule(schedule_selector(SleepyPlayerObject::fallAsleep), 0.125f);
diff --git a/src/menu/src/FloatingButton.cpp b/src/menu/src/FloatingButton.cpp
@@ -109,7 +109,7 @@ void FloatingButton::setPosition(CCPoint const& position) {
 
 bool FloatingButton::ccTouchBegan(CCTouch* touch, CCEvent* ev) {
     if (m_impl->m_sprite && isVisible()) {
-        CCPoint touchLocation = convertToNodeSpace(touch->getLocation());
+        CCPoint const touchLocation = convertToNodeSpace(touch->getLocation());
 
         auto box = m_impl->m_sprite->boundingBox();
         if (box.containsPoint(touchLocation)) {
@@ -121,7 +121,7 @@ bool FloatingButton::ccTouchBegan(CCTouch* touch, CCEvent* ev) {
             m_impl->m_isAnimating = true;
             m_impl->m_sprite->runAction(CCSequence::createWithTwoActions(
                 CCSpawn::createWithTwoActions(
-                    CCEaseExponentialOut::create(CCScaleTo::create(0.875f, m_impl->m_scale * 0.875f)),
+                    CCEaseExponentialOut::create(CCScaleTo::create(0.375f, m_impl->m_scale * 0.875f)),
                     CCFadeTo::create(0.25f, 255)
                 ),
                 CCCallFunc::create(this, callfunc_selector(FloatingButton::onScaleEnd)
@@ -136,8 +136,8 @@ bool FloatingButton::ccTouchBegan(CCTouch* touch, CCEvent* ev) {
 
 void FloatingButton::ccTouchMoved(CCTouch* touch, CCEvent* ev) {
     if (m_impl->m_isDragging) {
-        CCPoint touchLocation = touch->getLocation();
-        CCPoint newLocation = ccpAdd(touchLocation, m_impl->m_dragStartPos);
+        CCPoint const touchLocation = touch->getLocation();
+        CCPoint const newLocation = ccpAdd(touchLocation, m_impl->m_dragStartPos);
 
         setPosition(newLocation);
 
diff --git a/src/menu/src/HorribleMenuPopup.cpp b/src/menu/src/HorribleMenuPopup.cpp
@@ -241,7 +241,7 @@ bool HorribleMenuPopup::setup() {
 
     // Set safemode label if active
     if (horribleMod->getSettingValue<bool>("safe-mode")) {
-        safeModeLabel->setCString("Safe Mode ON");
+        safeModeLabel->setString("Safe Mode ON");
         safeModeLabel->setColor({ 0, 255, 0 });
     } else {
         log::warn("Safe mode is inactive");
