| summaryrefslogtreecommitdiff |
diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | src/battlemap/src/Battlemap.elm | 9 | ||||
| -rw-r--r-- | src/battlemap/src/Battlemap/Navigator.elm | 11 | ||||
| -rw-r--r-- | src/battlemap/src/Model/SelectTile.elm | 12 |
4 files changed, 33 insertions, 3 deletions
@@ -5,7 +5,7 @@ WWW_DIR = ${CURDIR}/www MODULES_SRC = $(addprefix $(SRC_DIR)/,$(MODULES)) MODULES_WWW = $(addprefix $(WWW_DIR)/,$(MODULES)) -all: build $(MODULES_WWW) +all: build $(WWW_DIR) $(MODULES_WWW) build: for module in $(MODULES_SRC) ; do \ @@ -18,7 +18,7 @@ clean: done $(MODULES_WWW): %: - ln -s $(SRC_DIR)/$(patsubst $(WWW_DIR)/%,%,$@)/www $@ + ln -s $(SRC_DIR)/$(patsubst $(WWW_DIR)/%,%,$@)/www/ $@ $(WWW_DIR): mkdir -p $@ diff --git a/src/battlemap/src/Battlemap.elm b/src/battlemap/src/Battlemap.elm index f79966a..8449559 100644 --- a/src/battlemap/src/Battlemap.elm +++ b/src/battlemap/src/Battlemap.elm @@ -5,6 +5,7 @@ module Battlemap exposing get_navigator_remaining_points, get_tiles, set_navigator, + clear_navigator_path, try_getting_navigator_location, try_getting_navigator_path_to, try_getting_navigator_summary, @@ -57,6 +58,14 @@ reset bmap = navigator = Nothing } +clear_navigator_path : Type -> Type +clear_navigator_path bmap = + case bmap.navigator of + (Just navigator) -> + {bmap | navigator = (Just (Battlemap.Navigator.clear_path navigator))} + + Nothing -> bmap + try_getting_navigator_location : Type -> (Maybe Battlemap.Location.Type) try_getting_navigator_location bmap = case bmap.navigator of diff --git a/src/battlemap/src/Battlemap/Navigator.elm b/src/battlemap/src/Battlemap/Navigator.elm index c4231e6..6db917a 100644 --- a/src/battlemap/src/Battlemap/Navigator.elm +++ b/src/battlemap/src/Battlemap/Navigator.elm @@ -7,6 +7,7 @@ module Battlemap.Navigator exposing get_remaining_points, get_range_markers, get_summary, + clear_path, try_adding_step, try_getting_path_to ) @@ -112,6 +113,16 @@ get_summary navigator = ) } +clear_path : Type -> Type +clear_path navigator = + {navigator | + path = + (Battlemap.Navigator.Path.new + navigator.starting_location + navigator.movement_dist + ) + } + try_adding_step : ( Type -> Battlemap.Direction.Type -> diff --git a/src/battlemap/src/Model/SelectTile.elm b/src/battlemap/src/Model/SelectTile.elm index 0fe30fa..7cc5dc1 100644 --- a/src/battlemap/src/Model/SelectTile.elm +++ b/src/battlemap/src/Model/SelectTile.elm @@ -38,7 +38,17 @@ go_to_tile model loc_ref = of (Just path) -> let - new_model = (List.foldr (autopilot) model path) + new_model = + (List.foldr + (autopilot) + {model | + battlemap = + (Battlemap.clear_navigator_path + model.battlemap + ) + } + path + ) in {new_model | state = Model.MovingCharacterWithClick} |