aboutsummaryrefslogtreecommitdiff
path: root/src/Model
diff options
context:
space:
mode:
authorJoris Guyonvarch2015-03-08 13:26:52 +0100
committerJoris Guyonvarch2015-03-08 13:29:01 +0100
commit97e494a7c5a105bba6a48f5025e71a376fc8673d (patch)
tree9cd83b9fedfa4787e6237fadce4dfd2d43faa0d6 /src/Model
parent6c1f5e10631a3f66f4c85a45b6f28ffd366105c5 (diff)
downloadcatchvoid-97e494a7c5a105bba6a48f5025e71a376fc8673d.tar.gz
catchvoid-97e494a7c5a105bba6a48f5025e71a376fc8673d.tar.bz2
catchvoid-97e494a7c5a105bba6a48f5025e71a376fc8673d.zip
Save round durations
Diffstat (limited to 'src/Model')
-rw-r--r--src/Model/Game.elm5
-rw-r--r--src/Model/Round.elm19
2 files changed, 22 insertions, 2 deletions
diff --git a/src/Model/Game.elm b/src/Model/Game.elm
index 705841d..6a9020f 100644
--- a/src/Model/Game.elm
+++ b/src/Model/Game.elm
@@ -10,6 +10,7 @@ import Model.Player (..)
import Model.Cloud (..)
import Model.Vec2 (Vec2)
import Model.Config (..)
+import Model.Round (Round)
type alias Game =
{ time : Float
@@ -17,7 +18,7 @@ type alias Game =
, currentScore : Int
, player : Player
, cloud : Cloud
- , scores : List Int
+ , rounds : List Round
, seed : Seed
}
@@ -28,6 +29,6 @@ initialGame seed =
, currentScore = 0
, player = initPlayer
, cloud = initCloud
- , scores = []
+ , rounds = []
, seed = seed
}
diff --git a/src/Model/Round.elm b/src/Model/Round.elm
new file mode 100644
index 0000000..d5210d5
--- /dev/null
+++ b/src/Model/Round.elm
@@ -0,0 +1,19 @@
+module Model.Round
+ ( Round
+ , roundOrder
+ ) where
+
+import Time (Time)
+
+type alias Round =
+ { duration : Time
+ , score : Int
+ }
+
+roundOrder : Round -> Round -> Order
+roundOrder round1 round2 =
+ if round1.score == round2.score
+ then
+ compare round2.duration round1.duration
+ else
+ compare round1.score round2.score