summaryrefslogtreecommitdiff |
diff options
author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-06-13 13:32:43 +0200 |
---|---|---|
committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-06-13 13:32:43 +0200 |
commit | 499c0981df958643097f96365138df689432e5b4 (patch) | |
tree | 4ad005b50aa261612e6a46f4549c1046134d3644 /src/battle/src/View | |
parent | 9eaf4c0a006e2a08fdd1e2248978c4ac5cdaef3b (diff) |
Adds AoO pathfinding & temporary representation.
The animation manager does not work correctly though: when a move action
has been interrupted, it will rewind like if there was only the last
movement part, yet play back all parts, landing the character at the
wrong location.
Diffstat (limited to 'src/battle/src/View')
-rw-r--r-- | src/battle/src/View/Character.elm | 8 | ||||
-rw-r--r-- | src/battle/src/View/Controlled/Targets.elm | 2 | ||||
-rw-r--r-- | src/battle/src/View/Map/Character.elm | 4 | ||||
-rw-r--r-- | src/battle/src/View/MessageBoard/Animator/Attack.elm | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/battle/src/View/Character.elm b/src/battle/src/View/Character.elm index 1213dc9..c5082c9 100644 --- a/src/battle/src/View/Character.elm +++ b/src/battle/src/View/Character.elm @@ -48,7 +48,7 @@ get_alliance_class : ( (Html.Attribute Struct.Event.Type) ) get_alliance_class model char = - if ((Struct.Character.get_player_ix char) == model.player_ix) + if ((Struct.Character.get_player_index char) == model.player_ix) then (Html.Attributes.class "character-ally") else @@ -105,7 +105,7 @@ get_icon_body_html char = (Html.Attributes.class ( "asset-character-team-body-" - ++ (String.fromInt (Struct.Character.get_player_ix char)) + ++ (String.fromInt (Struct.Character.get_player_index char)) ) ) ] @@ -178,7 +178,7 @@ get_portrait_html viewer_ix char = [ (Html.Attributes.class ( - if ((Struct.Character.get_player_ix char) == viewer_ix) + if ((Struct.Character.get_player_index char) == viewer_ix) then "character-ally" else @@ -189,7 +189,7 @@ get_portrait_html viewer_ix char = ( "character-portrait-team-" ++ - (String.fromInt (Struct.Character.get_player_ix char)) + (String.fromInt (Struct.Character.get_player_index char)) ) ), (Html.Events.onClick diff --git a/src/battle/src/View/Controlled/Targets.elm b/src/battle/src/View/Controlled/Targets.elm index f057cba..4b36f03 100644 --- a/src/battle/src/View/Controlled/Targets.elm +++ b/src/battle/src/View/Controlled/Targets.elm @@ -32,7 +32,7 @@ get_target_info_html model char_ref = "Attacking " ++ char.name ++ " (player " - ++ (String.fromInt (Struct.Character.get_player_ix char)) + ++ (String.fromInt (Struct.Character.get_player_index char)) ++ "): " ++ (String.fromInt diff --git a/src/battle/src/View/Map/Character.elm b/src/battle/src/View/Map/Character.elm index 65c1f03..4b69ebc 100644 --- a/src/battle/src/View/Map/Character.elm +++ b/src/battle/src/View/Map/Character.elm @@ -80,7 +80,7 @@ get_alliance_class : ( (Html.Attribute Struct.Event.Type) ) get_alliance_class model char = - if ((Struct.Character.get_player_ix char) == model.player_ix) + if ((Struct.Character.get_player_index char) == model.player_ix) then (Html.Attributes.class "character-ally") else @@ -137,7 +137,7 @@ get_body_html char = (Html.Attributes.class ( "asset-character-team-body-" - ++ (String.fromInt (Struct.Character.get_player_ix char)) + ++ (String.fromInt (Struct.Character.get_player_index char)) ) ) ] diff --git a/src/battle/src/View/MessageBoard/Animator/Attack.elm b/src/battle/src/View/MessageBoard/Animator/Attack.elm index 9fd419c..4378c5a 100644 --- a/src/battle/src/View/MessageBoard/Animator/Attack.elm +++ b/src/battle/src/View/MessageBoard/Animator/Attack.elm @@ -194,7 +194,7 @@ get_attacker_card maybe_attack char = ) [ (View.Controlled.CharacterCard.get_minimal_html - (Struct.Character.get_player_ix char) + (Struct.Character.get_player_index char) char ) ] |