diff options
author | Joris | 2015-12-30 01:03:47 +0100 |
---|---|---|
committer | Joris | 2015-12-30 01:03:47 +0100 |
commit | 1cf6bc1ad9209e4f3f2fcbc129f2577e74e94c99 (patch) | |
tree | 169e799b2d901a5f89829db8a82c79133e169474 /src/Model | |
parent | 79a9db1c532995c7c760bfb518b43d92dd703280 (diff) |
Upgrade to elm 0.16.0
Diffstat (limited to 'src/Model')
-rw-r--r-- | src/Model/Cloud.elm | 2 | ||||
-rw-r--r-- | src/Model/Game.elm | 2 | ||||
-rw-r--r-- | src/Model/Level.elm | 22 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/Model/Cloud.elm b/src/Model/Cloud.elm index d279bae..603477b 100644 --- a/src/Model/Cloud.elm +++ b/src/Model/Cloud.elm @@ -22,7 +22,7 @@ type alias Cloud = initCloud : Cloud initCloud = let spawn = 600 - in { points config = + in { points = \config -> case config of White -> [] Black -> [] diff --git a/src/Model/Game.elm b/src/Model/Game.elm index 8769651..24fd400 100644 --- a/src/Model/Game.elm +++ b/src/Model/Game.elm @@ -4,7 +4,7 @@ module Model.Game ) where import Random exposing (..) -import Keyboard exposing (KeyCode) +import Char exposing (KeyCode) import Time exposing (Time) import Set import Set exposing (Set) diff --git a/src/Model/Level.elm b/src/Model/Level.elm index a271653..3fc4258 100644 --- a/src/Model/Level.elm +++ b/src/Model/Level.elm @@ -52,39 +52,39 @@ progressiveRatio a b = (toFloat a ^ 7) / (toFloat b ^ 7) levels : List Level levels = [ { color = { red = 156, green = 168, blue = 233 } - , move initPos initDest delta = getMove (delta / 20) (initDest `sub` initPos) + , move = \initPos initDest delta -> getMove (delta / 20) (initDest `sub` initPos) } , { color = { red = 190, green = 156, blue = 233 } - , move initPos initDest delta = getWaveMove (delta / 20) (initDest `sub` initPos) 10 10 + , move = \initPos initDest delta -> getWaveMove (delta / 20) (initDest `sub` initPos) 10 10 } , { color = { red = 233, green = 156, blue = 232 } - , move initPos initDest delta = getMove (delta / 18) (initDest `sub` initPos) + , move = \initPos initDest delta -> getMove (delta / 18) (initDest `sub` initPos) } , { color = { red = 233, green = 156, blue = 187 } - , move initPos initDest delta = getWaveMove (delta / 18) (initDest `sub` initPos) 20 20 + , move = \initPos initDest delta -> getWaveMove (delta / 18) (initDest `sub` initPos) 20 20 } , { color = { red = 233, green = 171, blue = 156 } - , move initPos initDest delta = getMove (delta / 13) (initDest `sub` initPos) + , move = \initPos initDest delta -> getMove (delta / 13) (initDest `sub` initPos) } , { color = { red = 233, green = 215, blue = 156 } - , move initPos initDest delta = getWaveMove (delta / 16) (initDest `sub` initPos) 10 50 + , move = \initPos initDest delta -> getWaveMove (delta / 16) (initDest `sub` initPos) 10 50 } , { color = { red = 206, green = 233, blue = 156 } - , move initPos initDest delta = getMove (delta / 11) (initDest `sub` initPos) + , move = \initPos initDest delta -> getMove (delta / 11) (initDest `sub` initPos) } , { color = { red = 162, green = 233, blue = 156 } - , move initPos initDest delta = getWaveMove (delta / 14) (initDest `sub` initPos) 30 15 + , move = \initPos initDest delta -> getWaveMove (delta / 14) (initDest `sub` initPos) 30 15 } , { color = { red = 156, green = 233, blue = 196 } - , move initPos initDest delta = getMove (delta / 8) (initDest `sub` initPos) + , move = \initPos initDest delta -> getMove (delta / 8) (initDest `sub` initPos) } , { color = { red = 156, green = 225, blue = 233 } - , move initPos initDest delta = getWaveMove (delta / 12) (initDest `sub` initPos) 30 30 + , move = \initPos initDest delta -> getWaveMove (delta / 12) (initDest `sub` initPos) 30 30 } ] lastLevel : Level lastLevel = { color = { red = 156, green = 225, blue = 233 } - , move initPos initDest delta = getWaveMove (delta / 5) (initDest `sub` initPos) 30 30 + , move = \initPos initDest delta -> getWaveMove (delta / 5) (initDest `sub` initPos) 30 30 } |