| summaryrefslogtreecommitdiff |
diff options
| -rw-r--r-- | src/battlemap/src/Model/EndTurn.elm | 5 | ||||
| -rw-r--r-- | src/battlemap/src/Model/SelectCharacter.elm | 7 | ||||
| -rw-r--r-- | src/battlemap/www/style.css | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/battlemap/src/Model/EndTurn.elm b/src/battlemap/src/Model/EndTurn.elm index 5ab2a46..f62c108 100644 --- a/src/battlemap/src/Model/EndTurn.elm +++ b/src/battlemap/src/Model/EndTurn.elm @@ -32,7 +32,10 @@ make_it_so model char_ref = case maybe_char of (Just char) -> (Just - (Character.set_location location char) + (Character.set_enabled + (Character.set_location location char) + False + ) ) Nothing -> Nothing ) diff --git a/src/battlemap/src/Model/SelectCharacter.elm b/src/battlemap/src/Model/SelectCharacter.elm index c98766b..4b3082b 100644 --- a/src/battlemap/src/Model/SelectCharacter.elm +++ b/src/battlemap/src/Model/SelectCharacter.elm @@ -46,7 +46,7 @@ select_character : ( Model.Type ) select_character model target_char_id target_char = - if ((Character.get_team target_char) == model.controlled_team) + if ((Character.is_enabled target_char)) then {model | state = (Model.ControllingCharacter target_char_id), @@ -65,7 +65,10 @@ select_character model target_char_id target_char = model (Error.new Error.IllegalAction - "SelectCharacter: Wrong team. Attack is not implemented." + ( + "SelectCharacter: Wrong team or already moved this turn" + ++ ". Attack is not implemented." + ) ) ) -------------------------------------------------------------------------------- diff --git a/src/battlemap/www/style.css b/src/battlemap/www/style.css index 1660547..e208b27 100644 --- a/src/battlemap/www/style.css +++ b/src/battlemap/www/style.css @@ -48,7 +48,7 @@ .battlemap-character-icon-disabled { - opacity: 0.5; + opacity: 0.4; filter: grayscale(50%); border: 2px dotted rgba(0,0,0,0.7); } |