Add another types of obstacles - big and small UFOs (need to duck)

src/Game.elm

@@ -2,8 +2,8 @@ module Game exposing (..)
 
 import Hud
 import Rex
-import Cactus
-import CactusGenerator as CactusGen
+import Obstacle
+import ObstacleGenerator as ObsGen
 import Cloud
 import Background
 import WindowSize exposing (..)
@@ -27,7 +27,7 @@ type alias Model =
     { state : GameState
     , hud : Hud.Model
     , rex : Rex.Model
-    , cactusGen : CactusGen.Model
+    , obsGen : ObsGen.Model
     , cloud : Cloud.Model
     , seed : Seed
     }
@@ -38,7 +38,7 @@ init seed =
     { state = New
     , hud = Hud.init
     , rex = Rex.init
-    , cactusGen = CactusGen.init seed
+    , obsGen = ObsGen.init seed
     , cloud = Cloud.init
     , seed = nextSeed seed
     }
@@ -49,7 +49,7 @@ restart game =
     { state = New
     , hud = Hud.update Hud.Reset game.hud
     , rex = Rex.init
-    , cactusGen = CactusGen.init game.seed
+    , obsGen = ObsGen.init game.seed
     , cloud = game.cloud
     , seed = nextSeed game.seed
     }
@@ -76,7 +76,7 @@ update msg game =
 
 
 updatePlaying : Msg -> Model -> Model
-updatePlaying msg ({ hud, rex, cactusGen, cloud } as game) =
+updatePlaying msg ({ hud, rex, obsGen, cloud } as game) =
     if (spacePressed msg) then
         { game | state = Paused }
     else
@@ -88,7 +88,7 @@ updatePlaying msg ({ hud, rex, cactusGen, cloud } as game) =
                 { game | rex = Rex.update Rex.Run rex }
 
             Tick delta ->
