Merge dev -> master to start the developer beta

.github/workflows/build.yml

@@ -1,6 +1,13 @@
 name: Build
 
-on: [ workflow_dispatch, push ]
+on:
+  push:
+    branches:
+      - "*"
+    tags:
+      - "v*.*.*"
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   build-windows:
@@ -38,3 +45,23 @@ jobs:
       with:
         name: RLBotServer-ubuntu
         path: ./**/publish/RLBotServer
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    if: "startsWith(github.ref, 'refs/tags/')"
+    needs: [build-linux, build-windows]
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          merge-multiple: "true"
+      - name: Publish to GitHub Releases
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ./**/publish/RLBotServer*
+          generate_release_notes: true
+          body: |
+            Pre-built binaries that allows bots to interface with Rocket League via the RLBot v5 spec

README.md

@@ -24,7 +24,13 @@ compiled binaries at `RLBotCS\bin\Release\net8.0`.
 
 ## Deployment
 
-New deployment method is still TBD.
+1. Ensure all changes are on the `master` branch
+1. Create a new tag with the next version number - e.x. `git tag v0.1.0 -m "Core v0.1.0"`
+   - Preferably sign the tag too - `git tag -s v0.1.0 -m "Core v0.1.0"`
+1. Push the tag - `git push --tags`
+1. Wait for the Github Actions to build the release and upload it to the release page!
+
+Further deployment steps for automatic updates are still in progress.
 
 ## Maintenance
 
