tweaks n stuff

Author: BlueWitherer

changelog.md

@@ -1,5 +1,7 @@
 # v1.0.3 
 - Added additional info button to *Safe Mode* label in options menu
+- Raised *Ending Gamble* option Silly Tier to **High**
+- Tweaked some options' description
 - Minor tweaks
 
 # v1.0.2 

src/hooks/Gambler.cpp

@@ -11,9 +11,9 @@ using namespace horrible::prelude;
 
 static auto const o = Option::create(THIS_ID)
                           ->setName("Ending Gamble")
-                          ->setDescription("When reaching 95% in a level, you have a chance at randomly being blasted way far back.\n<cl>suggested by Timered</c>")
+                          ->setDescription("When reaching 95% in a level, you have a 50/50 chance at randomly being blasted way far back.\n<cl>suggested by Timered</c>")
                           ->setCategory(category::misc)
-                          ->setSillyTier(SillyTier::Medium)
+                          ->setSillyTier(SillyTier::High)
                           ->autoRegister();
 
 class $modify(GamblerPlayLayer, PlayLayer) {
@@ -50,11 +50,7 @@ class $modify(GamblerPlayLayer, PlayLayer) {
 
         // detect the moment the player first reaches or crosses 95
         if (getCurrentPercentInt() >= 95 && !f->triggered) {
-            // roll a random number between 0 and 1
-            auto roll = rng::flip();
-
-            log::info("Gambler roll: {}", roll);
-            if (roll) {
+            if (rng::flip()) {
                 log::info("Gambler lost the bet!");
 
                 sfx::play(sfx::file::pop);

src/hooks/Mock.cpp

@@ -12,7 +12,7 @@ using namespace horrible::prelude;
 
 static auto const o = Option::create(THIS_ID)
                           ->setName("Mock your 90%+ Fail")
-                          ->setDescription("Occasionally taunts you in the main menu with a screenshot of one of your 90%-99% fails.\n<cl>suggested by Wuffin</c>")
+                          ->setDescription("Occasionally taunts you in the main menu with a screenshot of one of your 90%-99% fails.\n<co>Must be enabled with Safe Mode disabled to save new best records.</c>\n<cl>suggested by Wuffin</c>")
                           ->setCategory(category::misc)
                           ->setSillyTier(SillyTier::Medium)
                           ->setSupportedPlatforms({Platform::Windows, Platform::Android})
@@ -125,8 +125,8 @@ class $modify(MockPlayLayer, PlayLayer) {
         int id = m_level->m_levelID;
         int percentage = m_level->m_normalPercent;
 
-        log::info("Showing new best for level ID: {}", id);
-        log::info("Level percentage: {}", percentage);
+        log::debug("Showing new best for level ID: {}", id);
+        log::debug("Level percentage: {}", percentage);
 
         if (percentage >= 90) {
             auto director = CCDirector::sharedDirector();

src/hooks/Placebo.cpp

@@ -12,14 +12,14 @@ using namespace horrible::prelude;
 
 static auto const o = Option::create(THIS_ID)
                           ->setName("Placebo")
-                          ->setDescription("A random chance that when you start a level, all the options you have enabled are disabled, or all the options you have disabled are enabled.\n<cl>suggested by tmdXD</c>")
+                          ->setDescription("A <cc>1%</c> chance that when you start a level, all of your options get toggled to the opposite of their current state.\n<cl>suggested by tmdXD</c>")
                           ->setCategory(category::misc)
                           ->setSillyTier(SillyTier::High)
                           ->autoRegister();
 
 void placeboEffect() {
     auto rnd = rng::fast();
-    log::trace("placebo effect roll: {}", rnd);
+    log::trace("placebo effect roll: {} / 1", rnd);
 
     if (rnd <= 1) {  // 1% chance :trol:
         log::warn("Placebo effect activated! Toggling all options...");

src/hooks/Sticky.cpp

@@ -70,22 +70,25 @@ class $modify(StickyPlayerObject, PlayerObject) {
     };
 
     bool onGround() {
-        // log::trace("1: {} 2: {} 3: {} 4: {}", m_isOnGround ? "y" : "n", m_isOnGround2 ? "y" : "n", m_isOnGround3 ? "y" : "n", m_isOnGround4 ? "y" : "n");
-        return m_isOnGround && m_isOnGround2 && m_isOnGround3 & m_isOnGround4;
+        log::trace("1: {} 2: {} 3: {} 4: {}", m_isOnGround ? "y" : "n", m_isOnGround2 ? "y" : "n", m_isOnGround3 ? "y" : "n", m_isOnGround4 ? "y" : "n");
+        return m_isOnGround && m_isOnGround2 && m_isOnGround3 && m_isOnGround4;
     };
 
     void hitGround(GameObject* object, bool notFlipped) {
+        if (!m_gameLayer) return PlayerObject::hitGround(object, notFlipped);
+
         auto f = m_fields.self();
 
         auto wasOnGround = f->m_onGround;
         PlayerObject::hitGround(object, notFlipped);
         auto nowOnGround = onGround();
 
         if (m_hasEverJumped) {
-            if (!wasOnGround && nowOnGround) {
+            if (nowOnGround && !wasOnGround) {
                 if (rng::fast() < f->chance) {
                     f->m_defSpeed = m_playerSpeed;
                     m_playerSpeed = 0.f;
+
                     if (f->m_clickLabel) f->m_clickLabel->setVisible(true);
                 };
             };

src/hooks/obstructive/Confetti.cpp

@@ -50,7 +50,7 @@ class $modify(ConfettiPlayLayer, PlayLayer) {
     };
 
     void confetti(float) {
-        log::info("unleashing confetti!");
+        log::debug("unleashing confetti!");
 
         sfx::play(sfx::file::bad);
         shakeCamera(0.875f, 2.5f, 0.00875f);

src/hooks/obstructive/Flipped.cpp

@@ -36,8 +36,8 @@ class $modify(FlippedPlayLayer, PlayLayer) {
     };
 
     void nextFlip() {
-        log::trace("scheduling spam challenge");
-        if (!m_hasCompletedLevel) scheduleOnce(schedule_selector(FlippedPlayLayer::flip), rng::get(30.f, 5.f) * chanceToDelayPct(m_fields->chance));
+        log::trace("scheduling flip");
+        if (!m_hasCompletedLevel) scheduleOnce(schedule_selector(FlippedPlayLayer::flip), rng::get(10.f, 2.5f) * chanceToDelayPct(m_fields->chance));
     };
 
     void flip(float) {

src/hooks/obstructive/Math.cpp

@@ -62,13 +62,13 @@ class $modify(MathPlayLayer, PlayLayer) {
 
             if (auto quiz = MathQuiz::create()) {
                 // handle correct/wrong answer
-                quiz->setCallback([this, quiz](bool correct) {
+                quiz->setCallback([this](bool correct) {
                     if (!correct) resetLevelFromStart();
                     nextQuiz();
 
                     cursor::hide();
 
-                    if (quiz) quiz->removeFromParent();
+                    cue::resetNode(m_fields->currentMath);
                 });
 
                 m_uiLayer->addChild(quiz, HIGHEST_Z);

src/hooks/obstructive/Spam.cpp

@@ -73,13 +73,13 @@ class $modify(SpamPlayLayer, PlayLayer) {
                 auto f = m_fields.self();
 
                 // handle correct/wrong answer
-                spam->setCallback([this, spam](bool success) {
+                spam->setCallback([this](bool success) {
                     if (!success) resetLevelFromStart();
                     nextSpam();
 
                     cursor::hide();
 
-                    if (spam) spam->removeFromParent();
+                    cue::resetNode(m_fields->currentSpam);
                 });
 
                 m_uiLayer->addChild(spam, HIGHEST_Z);