summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-11-25 11:34:56 +0100
committernsensfel <SpamShield0@noot-noot.org>2019-11-25 11:34:56 +0100
commit764a36d571bd071ee754678274be54ff5ab40b36 (patch)
tree443f43e26fbf97f488dffd8c757d812a8d9cc1a8 /src/shared/battle-characters/BattleCharacters
parent056513525e544d73ce8917739654c0ea0a437c2c (diff)
...
Diffstat (limited to 'src/shared/battle-characters/BattleCharacters')
-rw-r--r--src/shared/battle-characters/BattleCharacters/Struct/DataSet.elm24
-rw-r--r--src/shared/battle-characters/BattleCharacters/Struct/Portrait.elm8
-rw-r--r--src/shared/battle-characters/BattleCharacters/Struct/Skill.elm8
3 files changed, 20 insertions, 20 deletions
diff --git a/src/shared/battle-characters/BattleCharacters/Struct/DataSet.elm b/src/shared/battle-characters/BattleCharacters/Struct/DataSet.elm
index 4e3050a..3e938a2 100644
--- a/src/shared/battle-characters/BattleCharacters/Struct/DataSet.elm
+++ b/src/shared/battle-characters/BattleCharacters/Struct/DataSet.elm
@@ -75,23 +75,23 @@ type alias Type =
new : Type
new =
{
- weapons = (Dict.new),
- armors = (Dict.new),
- glyphs = (Dict.new),
- glyph_boards = (Dict.new),
- portraits = (Dict.new),
- skills = (Dict.new)
+ weapons = (Dict.empty),
+ armors = (Dict.empty),
+ glyphs = (Dict.empty),
+ glyph_boards = (Dict.empty),
+ portraits = (Dict.empty),
+ skills = (Dict.empty)
}
is_ready : Type -> Bool
is_ready data_set =
(
- (data_set.portraits /= (Dict.empty))
- && (data_set.weapons /= (Dict.empty))
- && (data_set.armors /= (Dict.empty))
- && (data_set.glyph_boards /= (Dict.empty))
- && (data_set.glyphs /= (Dict.empty))
- && (data_set.skills /= (Dict.empty))
+ (not (Dict.isEmpty data_set.portraits))
+ && (not (Dict.isEmpty data_set.weapons))
+ && (not (Dict.isEmpty data_set.armors))
+ && (not (Dict.isEmpty data_set.glyph_boards))
+ && (not (Dict.isEmpty data_set.glyphs))
+ && (not (Dict.isEmpty data_set.skills))
)
---- Accessors -----------------------------------------------------------------
diff --git a/src/shared/battle-characters/BattleCharacters/Struct/Portrait.elm b/src/shared/battle-characters/BattleCharacters/Struct/Portrait.elm
index 8fe92c0..66fd764 100644
--- a/src/shared/battle-characters/BattleCharacters/Struct/Portrait.elm
+++ b/src/shared/battle-characters/BattleCharacters/Struct/Portrait.elm
@@ -3,7 +3,7 @@ module BattleCharacters.Struct.Portrait exposing
Type,
Ref,
find,
- default,
+ none,
get_id,
get_name,
get_body_id,
@@ -41,10 +41,10 @@ find : (Dict.Dict Ref Type) -> Ref -> Type
find dict ref =
case (Dict.get ref dict) of
(Just e) -> e
- Nothing -> default
+ Nothing -> none
-default : Type
-default =
+none : Type
+none =
{
id = "cat",
name = "Black Cat",
diff --git a/src/shared/battle-characters/BattleCharacters/Struct/Skill.elm b/src/shared/battle-characters/BattleCharacters/Struct/Skill.elm
index 709c17f..cc0dcae 100644
--- a/src/shared/battle-characters/BattleCharacters/Struct/Skill.elm
+++ b/src/shared/battle-characters/BattleCharacters/Struct/Skill.elm
@@ -3,7 +3,7 @@ module BattleCharacters.Struct.Skill exposing
Type,
Ref,
find,
- default,
+ none,
get_id,
get_name,
get_cost,
@@ -54,10 +54,10 @@ find : (Dict.Dict Ref Type) -> Ref -> Type
find dict ref =
case (Dict.get ref dict) of
(Just e) -> e
- Nothing -> default
+ Nothing -> none
-default : Type
-default =
+none : Type
+none =
{
id = "",
name = "Skill Not Found",