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/shared
parentdc7c1857845a5da7cd6cba178c16fa8ea8c68cec (diff)
...
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/battle-map/BattleMap/Struct/Map.elm8
-rw-r--r--src/shared/battle-map/BattleMap/View/TileInfo.elm2
-rw-r--r--src/shared/elm/Struct/Flags.elm38
3 files changed, 24 insertions, 24 deletions
diff --git a/src/shared/battle-map/BattleMap/Struct/Map.elm b/src/shared/battle-map/BattleMap/Struct/Map.elm
index cb0143e..cbab5b2 100644
--- a/src/shared/battle-map/BattleMap/Struct/Map.elm
+++ b/src/shared/battle-map/BattleMap/Struct/Map.elm
@@ -15,7 +15,7 @@ module BattleMap.Struct.Map exposing
new,
set_tile_to,
solve_tiles,
- try_getting_tile_at
+ maybe_get_tile_at
)
-- Elm -------------------------------------------------------------------------
@@ -159,12 +159,12 @@ new width height tiles =
markers = (Dict.empty)
}
-try_getting_tile_at : (
+maybe_get_tile_at : (
BattleMap.Struct.Location.Type ->
Type ->
(Maybe BattleMap.Struct.TileInstance.Type)
)
-try_getting_tile_at loc map =
+maybe_get_tile_at loc map =
if (has_location loc map)
then (Array.get (location_to_index loc map) map.content)
else Nothing
@@ -185,7 +185,7 @@ get_omnimods_at : (
Battle.Struct.Omnimods.Type
)
get_omnimods_at loc dataset map =
- case (try_getting_tile_at loc map) of
+ case (maybe_get_tile_at loc map) of
Nothing -> (Battle.Struct.Omnimods.none)
(Just tile_inst) ->
(BattleMap.Struct.Tile.get_omnimods
diff --git a/src/shared/battle-map/BattleMap/View/TileInfo.elm b/src/shared/battle-map/BattleMap/View/TileInfo.elm
index 0dc57ff..3067bcb 100644
--- a/src/shared/battle-map/BattleMap/View/TileInfo.elm
+++ b/src/shared/battle-map/BattleMap/View/TileInfo.elm
@@ -121,7 +121,7 @@ get_html : (
)
get_html dataset loc_ref map =
let loc = (BattleMap.Struct.Location.from_ref loc_ref) in
- case (BattleMap.Struct.Map.try_getting_tile_at loc map) of
+ case (BattleMap.Struct.Map.maybe_get_tile_at loc map) of
(Just tile_instance) ->
let
tile_data =
diff --git a/src/shared/elm/Struct/Flags.elm b/src/shared/elm/Struct/Flags.elm
index a9f1630..475d1f2 100644
--- a/src/shared/elm/Struct/Flags.elm
+++ b/src/shared/elm/Struct/Flags.elm
@@ -1,9 +1,9 @@
module Struct.Flags exposing
(
Type,
- maybe_get_param,
- force_get_param,
- get_params_as_url,
+ maybe_get_parameter,
+ force_get_parameter,
+ get_parameters_as_url,
get_session_token,
get_user_id
)
@@ -21,27 +21,27 @@ type alias Type =
{
user_id : String,
token : String,
- url_params : (List (List String))
+ url_parameters : (List (List String))
}
--------------------------------------------------------------------------------
-- LOCAL -----------------------------------------------------------------------
--------------------------------------------------------------------------------
-param_as_url : (List String) -> String
-param_as_url param =
- case param of
+parameter_as_url : (List String) -> String
+parameter_as_url parameter =
+ case parameter of
[name, value] -> (name ++ "=" ++ value)
_ -> ""
--------------------------------------------------------------------------------
-- EXPORTED --------------------------------------------------------------------
--------------------------------------------------------------------------------
-maybe_get_param : String -> Type -> (Maybe String)
-maybe_get_param param flags =
+maybe_get_parameter : String -> Type -> (Maybe String)
+maybe_get_parameter parameter flags =
case
(Util.List.get_first
- (\e -> ((List.head e) == (Just param)))
- flags.url_params
+ (\e -> ((List.head e) == (Just parameter)))
+ flags.url_parameters
)
of
Nothing -> Nothing
@@ -50,20 +50,20 @@ maybe_get_param param flags =
Nothing -> Nothing
(Just b) -> (List.head b)
-force_get_param : String -> Type -> String
-force_get_param param flags =
- case (maybe_get_param param flags) of
+force_get_parameter : String -> Type -> String
+force_get_parameter parameter flags =
+ case (maybe_get_parameter parameter flags) of
Nothing -> ""
(Just str) -> str
-get_params_as_url : Type -> String
-get_params_as_url flags =
+get_parameters_as_url : Type -> String
+get_parameters_as_url flags =
(List.foldl
- (\param -> \current_params ->
- (current_params ++ "&" ++ (param_as_url param))
+ (\parameter -> \current_parameters ->
+ (current_parameters ++ "&" ++ (parameter_as_url parameter))
)
""
- flags.url_params
+ flags.url_parameters
)
get_session_token : Type -> String