summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-12-16 14:22:16 +0100
committernsensfel <SpamShield0@noot-noot.org>2019-12-16 14:22:16 +0100
commita22cf9ed01111999a8397ed4a9723d97ea407bdd (patch)
tree0c15afd16517c02e251f6cf1106d8ac852fabbd0 /src/battle
parent2542493b58b23106a398ca048d4c238d442573fd (diff)
...
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/src/Struct/Battle.elm15
-rw-r--r--src/battle/src/View/Map/Character.elm4
2 files changed, 11 insertions, 8 deletions
diff --git a/src/battle/src/Struct/Battle.elm b/src/battle/src/Struct/Battle.elm
index c7f5c0a..19c3ceb 100644
--- a/src/battle/src/Struct/Battle.elm
+++ b/src/battle/src/Struct/Battle.elm
@@ -131,12 +131,19 @@ new =
---- Characters ----
--------------------
add_character : Struct.Character.Type -> Type -> Type
-add_character char battle =
- let characters = battle.characters in
+add_character s0char battle =
+ let
+ s1char =
+ (Struct.Character.reset_extra_display_effects
+ battle.own_player_ix
+ s0char
+ )
+ characters = battle.characters
+ in
(regenerate_attack_of_opportunity_markers_of_char
(Array.length characters)
- char
- {battle | characters = (Array.push char characters)}
+ s1char
+ {battle | characters = (Array.push s1char characters)}
)
get_character : Int -> Type -> (Maybe Struct.Character.Type)
diff --git a/src/battle/src/View/Map/Character.elm b/src/battle/src/View/Map/Character.elm
index a62d197..b1442b1 100644
--- a/src/battle/src/View/Map/Character.elm
+++ b/src/battle/src/View/Map/Character.elm
@@ -16,12 +16,8 @@ import BattleCharacters.Struct.Equipment
-- Local Module ----------------------------------------------------------------
import Constants.UI
-import Struct.Battle
import Struct.Character
-import Struct.CharacterTurn
import Struct.Event
-import Struct.TurnResult
-import Struct.TurnResultAnimator
import Struct.UI
--------------------------------------------------------------------------------