optimizations + new option

Author: BlueWitherer

src/Utils.h

@@ -5,7 +5,6 @@
 
 #include <util/Cursor.hpp>
 #include <util/Jumpscares.hpp>
-#include <util/Menu.hpp>
 #include <util/Options.hpp>
 #include <util/Randng.hpp>
 #include <util/Themes.hpp>

src/hooks/InverseInput.cpp

@@ -0,0 +1,35 @@
+#include <Utils.h>
+
+#include <Geode/Geode.hpp>
+
+#include <Geode/modify/GJBaseGameLayer.hpp>
+
+using namespace geode::prelude;
+using namespace horrible::prelude;
+
+#define THIS_ID "inverse_input"
+
+static auto const o = Option::create(THIS_ID)
+                          ->setName("Inversed Inputs")
+                          ->setDescription("You jump while you're not holding the button, and don't jump while you hold the button. In platformer, movement inputs are switched with each other.\n<cl>suggested by ItsZentry</c>")
+                          ->setCategory(category::misc)
+                          ->setSillyTier(SillyTier::Low)
+                          ->autoRegister();
+
+class $modify(InverseInputGJBaseGameLayer, GJBaseGameLayer) {
+    HORRIBLE_DELEGATE_HOOKS(THIS_ID);
+
+    void handleButton(bool down, int button, bool isPlayer1) {
+        if (!m_isPlatformer) return GJBaseGameLayer::handleButton(!down, button, isPlayer1);
+
+        switch (button) {
+            default: [[fallthrough]];  // who nose
+
+            case 1: down = !down; break;
+            case 2: button = 3; break;  // left -> right
+            case 3: button = 2; break;  // right -> left
+        };
+
+        GJBaseGameLayer::handleButton(down, button, isPlayer1);
+    };
+};

src/hooks/randoms/Gravity.cpp

@@ -27,7 +27,7 @@ class $modify(GravityPlayerObject, PlayerObject) {
     void updateJump(float p0) {
         auto f = m_fields.self();
 
-        float newGrav = std::round(randng::pc() * (2.5f) * 100.f) / 100.f;
+        auto newGrav = std::round(randng::pc() * (2.5f) * 100.f) / 100.f;
         auto onGrnd = m_isOnGround || m_isOnGround2 || m_isOnGround3 || m_isOnGround4;
 
         // Only set gravity if on flat ground (not on a slope) and not rotating

src/main.cpp

@@ -2,6 +2,7 @@
 
 #include <ranges>
 
+#include <ui/Menu.h>
 #include <ui/MenuButton.h>
 #include <ui/SettingV3.h>
 
@@ -33,7 +34,10 @@ static std::vector<std::weak_ptr<Hook>> s_floatingBtnHooks;
 
 $on_game(Loaded) {
     (void)thisMod->registerCustomSettingType("menu", &HorribleSettingV3::parse);
-    if (auto fb = MenuButton::get()) OverlayManager::get()->addChild(fb);
+
+    if (auto om = OverlayManager::get()) {
+        if (auto fb = MenuButton::get()) om->addChild(fb);
+    };
 
     listenForSettingChanges<bool>(
         setting::SafeMode,
@@ -111,7 +115,7 @@ class $modify(HISafeGJGameLevel, GJGameLevel) {
     HORRIBLE_HOOK_INTERNAL(s_safeModeHooks);
 
     void savePercentage(int, bool, int, int, bool) {
-        log::warn("Safe mode is enabled, progress will not be saved!");
+        log::warn("Safe mode is enabled, so progress will not be saved!");
     };
 };
 
@@ -121,7 +125,7 @@ class $modify(HISafePlayLayer, PlayLayer) {
 
     // safe mode prevents level completion
     void levelComplete() {
-        log::warn("Safe mode is enabled, progress will not be saved");
+        log::warn("Safe mode is enabled, so progress will not be saved");
 
         bool testMode = m_isTestMode;
 
@@ -177,8 +181,9 @@ class $modify(HIFloatBtnPlayLayer, PlayLayer) {
 
     void toggleButton(bool toggle = false) {
         log::trace("{} floating button", toggle ? "Showing" : "Hiding");
+
         if (auto fb = MenuButton::get()) {
-            auto toggleTo = thisMod->getSettingValue<bool>(setting::FloatingBtn) & (fb->showInLevel() || toggle);
+            auto toggleTo = thisMod->getSettingValue<bool>(setting::FloatingBtn) && (fb->showInLevel() || toggle);
 
             fb->setVisible(toggleTo);
             fb->setTouchEnabled(toggleTo);

src/ui/Menu.h

@@ -42,4 +42,16 @@ namespace horrible {
 
         static Menu* get() noexcept;
     };
+
+    // Menu-related utilities
+    namespace menu {
+        // Open the Horrible Menu mod option menu
+        inline void open() {
+            if (auto old = Menu::get()) {
+                old->removeFromParent();
+            } else if (auto popup = Menu::create()) {
+                popup->show();
+            };
+        };
+    };
 };

src/ui/src/MenuButton.cpp

@@ -2,6 +2,8 @@
 
 #include <Utils.h>
 
+#include <ui/Menu.h>
+
 #include <Geode/Geode.hpp>
 
 using namespace geode::prelude;

src/ui/src/SettingV3.cpp

@@ -2,6 +2,8 @@
 
 #include <Utils.h>
 
+#include <ui/Menu.h>
+
 #include <Geode/Geode.hpp>
 
 #include <Geode/ui/Button.hpp>

src/util/Menu.hpp

@@ -20,30 +20,27 @@ namespace horrible {
             };
 
             /**
-             * Get any number between 0 and 3000
+             * Get any number between 0 and 2048
              * @note Recommended to balance chances when calling every frame
              */
-            template <
-                typename T = uint16_t,
-                typename = std::enable_if_t<std::is_integral_v<T>>>
-            inline T tiny() {
-                return get<T>(static_cast<T>(3000), static_cast<T>(0));
+            inline uint16_t tiny() {
+                return get<uint16_t>(2048, 0);
             };
 
             // Get any number between 0 and 100
-            template <
-                typename T = uint8_t,
-                typename = std::enable_if_t<std::is_integral_v<T>>>
-            inline T fast() {
-                return get<T>(static_cast<T>(100), static_cast<T>(0));
+            inline uint8_t fast() {
+                return get<uint8_t>(100, 0);
             };
 
-            // Get any percent decimal between 0 and 1
-            template <
-                typename F = float,
-                typename = std::enable_if_t<std::is_floating_point_v<F>>>
-            inline F pc() {
-                return static_cast<F>(fast<int>()) / static_cast<F>(100);
+            /**
+             * Get any percent decimal between 0 and 1
+             *
+             * @param max The maximum number to get
+             * @param min The minimum number to get
+             */
+            inline float pc(uint8_t precision = 2) {
+                auto factor = static_cast<float>(std::pow(10, precision));
+                return std::round(get(1.f) * factor) / factor;
             };
         };
     };