From 7a0f270a47fb245f226696bfb47e15cfd7e876b5 Mon Sep 17 00:00:00 2001 From: Mark Wunsch Date: Tue, 27 Sep 2016 16:57:51 -0400 Subject: [PATCH] Compose fighter into movementArea; remove Click sub --- src/Main.elm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/Main.elm b/src/Main.elm index efaf396..08e7c4e 100644 --- a/src/Main.elm +++ b/src/Main.elm @@ -82,7 +82,7 @@ update msg game = subscriptions : GameState -> Sub Msg subscriptions game = - Mouse.clicks Click + Sub.none @@ -116,15 +116,16 @@ view game = movementArea = case game.playerSelection of Nothing -> - [] + [ fighter ] Just x -> - [ circle + [ fighter + , circle [ cx (x.position |> posX |> toString) , cy (x.position |> posY |> toString) , r (x.profile.move |> toString) - , fill "pink" - , fillOpacity "0.5" + , fill "white" + , fillOpacity "0.25" ] [] ] @@ -134,7 +135,6 @@ view game = in svg [ viewBox "0 0 100 100" - , width "100%" , onClick (case game.playerSelection of Just x -> @@ -144,9 +144,4 @@ view game = NoOp ) ] - (List.append - [ (Tabletop.view tabletop []) - , fighter - ] - movementArea - ) + (Tabletop.view tabletop [] :: movementArea)