increased score with invader death

jhorv · Apr 29, 2019 · fc6eaff · fc6eaff
1 parent 390aae1
commit fc6eaff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/samples/space-invaders-clone/Config.fs b/samples/space-invaders-clone/Config.fs
@@ -35,6 +35,7 @@ type InvaderKind = {
     offset: int
     colour: Colour
     animations: (int * int * int * int) []
+    score: int
 }
 
 let largeSize = 
@@ -48,7 +49,8 @@ let largeSize =
         animations = [|
                 spritemap.["invader-large-0"]
                 spritemap.["invader-large-1"]
-            |] }
+            |]
+        score = 10 }
 
 let mediumSize = 
     let width, height = 
@@ -61,7 +63,8 @@ let mediumSize =
         animations = [|
                 spritemap.["invader-medium-0"]
                 spritemap.["invader-medium-1"]
-            |] }
+            |]
+        score = 20 }
 
 let smallSize = 
     let width, height = 
@@ -74,7 +77,8 @@ let smallSize =
         animations = [|
                 spritemap.["invader-small-0"]
                 spritemap.["invader-small-1"]
-            |] }
+            |]
+        score = 30 }
 
 let animationSpeed = 100L
 

diff --git a/samples/space-invaders-clone/Program.fs b/samples/space-invaders-clone/Program.fs
@@ -175,11 +175,14 @@ let destroyInvader targetRow index model =
         | Down (n, nextDir) when n = newInvaders.Length -> Down (n - 1, nextDir)
         | other -> other
 
+    let scoreIncrease = model.invaders.[targetRow].kind.score
+
     { model with
         invaders = newInvaders
         invaderDirection = newInvaderDirection
         explosions = newExplosion::model.explosions
-        shuffleInterval = max minShuffle (model.shuffleInterval - shuffleDecrease) }, Cmd.none
+        shuffleInterval = max minShuffle (model.shuffleInterval - shuffleDecrease)
+        score = model.score + scoreIncrease }, Cmd.none
 
 let update message model =
     match message with