Doggos now eat things that come near

Author: IntegerMan

MattEland.FSharpGeneticAlgorithm.Logic/Simulator.fs

@@ -36,8 +36,22 @@ let moveActor state actor pos =
     if otherActor <> actor && canEnterActorCell actor.ActorKind otherActor.ActorKind then 
 
       match actor.ActorKind with 
+      | Doggo -> 
+          if otherActor.ActorKind = Rabbit then
+            {state with World = {world with
+              Rabbit = {world.Rabbit with IsActive = false}
+              Doggo = {world.Doggo with Pos = pos}
+            }}
+          else
+            {state with SimState = Lost; World = {world with
+              Squirrel = {world.Squirrel with IsActive = false}
+              Doggo = {world.Doggo with Pos = pos}
+              }
+            }
+
       | Squirrel hasAcorn -> 
-        if not hasAcorn && otherActor.ActorKind = Acorn then
+        if not hasAcorn && otherActor.ActorKind = Acorn && not otherActor.IsActive then
+          // Moving to the acorn for the first time should give the squirrel the acorn
           {state with World =
             { 
               world with 
@@ -46,6 +60,7 @@ let moveActor state actor pos =
             }
           }
         else if hasAcorn && otherActor.ActorKind = Tree then
+          // Moving to the tree with the acorn - this should win the game
           {
             state with SimState = Won; World = { 
               world with Squirrel = {ActorKind = Squirrel true; Pos = pos; IsActive = true} 
@@ -76,12 +91,22 @@ let moveRandomly state actor getRandomNumber =
 
   moveActor state actor movedPos
 
-let simulateActors (state: GameState) getRandomNumber =
-  let mutable endState = state
+let simulateDoggo (state: GameState) =
+  let doggo = state.World.Doggo
+  let rabbit = state.World.Rabbit
+  let squirrel = state.World.Squirrel
 
-  endState <- moveRandomly endState endState.World.Rabbit getRandomNumber
+  // Eat any adjacent actor
+  if rabbit.IsActive && isAdjacentTo doggo.Pos rabbit.Pos then
+    moveActor state doggo rabbit.Pos
+  else if squirrel.IsActive && isAdjacentTo doggo.Pos squirrel.Pos then
+    moveActor state doggo squirrel.Pos
+  else
+    state
 
-  endState
+let simulateActors (state: GameState) getRandomNumber =
+  moveRandomly state state.World.Rabbit getRandomNumber 
+  |>  simulateDoggo
 
 let handlePlayerCommand state command =
   let player = state.World.Squirrel

MattEland.FSharpGeneticAlgorithm.Tests/Tests.fs

@@ -63,3 +63,21 @@ let ``Squirrel Getting Acorn to Tree Should Win Game`` () =
   // Assert
   newState.World.Squirrel.Pos |> should equal world.Tree.Pos
   newState.SimState |> should equal Won
+
+  
+[<Fact>]
+let ``Squirrel Moving Next to Dog Should End With Squirrel Eaten`` () =
+  // Arrange
+  let randomizer = new Random(42)
+  let customSquirrel = {Pos=newPos 3 6; ActorKind = Squirrel false; IsActive = true}
+  let world: World = {(makeTestWorld false) with Squirrel = customSquirrel}
+  let state: GameState = {World=world; SimState=Simulating}
+    
+  // Act
+  let newState = simulateActors state randomizer.Next
+  
+  // Assert
+  newState.World.Doggo.Pos |> should equal world.Squirrel.Pos
+  newState.World.Squirrel.IsActive |> should equal false
+  newState.SimState |> should equal Lost
+