aboutsummaryrefslogtreecommitdiff
path: root/src/Model
diff options
context:
space:
mode:
Diffstat (limited to 'src/Model')
-rw-r--r--src/Model/Game.elm33
-rw-r--r--src/Model/Player.elm10
2 files changed, 21 insertions, 22 deletions
diff --git a/src/Model/Game.elm b/src/Model/Game.elm
index 4ef5d89..705841d 100644
--- a/src/Model/Game.elm
+++ b/src/Model/Game.elm
@@ -14,29 +14,20 @@ import Model.Config (..)
type alias Game =
{ time : Float
, keysDown : List KeyCode
- , score : Int
+ , currentScore : Int
, player : Player
, cloud : Cloud
- , bestScore : Int
+ , scores : List Int
, seed : Seed
}
-initialGame : Seed -> Vec2 -> Config -> Int -> Game
-initialGame seed playerPos config bestScore =
- let initPlayer =
- { pos = playerPos
- , speed =
- { x = 0
- , y = 0
- }
- , config = config
- }
- in
- { time = 0
- , keysDown = []
- , score = 0
- , player = initPlayer
- , cloud = initCloud
- , bestScore = bestScore
- , seed = seed
- }
+initialGame : Seed -> Game
+initialGame seed =
+ { time = 0
+ , keysDown = []
+ , currentScore = 0
+ , player = initPlayer
+ , cloud = initCloud
+ , scores = []
+ , seed = seed
+ }
diff --git a/src/Model/Player.elm b/src/Model/Player.elm
index c6aac21..a9f3f00 100644
--- a/src/Model/Player.elm
+++ b/src/Model/Player.elm
@@ -1,11 +1,12 @@
module Model.Player
( Player
+ , initPlayer
, playerSize
, playerSpeed
) where
import Model.Vec2 (..)
-import Model.Config (Config)
+import Model.Config (..)
type alias Player =
{ pos : Vec2
@@ -13,6 +14,13 @@ type alias Player =
, config : Config
}
+initPlayer : Player
+initPlayer =
+ { pos = originVec
+ , speed = originVec
+ , config = White
+ }
+
playerSize : Float
playerSize = 15