summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2020-01-15 17:22:01 +0100
committernsensfel <SpamShield0@noot-noot.org>2020-01-15 17:22:01 +0100
commit83543758b9682f0e476809f207957471fcbbff5b (patch)
tree89b1f3a64810e47302b103acde5b608fd8d5327d /src/battle/src/View
parentdc7c1857845a5da7cd6cba178c16fa8ea8c68cec (diff)
...
Diffstat (limited to 'src/battle/src/View')
-rw-r--r--src/battle/src/View/Controlled.elm4
-rw-r--r--src/battle/src/View/Controlled/CharacterCard.elm4
-rw-r--r--src/battle/src/View/MessageBoard.elm2
-rw-r--r--src/battle/src/View/SubMenu.elm4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/battle/src/View/Controlled.elm b/src/battle/src/View/Controlled.elm
index 003ec34..fe730fb 100644
--- a/src/battle/src/View/Controlled.elm
+++ b/src/battle/src/View/Controlled.elm
@@ -21,7 +21,7 @@ import View.Controlled.ManualControls
--------------------------------------------------------------------------------
has_a_path : Struct.CharacterTurn.Type -> Bool
has_a_path char_turn =
- case (Struct.CharacterTurn.try_getting_navigator char_turn) of
+ case (Struct.CharacterTurn.maybe_get_navigator char_turn) of
(Just nav) -> ((Struct.Navigator.get_path nav) /= [])
Nothing -> False
@@ -126,7 +126,7 @@ get_available_actions char_turn =
get_html : Struct.CharacterTurn.Type -> Int -> (Html.Html Struct.Event.Type)
get_html char_turn player_ix =
case
- (Struct.CharacterTurn.try_getting_active_character char_turn)
+ (Struct.CharacterTurn.maybe_get_active_character char_turn)
of
(Just char) ->
(Html.div
diff --git a/src/battle/src/View/Controlled/CharacterCard.elm b/src/battle/src/View/Controlled/CharacterCard.elm
index 0d7eda1..2fea74c 100644
--- a/src/battle/src/View/Controlled/CharacterCard.elm
+++ b/src/battle/src/View/Controlled/CharacterCard.elm
@@ -207,7 +207,7 @@ get_movement_bar : (
(Html.Html Struct.Event.Type)
)
get_movement_bar char_turn char =
- case (Struct.CharacterTurn.try_getting_active_character char_turn) of
+ case (Struct.CharacterTurn.maybe_get_active_character char_turn) of
(Just active_char) ->
if
(
@@ -217,7 +217,7 @@ get_movement_bar char_turn char =
)
then
(get_active_movement_bar
- (Struct.CharacterTurn.try_getting_navigator char_turn)
+ (Struct.CharacterTurn.maybe_get_navigator char_turn)
active_char
)
else
diff --git a/src/battle/src/View/MessageBoard.elm b/src/battle/src/View/MessageBoard.elm
index 8a47b40..aebda2a 100644
--- a/src/battle/src/View/MessageBoard.elm
+++ b/src/battle/src/View/MessageBoard.elm
@@ -35,6 +35,6 @@ display model message =
--------------------------------------------------------------------------------
get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
get_html model =
- case (Struct.MessageBoard.try_getting_current_message model.message_board) of
+ case (Struct.MessageBoard.maybe_get_current_message model.message_board) of
Nothing -> (Util.Html.nothing)
(Just message) -> (display model message)
diff --git a/src/battle/src/View/SubMenu.elm b/src/battle/src/View/SubMenu.elm
index dea0a86..5cb1b84 100644
--- a/src/battle/src/View/SubMenu.elm
+++ b/src/battle/src/View/SubMenu.elm
@@ -54,7 +54,7 @@ get_inner_html model tab =
--------------------------------------------------------------------------------
get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
get_html model =
- case (Struct.UI.try_getting_displayed_tab model.ui) of
+ case (Struct.UI.maybe_get_displayed_tab model.ui) of
(Just tab) ->
(Html.div
[(Html.Attributes.class "sub-menu")]
@@ -62,7 +62,7 @@ get_html model =
)
Nothing ->
- case (Struct.CharacterTurn.try_getting_target model.char_turn) of
+ case (Struct.CharacterTurn.maybe_get_target model.char_turn) of
(Just char_ref) ->
case (Array.get char_ref model.characters) of
(Just char) ->