the modify cast update

Author: BlueWitherer

CMakeLists.txt

@@ -8,7 +8,7 @@ else()
 endif()
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
-project(HorribleMenu VERSION 1.2.2)
+project(HorribleMenu VERSION 1.2.3)
 
 file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS src/*.cpp)
 add_library(${PROJECT_NAME} SHARED ${SOURCES})

changelog.md

@@ -1,3 +1,10 @@
+# v1.2.3 
+- Rework game modification internals to allow safer option toggling mid-level
+  - This should reduce crash issues with *Flicks* option
+- Fix jump boost not working for *Ending Gamble*, *Charged Leap*, and *Super Jump* options while the player's gravity is upside-down
+- Lowered cooldown range for *Blinking Icon* option
+- Several other fixes
+
 # v1.2.2 
 - Tweaked charge-up flow for *Charged Leap* option
 - Decreased speed multiplier for *Charged Leap* option by `16.7%`

src/Utils.h

@@ -32,6 +32,20 @@
 
 #define HIGHEST_Z cocos2d::CCScene::get()->getHighestChildZ() + 1
 
+#define HORRIBLE_MODIFY_EVENT_HANDLER(Base, Derived)                                                  \
+    listenForHorribleOptionChanges(                                                                   \
+        THIS_ID,                                                                                      \
+        [](HorribleOptionSave data) {                                                                 \
+            if (auto b = Base::get()) modify_cast<Derived*>(b)->setupHorribleInterface(data.enabled); \
+        })
+
+#define HORRIBLE_TOGGLE_MODIFY(Base, Derived)         \
+    $on_mod(Loaded) {                                 \
+        HORRIBLE_MODIFY_EVENT_HANDLER(Base, Derived); \
+    }
+
+#define HORRIBLE_SETUP_INTERFACE_FUNC void setupHorribleInterface(bool on = true)
+
 // Additional utility methods for Horrible Menu
 namespace horrible {
     // Pointer to this Geode mod

src/hooks/Gambler.cpp

@@ -24,39 +24,31 @@ class $modify(GamblerPlayLayer, PlayLayer) {
         bool triggered = false;
     };
 
+    HORRIBLE_SETUP_INTERFACE_FUNC {
+        if (!on) {
+            unschedule(schedule_selector(GamblerPlayLayer::gamblerCheck));
+
+            return;
+        };
+
+        schedule(schedule_selector(GamblerPlayLayer::gamblerCheck), 0.125f);
+    };
+
     bool init(GJGameLevel* level, bool useReplay, bool dontCreateObjects) {
         if (!PlayLayer::init(level, useReplay, dontCreateObjects)) return false;
 
-        // check every frame so we can detect each percentage change
-        if (!m_fields->triggered) schedule(schedule_selector(GamblerPlayLayer::gamblerCheck), 0.125f);
+        setupHorribleInterface();
 
         return true;
     };
 
-    // ensure that triggered is reset on level restart/full reset
     void fullReset() {
         PlayLayer::fullReset();
-        m_fields->triggered = false;
+        schedule(schedule_selector(GamblerPlayLayer::gamblerCheck), 0.125f);
         log::trace("gambler full reset");
     };
 
-    void resetLevel() {
-        PlayLayer::resetLevel();
-        m_fields->triggered = false;
-        log::trace("gambler level reset");
-    };
-
-    void resetLevelFromStart() {
-        PlayLayer::resetLevelFromStart();
-        m_fields->triggered = false;
-        log::trace("gambler level reset from start");
-    };
-
     void gamblerCheck(float) {
-        auto f = m_fields.self();
-
-        if (f->triggered) return;
-
         // detect the moment the player first reaches or crosses 95
         if (getCurrentPercentInt() >= 95) {
             if (rng::flip()) {
@@ -68,8 +60,8 @@ class $modify(GamblerPlayLayer, PlayLayer) {
                 m_player1->reversePlayer(nullptr);
                 m_player2->reversePlayer(nullptr);
 
-                m_player1->boostPlayer(rng::get(12.5f, 8.75f));
-                m_player2->boostPlayer(rng::get(12.5f, 8.75f));
+                m_player1->boostPlayer(rng::get(12.5f, 8.75f) * (m_player1->m_isUpsideDown ? -1.f : 1.f));
+                m_player2->boostPlayer(rng::get(12.5f, 8.75f) * (m_player2->m_isUpsideDown ? -1.f : 1.f));
             } else {
                 log::info("Gambler won the bet! instant win.");
 
@@ -79,8 +71,9 @@ class $modify(GamblerPlayLayer, PlayLayer) {
                 levelComplete();
             };
 
-            f->triggered = true;
             unschedule(schedule_selector(GamblerPlayLayer::gamblerCheck));
         };
     };
-};
+};
+
+HORRIBLE_TOGGLE_MODIFY(PlayLayer, GamblerPlayLayer);

src/hooks/Sticky.cpp

@@ -23,26 +23,32 @@ class $modify(StickyPlayerObject, PlayerObject) {
     struct Fields final {
         uint8_t chance = options::getChance(THIS_ID);
 
-        float m_defSpeed = 0.f;
+        float defSpeed = 0.f;
 
-        CCLabelBMFont* m_clickLabel = nullptr;
+        CCLabelBMFont* clickLabel = nullptr;
 
-        bool m_onGround = true;
+        bool onGround = true;
     };
 
-    bool init(int player, int ship, GJBaseGameLayer* gameLayer, CCLayer* layer, bool playLayer) {
-        if (!PlayerObject::init(player, ship, gameLayer, layer, playLayer)) return false;
-
+    HORRIBLE_SETUP_INTERFACE_FUNC {
         auto f = m_fields.self();
 
-        if (auto pl = PlayLayer::get()) {
-            f->m_clickLabel = CCLabelBMFont::create("Press again to un-stick!", font::big, pl->getScaledContentWidth() - 12.5f);
-            f->m_clickLabel->setID("sticky-alert"_spr);
-            f->m_clickLabel->setScale(0.625f);
-            f->m_clickLabel->setAlignment(kCCTextAlignmentCenter);
-            f->m_clickLabel->setAnchorPoint({0.5, 0});
-            f->m_clickLabel->setPosition({pl->getScaledContentWidth() / 2.f, 25.f});
-            f->m_clickLabel->setVisible(false);
+        if (!on) {
+            cue::resetNode(f->clickLabel);
+
+            m_playerSpeed = f->defSpeed;
+
+            return;
+        };
+
+        if (auto pl = PlayLayer::get(); pl && !f->clickLabel && !m_isSecondPlayer) {
+            f->clickLabel = CCLabelBMFont::create("Press again to un-stick!", font::big, pl->getScaledContentWidth() - 12.5f);
+            f->clickLabel->setID("sticky-alert"_spr);
+            f->clickLabel->setScale(0.625f);
+            f->clickLabel->setAlignment(kCCTextAlignmentCenter);
+            f->clickLabel->setAnchorPoint({0.5, 0});
+            f->clickLabel->setPosition({pl->getScaledContentWidth() / 2.f, 25.f});
+            f->clickLabel->setVisible(m_playerSpeed <= 0.f);
 
             auto seq = CCSequence::create(
                 CCCallFuncN::create(this, callfuncN_selector(StickyPlayerObject::stickyCol1)),
@@ -51,11 +57,19 @@ class $modify(StickyPlayerObject, PlayerObject) {
                 CCDelayTime::create(0.125f),
                 nullptr);
 
-            pl->m_uiLayer->addChild(f->m_clickLabel, HIGHEST_Z);
-            f->m_clickLabel->runAction(CCRepeatForever::create(seq));
+            pl->m_uiLayer->addChild(f->clickLabel, HIGHEST_Z);
+            f->clickLabel->runAction(CCRepeatForever::create(seq));
         };
+    };
+
+    bool init(int player, int ship, GJBaseGameLayer* gameLayer, CCLayer* layer, bool playLayer) {
+        if (!PlayerObject::init(player, ship, gameLayer, layer, playLayer)) return false;
+
+        if (playLayer) {
+            m_fields->onGround = onGround();
 
-        f->m_onGround = onGround();
+            setupHorribleInterface();
+        };
 
         return true;
     };
@@ -78,21 +92,21 @@ class $modify(StickyPlayerObject, PlayerObject) {
 
         auto f = m_fields.self();
 
-        auto wasOnGround = f->m_onGround;
+        auto wasOnGround = f->onGround;
         PlayerObject::hitGround(object, notFlipped);
         auto nowOnGround = onGround();
 
         if (m_hasEverJumped) {
             if (nowOnGround && !wasOnGround) {
                 if (rng::fast() < f->chance) {
-                    f->m_defSpeed = m_playerSpeed;
+                    f->defSpeed = m_playerSpeed;
                     m_playerSpeed = 0.f;
 
-                    if (f->m_clickLabel) f->m_clickLabel->setVisible(true);
+                    if (f->clickLabel) f->clickLabel->setVisible(true);
                 };
             };
 
-            f->m_onGround = nowOnGround;
+            f->onGround = nowOnGround;
         };
     };
 
@@ -101,13 +115,21 @@ class $modify(StickyPlayerObject, PlayerObject) {
 
         auto f = m_fields.self();
 
-        if (m_playerSpeed <= 0.f && f->m_onGround) {
-            m_playerSpeed = f->m_defSpeed;
-            if (f->m_clickLabel) f->m_clickLabel->setVisible(false);
+        if (m_playerSpeed <= 0.f && f->onGround) {
+            m_playerSpeed = f->defSpeed;
+            if (f->clickLabel) f->clickLabel->setVisible(false);
         };
 
-        f->m_onGround = onGround();
+        f->onGround = onGround();
 
         return true;
     };
+};
+
+$on_mod(Loaded) {
+    listenForHorribleOptionChanges(
+        THIS_ID,
+        [](HorribleOptionSave data) {
+            if (auto pl = PlayLayer::get()) modify_cast<StickyPlayerObject*>(pl->m_player1)->setupHorribleInterface(data.enabled);
+        });
 };

src/hooks/chances/CrashGame.cpp

@@ -33,7 +33,7 @@ class $modify(CrashGamePlayLayer, PlayLayer) {
             log::warn("ur game crash hehehehehehehe");
 
             PlayLayer::destroyPlayer(p0, p1);
-            game::exit(true);  // saves data
+            game::exit(true);  // saves data mrrp
         };
 
         PlayLayer::destroyPlayer(p0, p1);

src/hooks/chances/Pause.cpp

@@ -17,25 +17,37 @@ static auto const o = Option::create(THIS_ID)
                           ->setCheating(true)
                           ->autoRegister();
 
-class $modify(PausePlayerObject, PlayLayer) {
+class $modify(PausePlayLayer, PlayLayer) {
     HORRIBLE_DELEGATE_HOOKS(THIS_ID);
 
     struct Fields final {
         uint8_t chance = options::getChance(THIS_ID);
     };
 
+    HORRIBLE_SETUP_INTERFACE_FUNC {
+        if (!on) {
+            unschedule(schedule_selector(PausePlayLayer::pause));
+
+            return;
+        };
+
+        nextPause();
+    };
+
     void setupHasCompleted() {
         PlayLayer::setupHasCompleted();
-        nextPause();
+        setupHorribleInterface();
     };
 
     void nextPause() {
         log::trace("scheduling pause");
-        scheduleOnce(schedule_selector(PausePlayerObject::pause), rng::get(15.f, 3.f) * chanceToDelayPct(m_fields->chance));
+        scheduleOnce(schedule_selector(PausePlayLayer::pause), rng::get(15.f, 3.f) * chanceToDelayPct(m_fields->chance));
     };
 
     void pause(float) {
         nextPause();
         pauseGame(true);
     };
-};
+};
+
+HORRIBLE_TOGGLE_MODIFY(PlayLayer, PausePlayLayer);

src/hooks/chances/RandomMirror.cpp

@@ -25,9 +25,20 @@ class $modify(RandomMirrorPlayLayer, PlayLayer) {
         bool isFlipped = false;
     };
 
+    HORRIBLE_SETUP_INTERFACE_FUNC {
+        if (!on) {
+            unschedule(schedule_selector(RandomMirrorPlayLayer::nextFlipPortal));
+            unschedule(schedule_selector(RandomMirrorPlayLayer::flipPortal));
+
+            return;
+        };
+
+        scheduleOnce(schedule_selector(RandomMirrorPlayLayer::nextFlipPortal), 0.125f);
+    };
+
     void setupHasCompleted() {
         PlayLayer::setupHasCompleted();
-        scheduleOnce(schedule_selector(RandomMirrorPlayLayer::nextFlipPortal), 0.125f);
+        setupHorribleInterface();
     };
 
     void toggleFlipped(bool p0, bool p1) {
@@ -45,9 +56,9 @@ class $modify(RandomMirrorPlayLayer, PlayLayer) {
     };
 
     void flipPortal(float) {
-        auto f = m_fields.self();
-
-        toggleFlipped(!f->isFlipped, false);
+        toggleFlipped(!m_fields->isFlipped, false);
         scheduleOnce(schedule_selector(RandomMirrorPlayLayer::nextFlipPortal), 2.5f);
     };
-};
+};
+
+HORRIBLE_TOGGLE_MODIFY(PlayLayer, RandomMirrorPlayLayer);

src/hooks/mechanics/DoubleJump.cpp

@@ -27,6 +27,8 @@ class $modify(DoubleJumpPlayerObject, PlayerObject) {
     };
 
     bool pushButton(PlayerButton p0) {
+        if (!m_gameLayer) return PlayerObject::pushButton(p0);
+
         auto f = m_fields.self();
 
         if (p0 == PlayerButton::Jump) {