beta 7

ZiLko · Oct 5, 2024 · 38e4cd1 · 38e4cd1
1 parent fbdc140
commit 38e4cd1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+# v2.0.0-beta.7
+
+* Fixed show trajectory not working.
+* Fixed spider being flipped when show trajectory is on.
+
 # v2.0.0-beta.6
 
 * Fixed more settings popup being brown.

diff --git a/mod.json b/mod.json
@@ -4,7 +4,7 @@
 		"win": "2.206",
 		"android": "2.206"
 	},
-	"version": "v2.0.0-beta.6",
+	"version": "v2.0.0-beta.7",
 	"id": "zilko.xdbot",
 	"name": "xdBot",
 	"developer": "Zilko",

diff --git a/src/hacks/show_trajectory.cpp b/src/hacks/show_trajectory.cpp
@@ -61,7 +61,7 @@ void ShowTrajectory::createTrajectory(PlayLayer* pl, PlayerObject* fakePlayer, P
     bool player2 = pl->m_player2 == realPlayer;
 
     PlayerData playerData = PlayerPracticeFixes::saveData(realPlayer);
-    PlayerPracticeFixes::applyData(fakePlayer, playerData, pl->m_player2, true);
+    PlayerPracticeFixes::applyData(fakePlayer, playerData, false, true);
 
     t.cancelTrajectory = false;
 

diff --git a/src/macro.hpp b/src/macro.hpp
@@ -47,7 +47,7 @@ struct input : gdr::Input {
 
 struct Macro : gdr::Replay<Macro, input> {
 
-    Macro() : Replay("xdBot", "v2.0.0-beta.6") {}
+    Macro() : Replay("xdBot", "v2.0.0-beta.7") {}
 
 public:
 

diff --git a/src/practice_fixes/player.cpp b/src/practice_fixes/player.cpp
@@ -295,7 +295,9 @@ void PlayerPracticeFixes::applyData(PlayerObject* player, PlayerData data, bool
 
     #endif
 
-    player->m_mainLayer = data.m_mainLayer;
+    if (!isFakePlayer)
+        player->m_mainLayer = data.m_mainLayer;
+
     player->m_wasTeleported = data.m_wasTeleported; 
     player->m_fixGravityBug = data.m_fixGravityBug;
     player->m_reverseSync = data.m_reverseSync;

diff --git a/src/ui/record_layer.cpp b/src/ui/record_layer.cpp
@@ -501,7 +501,7 @@ bool RecordLayer::setup() {
     CCSprite* spriteOn = CCSprite::createWithSpriteFrameName("GJ_checkOn_001.png");
     CCSprite* spriteOff = CCSprite::createWithSpriteFrameName("GJ_checkOff_001.png");
 
-    CCLabelBMFont* versionLabel = CCLabelBMFont::create("xdBot v2.0.0-beta.6", "chatFont.fnt");
+    CCLabelBMFont* versionLabel = CCLabelBMFont::create("xdBot v2.0.0-beta.7", "chatFont.fnt");
     versionLabel->setOpacity(63);
     versionLabel->setPosition(ccp(-217, -125));
     versionLabel->setAnchorPoint({ 0, 0.5 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,7 @@ struct input : gdr::Input { @@
     struct Macro : gdr::Replay<Macro, input> {
-        Macro() : Replay("xdBot", "v2.0.0-beta.6") {}
+        Macro() : Replay("xdBot", "v2.0.0-beta.7") {}
     public:
@@ Expand Down @@