Rollback changes depended on seq id gen, fix jump function

Author: evgTSV

O21.Game/Engine/RandomGenerator.fs

@@ -44,7 +44,8 @@ type RandomGenerator(seed: int64) =
 
     do initializeState(seed)
 
-    member this.Seed = seed
+    member private _.State = randState
+    member _.Seed = seed
 
     member this.Next() : uint64 =
         let result = rotl (randState[0] + randState[3]) 23 + randState[0]
@@ -108,18 +109,22 @@ type RandomGenerator(seed: int64) =
             invalidArg (nameof(state)) "State must have exactly 4 elements"
         state.CopyTo randState
 
+    static member FromState(state: Span<uint64>) =
+        let generator = RandomGenerator(0)
+        generator.LoadState(state)
+        generator
+        
     member private this.JumpBase(jumps: uint64[]) =
+        let rand = RandomGenerator.FromState(randState)
         let newState = stackalloc<uint64> 4
         for i in 0 .. 3 do
             for b in 0 .. 63 do
                 if (jumps[i] &&& (1UL <<< b)) <> 0UL then
                     for j in 0 .. 3 do
-                        newState[j] <- newState[j] ^^^ randState[j]
-                this.Next() |> ignore
+                        newState[j] <- newState[j] ^^^ rand.State[j]
+                rand.Next() |> ignore
 
-        let generator = RandomGenerator(0)
-        generator.LoadState(newState)
-        generator
+        RandomGenerator.FromState(newState)
 
     member this.Jump() =
         this.JumpBase(jump)

O21.Game/Engine/ReproducibleRandom.fs

@@ -6,7 +6,6 @@ namespace O21.Game.Engine
 
 open System
 open System.Collections.Generic
-open O21.Game.Engine.EntityId
 open O21.Game.U95    
 
 type ReproducibleRandom private (backend: RandomGenerator, idGenerator: SequentialIdGenerator) =
@@ -15,7 +14,7 @@ type ReproducibleRandom private (backend: RandomGenerator, idGenerator: Sequenti
     /// to have reproducible number sequence generated across all of the supported platforms.
     static member FromSeed(seed: int64): ReproducibleRandom =
         let baseGenerator = RandomGenerator(seed)
-        ReproducibleRandom(baseGenerator, SequentialIdGenerator(baseGenerator.Jump()))
+        ReproducibleRandom(baseGenerator, SequentialIdGenerator())
 
     /// <summary>
     /// <para>Will choose a random seed to instantiate a new instance.</para>
@@ -32,13 +31,13 @@ type ReproducibleRandom private (backend: RandomGenerator, idGenerator: Sequenti
         backend.Next 100 >= 50
 
     member _.NextFishId() =
-        idGenerator.NextIdWithPrefix(FishId.prefix) |> FishId
+        idGenerator.GetFishId()
 
     member _.NextBombId() =
-        idGenerator.NextIdWithPrefix(BombId.prefix) |> BombId
+        idGenerator.GetBombId()
 
     member _.NextBonusId() =
-        idGenerator.NextIdWithPrefix(BonusId.prefix) |> BonusId
+        idGenerator.GetBonusId()
 
     member _.Chance(probability: float): bool =
         backend.NextBool(probability)

O21.Game/Engine/SequentialIdGenerator.fs

@@ -4,18 +4,24 @@
 
 namespace O21.Game.Engine
 
-type SequentialIdGenerator(generator: RandomGenerator) =
-    let mutable counter = 0UL
+open O21.Game.Engine.EntityId
+
+type SequentialIdGenerator() =
+    let mutable nextFishId = 0UL
+    let mutable nextBombId = 0UL
+    let mutable nextBonusId = 0UL
 
-    member this.NextId() : uint64 =
-        counter <- counter + 1UL
-        
-        let randomPart = generator.Next()
-        let combined = counter ^^^ randomPart
+    member _.GetFishId() =
+        let newId = nextFishId + 1UL
+        nextFishId <- newId
+        FishId <| newId
+    
+    member _.GetBombId() =
+        let newId = nextBombId + 1UL
+        nextBombId <- newId
+        BombId <| newId
 
-        if combined = 0UL then 1UL else combined
-
-    member this.NextIdWithPrefix (prefix: uint16) : uint64 =
-        let id = this.NextId()
-        let prefix = uint64 prefix <<< 48
-        (id &&& 0x0000FFFFFFFFFFFFUL) ||| prefix
+    member _.GetBonusId() =
+        let newId = nextBonusId + 1UL
+        nextBonusId <- newId
+        BonusId <| newId

O21.Tests/EnemyTests.fs

@@ -21,37 +21,43 @@ let ``Basic fish get spawned on level``(): unit =
         |> Array.map (fun f -> { f with Id = FishId.empty }) // Ignore IDs for comparison
     Assert.Equivalent(
         [| { Id = FishId.empty
-             TopLeft = Point (72, 60)
+             TopLeft = Point (96, 264)
              Type = 4
              HorizontalVelocity = 3
              HorizontalDirection = HorizontalDirection.Right
              VerticalDirection = VerticalDirection.Up }
            { Id = FishId.empty
-             TopLeft = Point (108, 0)
+             TopLeft = Point (132, 36)
+             Type = 1
+             HorizontalVelocity = 5
+             HorizontalDirection = HorizontalDirection.Right
+             VerticalDirection = VerticalDirection.Up }
+           { Id = FishId.empty
+             TopLeft = Point (132, 204)
              Type = 4
              HorizontalVelocity = 5
              HorizontalDirection = HorizontalDirection.Right
              VerticalDirection = VerticalDirection.Up }
            { Id = FishId.empty
-             TopLeft = Point (264, 72)
+             TopLeft = Point (288, 276)
              Type = 0
              HorizontalVelocity = 5
              HorizontalDirection = HorizontalDirection.Left
              VerticalDirection = VerticalDirection.Up }
            { Id = FishId.empty
-             TopLeft = Point (360, 108)
+             TopLeft = Point (396, 12)
              Type = 2
              HorizontalVelocity = 4
              HorizontalDirection = HorizontalDirection.Right
              VerticalDirection = VerticalDirection.Up }
            { Id = FishId.empty
-             TopLeft = Point (456, 96)
+             TopLeft = Point (492, 0)
              Type = 3
              HorizontalVelocity = 5
              HorizontalDirection = HorizontalDirection.Right
              VerticalDirection = VerticalDirection.Up }
            { Id = FishId.empty
-             TopLeft = Point (516, 216)
+             TopLeft = Point (552, 108)
              Type = 0
              HorizontalVelocity = 3
              HorizontalDirection = HorizontalDirection.Left