| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src/battle')
| -rw-r--r-- | src/battle/src/Struct/Battle.elm | 24 | ||||
| -rw-r--r-- | src/battle/src/Struct/TurnResultAnimator.elm | 10 | ||||
| -rw-r--r-- | src/battle/src/Update/HandleServerReply.elm | 8 |
3 files changed, 26 insertions, 16 deletions
diff --git a/src/battle/src/Struct/Battle.elm b/src/battle/src/Struct/Battle.elm index 1798786..ae6e3fe 100644 --- a/src/battle/src/Struct/Battle.elm +++ b/src/battle/src/Struct/Battle.elm @@ -24,9 +24,7 @@ module Struct.Battle exposing get_id, - get_own_player_index, - - tile_omnimods_fun + get_own_player_index ) -- Elm ------------------------------------------------------------------------- @@ -39,10 +37,17 @@ import Set -- Battle ---------------------------------------------------------------------- import Battle.Struct.Omnimods +-- Elm ------------------------------------------------------------------------- +import Array + +-- Shared ---------------------------------------------------------------------- +import Struct.Flags + -- Battle Map ------------------------------------------------------------------ import BattleMap.Struct.Location import BattleMap.Struct.Map import BattleMap.Struct.Marker +import BattleMap.Struct.DataSet -- Local Module ---------------------------------------------------------------- import Struct.Character @@ -121,13 +126,6 @@ regenerate_attack_of_opportunity_markers char_ix battle = -------------------------------------------------------------------------------- -- EXPORTED -------------------------------------------------------------------- -------------------------------------------------------------------------------- -tile_omnimods_fun : ( - BattleMap.Struct.DataSet.Type -> - (BattleMap.Struct.Location.Type -> Battle.Struct.Omnimods.Type) - ) -tile_omnimods_fun dataset battle = - (\loc -> (BattleMap.Struct.Map.get_omnimods_at loc dataset battle.map)) - new : Type new = { @@ -180,10 +178,10 @@ set_characters chars battle = {battle | characters = chars} add_player : Struct.Flags.Type -> Struct.Player.Type -> Type -> Type add_player flags pl battle = {battle | - players = (Array.push pl battle.players) + players = (Array.push pl battle.players), own_player_ix = - if (Struct.Player.get_id == (Struct.Flags.get_player_id flags)) - then (Array.size battle.players) + if ((Struct.Player.get_id pl) == (Struct.Flags.get_user_id flags)) + then (Array.length battle.players) else battle.own_player_ix } diff --git a/src/battle/src/Struct/TurnResultAnimator.elm b/src/battle/src/Struct/TurnResultAnimator.elm index 49acdb8..2a1220f 100644 --- a/src/battle/src/Struct/TurnResultAnimator.elm +++ b/src/battle/src/Struct/TurnResultAnimator.elm @@ -10,9 +10,14 @@ module Struct.TurnResultAnimator exposing ) -- Elm ------------------------------------------------------------------------- +import Array import Set +-- Battle Map ------------------------------------------------------------------ +import BattleMap.Struct.DataSet + -- Local Module ---------------------------------------------------------------- +import Struct.Battle import Struct.TurnResult -------------------------------------------------------------------------------- @@ -148,8 +153,9 @@ move_animator_to_next_step maybe_animator = apply_animator_step : ( BattleMap.Struct.DataSet.Type -> - Battle.Struct.Type -> - Battle.Struct.Type + Type -> + Struct.Battle.Type -> + Struct.Battle.Type ) apply_animator_step dataset animator battle = case (Struct.TurnResultAnimator.get_current_animation animator) of diff --git a/src/battle/src/Update/HandleServerReply.elm b/src/battle/src/Update/HandleServerReply.elm index 969358e..1ab919e 100644 --- a/src/battle/src/Update/HandleServerReply.elm +++ b/src/battle/src/Update/HandleServerReply.elm @@ -230,7 +230,13 @@ add_character unresolved_char current_state = battle = (Struct.Battle.add_character (Struct.Character.resolve - (Struct.Model.tile_omnimods_fun model) + (\loc -> + (BattleMap.Struct.Map.tile_omnimods_fun + loc + model.map_dataset + (Struct.Battle.get_map model.battle) + ) + ) model.characters_dataset unresolved_char ) |