| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2020-03-04 11:15:08 +0100 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2020-03-04 11:15:08 +0100 |
| commit | f6fbffbe6aac7e499db1db5a453b84885bb4b1db (patch) | |
| tree | f2c94377dc4304d00d22f6f97a2c8de101d87e0f /src/battle/src/View | |
| parent | 64756704edf7e1ae2109cc3fc25fe1d62c629d11 (diff) | |
Oh, it compiles?
Diffstat (limited to 'src/battle/src/View')
| -rw-r--r-- | src/battle/src/View/SubMenu.elm | 14 | ||||
| -rw-r--r-- | src/battle/src/View/SubMenu/Settings.elm | 20 |
2 files changed, 7 insertions, 27 deletions
diff --git a/src/battle/src/View/SubMenu.elm b/src/battle/src/View/SubMenu.elm index 5cb1b84..0577cbf 100644 --- a/src/battle/src/View/SubMenu.elm +++ b/src/battle/src/View/SubMenu.elm @@ -38,9 +38,10 @@ get_inner_html model tab = (View.SubMenu.Status.get_html model) Struct.UI.CharactersTab -> - (Html.Lazy.lazy + (Html.Lazy.lazy2 (View.SubMenu.Characters.get_html) - model.battle + model.battle.characters + model.battle.own_player_ix ) Struct.UI.SettingsTab -> @@ -64,19 +65,16 @@ get_html model = Nothing -> case (Struct.CharacterTurn.maybe_get_target model.char_turn) of (Just char_ref) -> - case (Array.get char_ref model.characters) of + case (Struct.Battle.get_character char_ref model.battle) of (Just char) -> (Html.div [(Html.Attributes.class "sub-menu")] [ (Html.text "Targeting:"), (Html.Lazy.lazy3 - (View.Controlled.CharacterCard.get_summary_html - (Struct.Battle.get_own_player_index - model.battle - ) - ) + (View.Controlled.CharacterCard.get_summary_html) model.char_turn + model.battle.own_player_ix char ) ] diff --git a/src/battle/src/View/SubMenu/Settings.elm b/src/battle/src/View/SubMenu/Settings.elm index d214c7b..e14de91 100644 --- a/src/battle/src/View/SubMenu/Settings.elm +++ b/src/battle/src/View/SubMenu/Settings.elm @@ -36,24 +36,6 @@ get_html model = [ (scale_button (0.75) "Zoom -"), (scale_button 0 "Zoom Reset"), - (scale_button (1.15) "Zoom +"), - (Html.button - [ - (Html.Events.onClick Struct.Event.DebugTeamSwitchRequest) - ] - [ (Html.text "[DEBUG] Switch team") ] - ), - (Html.button - [ - (Html.Events.onClick Struct.Event.DebugLoadBattleRequest) - ] - [ (Html.text "[DEBUG] Load map") ] - ), - (Html.button - [ - (Html.Events.onClick Struct.Event.DebugTestAnimation) - ] - [ (Html.text "[DEBUG] Test animations") ] - ) + (scale_button (1.15) "Zoom +") ] ) |