@@ -35,11 +41,11 @@ This project uses the CSharpier formatter. You can run it with `dotnet csharpier
 ### Flatbuffers
 
 The Core project uses flatbuffers, which involves generating C# code based on a specification
-file called `rlbot.fbs`. Find this in `RLBotCS/FlatBuffer` after it's been generated.
+file called `rlbot.fbs`. Find this in `./FlatBuffer` after it's been generated.
 
 The [flatbuffers-schema](https://github.com/RLBot/flatbuffers-schema) submodule should be kept update to date:
 
-- `cd RLBotCS/flatbuffers-schema`
+- `cd flatbuffers-schema`
 - `git checkout main`
 - `git fetch`
 - `git pull`
@@ -52,3 +58,10 @@ The `Bridge.dll` file in `RLBotCS/lib` is built from a _closed-source_ repositor
 It is maintained by RLBot developers who have signed an agreement with Psyonix to keep it private.
 
 The dll file is platform-independent and works for building the project on both Windows and Linux.
+
+### rl_ball_sym
+
+The native binaries that live in `RLBotCS/lib/rl_ball_sym` generate the ball prediction that core then distributes to bots & scripts that request it.
+The `dll`/`so` are dynamically loaded at run time while developing core, and the `a`/`lib` files are statically linked during publishing.
+
+All source code and releases for building the dlls can be found at <https://github.com/VirxEC/rl_ball_sym_dll> but the core of the code is a library that's published for anyone's use at <https://crates.io/crates/rl_ball_sym>.

RLBotCS/Conversion/FlatToCommand.cs

@@ -18,6 +18,7 @@ private static string MapGameMode(GameMode gameMode) =>
             GameMode.Rumble => "?game=TAGame.GameInfo_Items_TA",
             GameMode.Heatseeker => "?game=TAGame.GameInfo_GodBall_TA",
             GameMode.Gridiron => "?game=TAGame.GameInfo_Football_TA",
+            GameMode.Knockout => "?game=TAGame.GameInfo_KnockOut_TA",
             _ => throw new ArgumentOutOfRangeException(nameof(gameMode), gameMode, null)
         };
 
@@ -101,6 +102,8 @@ private static string MapBallType(BallTypeOption option) =>
             BallTypeOption.Beachball => "Ball_BeachBall",
             BallTypeOption.Anniversary => "Ball_Anniversary",
             BallTypeOption.Haunted => "Ball_Haunted",
+            BallTypeOption.Ekin => "Ball_Ekin",
+            BallTypeOption.SpookyCube => "Ball_SpookyCube",
             _ => throw new ArgumentOutOfRangeException(nameof(option), option, null)
         };
 
@@ -113,6 +116,7 @@ private static string MapBallWeight(BallWeightOption option) =>
             BallWeightOption.Super_Light => "SuperLightBall",
             BallWeightOption.Curve_Ball => "MagnusBall",
             BallWeightOption.Beach_Ball_Curve => "MagnusBeachBall",
+            BallWeightOption.Magnus_FutBall => "MagnusFutBallTest",
             _ => throw new ArgumentOutOfRangeException(nameof(option), option, null)
         };
 
@@ -121,6 +125,7 @@ private static string MapBallSize(BallSizeOption option) =>
         {
             BallSizeOption.Default => "",
             BallSizeOption.Small => "SmallBall",
+            BallSizeOption.Medium => "MediumBall",
             BallSizeOption.Large => "BigBall",
             BallSizeOption.Gigantic => "GiantBall",
             _ => throw new ArgumentOutOfRangeException(nameof(option), option, null)
@@ -133,6 +138,7 @@ private static string MapBallBounciness(BallBouncinessOption option) =>
             BallBouncinessOption.Low => "LowBounciness",
             BallBouncinessOption.High => "HighBounciness",
             BallBouncinessOption.Super_High => "SuperBounciness",
+            BallBouncinessOption.LowishBounciness => "LowishBounciness",
             _ => throw new ArgumentOutOfRangeException(nameof(option), option, null)
         };
 
@@ -160,6 +166,7 @@ private static string MapRumble(RumbleOption option) =>
             RumbleOption.Spike_Rush => "ItemsModeRugby",
             RumbleOption.Haunted_Ball_Beam => "ItemsModeHauntedBallBeam",
             RumbleOption.Tactical => "ItemsModeSelection",
+            RumbleOption.BatmanRumble => "ItemsMode_BM",
             _ => throw new ArgumentOutOfRangeException(nameof(option), option, null)
         };
 
@@ -169,6 +176,7 @@ private static string MapBoostStrength(BoostStrengthOption option) =>
             BoostStrengthOption.One => "",
             BoostStrengthOption.OneAndAHalf => "BoostMultiplier1_5x",
             BoostStrengthOption.Two => "BoostMultiplier2x",
+            BoostStrengthOption.Five => "BoostMultiplier5x",
             BoostStrengthOption.Ten => "BoostMultiplier10x",
             _ => throw new ArgumentOutOfRangeException(nameof(option), option, null)
         };
@@ -205,6 +213,31 @@ private static string MapRespawnTime(RespawnTimeOption option) =>
             _ => throw new ArgumentOutOfRangeException(nameof(option), option, null)
         };
 
+    private static string MapMaxTime(MaxTimeOption option) =>
+        option switch
+        {
+            MaxTimeOption.Default => "",
+            MaxTimeOption.Eleven_Minutes => "MaxTime11Minutes",
+            _ => throw new ArgumentOutOfRangeException(nameof(option), option, null)
+        };
+
+    private static string MapGameEvent(GameEventOption option) =>
+        option switch
+        {
+            GameEventOption.Default => "",
+            GameEventOption.Rugby => "RugbyGameEventRules",
+            GameEventOption.Haunted => "HauntedGameEventRules",
+            _ => throw new ArgumentOutOfRangeException(nameof(option), option, null)
+        };
+
+    private static string MapAudio(AudioOption option) =>
+        option switch
+        {
+            AudioOption.Default => "",
+            AudioOption.Haunted => "HauntedAudio",
+            _ => throw new ArgumentOutOfRangeException(nameof(option), option, null)
+        };
+
     private static string GetOption(string option)
     {
         if (option != "")
@@ -232,6 +265,9 @@ public static string MakeOpenCommand(MatchSettingsT matchSettings)
         // Parse game mode
         command += MapGameMode(matchSettings.GameMode);
 
+        if (matchSettings.SkipReplays)
+            command += "?noreplay";
+
         // Whether to or not to skip the kickoff countdown
         if (!matchSettings.InstantStart)
             command += "?Playtest";
@@ -262,6 +298,9 @@ public static string MakeOpenCommand(MatchSettingsT matchSettings)
         command += GetOption(MapGravity(mutatorSettings.GravityOption));
         command += GetOption(MapDemolish(mutatorSettings.DemolishOption));
         command += GetOption(MapRespawnTime(mutatorSettings.RespawnTimeOption));
+        command += GetOption(MapMaxTime(mutatorSettings.MaxTimeOption));
+        command += GetOption(MapGameEvent(mutatorSettings.GameEventOption));
+        command += GetOption(MapAudio(mutatorSettings.AudioOption));
 
         return command;
     }

RLBotCS/Conversion/GameStateToFlat.cs

@@ -1,4 +1,5 @@
 using Bridge.Models.Message;
+using Bridge.Packet;
 using Bridge.State;
 using rlbot.flat;
 using CollisionShapeUnion = rlbot.flat.CollisionShapeUnion;
@@ -51,17 +52,6 @@ public static GameTickPacketT ToFlatBuffers(this GameState gameState)
                     AngularVelocity = ball.Physics.AngularVelocity.ToVector3T()
                 };
 
-            TouchT lastTouch =
-                new()
-                {
-                    PlayerName = ball.LatestTouch.PlayerName,
-                    PlayerIndex = ball.LatestTouch.PlayerIndex,
-                    Team = ball.LatestTouch.Team,
-                    GameSeconds = ball.LatestTouch.TimeSeconds,
-                    Location = ball.LatestTouch.HitLocation.ToVector3T(),
-                    Normal = ball.LatestTouch.HitNormal.ToVector3T()
-                };
-
             CollisionShapeUnion collisionShape = ball.Shape switch
             {
                 ICollisionShape.Box boxShape
@@ -91,14 +81,7 @@ ICollisionShape.Cylinder cylinderShape
                     )
             };
 
-            balls.Add(
-                new()
-                {
-                    Physics = ballPhysics,
-                    LatestTouch = lastTouch,
-                    Shape = collisionShape
-                }
-            );
+            balls.Add(new() { Physics = ballPhysics, Shape = collisionShape });
         }
 
         rlbot.flat.GameStateType gameStateType = gameState.GameStateType switch
@@ -134,7 +117,9 @@ ICollisionShape.Cylinder cylinderShape
         ];
 
         List<BoostPadStateT> boostStates = gameState
-            .BoostPads.Values.Select(
+            .BoostPads.Values.OrderBy(boost => boost.SpawnPosition.Y)
+            .ThenBy(boost => boost.SpawnPosition.X)
+            .Select(
                 boost => new BoostPadStateT { IsActive = boost.IsActive, Timer = boost.Timer }
             )
             .ToList();
@@ -152,6 +137,16 @@ ICollisionShape.Cylinder cylinderShape
                 _ => AirState.OnGround
             };
 
+            TouchT? lastTouch = null;
+            if (car.LastTouch is BallTouch touch)
+                lastTouch = new()
+                {
+                    GameSeconds = touch.TimeSeconds,
+                    Location = touch.HitLocation.ToVector3T(),
+                    Normal = touch.HitNormal.ToVector3T(),
+                    BallIndex = touch.BallIndex,
+                };
+
             players.Add(
                 new()
                 {
@@ -162,6 +157,7 @@ ICollisionShape.Cylinder cylinderShape
                         Velocity = car.Physics.Velocity.ToVector3T(),
                         AngularVelocity = car.Physics.AngularVelocity.ToVector3T()
                     },
+                    LastestTouch = lastTouch,
                     AirState = airState,
                     DodgeTimeout = car.DodgeTimeout,
                     DemolishedTimeout = car.DemolishedTimeout,
@@ -210,7 +206,7 @@ ICollisionShape.Cylinder cylinderShape
             Balls = balls,
             GameInfo = gameInfo,
             Teams = teams,
-            BoostPadStates = boostStates,
+            BoostPads = boostStates,
             Players = players
         };
     }

RLBotCS/Conversion/PsyonixLoadouts.cs

@@ -6,18 +6,30 @@ namespace RLBotCS.Conversion;
 internal static class PsyonixLoadouts
 {
     private static Random _random = new();
-    
+
     /// Unused loadout names, used to avoid spawning multiple of the same Psyonix bot
     private static List<string> Unused = new();
 
     public static void Reset()
     {
         Unused.Clear();
     }
-
+
+    public static PlayerLoadoutT? GetFromName(string name, int team)
+    {
+        int index = Unused.FindIndex(n => n.Contains(name));
+        if (index == -1)
+            return null;
+
+        var loadout = DefaultLoadouts[Unused[index]][team];
+        Unused.RemoveAt(index);
+        return loadout;
+    }
+
     public static (string, PlayerLoadoutT) GetNext(int team)
     {
-        if (Unused.Count == 0) Unused = DefaultLoadouts.Keys.OrderBy(_ => _random.Next()).ToList();
+        if (Unused.Count == 0)
+            Unused = DefaultLoadouts.Keys.OrderBy(_ => _random.Next()).ToList();
         var fullName = Unused.Last();
         Unused.RemoveAt(Unused.Count - 1);
         var loadout = DefaultLoadouts[fullName][team];

RLBotCS/Main.cs

@@ -16,7 +16,8 @@
     if (rlbotSocketsPort < 0)
     {
         throw new FormatException();
-    } else if (rlbotSocketsPort > 65535)
+    }
+    else if (rlbotSocketsPort > 65535)
     {
         throw new OverflowException();
     }

RLBotCS/ManagerTools/BallPredictor.cs

@@ -1,5 +1,4 @@
 using System.Runtime.InteropServices;
-using Bridge.Packet;
 using rlbot.flat;
 
 namespace RLBotCS.ManagerTools;
@@ -62,7 +61,7 @@ public static partial class BallPredictor
     [LibraryImport("rl_ball_sym", EntryPoint = "free_ball_slices")]
     private static unsafe partial void FreeBallSlices(BallSlice* slices, ushort ticks);
 
-    private static Vec3 ToVec3(Bridge.Models.Phys.Vector3 vec) => new(vec.X, vec.Y, vec.Z);
+    private static Vec3 ToVec3(Vector3T vec) => new(vec.X, vec.Y, vec.Z);
 
     private static Vector3T ToVector3T(Vec3 vec) =>
         new()
@@ -111,7 +110,8 @@ public static PredictionMode GetMode(MatchSettingsT matchSettings)
     public static BallPredictionT Generate(
         PredictionMode mode,
         float currentTime,
-        Ball currentBall
+        BallInfoT currentBall,
+        (TouchT, uint)? lastTouch
     )
     {
         BallSlice ball =
@@ -131,20 +131,23 @@ Ball currentBall
 
         if (mode == PredictionMode.Heatseeker)
         {
-            if (currentBall.LatestTouch.TimeSeconds < float.Epsilon)
+            if (lastTouch is (TouchT, uint) lastestTouch)
             {
-                // A goal happened, we're in kickoff
-                ResetHeatseekerTarget();
-            }
-            else if (currentTime - currentBall.LatestTouch.TimeSeconds < 0.1)
-            {
-                // Target goal is the opposite of the last touch
-                SetHeatseekerTarget(currentBall.LatestTouch.Team == 1 ? (byte)0 : (byte)1);
+                if (currentTime - lastestTouch.Item1.GameSeconds < 0.1)
+                {
+                    // Target goal is the opposite of the last touch
+                    SetHeatseekerTarget(lastestTouch.Item2 == 1 ? (byte)0 : (byte)1);
+                }
+                else if (GetHeatseekerTargetY() == 0 || MathF.Abs(ball.Location.Y) >= 4820)
+                {
+                    // We're very likely to hit a wall that will redirect the ball towards the other goal
+                    SetHeatseekerTarget(ball.LinearVelocity.Y < 0 ? (byte)1 : (byte)0);
+                }
             }
-            else if (GetHeatseekerTargetY() == 0 || MathF.Abs(ball.Location.Y) >= 4820)
+            else
             {
-                // We're very likely to hit a wall that will redirect the ball towards the other goal
-                SetHeatseekerTarget(ball.LinearVelocity.Y < 0 ? (byte)1 : (byte)0);
+                // A goal happened, we're in kickoff
+                ResetHeatseekerTarget();
             }
         }