2.3.6 2

changelog.md

@@ -1,6 +1,6 @@
 # v2.3.6
 
-* Improved compatibility with other bots macros.
+* Improved compatibility with other bot's macros (Pathfinder, Eclipse).
 
 # v2.3.5
 

src/global.cpp

@@ -158,22 +158,28 @@ float Global::getTPS() {
 }
 
 int Global::getCurrentFrame(bool editor) {
-  double levelTime;
+  // double levelTime;
   PlayLayer* pl = PlayLayer::get();
 
   if (!pl) {
     if (!editor) return 0;
 
-    levelTime = GJBaseGameLayer::get()->m_gameState.m_levelTime;
+    // levelTime = GJBaseGameLayer::get()->m_gameState.m_levelTime;
   }
 
-  levelTime = pl->m_gameState.m_levelTime;
-  // int frame = pl->m_gameState.m_currentProgress;
-  int frame = static_cast<int>(levelTime * getTPS());
+  auto& g = Global::get();
+  int frame;
+  // levelTime = pl->m_gameState.m_levelTime;
 
-  frame -= Global::get().frameOffset;
-  frame++;
+  if (!g.macro.xdBotMacro && g.state == state::playing) {
+    frame = pl->m_gameState.m_currentProgress;
+  }
+  else {
+    frame = static_cast<int>(pl->m_gameState.m_levelTime * getTPS());
+    frame++;
+  }
 
+  frame -= g.frameOffset;
   if (frame < 0) return 0;
 
   return frame;

src/includes.hpp

@@ -103,6 +103,7 @@ class Global {
     bool cancelCheckpoint = false;
     bool ignoreRecordAction = false;
     bool restart = false;
+    bool restartLater = false;
     bool creatingTrajectory = false;
     bool firstAttempt = false;
 

src/macro.cpp

@@ -109,6 +109,7 @@ void Macro::updateInfo(PlayLayer* pl) {
 
     g.macro.botInfo.name = "xdBot";
     g.macro.botInfo.version = xdBotVersion;
+    g.macro.xdBotMacro = true;
 }
 
 void Macro::updateTPS() {

src/macro.hpp

@@ -43,6 +43,7 @@ struct Macro : gdr::Replay<Macro, input> {
 
     bool canChangeFPS = true;
     uintptr_t seed = 0;
+    bool xdBotMacro = true;
 
     static void recordAction(int frame, int button, bool player2, bool hold);
 

src/main.cpp

@@ -135,7 +135,7 @@ class $modify(PlayLayer) {
       g.renderer.levelStartFrame = frame;
 
     if (g.restart && m_levelSettings->m_platformerMode && g.state != state::none)
-      m_fields->delayedLevelRestart = frame + 1;
+      m_fields->delayedLevelRestart = frame + 2;
 
     Global::updateSeed(true);
 
@@ -218,19 +218,18 @@ class $modify(BGLHook, GJBaseGameLayer) {
         g.renderer.dontRecordAudio = false;
       }
 
-    int frame = Global::getCurrentFrame();
-
-      if (frame > 2 && g.firstAttempt) {
+      int frame = Global::getCurrentFrame();
+      if (frame > 2 && g.firstAttempt && g.macro.xdBotMacro) {
         g.firstAttempt = false;
 
         if ((m_levelSettings->m_platformerMode || rendering) && !m_levelEndAnimationStarted)
-          return PlayLayer::get()->resetLevelFromStart();
+          return pl->resetLevelFromStart();
         else if (!m_levelEndAnimationStarted)
-          return PlayLayer::get()->resetLevel();
+          return pl->resetLevel();
       }
 
-      if (g.previousFrame == frame && frame != 0)
-        return GJBaseGameLayer::processCommands(dt);
+      // if (g.previousFrame == frame && frame != 0)
+      //   return GJBaseGameLayer::processCommands(dt);
 
     }
 
@@ -253,7 +252,7 @@ class $modify(BGLHook, GJBaseGameLayer) {
       handleRecording(frame);
 
     if (g.state == state::playing)
-      handlePlaying(frame);
+      handlePlaying(Global::getCurrentFrame());
 
   }
 
@@ -446,7 +445,6 @@ class $modify(PauseLayer) {
     g.checkpoints.clear();
 
     if (g.restart) {
-      g.restart = false;
       if (PlayLayer* pl = PlayLayer::get())
         pl->resetLevel();
     }

src/ui/load_macro_layer.cpp

@@ -710,6 +710,8 @@ void MacroCell::handleLoad() {
 	g.restart = true;
 	g.macro.canChangeFPS = false;
 
+    g.macro.xdBotMacro = g.macro.botInfo.name == "xdBot";
+
 	loadLayer->keyBackClicked();
 
 	RecordLayer* newLayer = nullptr;

src/ui/record_layer.cpp

@@ -240,7 +240,7 @@ void RecordLayer::togglePlaying(CCObject*) {
     if (g.state == state::playing) {
         g.currentAction = 0;
         g.currentFrameFix = 0;
-
+        
         PlayLayer* pl = PlayLayer::get();
 
         if (pl) {