asdrffsdfasd

TheSillyDoggo · Feb 9, 2024 · 4f9c53f · 4f9c53f
1 parent 9c1a158
commit 4f9c53f
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 9 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,11 +1,13 @@
 # 1.1.3
 
-- Fixed Level Edit breaking level page
+- Fixed Level Edit breaking level page, for anyone who used this before the update: Press the ? button in the levels tab while in the broken level. Do this fast as the button WILL BE REMOVED IN THE FUTURE
 - Added Force Trail On and Force Trail Off
 - Added No Camera Shake
 - Added Force Platformer On Android
 - Moved Confirm Practice and Confirm Restart From Universal to Level
 - Added Menu Animations, From Left, From Right, From Top, From Bottom and Scale
+- Added FPS Bypass (Beta)
+- Added Noclip broken slope fix
 - Added ~~Herobrine~~ Zulguroth
 
 # 1.1.2

diff --git a/src/Client/Window.h b/src/Client/Window.h
@@ -1201,6 +1201,14 @@ class IconEffects : public Window
 class Level : public Window
 {
     public:
+        void onFix(CCObject*)
+        {
+            if (PlayLayer::get())
+            {
+                PlayLayer::get()->m_level->m_levelType = GJLevelType::Saved;
+            }
+        }
+
         void onFPS(CCObject*)
         {
             SetupFPSBypass::addToScene();
@@ -1220,6 +1228,17 @@ class Level : public Window
             btn->setSizeMult(1.15f);
             btn->setPosition(pos);
             menu->addChild(btn);
+
+            pos = pos + ccp(-30 - 27, -5);
+
+            auto btnS2 = ButtonSprite::create("?", 10, false, "bigFont.fnt", "GJ_button_05.png", 25, 0.75f);
+            as<CCNode*>(btnS2->getChildren()->objectAtIndex(0))->setScale(0.375f);
+            as<CCLabelBMFont*>(btnS2->getChildren()->objectAtIndex(0))->setAlignment(CCTextAlignment::kCCTextAlignmentCenter);
+            as<CCLabelBMFont*>(btnS2->getChildren()->objectAtIndex(0))->updateLabel();
+            auto btn2 = CCMenuItemSpriteExtra::create(btnS2, menu, menu_selector(Level::onFix));
+            btn2->setSizeMult(1.15f);
+            btn2->setPosition(pos);
+            menu->addChild(btn2);
         }
 };
 

diff --git a/src/Hacks/NoDeathEffect.cpp b/src/Hacks/NoDeathEffect.cpp
@@ -7,9 +7,7 @@ using namespace geode::prelude;
 class $modify (PlayerObject)
 {
     void playerDestroyed(bool p0)
-    {
-        log::info("PlayerObject::playerDestroyed");
-
+    {        
         if (!Client::GetModuleEnabled("no-death"))
             PlayerObject::playerDestroyed(p0);
     }

diff --git a/src/Hacks/Noclip.cpp b/src/Hacks/Noclip.cpp
@@ -6,12 +6,16 @@ using namespace geode::prelude;
 
 class $modify (PlayLayer)
 {
+    GameObject* ac;
     //int i = 0;
     //int d = 0;
 
     void destroyPlayer(PlayerObject * p0, GameObject * p1)
     {
-        if (!Client::GetModuleEnabled("noclip"))
+        if (!m_fields->ac)
+            m_fields->ac = p1;
+
+        if (!Client::GetModuleEnabled("noclip") || (m_fields->ac == p1))
             PlayLayer::destroyPlayer(p0, p1);
     }
 };
diff --git a/src/Hacks/TextLimitBypass.cpp b/src/Hacks/TextLimitBypass.cpp
@@ -17,7 +17,7 @@ class $modify (CCTextInputNode)
         }
 
         if (Client::GetModuleEnabled("char-limit"))
-            CCTextInputNode::setMaxLabelLength(32767);
+            CCTextInputNode::setMaxLabelLength(6969);
 
         if (Client::GetModuleEnabled("char-filter"))
             CCTextInputNode::setAllowedChars("!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ ");

diff --git a/src/Layers/SetupFPSBypass.h b/src/Layers/SetupFPSBypass.h
@@ -7,11 +7,18 @@ class SetupFPSBypass : public FLAlertLayer
 {
     public:
         geode::InputNode* inp = nullptr;
+        CCMenuItemToggler* enb = nullptr;
 
         void onClose(CCObject*)
-        {            
+        {
+            if (GameManager::get()->getGameVariable("0116") != enb->isToggled())
+            {
+                GameManager::get()->m_customFPSTarget = std::stof(inp->getString());
+                GameManager::get()->setGameVariable("0116", enb->isToggled());
+                GameManager::get()->setGameVariable("0030", !enb->isToggled());
 
-            //GameManager::get()->m_customFPSTarget = std::stof(inp->getString());
+                GameManager::get()->updateCustomFPS();
+            }
 
             this->removeFromParent();
         }
@@ -75,8 +82,9 @@ class SetupFPSBypass : public FLAlertLayer
             lb2->setAnchorPoint(ccp(1, 0.5f));
             l->addChild(lb2);
 
-            auto enb = CCMenuItemToggler::createWithStandardSprites(this, nullptr, 0.8f);
+            enb = CCMenuItemToggler::createWithStandardSprites(this, nullptr, 0.8f);
             enb->setPosition(l->getContentSize() / 2 + ccp(20, -10));
+            enb->toggle(GameManager::get()->getGameVariable("0116"));
             l->addChild(enb);
 
             auto ok = CCMenuItemSpriteExtra::create(ButtonSprite::create("OK"), this, menu_selector(SetupFPSBypass::onClose));