-                if Rex.hitDetected rex cactusGen.cacti then
+                if Rex.hitDetected rex obsGen.obstacles then
                     { game
                         | state = GameOver
                         , hud = Hud.update Hud.Highlight hud
@@ -98,7 +98,7 @@ updatePlaying msg ({ hud, rex, cactusGen, cloud } as game) =
                 else
                     { game
                         | rex = Rex.update (Rex.Tick delta) rex
-                        , cactusGen = CactusGen.update delta hud.score cactusGen
+                        , obsGen = ObsGen.update delta hud.score obsGen
                         , cloud = Cloud.update delta cloud
                         , hud =
                             if (Rex.hasLandedFromJumping rex) then
@@ -163,7 +163,7 @@ subscriptions _ =
 
 
 view : Model -> Html Msg
-view { state, hud, rex, cactusGen, cloud } =
+view { state, hud, rex, obsGen, cloud } =
     let
         ( w, h ) =
             ( toString windowWidth, toString windowHeight )
@@ -177,7 +177,7 @@ view { state, hud, rex, cactusGen, cloud } =
 
         sceneElements =
             [ viewBackground
-            , viewCacti cactusGen.cacti
+            , viewCacti obsGen.obstacles
             , viewCloud cloud
             , viewRex rex
             , viewAlert state hud.score
@@ -241,11 +241,11 @@ viewBackground =
     map (\_ -> SubMsg) Background.view
 
 
-viewCacti : List Cactus.Model -> Svg Msg
+viewCacti : List Obstacle.Model -> Svg Msg
 viewCacti elems =
     let
         render elem =
-            map (\_ -> SubMsg) (Cactus.view elem)
+            map (\_ -> SubMsg) (Obstacle.view elem)
     in
         Svg.svg [] <| List.map render elems
 

src/Obstacle.elm

@@ -0,0 +1,83 @@
+module Obstacle exposing (Model, Kind(..), init, update, view, isVisible, bounds)
+
+import WindowSize exposing (..)
+import Svg exposing (Svg)
+import Svg.Attributes exposing (..)
+
+
+
+type Kind
+    = Cactus
+    | Ufo
+    | UfoBig
+
+
+type alias Model =
+    { xPos : Float
+    , yPos : Float
+    , speed : Float
+    , width : Float
+    , height : Float
+    , img : String
+    , kind : Kind
+    }
+
+
+init : Float -> Int -> Float -> Kind -> Model
+init x i speedInc kind =
+    let 
+        (img, y, width, height) = case kind of
+            Ufo -> ("images/ufo/ufo.png", -20, 64, 38)
+            UfoBig -> ("images/ufo/ufo_big.png", -20, 135, 80)
+            _ -> ("images/cacti/cactus_" ++ toString i ++ ".png", 42, 64, 84)            
+    in
+        { xPos = x
+        , yPos = y
+        , speed = 0.4 + 0.02 * speedInc
+        , width = width
+        , height = height
+        , kind = kind
+        , img = img
+        }
+
+
+update : Float -> Model -> Model
+update delta obstacle =
+    { obstacle | xPos = obstacle.xPos - obstacle.speed * delta }
+
+
+view : Model -> Svg {}
+view obstacle =
+    let
+        { exMin, eyMin } =
+            bounds obstacle
+    in
+        Svg.image
+            [ x <| toString exMin
+            , y <| toString eyMin
+            , width <| toString obstacle.width
+            , height <| toString obstacle.height
+            , xlinkHref obstacle.img
+            ]
+            []
+
+
+isVisible : Model -> Bool
+isVisible obstacle =
+    obstacle.xPos >= -obstacle.width
+
+
+bounds : Model -> { exMin : Float, exMax : Float, eyMin : Float, eyMax : Float }
+bounds obstacle =
+    let
+        offsetFromBottomEdge =
+            100
+
+        ( offsetX, offsetY ) =
+            ( obstacle.xPos, windowHeight - offsetFromBottomEdge + obstacle.yPos )
+    in
+        { exMin = offsetX
+        , exMax = offsetX + obstacle.width
+        , eyMin = offsetY - obstacle.height
+        , eyMax = offsetY
+        }

src/CactusGenerator.elm → src/ObstacleGenerator.elm

@@ -1,16 +1,16 @@
-module CactusGenerator exposing (Model, init, update)
+module ObstacleGenerator exposing (Model, init, update)
 
-import Cactus
+import Obstacle
 import WindowSize exposing (..)
-import Random exposing (Seed, initialSeed, step)
+import Random exposing (Seed, initialSeed, step, int)
 import List exposing (length, range, map, map2, filter)
 import Dict exposing (Dict, fromList, get)
 import Maybe exposing (withDefault)
 
 
 type alias Model =
     { seed : Seed
-    , cacti : List Cactus.Model
+    , obstacles : List Obstacle.Model
     , spawnTimer : Int
     }
 
@@ -20,54 +20,60 @@ init seed0 =
     let
         startPosition =
             windowWidth - 200
-
-        ( cactus, seed1 ) =
-            generateCactusAt startPosition seed0
+        
+        ( obstacle, seed1 ) =
+            generateObstacleAt startPosition seed0
     in
         { seed = seed1
-        , cacti = [ cactus ]
+        , obstacles = [ obstacle ]
         , spawnTimer = 50
         }
 
 
 update : Float -> Int -> Model -> Model
-update delta score ({ seed, cacti, spawnTimer } as model) =
+update delta score ({ seed, obstacles, spawnTimer } as model) =
     let
         ( i, nextSeed ) =
             generateIndex seed
 
+        (ufoFactor, _ ) = step (int 0 5) seed
+
+        kind = if ufoFactor == 0 then Obstacle.UfoBig 
+            else if ufoFactor <= 2 then Obstacle.Ufo
+            else Obstacle.Cactus
+
         speedInc =
             toFloat <| score // 500
 
-        updatedCacti =
-            map (Cactus.update delta) <| filter Cactus.isVisible cacti
+        updatedObstacles =
+            map (Obstacle.update delta) <| filter Obstacle.isVisible obstacles
     in
         if spawnTimer == 0 then
             { model
-                | cacti = (Cactus.init windowWidth i speedInc) :: updatedCacti
+                | obstacles = (Obstacle.init windowWidth i speedInc kind) :: updatedObstacles
                 , seed = nextSeed
                 , spawnTimer = getSpawnTime i <| speedInc
             }
         else
             { model
-                | cacti = updatedCacti
+                | obstacles = updatedObstacles
                 , seed = nextSeed
                 , spawnTimer = spawnTimer - 1
             }
 
 
-generateCactusAt : Float -> Seed -> ( Cactus.Model, Seed )
-generateCactusAt position seed0 =
+generateObstacleAt : Float -> Seed -> ( Obstacle.Model, Seed )
+generateObstacleAt x seed0 =
     let
         ( i, seed1 ) =
             generateIndex seed0
     in
-        ( Cactus.init position i 0, seed1 )
+        ( Obstacle.init x i 0 Obstacle.Cactus, seed1 )
 
 
 generateIndex : Seed -> ( Int, Seed )
 generateIndex =
-    step <| Random.int 0 maxCactusIndex
+    step <| Random.int 0 maxObstacleIndex
 
 
 getSpawnTime : Int -> Float -> Int
@@ -80,11 +86,11 @@ getSpawnTime index inc =
             ( i, 45 + 6 * i - timeDec )
 
         indices =
-            range 0 maxCactusIndex
+            range 0 maxObstacleIndex
     in
         withDefault 0 << get index << fromList << map withSpawnTime <| indices
 
 
-maxCactusIndex : Int
-maxCactusIndex =
+maxObstacleIndex : Int
+maxObstacleIndex =
     5

src/Rex.elm

@@ -1,6 +1,6 @@
 module Rex exposing (Model, Msg(..), init, update, hasLandedFromJumping, hitDetected, view)
 
-import Cactus
+import Obstacle
 import WindowSize exposing (..)
 import Svg exposing (Svg, Attribute)
 import Svg.Attributes as Attributes exposing (..)
@@ -149,7 +149,7 @@ animate state ({ runCount, frameInc } as model) =
         }
 
 
-hitDetected : Model -> List Cactus.Model -> Bool
+hitDetected : Model -> List Obstacle.Model -> Bool
 hitDetected rex obstacles =
     case obstacles of
         [] ->
@@ -161,13 +161,13 @@ hitDetected rex obstacles =
                     bounds rex
 
                 { exMin, exMax, eyMin, eyMax } =
-                    Cactus.bounds elem
+                    Obstacle.bounds elem
 
-                ( margin, marginAfter ) =
-                    if rex.state == Jumping then
-                        ( 25, 20 )
-                    else
-                        ( 4, 10 )
+                ( margin, marginAfter ) = 
+                    case rex.state of 
+                        Jumping -> ( 25, 20 )
+                        Ducking -> ( 4, 2 )
+                        _ -> ( 4, 10 )
 
                 xInBounds =
                     margin < xMax - exMin && marginAfter < exMax - xMin