nerf some stuff

Author: BlueWitherer

src/Utils.h

@@ -30,7 +30,7 @@
 // Additional utility methods for Horrible Menu
 namespace horrible {
     // Pointer to this Geode mod
-    inline static Mod* thisMod = geode::Mod::get();
+    inline static Mod* mod = geode::Mod::get();
 
     /**
      * Convert a chance setting number to a cooldown percentage decimal
@@ -87,6 +87,11 @@ namespace horrible {
         inline constexpr auto misc = "Misc";
     };
 
+    // got tired of typing {0.5, 0.5} a billion times
+    namespace anchor {
+        inline constexpr cocos2d::CCPoint center = {0.5f, 0.5f};
+    };
+
     // All namespace includes
     namespace prelude {
         using namespace ::horrible;

src/hooks/Mock.cpp

@@ -36,7 +36,7 @@ class $modify(MockMenuLayer, MenuLayer) {
         log::trace("mock chance {}", rnd);
 
         if (rnd <= f->chance) {
-            auto const mockConfigPath = fmt::format("{}\\mock.json", thisMod->getSaveDir());
+            auto const mockConfigPath = fmt::format("{}\\mock.json", mod->getSaveDir());
             auto const mockConfig = file::readJson(fs::path(mockConfigPath));
 
             log::trace("Reading path {}...", mockConfigPath);
@@ -55,14 +55,14 @@ class $modify(MockMenuLayer, MenuLayer) {
                 if (!id.empty()) {
                     log::trace("ID {} with percentage {} is valid", id, percent);
 
-                    auto const pngPath = fmt::format("{}\\{}.png", thisMod->getSaveDir(), id);
+                    auto const pngPath = fmt::format("{}\\{}.png", mod->getSaveDir(), id);
 
                     log::info("Displaying {}", pngPath);
 
                     auto ss = LazySprite::create({192.f, 108.f});
                     ss->setID("mocked"_spr);
                     ss->setScale(0.25);
-                    ss->setAnchorPoint({0.5, 0.5});
+                    ss->setAnchorPoint(anchor::center);
                     ss->setPosition({-192.f, getScaledContentHeight() / 2.f});
 
                     ss->setLoadCallback([self = WeakRef(this), screenshot = WeakRef(ss), percent, rnd](Result<> res) {
@@ -150,10 +150,10 @@ class $modify(MockPlayLayer, PlayLayer) {
             renderTexture->end();
 
             if (auto image = renderTexture->newCCImage()) {
-                auto const path = fmt::format("{}\\{}.png", thisMod->getSaveDir(), id);
+                auto const path = fmt::format("{}\\{}.png", mod->getSaveDir(), id);
 
                 if (image->saveToFile(path.c_str(), false)) {
-                    auto const mockConfigPath = fmt::format("{}\\mock.json", thisMod->getSaveDir());
+                    auto const mockConfigPath = fmt::format("{}\\mock.json", mod->getSaveDir());
                     auto const mockConfig = file::readJson(fs::path(mockConfigPath));  // get the saved fails to mock the player with :)
 
                     auto toWrite = matjson::Value();  // what we're gonna write in the mock.json file
@@ -198,7 +198,7 @@ class $modify(MockPlayLayer, PlayLayer) {
         int id = m_level->m_levelID;
         int percentage = m_level->m_normalPercent;
 
-        auto const mockConfigPath = fmt::format("{}\\mock.json", thisMod->getSaveDir());
+        auto const mockConfigPath = fmt::format("{}\\mock.json", mod->getSaveDir());
         auto const mockConfig = file::readJson(fs::path(mockConfigPath));  // get the saved levels to mock the player :)
 
         if (mockConfig.isOk()) {

src/hooks/obstructive/BlackScreen.cpp

@@ -34,23 +34,25 @@ class $modify(BlackScreenPlayLayer, PlayLayer) {
 
         auto const winSize = CCDirector::sharedDirector()->getWinSize();
 
-        auto blackScreen = NineSlice::create("square02_001.png");
+        auto blackScreen = CCLayerColor::create();
         blackScreen->setID("blink"_spr);
-        blackScreen->setContentSize({winSize.width + 10.f, winSize.height + 10.f});
+        blackScreen->setColor(colors::black);
+        blackScreen->setAnchorPoint(anchor::center);
+        blackScreen->setContentSize(winSize);
         blackScreen->setPosition(winSize / 2.f);
 
         m_uiLayer->addChild(blackScreen, 99);
 
         // Schedule removal after 0.5 seconds, then schedule to show again after a random delay
         blackScreen->runAction(CCSequence::createWithTwoActions(
-            CCDelayTime::create(0.25f),
+            CCDelayTime::create(randng::get(0.25f, 0.125f)),
             CCCallFuncN::create(this, callfuncN_selector(BlackScreenPlayLayer::removeBlackScreen))));
     };
 
     void removeBlackScreen(CCNode* sender) {
         cue::resetNode(sender);
 
-        float delay = randng::get(3.f);  // random delay between 0 and 3 seconds
+        auto delay = randng::get(3.75f);
         log::debug("Black screen will appear again after {} seconds", delay);
 
         scheduleOnce(schedule_selector(BlackScreenPlayLayer::showBlackScreen), delay);

src/hooks/obstructive/Confetti.cpp

@@ -39,12 +39,11 @@ class $modify(ConfettiPlayLayer, PlayLayer) {
 
     void setupHasCompleted() {
         PlayLayer::setupHasCompleted();
-
         scheduleOnce(schedule_selector(ConfettiPlayLayer::nextConfetti), randng::get(0.125f));
     };
 
     void nextConfetti(float) {
-        auto delay = randng::get(10.f, 1.f);
+        auto delay = randng::get(8.75f, 1.25f);
         log::trace("scheduling confetti in {}s", delay);
 
         scheduleOnce(schedule_selector(ConfettiPlayLayer::confetti), delay);

src/hooks/obstructive/Earthquake.cpp

@@ -25,7 +25,7 @@ class $modify(EarthquakePlayLayer, PlayLayer) {
     };
 
     void nextQuake(float) {
-        auto delay = randng::get(5.f, 1.f);
+        auto delay = randng::get(3.75f, 1.25f);
         log::trace("scheduling quake in {}s", delay);
 
         scheduleOnce(schedule_selector(EarthquakePlayLayer::quake), delay);
@@ -35,7 +35,7 @@ class $modify(EarthquakePlayLayer, PlayLayer) {
         // shake the camera randomly based on intensity
         auto rnd = randng::fast();
 
-        shakeCamera(randng::get(5.f, 1.f), randng::get(10.f, 1.f), 0.00125f);
+        shakeCamera(randng::get(2.5f, 1.f), randng::get(5.f, 1.f), 0.00125f);
 
         scheduleOnce(schedule_selector(EarthquakePlayLayer::nextQuake), 0.125f);
     };

src/hooks/obstructive/Friends.cpp

@@ -57,8 +57,6 @@ class $modify(FriendsPlayLayer, PlayLayer) {
         auto rA = randng::pc();
         auto rB = randng::pc();
 
-        log::trace("friend starts at height percent {} and ends at {}", rA, rB);
-
         auto yA = uiSize.height * rA;  // starting height pos
         auto yB = uiSize.height * rB;  // ending height pos
 

src/hooks/playerlife/Health.cpp

@@ -37,7 +37,7 @@ class $modify(HealthPlayLayer, PlayLayer) {
             f->m_healthBar = ProgressBar::create();
             f->m_healthBar->setID("health-bar"_spr);
             f->m_healthBar->setFillColor(colors::red);
-            f->m_healthBar->setAnchorPoint({0.5f, 0.5f});
+            f->m_healthBar->setAnchorPoint(anchor::center);
             f->m_healthBar->setPosition({10.f, getScaledContentHeight() / 2.f});
             f->m_healthBar->setRotation(-90.f);
 

src/hooks/playerlife/Oxygen.cpp

@@ -43,7 +43,7 @@ class $modify(OxygenPlayLayer, PlayLayer) {
             f->m_oxygenBar = ProgressBar::create();
             f->m_oxygenBar->setID("oxygen-bar"_spr);
             f->m_oxygenBar->setFillColor(colors::cyan);
-            f->m_oxygenBar->setAnchorPoint({0.5f, 0.5f});
+            f->m_oxygenBar->setAnchorPoint(anchor::center);
             f->m_oxygenBar->setPosition({10.f, getScaledContentHeight() / 2.f});
             f->m_oxygenBar->setRotation(-90.f);
 

src/hooks/randoms/Freeze.cpp

@@ -26,7 +26,7 @@ class $modify(FreezeMenuLayer, MenuLayer) {
         if (auto gm = GameManager::sharedState()) {
             // get and store user current fps
             float currentFPS = gm->m_customFPSTarget;
-            (void)thisMod->setSavedValue<float>("fps", currentFPS);
+            (void)mod->setSavedValue<float>("fps", currentFPS);
 
             log::debug("Stored current FPS: {}", currentFPS);
         };
@@ -62,7 +62,7 @@ class $modify(FreezePlayLayer, PlayLayer) {
         // default to user old fps
         auto gm = GameManager::sharedState();
 
-        float oldFPS = thisMod->getSavedValue<float>("fps");
+        float oldFPS = mod->getSavedValue<float>("fps");
 
         gm->setGameVariable("0116", true);
 
@@ -114,7 +114,7 @@ class $modify(FreezePlayLayer, PlayLayer) {
 
             gm->setGameVariable("0116", true);
 
-            auto oldFPS = thisMod->getSavedValue<float>("fps");
+            auto oldFPS = mod->getSavedValue<float>("fps");
 
             // Use seconds per frame, not raw FPS
             auto interval = (oldFPS > 10.f) ? (1.f / oldFPS) : (1.f / 60.f);  // minimum 10 FPS

src/main.cpp

@@ -20,7 +20,7 @@ static std::vector<std::weak_ptr<Hook>> s_floatingBtnHooks;
 #define HORRIBLE_HOOK_INTERNAL(hookVector, settingId)                                  \
     static void onModify(auto& self) {                                                 \
         utils::StringMap<std::shared_ptr<Hook>>& hooks = self.m_hooks;                 \
-        auto enable = thisMod->getSettingValue<bool>(settingId);                       \
+        auto enable = mod->getSettingValue<bool>(settingId);                           \
                                                                                        \
         for (auto& hook : hooks | std::views::values) {                                \
             hook->setAutoEnable(enable);                                               \
@@ -33,7 +33,7 @@ static std::vector<std::weak_ptr<Hook>> s_floatingBtnHooks;
     }
 
 $on_game(Loaded) {
-    (void)thisMod->registerCustomSettingType("menu", &HorribleSettingV3::parse);
+    (void)mod->registerCustomSettingType("menu", &HorribleSettingV3::parse);
 
     if (auto om = OverlayManager::get()) {
         if (auto fb = MenuButton::get()) om->addChild(fb);
@@ -139,7 +139,7 @@ class $modify(HIFloatBtnPauseLayer, PauseLayer) {
     HORRIBLE_HOOK_INTERNAL(s_floatingBtnHooks, setting::FloatingBtn);
 
     void customSetup() {
-        auto toggle = thisMod->getSettingValue<bool>(setting::FloatingBtn);
+        auto toggle = mod->getSettingValue<bool>(setting::FloatingBtn);
 
         log::trace("{} floating button", toggle ? "Showing" : "Hiding");
         if (auto fb = MenuButton::get()) {
@@ -183,7 +183,7 @@ class $modify(HIFloatBtnPlayLayer, PlayLayer) {
         log::trace("{} floating button", toggle ? "Showing" : "Hiding");
 
         if (auto fb = MenuButton::get()) {
-            auto toggleTo = thisMod->getSettingValue<bool>(setting::FloatingBtn) && (fb->showInLevel() || toggle);
+            auto toggleTo = mod->getSettingValue<bool>(setting::FloatingBtn) && (fb->showInLevel() || toggle);
 
             fb->setVisible(toggleTo);
             fb->setTouchEnabled(toggleTo);