tweaks

Author: BlueWitherer

changelog.md

@@ -1,4 +1,6 @@
 # v1.2.2 
+- Tweaked charge-up functionality for *Charged Leap* option
+- Decreased speed multiplier for *Charged Leap* option by `16.7%`
 - Fix visual bug with fading color progress bars
 
 # v1.2.1 

src/Utils.h

@@ -76,8 +76,15 @@ namespace horrible {
         inline constexpr auto chat = "chatFont.fnt";
     };
 
-    namespace fs = asp::fs;                // Shortcut for `asp::fs`
-    namespace str = geode::utils::string;  // Shortcut for `geode::utils::string`
+    namespace fs = asp::fs;  // Shortcut for `asp::fs`
+
+    namespace str {
+        using namespace geode::utils::string;
+
+        inline constexpr auto isOnOff(bool on) {
+            return on ? "ON" : "OFF";
+        };
+    };
 
     namespace popup {
         inline void closeBtnID(CCMenuItemSpriteExtra* btn) {

src/hooks/Flicks.cpp

@@ -45,10 +45,10 @@ class $modify(FlicksPlayLayer, PlayLayer) {
             queueInMainThread([opt]() {
                 if (auto o = opt.lock()) {
                     o->isEnabled() ? o->disable() : o->enable();
-                    log::warn("Flicked option {} {} due to flicks", o->getID(), o->isEnabled() ? "ON" : "OFF");
+                    log::warn("Flicked option {} {} due to flicks", o->getID(), str::isOnOff(o->isEnabled()));
 
                     sfx::play(sfx::file::bad);
-                    Notification::create(fmt::format("Flicked {} ({}) {}", o->getName(), o->getCategory(), o->isEnabled() ? "ON" : "OFF").c_str(), NotificationIcon::Warning, 0.5f)->show();
+                    Notification::create(fmt::format("Flicked {} ({}) {}", o->getName(), o->getCategory(), str::isOnOff(o->isEnabled())).c_str(), NotificationIcon::Warning, 0.5f)->show();
                 };
             });
         };

src/hooks/jumpscares/ForceLevels.cpp

@@ -52,7 +52,7 @@ namespace js_internal {
     };
 
     static void toggleHooks(bool on) {
-        log::trace("Toggling all jumpscare hooks {}", on ? "ON" : "OFF");
+        log::trace("Toggling all jumpscare hooks {}", str::isOnOff(on));
 
         for (auto& hook : g_jsHookVector) {
             if (auto h = hook.lock()) (void)h->toggle(on);

src/hooks/mechanics/Leap.cpp

@@ -63,7 +63,7 @@ class $modify(LeapGJBaseGameLayer, GJBaseGameLayer) {
         if (down) {
             f->charge = 0.f;
 
-            schedule(schedule_selector(LeapGJBaseGameLayer::chargeUp), 0.125f);
+            schedule(schedule_selector(LeapGJBaseGameLayer::chargeUp), 0.1f);
             if (f->chargeMeter) f->chargeMeter->setVisible(true);
         } else {
             unschedule(schedule_selector(LeapGJBaseGameLayer::chargeUp));
@@ -83,7 +83,7 @@ class $modify(LeapGJBaseGameLayer, GJBaseGameLayer) {
 
             auto pct = f->charge / 100.f;
 
-            auto newSpeed = (f->speed * 3.f) * pct;
+            auto newSpeed = (f->speed * 2.5f) * pct;
             auto boostHeight = 16.25f * pct;
 
             m_player1->m_playerSpeed = newSpeed;
@@ -123,7 +123,7 @@ class $modify(LeapGJBaseGameLayer, GJBaseGameLayer) {
             unschedule(schedule_selector(LeapGJBaseGameLayer::chargeUp));
         };
 
-        f->charge += 16.25f;
+        f->charge += 20.f;
 
         if (f->chargeMeter) {
             f->chargeMeter->updateProgress(f->charge);

src/main.cpp

@@ -34,7 +34,7 @@ namespace main {
     static void toggleSafeModeHooks(bool value) {
         for (auto const& hook : g_safeModeHooks) {
             if (auto h = hook.lock()) {
-                log::trace("Toggling safe mode hook '{}' {}...", h->getDisplayName(), value ? "ON" : "OFF");
+                log::trace("Toggling safe mode hook '{}' {}...", h->getDisplayName(), str::isOnOff(value));
                 (void)h->toggle(value);
             };
         };
@@ -89,7 +89,7 @@ namespace main {
 
             for (auto const& hook : g_floatingBtnHooks) {
                 if (auto h = hook.lock()) {
-                    log::trace("Toggling floating button hook '{}' {}...", h->getDisplayName(), value ? "ON" : "OFF");
+                    log::trace("Toggling floating button hook '{}' {}...", h->getDisplayName(), str::isOnOff(value));
                     (void)h->toggle(value);
                 };
             };
@@ -184,7 +184,7 @@ namespace main {
     OptionCheatingEvent()
         .listen([](bool cheating) {
             if (mod->getSettingValue<bool>(setting::DynamicSafeMode)) {
-                log::warn("Dynamic safe mode is now {}", cheating ? "ON" : "OFF");
+                log::warn("Dynamic safe mode is now {}", str::isOnOff(cheating));
                 main::toggleSafeModeHooks(cheating);
             };
         })