fix leaking rng for floats

Author: BlueWitherer

src/Utils.h

@@ -30,7 +30,7 @@
 // Additional utility methods for Horrible Menu
 namespace horrible {
     // Pointer to this Geode mod
-    inline Mod* thisMod = geode::Mod::get();
+    inline static Mod* thisMod = geode::Mod::get();
 
     /**
      * Convert a chance setting number to a cooldown percentage decimal

src/hooks/obstructive/BlackScreen.cpp

@@ -48,7 +48,7 @@ class $modify(BlackScreenPlayLayer, PlayLayer) {
     };
 
     void removeBlackScreen(CCNode* sender) {
-        if (sender) sender->removeFromParent();
+        cue::resetNode(sender);
 
         float delay = randng::get(3.f);  // random delay between 0 and 3 seconds
         log::debug("Black screen will appear again after {} seconds", delay);

src/hooks/obstructive/Confetti.cpp

@@ -10,7 +10,7 @@ using namespace horrible::prelude;
 #define THIS_ID "confetti"
 
 static auto const o = Option::create(THIS_ID)
-                          ->setName("Confetti Explosion")
+                          ->setName("Confetti Explosions")
                           ->setDescription("While playing a level, the screen will sometimes cause an explosion of random textures.\n<cl>created by Cheeseworks</c>")
                           ->setCategory(category::obstructive)
                           ->setSillyTier(SillyTier::Medium)
@@ -56,14 +56,14 @@ class $modify(ConfettiPlayLayer, PlayLayer) {
         sfx::play(sfx::file::bad);
         shakeCamera(1.25f, 2.5f, 0.00875f);
 
-        for (int i = 0; i < randng::get(125, 75); i++) createConfetti();
+        for (int i = 0; i < randng::get(150, 75); i++) createConfetti();
 
         scheduleOnce(schedule_selector(ConfettiPlayLayer::nextConfetti), randng::get(0.125f));
     };
 
     void createConfetti() {
         auto conf = CCSprite::createWithSpriteFrameName(s_confettis[randng::get(s_confettis.size() - 1)]);
-        conf->setScale(0.875f * randng::pc());
+        conf->setScale(0.5f * randng::pc());
 
         auto useY = randng::get(1) > 0;
         auto const endPos = ccp(
@@ -82,6 +82,6 @@ class $modify(ConfettiPlayLayer, PlayLayer) {
     };
 
     void cleanConfetti(CCNode* sender) {
-        if (sender) sender->removeFromParent();
+        cue::resetNode(sender);
     };
 };

src/hooks/obstructive/Earthquake.cpp

@@ -25,7 +25,7 @@ class $modify(EarthquakePlayLayer, PlayLayer) {
     };
 
     void nextQuake(float) {
-        auto delay = randng::get(3.f, 1.f);
+        auto delay = randng::get(5.f, 1.f);
         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.00875F);
+        shakeCamera(randng::get(5.f, 1.f), randng::get(10.f, 1.f), 0.00125f);
 
         scheduleOnce(schedule_selector(EarthquakePlayLayer::nextQuake), 0.125f);
     };

src/hooks/obstructive/Friends.cpp

@@ -37,32 +37,34 @@ class $modify(FriendsPlayLayer, PlayLayer) {
     void setupHasCompleted() {
         PlayLayer::setupHasCompleted();
 
-        auto delay = randng::get(3.f);
+        auto delay = randng::get(1.25f);
         log::trace("Friend will visit after {} seconds", delay);
 
         scheduleOnce(schedule_selector(FriendsPlayLayer::showAFriend), delay);
     };
 
     void showAFriend(float) {
-        auto rnd = randng::fast();
+        auto const uiSize = m_uiLayer->getScaledContentSize();
 
-        float xA = -125.f;                           // starting x pos
-        float xB = getScaledContentWidth() + 125.f;  // ending x pos
+        auto xA = -125.f;                // starting x pos
+        auto xB = uiSize.width + 125.f;  // ending x pos
 
-        if ((static_cast<float>(rnd) / 2) <= 50.0) {
+        if ((static_cast<float>(randng::fast()) / 2.f) <= 50.f) {
             xA = xB;
             xB = -125.f;
         };  // swap sides
 
         auto rA = randng::pc();
         auto rB = randng::pc();
 
-        float yA = getScaledContentHeight() * rA;  // starting height pos
-        float yB = getScaledContentHeight() * rB;  // ending height pos
+        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
 
         auto friendSpr = CCSprite::createWithSpriteFrameName(s_friends[randng::get(s_friends.size() - 1)]);
         friendSpr->setPosition({xA, yA});
-        friendSpr->setScale(1.25 * (rB + rA));
+        friendSpr->setScale(0.875f * (rB + rA));
         friendSpr->setRotation(180.f * (yA * yB));  // random rotation
 
         auto dur = 12.5f * rA;
@@ -80,11 +82,11 @@ class $modify(FriendsPlayLayer, PlayLayer) {
     };
 
     void cleanupFriend(CCNode* sender) {
-        if (sender) sender->removeFromParent();
+        cue::resetNode(sender);
     };
 
     void scheduleNextFriend() {
-        auto delay = randng::get(5.f);
+        auto delay = randng::get(2.5f);
         log::trace("Friend will visit again after {} seconds", delay);
 
         scheduleOnce(schedule_selector(FriendsPlayLayer::showAFriend), delay);

src/hooks/obstructive/Motivation.cpp

@@ -147,7 +147,7 @@ class $modify(MotivationPlayLayer, PlayLayer) {
     };
 
     void scheduleNextMessage(CCNode* sender) {
-        if (sender) sender->removeFromParent();
+        cue::resetNode(sender);
 
         auto delay = randng::get(15.f, 5.f);
         log::debug("Motivational message will show again after {} seconds", delay);

src/hooks/obstructive/TOS.cpp

@@ -42,16 +42,14 @@ class $modify(TOSGJBaseGameLayer, GJBaseGameLayer) {
 
                         if (!accepted) {
                             Notification::create("You declined our terms and conditions!", NotificationIcon::Error)->show();
-
-                            sfx::play(sfx::file::bad);
                             if (auto pl = PlayLayer::get()) pl->resetLevelFromStart();
-                        } else {
-                            sfx::play(sfx::file::good);
                         };
                     })) {
                 popup->show();
                 f->currentTos = popup;
 
+                cursor::show();
+
                 updateTimeWarp(0.125f);
             };
         };

src/util/Randng.hpp

@@ -16,7 +16,11 @@ namespace horrible {
                 typename T = int,
                 typename = std::enable_if_t<std::is_arithmetic_v<T>>>
             inline T get(T max, T min = static_cast<T>(0)) {
-                return geode::utils::random::generate<T>(min, max + static_cast<T>(1));
+                if constexpr (std::is_integral_v<T>) {
+                    return geode::utils::random::generate<T>(min, max + static_cast<T>(1));
+                } else {
+                    return geode::utils::random::generate<T>(min, max);
+                };
             };
 
             /**

src/util/ui/src/MathQuiz.cpp

@@ -13,8 +13,8 @@ class MathQuiz::Impl final {
 public:
     Richard* richard = nullptr;
 
-    int8_t numFirst = 0;
-    int8_t numSecond = 0;
+    uint8_t numFirst = 0;
+    uint8_t numSecond = 0;
 
     MathOperation operation = MathOperation::Addition;
 

src/util/ui/src/TermsAndConditions.cpp

@@ -54,6 +54,7 @@ bool TermsAndConditions::init(Callback&& cb) {
             "bigFont.fnt",
             themes::getButtonSquareSprite(theme)),
         [this, cb](auto) {
+            sfx::play(sfx::file::good);
             if (cb) cb(true);
             removeFromParent();
         });
@@ -65,6 +66,7 @@ bool TermsAndConditions::init(Callback&& cb) {
             "goldFont.fnt",
             themes::getButtonSquareSprite(theme)),
         [this, cb](auto) {
+            sfx::play(sfx::file::bad);
             if (cb) cb(false);
             removeFromParent();
         });