a

Author: TheSillyDoggo

changelog.md

@@ -1,3 +1,9 @@
+# 2.8.3
+
+- Fixed No Rotation changing the players rotated hitbox
+- Fixed Show Trajectory having a trail
+- Fixed Hitboxes not updating when dead
+
 # 2.8.2
 
 - Added Label Rotation

mod-2.2074.json

@@ -1,6 +1,6 @@
 {
 	"geode": "4.10.0",
-	"version": "v2.8.2-beta.1",
+	"version": "v2.8.3-beta.1",
 	"gd": {
 		"win": "2.2074",
 		"android": "2.2074",

mod.json

@@ -1,6 +1,6 @@
 {
 	"geode": "5.4.0",
-	"version": "v2.8.2",
+	"version": "v2.8.3",
 	"gd": {
 		"win": "2.2081",
 		"android": "2.2081",

src/Hacks/Cosmetic/NoPlayerRotation.cpp

@@ -1,5 +1,6 @@
 #include "../../Client/Module.hpp"
-#include <Geode/modify/GJBaseGameLayer.hpp>
+#include <Geode/modify/PlayerObject.hpp>
+#include <VisitHook.hpp>
 
 using namespace geode::prelude;
 
@@ -125,62 +126,87 @@ SUBMIT_OPTION(NoPlayerRotation, NoRotRobot);
 SUBMIT_OPTION(NoPlayerRotation, NoRotSpider);
 SUBMIT_OPTION(NoPlayerRotation, NoRotSwing);
 
-class $modify (GJBaseGameLayer)
+namespace qolmod
 {
-    bool noRotateEnabled(PlayerObject* po)
+    class PlayerObjectVisitHook : public qolmod::VisitHook
     {
-        if (po->m_isShip)
-        {
-            if (po->m_isPlatformer)
-                return NoRotJetpack::get()->getRealEnabled();
-            else
-                return NoRotShip::get()->getRealEnabled();
-        }
-        else if (po->m_isBall)
-        {
-            return NoRotBall::get()->getRealEnabled();
-        }
-        else if (po->m_isBird)
-        {
-            return NoRotUfo::get()->getRealEnabled();
-        }
-        else if (po->m_isDart)
-        {
-            return NoRotWave::get()->getRealEnabled();
-        }
-        else if (po->m_isRobot)
-        {
-            return NoRotRobot::get()->getRealEnabled();
-        }
-        else if (po->m_isSpider)
-        {
-            return NoRotSpider::get()->getRealEnabled();
-        }
-        else if (po->m_isSwing)
-        {
-            return NoRotSwing::get()->getRealEnabled();
-        }
+        public:
+            CREATE_FUNC(PlayerObjectVisitHook)
+            PlayerObject* player = nullptr;
+            float rot = 0;
+            float rot2 = 0;
 
-        return NoRotCube::get()->getRealEnabled();
-    }
-
-    virtual void update(float dt)
-    {
-        GJBaseGameLayer::update(dt);
+            bool noRotateEnabled(PlayerObject* po)
+            {
+                if (!NoPlayerRotation::get()->getRealEnabled())
+                    return false;
+
+                if (po->m_isShip)
+                {
+                    if (po->m_isPlatformer)
+                        return NoRotJetpack::get()->getRealEnabled();
+                    else
+                        return NoRotShip::get()->getRealEnabled();
+                }
+                else if (po->m_isBall)
+                {
+                    return NoRotBall::get()->getRealEnabled();
+                }
+                else if (po->m_isBird)
+                {
+                    return NoRotUfo::get()->getRealEnabled();
+                }
+                else if (po->m_isDart)
+                {
+                    return NoRotWave::get()->getRealEnabled();
+                }
+                else if (po->m_isRobot)
+                {
+                    return NoRotRobot::get()->getRealEnabled();
+                }
+                else if (po->m_isSpider)
+                {
+                    return NoRotSpider::get()->getRealEnabled();
+                }
+                else if (po->m_isSwing)
+                {
+                    return NoRotSwing::get()->getRealEnabled();
+                }
+
+                return NoRotCube::get()->getRealEnabled();
+            }
 
-        if (NoPlayerRotation::get()->getRealEnabled())
-        {
-            if (m_player1 && noRotateEnabled(m_player1))
+            virtual void preVisit()
             {
-                m_player1->setRotation(0);
-                m_player1->m_iconSprite->setRotation(0);
+                rot = player->getRotation();
+                rot2 = player->m_iconSprite->getRotation();
+
+                if (noRotateEnabled(player))
+                {
+                    player->setRotation(0);
+                    player->m_iconSprite->setRotation(0);
+                }
             }
 
-            if (m_player2 && noRotateEnabled(m_player1))
+            virtual void postVisit(cocos2d::CCNode* node)
             {
-                m_player2->setRotation(0);
-                m_player2->m_iconSprite->setRotation(0);
+                player->setRotation(rot);
+                player->m_iconSprite->setRotation(rot2);
             }
-        }
+    };
+};
+
+class $modify (PlayerObject)
+{
+    bool init(int player, int ship, GJBaseGameLayer* gameLayer, cocos2d::CCLayer* layer, bool playLayer)
+    {
+        if (!PlayerObject::init(player, ship, gameLayer, layer, playLayer))
+            return false;
+
+        auto vh = qolmod::PlayerObjectVisitHook::create();
+        vh->player = this;
+
+        this->setGrid(vh);
+        return true;
     }
 };

src/Hacks/Level/ShowTrajectory/TrajectoryNode.cpp

@@ -120,6 +120,9 @@ void TrajectoryNode::simulate(PlayerObject* plr, bool held)
             ShowTrajectoryP2Release::get()->getColour());
     }
 
+    if (player->m_regularTrail)
+        player->m_regularTrail->setVisible(false);
+
     for (size_t i = 0; i < getIterCount(); i++)
     {
         player->m_collisionLogTop->removeAllObjects();

src/UI/BaseDrawNode.cpp

@@ -295,7 +295,7 @@ class $modify (GJBaseGameLayer)
     {
         GJBaseGameLayer::update(dt);
 
-        if (!m_started || __didTickThisFrame)
+        if (!m_started || __didTickThisFrame || m_player1->m_isDead)
         {
             __didTickThisFrame = false;
             redrawAll();

src/UI/VisitHook.cpp

@@ -0,0 +1,59 @@
+#include "VisitHook.hpp"
+#include <Geode/modify/CCGridBase.hpp>
+
+using namespace geode::prelude;
+using namespace qolmod;
+
+bool VisitHook::init()
+{
+    initWithSize(CCSizeMake(100, 100));
+    m_bActive = true;
+    return true;
+}
+
+void VisitHook::setCallbackPre(const VisitHook::VisitCallbackFunc& func)
+{
+    this->callbackPre = std::move(func);
+}
+
+void VisitHook::setCallbackPost(const VisitHook::VisitCallbackFunc& func)
+{
+    this->callbackPost = std::move(func);
+}
+
+void VisitHook::preVisit()
+{
+    if (callbackPre)
+        callbackPre(nullptr);
+}
+
+void VisitHook::postVisit(cocos2d::CCNode* node)
+{
+    if (callbackPost)
+        callbackPost(node);
+}
+
+class $modify (VisitHookGridBase, CCGridBase)
+{
+    void beforeDraw(void)
+    {
+        if (auto hook = typeinfo_cast<VisitHook*>(this))
+        {
+            hook->preVisit();
+            return;
+        }
+
+        CCGridBase::beforeDraw();
+    }
+
+    void afterDraw(CCNode *pTarget)
+    {
+        if (auto hook = typeinfo_cast<VisitHook*>(this))
+        {
+            hook->postVisit(pTarget);
+            return;
+        }
+
+        CCGridBase::afterDraw(pTarget);
+    }
+};

src/UI/VisitHook.hpp

@@ -0,0 +1,26 @@
+#pragma once
+
+#include <Geode/Geode.hpp>
+
+namespace qolmod
+{
+    class VisitHook : public cocos2d::CCGridBase
+    {
+        using VisitCallbackFunc = std::function<void(cocos2d::CCNode* node)>;
+
+        protected:
+            VisitCallbackFunc callbackPre = nullptr;
+            VisitCallbackFunc callbackPost = nullptr;
+
+            virtual bool init();
+
+        public:
+            CREATE_FUNC(VisitHook);
+
+            void setCallbackPre(const VisitCallbackFunc& func);
+            void setCallbackPost(const VisitCallbackFunc& func);
+        
+            virtual void preVisit();
+            virtual void postVisit(cocos2d::CCNode* node);
+    };
+};