a few things

Author: TheSillyDoggo

changelog.md

@@ -1,7 +1,11 @@
 # 1.3.7
 
 - Label Corners now save the corner
-- Fixed Crash Playing Levels
+- Fixed Crash Playing Levels on Windows
+- Fixed Attempt Count saying nullptr every attempt
+- Increased the amount of numbers you can input in tps bypass to 11
+- FPS Counter now only updates every half of a second instead of every frame
+- Added No Transition and Verify Hack On MacOS
 
 # 1.3.6
 

mod.json

@@ -1,6 +1,6 @@
 {
 	"geode": "2.0.0-beta.24",
-	"version": "v1.3.6",
+	"version": "v1.3.7",
 	"gd": {
 		"win": "2.204",
 		"mac": "2.200",

src/Client/ClientSetup.h

@@ -169,7 +169,7 @@ class ClientUtils
         Client::instance->windows.push_back(bypass);
 
         auto tps = new InputModule("Ticks:", "tps-bypass-value", "240");
-        tps->maxSize = 6;
+        tps->maxSize = 11;
         Client::GetModule("tps-bypass")->options.push_back(tps);
     }
 
@@ -413,8 +413,6 @@ class ClientUtils
             "no-static",
             "show-trajectory",
             "show-layout",
-            "no-trans",
-            "verify-hack",
             "coin-tracers",
             "no-wave",
             "solid-wave",

src/Client/Module.cpp

@@ -143,6 +143,7 @@ void DropdownModule::onDropdownSelectionChanged(CCObject* sender)
     auto drop = as<Dropdown*>(as<CCNode*>(sender)->getParent());
 
     mod->index = drop->getSelectedIndex();
+    mod->save();
 
     if (mod->delegate)
         mod->delegate->onModuleChanged(mod->enabled);

src/Hacks/SafeMode.cpp

@@ -47,6 +47,8 @@ class HackModuleDelegate : public ModuleChangeDelegate
 
         updateInd();
 
+        #ifdef STATUS_TEXTS
+
         if (PlayLayer::get())
         {
             if (auto stn = StatusNode::get())
@@ -56,6 +58,8 @@ class HackModuleDelegate : public ModuleChangeDelegate
                 stn->reorderPosition();
             }
         }
+
+        #endif
     }
 };
 

src/Hacks/TPSBypass.cpp

@@ -52,7 +52,7 @@ void updateTPSPatches(bool tpsEnabled)
         #endif
 
         #ifdef GEODE_IS_MACOS
-        patches.push_back(Mod::get()->patch(reinterpret_cast<void*>(geode::base::get() + 0x7e9c60), getBytes<float>(1.0f / tps)).unwrap());
+        patches.push_back(Mod::get()->patch(reinterpret_cast<void*>(geode::base::get() + 0x7e9c60), getBytes<double>(1.0f / tps)).unwrap());
         #endif
     }
 }

src/Hacks/TransitionTimeCustomiser.cpp

@@ -1,5 +1,3 @@
-#ifndef GEODE_IS_MACOS
-
 #include <Geode/Geode.hpp>
 #include <Geode/cocos/layers_scenes_transitions_nodes/CCTransition.h>
 #include <Geode/modify/CCTransitionFade.hpp>
@@ -16,6 +14,7 @@ CCScene* getSceneForSel(int i, float f, CCScene* s)
 
     if (i == 0)
         return CCTransitionFade::create(f, s);
+    #ifndef GEODE_IS_MACOS
     else if (i == 1)
         return CCTransitionCrossFade::create(f, s);
     else if (i == 2)
@@ -66,6 +65,8 @@ CCScene* getSceneForSel(int i, float f, CCScene* s)
         return CCTransitionSplitCols::create(f, s);
     else if (i == 25)
         return CCTransitionTurnOffTiles::create(f, s);
+    
+    #endif
 
     return nullptr;
 }
@@ -115,6 +116,4 @@ class $modify (cocos2d::CCTransitionFade)
 
         return as<CCTransitionFade*>(getSceneForSel(Mod::get()->getSavedValue<int>("transition", 0), duration * mod, scene));// /*base_cast<CCTransitionFade*>(CCTransitionFlipY::create(duration * mod, scene));  */CCTransitionFade::create(duration * mod, scene);
     }
-};
-
-#endif
+};

src/Hacks/VerifyHack.cpp

@@ -1,5 +1,3 @@
-#ifndef GEODE_IS_MACOS
-
 #include <Geode/Geode.hpp>
 #include <Geode/modify/ShareLevelLayer.hpp>
 #include "../Client/Client.h"
@@ -32,6 +30,4 @@ class $modify(ShareLevelLayer)
 
         ShareLevelLayer::onShare(sender);
     }
-};
-
-#endif
+};

src/Labels/Labels.cpp

