Fix IsBot always being false

Fix unit ball pred unit test Add more to player mapping test to prevent regression
RLBot · Jul 12, 2024 · 4ff6a55 · 4ff6a55
1 parent 9c9a0b2
commit 4ff6a55
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/RLBotCS/Conversion/GameStateToFlat.cs b/RLBotCS/Conversion/GameStateToFlat.cs
@@ -159,7 +159,7 @@ ICollisionShape.Cylinder cylinderShape
                     DodgeTimeout = car.DodgeTimeout,
                     DemolishedTimeout = car.DemolishedTimeout,
                     IsSupersonic = car.IsSuperSonic,
-                    IsBot = car.IsBot,
+                    IsBot = car.IsCustomBot,
                     Name = car.Name,
                     Team = car.Team,
                     Boost = (uint)Math.Floor(car.Boost),

diff --git a/RLBotCS/Server/BridgeMessage.cs b/RLBotCS/Server/BridgeMessage.cs
@@ -47,6 +47,7 @@ public void HandleMessage(BridgeContext context)
                 CommandId = 0,
                 SpawnId = PlayerConfig.SpawnId,
                 DesiredPlayerIndex = DesiredIndex,
+                IsBot = false,
                 IsCustomBot = false
             }
         );
@@ -84,7 +85,8 @@ public void HandleMessage(BridgeContext context)
                 CommandId = commandId,
                 SpawnId = config.SpawnId,
                 DesiredPlayerIndex = DesiredIndex,
-                IsCustomBot = IsCustomBot
+                IsCustomBot = IsCustomBot,
+                IsBot = true
             }
         );
     }

diff --git a/RLBotCS/lib/Bridge.dll b/RLBotCS/lib/Bridge.dll
diff --git a/RLBotCSTests/BallPrediction.cs b/RLBotCSTests/BallPrediction.cs
@@ -40,9 +40,9 @@ public void TestBallPred()
 
             var ballPred = BallPredictor.Generate(PredictionMode.Standard, 1, packet.Balls[12345]);
 
-            int numSlices = 8 * 120;
+            int numSlices = 6 * 120;
             Assert.AreEqual(numSlices, ballPred.Slices.Count);
-            Assert.IsTrue(ballPred.Slices[numSlices - 1].GameSeconds > 8.9999);
+            Assert.IsTrue(ballPred.Slices[numSlices - 1].GameSeconds > 5.9999);
 
             // comment out to see results of the below test
             // dotnet test -c "Release" for best results

diff --git a/RLBotCSTests/PlayerMappingTest.cs b/RLBotCSTests/PlayerMappingTest.cs
@@ -29,21 +29,24 @@ public void TestSpawnProcess()
                 SpawnId = spawnId,
                 CommandId = commandId,
                 DesiredPlayerIndex = desiredIndex,
-                IsCustomBot = true
+                IsBot = true
             };
 
             _playerMapping.AddPendingSpawn(spawnTracker);
 
             var carSpawn = new CarSpawn() { ActorId = actorId, CommandId = commandId, };
-            _playerMapping.ApplyCarSpawn(carSpawn);
+            var metadata = _playerMapping.ApplyCarSpawn(carSpawn);
 
             Assert.AreEqual(desiredIndex, _playerMapping.PlayerIndexFromActorId(actorId));
+            Assert.IsTrue(metadata.IsBot);
+            Assert.IsTrue(!metadata.IsCustomBot);
 
-            _playerMapping.ApplyCarSpawn(new CarSpawn() { ActorId = 111, CommandId = 222, });
+            var metadata2 = _playerMapping.ApplyCarSpawn(new CarSpawn() { ActorId = 111, CommandId = 222, });
 
             Assert.AreEqual(0u, _playerMapping.PlayerIndexFromActorId(111));
             Assert.AreEqual(desiredIndex, _playerMapping.PlayerIndexFromActorId(actorId));
-            Console.Write("Good");
+            Assert.IsTrue(!metadata2.IsBot);
+            Assert.IsTrue(!metadata2.IsCustomBot);
         }
     }
 }