| summaryrefslogtreecommitdiff |
diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | elm/battlemap/src/Battlemap/Navigator/Move.elm | 6 | ||||
| -rw-r--r-- | elm/battlemap/src/Battlemap/Tile.elm | 13 | ||||
| -rw-r--r-- | elm/battlemap/src/Character.elm | 5 | ||||
| -rw-r--r-- | elm/battlemap/src/Update/EndTurn.elm | 2 | ||||
| -rw-r--r-- | elm/battlemap/src/Update/SelectCharacter.elm | 2 |
6 files changed, 15 insertions, 15 deletions
@@ -3,7 +3,7 @@ PAGES = $(addsuffix .html,$(TARGETS)) all: $(TARGETS) $(PAGES) -upload_demo: $(PAGES) +upload_demo: $(PAGES) LICENSE scp -r $^ dreamhost:~/tacticians.online/ $(TARGETS): diff --git a/elm/battlemap/src/Battlemap/Navigator/Move.elm b/elm/battlemap/src/Battlemap/Navigator/Move.elm index 924f715..9d7a17b 100644 --- a/elm/battlemap/src/Battlemap/Navigator/Move.elm +++ b/elm/battlemap/src/Battlemap/Navigator/Move.elm @@ -111,7 +111,11 @@ to : ( to battlemap nav dir char_list = let next_location = (Battlemap.Location.neighbor nav.current_location dir) - is_occupied = (List.any (\c -> (c.location == next_location)) char_list) + is_occupied = + (List.any + (\c -> ((Character.get_location c) == next_location)) + char_list + ) in if (not is_occupied) then diff --git a/elm/battlemap/src/Battlemap/Tile.elm b/elm/battlemap/src/Battlemap/Tile.elm index 986cb2a..7e0ae68 100644 --- a/elm/battlemap/src/Battlemap/Tile.elm +++ b/elm/battlemap/src/Battlemap/Tile.elm @@ -3,8 +3,7 @@ module Battlemap.Tile exposing Type, TileModifier(..), set_direction, - set_navigation, - reset_tile + reset ) import Battlemap.Direction @@ -31,14 +30,8 @@ set_direction d t = nav_level = d } -set_navigation : Battlemap.Direction.Type -> Type -> Type -set_navigation dir t = - {t | - nav_level = dir - } - -reset_tile : Type -> Type -reset_tile t = +reset: Type -> Type +reset t = {t | nav_level = Battlemap.Direction.None, mod_level = Nothing diff --git a/elm/battlemap/src/Character.elm b/elm/battlemap/src/Character.elm index 41cfc84..f98dfd9 100644 --- a/elm/battlemap/src/Character.elm +++ b/elm/battlemap/src/Character.elm @@ -1,4 +1,4 @@ -module Character exposing (Type, Ref, get_ref) +module Character exposing (Type, Ref, get_ref, get_location) import Battlemap.Location @@ -18,3 +18,6 @@ type alias Ref = String get_ref : Type -> Ref get_ref c = c.id + +get_location : Type -> Battlemap.Location.Type +get_location t = t.location diff --git a/elm/battlemap/src/Update/EndTurn.elm b/elm/battlemap/src/Update/EndTurn.elm index 7172b2f..b8b4ee5 100644 --- a/elm/battlemap/src/Update/EndTurn.elm +++ b/elm/battlemap/src/Update/EndTurn.elm @@ -33,7 +33,7 @@ make_it_so model = selection.navigator.current_location (\t -> {t | char_level = (Just selection.character)}) ) - (Battlemap.Tile.reset_tile) + (Battlemap.Tile.reset) ), characters = (Dict.update diff --git a/elm/battlemap/src/Update/SelectCharacter.elm b/elm/battlemap/src/Update/SelectCharacter.elm index 0e7b1c4..d42c7fc 100644 --- a/elm/battlemap/src/Update/SelectCharacter.elm +++ b/elm/battlemap/src/Update/SelectCharacter.elm @@ -63,7 +63,7 @@ make_it_so model char_id = (display_range char.movement_points) (Battlemap.apply_to_all_tiles model.battlemap - (Battlemap.Tile.reset_tile) + (Battlemap.Tile.reset) ) new_range_indicator ) |