stuff

Author: TheSillyDoggo

changelog.md

@@ -3,6 +3,7 @@
 - Fixed Speedhack Keybinds not working correctly
 - Fixed Keybinds activating on release
 - Fixed Keybinds activating in the Edit Keybind UI
+- Fixed Show Trajectory Hitbox Trail not drawing if the player doesn't die
 
 # 2.8.5
 

src/Hacks/Level/ShowTrajectory/Hooks.cpp

@@ -123,6 +123,19 @@ class $modify(GJBaseGameLayer)
 
                     player->bumpPlayer(getBumpMod(player, (int)obj->m_objectType), (int)obj->m_objectType, true, nullptr);
                     break;
+
+                case GameObjectType::YellowJumpRing:
+                case GameObjectType::PinkJumpRing:
+                case GameObjectType::GravityRing:
+                case GameObjectType::GreenRing:
+                case GameObjectType::DropRing:
+                case GameObjectType::RedJumpRing:
+                case GameObjectType::CustomRing:
+                case GameObjectType::DashRing:
+                case GameObjectType::GravityDashRing:
+                case GameObjectType::SpiderOrb:
+                    playerTouchedRing(player, static_cast<RingObject*>(obj));
+                    break;
 
                 default:
                     break;
@@ -184,8 +197,12 @@ class $modify(GJBaseGameLayer)
 
     void playerTouchedRing(PlayerObject * p0, RingObject * p1)
     {
-        if (TrajectoryNode::get() && !TrajectoryNode::get()->isSimulating())
+        if (TrajectoryNode::get() ? !TrajectoryNode::get()->isSimulating() : true)
             GJBaseGameLayer::playerTouchedRing(p0, p1);
+        else if (TrajectoryNode::get() && TrajectoryNode::get()->isSimulating())
+        {
+            TrajectoryNode::get()->simulateFromRing(p0, p1);
+        }
     }
 
     void playerTouchedTrigger(PlayerObject* p0, EffectGameObject* p1)

src/Hacks/Level/ShowTrajectory/TrajectoryNode.cpp

@@ -86,6 +86,7 @@ void TrajectoryNode::simulate(PlayerObject* plr, bool held)
         return;
 
     simulating = true;
+    ringSimulated = !held;
 
     PlayerState state;
     state.saveState(plr);
@@ -102,8 +103,6 @@ void TrajectoryNode::simulate(PlayerObject* plr, bool held)
         player->m_isSwing = gjbgl->m_levelSettings->m_startMode == 7;
     }
 
-    CCPoint prevPoint = plr->getPosition();
-
     if (
         (held && state.plMembers.m_dashRing) ||
         (held && state.plMembers.m_isRobot && state.plMembers.m_holdingButtons[(int)PlayerButton::Jump])
@@ -137,7 +136,35 @@ void TrajectoryNode::simulate(PlayerObject* plr, bool held)
     if (player->m_regularTrail)
         player->m_regularTrail->setVisible(false);
 
-    trailStates.clear();
+    performSimulation(col, useTrail);
+
+    simulating = false;
+}
+
+void TrajectoryNode::simulateFromRing(PlayerObject* player2, RingObject* ring)
+{
+    return;
+
+    if (ringSimulated)
+        return;
+
+    ringSimulated = true;
+
+    PlayerState state;
+    state.saveState(player);
+
+    player->ringJump(ring, false);
+
+    performSimulation(ccc4f(1, 1, 0, 1), false);
+
+    state.loadState(this->player);
+}
+
+void TrajectoryNode::performSimulation(cocos2d::ccColor4F colour, bool useTrail)
+{
+    CCPoint prevPoint = player->getPosition();
+    auto oldTrails = trailStates;
+    bool drewTrails = false;
 
     for (size_t i = 0; i < getIterCount(); i++)
     {
@@ -152,11 +179,12 @@ void TrajectoryNode::simulate(PlayerObject* plr, bool held)
         player->updateRotation(deltaIter);
         player->updatePlayerScale();
 
-        drawSegment(prevPoint, player->getPosition(), 1, col);
+        drawSegment(prevPoint, player->getPosition(), 1, colour);
         prevPoint = player->getPosition();
 
         if (player->m_isDead || player->m_maybeIsColliding)
         {
+            drewTrails = true;
             drawPlayerTrails();
             drawPlayerHitbox(player);
             break;
@@ -171,7 +199,10 @@ void TrajectoryNode::simulate(PlayerObject* plr, bool held)
         }
     }
 
-    simulating = false;
+    if (!drewTrails)
+        drawPlayerTrails();
+
+    trailStates = oldTrails;
 }
 
 bool TrajectoryNode::shouldDrawTrail()

src/Hacks/Level/ShowTrajectory/TrajectoryNode.hpp

@@ -13,6 +13,7 @@ namespace qolmod
             bool simulating = false;
             float deltaIter = 0.5f;
             int iterCount = 240;
+            bool ringSimulated = false;
 
             ~TrajectoryNode();
 
@@ -24,6 +25,8 @@ namespace qolmod
 
             bool isSimulating();
             void simulate(PlayerObject* plr, bool held);
+            void simulateFromRing(PlayerObject* player, RingObject* ring);
+            void performSimulation(cocos2d::ccColor4F colour, bool useTrail);
 
             float getDeltaIter();
             int getIterCount();