@@ -6,6 +6,8 @@ bool StatusNode::init()
 {
     if (!CCNode::init())
         return false;
+
+    instance = this;
 
     this->setID("status-node"_spr);
     this->setZOrder(69);
@@ -225,6 +227,8 @@ void StatusNode::update(float dt)
     if (!session)
         session = Client::GetModule("status-session");
 
+    if (!attPL)
+        attPL = static_cast<AttemptPlayLayer*>(PlayLayer::get());
 
 
     float v = 100 * (1 - (PlayLayer::get()->m_gameState.m_unk1f8 == 0 ? 0 : as<NoclipLayer*>(PlayLayer::get())->m_fields->t / static_cast<float>(PlayLayer::get()->m_gameState.m_unk1f8)));
@@ -242,10 +246,9 @@ void StatusNode::update(float dt)
     sLabels[7]->setVisible(session->enabled);
 
 
-    sLabels[1]->setString((numToString(1 / (dt / CCScheduler::get()->getTimeScale()), 0) + std::string(" FPS")).c_str());
     sLabels[2]->setString((numToString(v, 2) + std::string("%")).c_str());
     sLabels[3]->setString((numToString(as<NoclipLayer*>(PlayLayer::get())->m_fields->d, 0) + (as<NoclipLayer*>(PlayLayer::get())->m_fields->d == 1 ? std::string(" Death") : std::string(" Deaths"))).c_str());
-    sLabels[4]->setString(attemptText == nullptr ? "nullptr" : attemptText->getString());
+    sLabels[4]->setString((std::string("Attempt ") + std::to_string(attPL->m_fields->attemptCount)).c_str());
 
     std::stringstream ss;
     ss << "Frame: " << numToString(GJReplayManager::frame) << ", Delta: " << numToString(GJReplayManager::dt, 4);
@@ -274,6 +277,21 @@ void StatusNode::update(float dt)
         as<NoclipLayer*>(PlayLayer::get())->m_fields->isDead = false;
     }
 
+    _timeLeft -= dt;
+    _accum += 1 / dt;
+    _frames++;
+
+    if (_timeLeft <= 0) {
+        float fps = _accum / _frames;
+
+        sLabels[1]->setString((std::to_string(as<int>(roundf(fps))) + std::string(" FPS")).c_str());
+        //CCLOG("Average FPS: %.2f", fps);
+
+        _timeLeft = _updateInterval;
+        _accum = 0;
+        _frames = 0;
+    }
+
     updateVis();
 }
 

src/Labels/Labels.h

@@ -10,6 +10,18 @@
 
 using namespace geode::prelude;
 
+class $modify (AttemptPlayLayer, PlayLayer)
+{
+    int attemptCount = 0;
+
+    void resetLevel()
+    {
+        PlayLayer::resetLevel();
+
+        m_fields->attemptCount++;
+    }
+};
+
 class StatusNode : public CCNode
 {
     public:
@@ -31,7 +43,7 @@ class StatusNode : public CCNode
 
         bool mods;
 
-        CCLabelBMFont* attemptText = nullptr;
+        AttemptPlayLayer* attPL = nullptr;
 
         static inline Module* fps = nullptr;
         static inline Module* cheat = nullptr;
@@ -55,6 +67,11 @@ class StatusNode : public CCNode
 
         static inline bool hidden = false;
 
+        float _updateInterval = 0.5f;
+        float _timeLeft = _updateInterval;
+        float _accum;
+        int _frames;
+
         std::string formatTime(float time) {
             // Convert float time to milliseconds
             std::chrono::milliseconds duration(static_cast<long long>(time * 1000));
@@ -90,67 +107,17 @@ class StatusNode : public CCNode
 
 class $modify (PlayLayer)
 {
-    StatusNode* stn;
-
-    virtual void postUpdate(float p0)
-    {
-        PlayLayer::postUpdate(p0);
-
-        //m_fields->stn->attemptText = m_attemptLabel;
-
-        return;
-        
-        if (m_fields->stn && !m_fields->stn->attemptText)
-        {
-            CCLayer* mainLayer = this->m_objectLayer;
-            log::info("mainLayer: {}", mainLayer);
-            auto lbl = getChildOfType<CCLabelBMFont>(mainLayer, 0);
-            log::info("label: {}", lbl);
-
-            auto stn2 = this->m_fields->stn;
-            log::info("status node: {}", stn2);
-            stn2->attemptText = lbl;
-            log::info("sex");
-        }
-    }
-
     bool init(GJGameLevel* p0, bool p1, bool p2)
     {
         if (!PlayLayer::init(p0, p1, p2))
             return false;
 
-        if (this->getChildByID("status-text-menu"_spr))
+        if (getChildByID("status-node"_spr))
             return true;
 
-        CCLayer* mainLayer = nullptr;
-
-        if (!mainLayer)
-        {
-            if (auto mainNode = getChildOfType<CCNode>(this, 1))
-            {
-                if (auto l = getChildOfType<CCLayer>(mainNode, 0))
-                {
-                    mainLayer = l;
-                }
-            }
-        }
-
         auto stn = StatusNode::create();
-        stn->attemptText = m_attemptLabel;
-        log::info("attemptText: {}", stn->attemptText);
-
-        auto menu = CCMenu::create();
-        menu->setID("status-text-menu"_spr);
-        menu->setPosition(ccp(0, 0));
-        menu->setContentSize(CCDirector::get()->getWinSize());
-        menu->setAnchorPoint(ccp(0, 0));
-        menu->ignoreAnchorPointForPosition(false);
-
+        stn->attPL = static_cast<AttemptPlayLayer*>(PlayLayer::get());
         this->addChild(stn);
-
-        this->addChild(menu, 69420);
-
-        m_fields->stn = stn;
 
         return true;
     }