summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/src/Constants/DisplayEffects.elm31
-rw-r--r--src/battle/src/Struct/Character.elm20
-rw-r--r--src/battle/src/Update/CharacterTurn.elm2
-rw-r--r--src/battle/src/Update/CharacterTurn/AbortTurn.elm6
-rw-r--r--src/battle/src/Update/CharacterTurn/EndTurn.elm2
-rw-r--r--src/battle/src/Update/CharacterTurn/ToggleTarget.elm4
-rw-r--r--src/battle/src/View/Character.elm4
-rw-r--r--src/battle/src/View/Map.elm1
-rw-r--r--src/battle/src/View/Map/Character.elm6
9 files changed, 52 insertions, 24 deletions
diff --git a/src/battle/src/Constants/DisplayEffects.elm b/src/battle/src/Constants/DisplayEffects.elm
index da9db9a..2b02163 100644
--- a/src/battle/src/Constants/DisplayEffects.elm
+++ b/src/battle/src/Constants/DisplayEffects.elm
@@ -1,13 +1,28 @@
module Constants.DisplayEffects exposing (..)
-active_character : String
-active_character = "active"
+null : String
+null = ""
-enabled_character : String
-enabled_character = "enabled"
+active : String
+active = "active"
-target_character : String
-target_character = "target"
+dead : String
+dead = "dead"
-target_tile : String
-target_tile = "target"
+enabled : String
+enabled = "enabled"
+
+target : String
+target = "target"
+
+ally : String
+ally = "ally"
+
+enemy : String
+enemy = "ally"
+
+in_team : String
+in_team = "team-"
+
+css_class_prefix : String
+css_class_prefix = "display-effect-"
diff --git a/src/battle/src/Struct/Character.elm b/src/battle/src/Struct/Character.elm
index df78ff3..d1ccedf 100644
--- a/src/battle/src/Struct/Character.elm
+++ b/src/battle/src/Struct/Character.elm
@@ -53,6 +53,9 @@ import BattleCharacters.Struct.Weapon
-- Battle Map ------------------------------------------------------------------
import BattleMap.Struct.Location
+-- Local Module ----------------------------------------------------------------
+import Constants.DisplayEffects
+
--------------------------------------------------------------------------------
-- TYPES -----------------------------------------------------------------------
--------------------------------------------------------------------------------
@@ -275,19 +278,22 @@ reset_extra_display_effects viewer_ix char =
[
(
if (viewer_ix == char.player_ix)
- then "ally"
- else "enemy"
+ then Constants.DisplayEffects.ally
+ else Constants.DisplayEffects.enemy
+ ),
+ (
+ Constants.DisplayEffects.in_team
+ ++ (String.fromInt char.player_ix)
),
- ("team-" ++ (String.fromInt char.player_ix)),
(
if (char.enabled)
- then "enabled"
- else "disabled"
+ then Constants.DisplayEffects.enabled
+ else Constants.DisplayEffects.null
),
(
if (is_alive char)
- then "alive"
- else "dead"
+ then Constants.DisplayEffects.null
+ else Constants.DisplayEffects.dead
)
]
)
diff --git a/src/battle/src/Update/CharacterTurn.elm b/src/battle/src/Update/CharacterTurn.elm
index 694bb5d..9f1483a 100644
--- a/src/battle/src/Update/CharacterTurn.elm
+++ b/src/battle/src/Update/CharacterTurn.elm
@@ -52,7 +52,7 @@ apply_to target_char model =
(Struct.Battle.update_character
(Struct.Character.get_index target_char)
(Struct.Character.add_extra_display_effect
- Constants.DisplayEffects.active_character
+ Constants.DisplayEffects.active
)
model.battle
),
diff --git a/src/battle/src/Update/CharacterTurn/AbortTurn.elm b/src/battle/src/Update/CharacterTurn/AbortTurn.elm
index fbcbfc2..1f69836 100644
--- a/src/battle/src/Update/CharacterTurn/AbortTurn.elm
+++ b/src/battle/src/Update/CharacterTurn/AbortTurn.elm
@@ -32,7 +32,7 @@ remove_active_character_effects char_turn battle =
(Struct.Battle.update_character
(Struct.Character.get_index char)
(Struct.Character.remove_extra_display_effect
- Constants.DisplayEffects.active_character
+ Constants.DisplayEffects.active
)
battle
)
@@ -49,7 +49,7 @@ remove_target_effects char_turn battle =
(Struct.Battle.update_character
target_index
(Struct.Character.remove_extra_display_effect
- Constants.DisplayEffects.target_character
+ Constants.DisplayEffects.target
)
current_battle
)
@@ -72,7 +72,7 @@ remove_location_effects char_turn battle =
(BattleMap.Struct.Map.update_tile_at
(BattleMap.Struct.Location.from_ref location_ref)
(BattleMap.Struct.TileInstance.remove_extra_display_effect
- Constants.DisplayEffects.target_tile
+ Constants.DisplayEffects.target
)
current_map
)
diff --git a/src/battle/src/Update/CharacterTurn/EndTurn.elm b/src/battle/src/Update/CharacterTurn/EndTurn.elm
index c2348ec..99cb8bf 100644
--- a/src/battle/src/Update/CharacterTurn/EndTurn.elm
+++ b/src/battle/src/Update/CharacterTurn/EndTurn.elm
@@ -41,7 +41,7 @@ apply_to model =
(Struct.Character.get_index char)
(
(Struct.Character.remove_extra_display_effect
- Constants.DisplayEffects.enabled_character
+ Constants.DisplayEffects.enabled
)
>>
(Struct.Character.set_enabled False)
diff --git a/src/battle/src/Update/CharacterTurn/ToggleTarget.elm b/src/battle/src/Update/CharacterTurn/ToggleTarget.elm
index 1fb69da..8dfeb75 100644
--- a/src/battle/src/Update/CharacterTurn/ToggleTarget.elm
+++ b/src/battle/src/Update/CharacterTurn/ToggleTarget.elm
@@ -65,7 +65,7 @@ toggle_attack_character model target_char_id =
(Struct.Battle.update_character
target_char_id
(Struct.Character.toggle_extra_display_effect
- Constants.DisplayEffects.target_character
+ Constants.DisplayEffects.target
)
model.battle
),
@@ -93,7 +93,7 @@ undo_attack_character model target_char_id =
(Struct.Battle.update_character
target_char_id
(Struct.Character.remove_extra_display_effect
- Constants.DisplayEffects.target_character
+ Constants.DisplayEffects.target
)
model.battle
),
diff --git a/src/battle/src/View/Character.elm b/src/battle/src/View/Character.elm
index dac5989..1b2d2e4 100644
--- a/src/battle/src/View/Character.elm
+++ b/src/battle/src/View/Character.elm
@@ -11,6 +11,8 @@ import BattleCharacters.Struct.Character
import BattleCharacters.View.Portrait
-- Local Module ----------------------------------------------------------------
+import Constants.DisplayEffects
+
import Struct.Character
import Struct.Event
@@ -33,7 +35,7 @@ get_portrait_html char =
(
\effect_name ->
(Html.Attributes.class
- ("character-portrait-effect-" ++ effect_name)
+ (Constants.DisplayEffects.css_class_prefix ++ effect_name)
)
)
(Struct.Character.get_extra_display_effects_list char)
diff --git a/src/battle/src/View/Map.elm b/src/battle/src/View/Map.elm
index 5b0182e..f6e6c28 100644
--- a/src/battle/src/View/Map.elm
+++ b/src/battle/src/View/Map.elm
@@ -18,6 +18,7 @@ import BattleMap.Struct.Map
import BattleMap.View.Tile
-- Local Module ----------------------------------------------------------------
+import Constants.DisplayEffects
import Constants.UI
import Struct.Battle
diff --git a/src/battle/src/View/Map/Character.elm b/src/battle/src/View/Map/Character.elm
index 49150eb..67a165b 100644
--- a/src/battle/src/View/Map/Character.elm
+++ b/src/battle/src/View/Map/Character.elm
@@ -14,6 +14,7 @@ import BattleCharacters.Struct.Character
import BattleCharacters.Struct.Equipment
-- Local Module ----------------------------------------------------------------
+import Constants.DisplayEffects
import Constants.UI
import Struct.Character
@@ -101,7 +102,10 @@ get_actual_html char =
(
\effect_name ->
(Html.Attributes.class
- ("character-icon-effect-" ++ effect_name)
+ (
+ Constants.DisplayEffects.css_class_prefix
+ ++ effect_name
+ )
)
)
(Struct.Character.get_extra_display_effects_list char)