From 97e494a7c5a105bba6a48f5025e71a376fc8673d Mon Sep 17 00:00:00 2001 From: Joris Guyonvarch Date: Sun, 8 Mar 2015 13:26:52 +0100 Subject: Save round durations --- src/Model/Game.elm | 5 +++-- src/Model/Round.elm | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/Model/Round.elm (limited to 'src/Model') 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 -- cgit v1.2.3