summaryrefslogtreecommitdiff |
diff options
author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-10-19 17:35:53 +0200 |
---|---|---|
committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2017-10-19 17:35:53 +0200 |
commit | 7ef97d8cd7a62fe40701842286f28743c237cedb (patch) | |
tree | fea94ee84e7dd14f9f9b45e5b87babcced1712e1 /src | |
parent | ebb50d0c4063009dffcd3031ee2d6b82a28023bd (diff) |
Fixes 'www' generation, navigator path change.
Diffstat (limited to 'src')
-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 |
3 files changed, 31 insertions, 1 deletions
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} |