| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src/query')
| -rw-r--r-- | src/query/character_turn.erl | 8 | ||||
| -rw-r--r-- | src/query/load_state.erl | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/query/character_turn.erl b/src/query/character_turn.erl index a692be1..e796493 100644 --- a/src/query/character_turn.erl +++ b/src/query/character_turn.erl @@ -87,11 +87,11 @@ assert_character_instance_can_be_played (RData, Input) -> ( battle:get_current_player_turn(Battle) ), - CurrentPlayer = battle:get_player_id(CurrentPlayerIX, Battle), - CharacterOwner = character:get_owner_id(Character), + CurrentPlayer = battle:get_player(CurrentPlayerIX, Battle), + CharacterOwnerID = character:get_owner_id(Character), - PlayerID = CurrentPlayer, - PlayerID = CharacterOwner, + PlayerID = player:get_id(CurrentPlayer), + PlayerID = CharacterOwnerID, true = character_instance:get_is_active(CharacterInstance). diff --git a/src/query/load_state.erl b/src/query/load_state.erl index eb27b9e..cc8f28f 100644 --- a/src/query/load_state.erl +++ b/src/query/load_state.erl @@ -87,6 +87,8 @@ generate_reply (QueryState, Input) -> ) ) ] + ++ + battle:get_encoded_last_turns_effects(Battle) ). -spec handle (binary()) -> binary(). |