| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2018-12-10 18:49:05 +0100 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2018-12-10 18:49:05 +0100 |
| commit | bf88fff4463697c20fa664852486278771189d35 (patch) | |
| tree | 15e92b4452551e4abbf53496348f758546c05d02 /src/battle/struct | |
| parent | b9860582e2334213572d2100d2e047d0ad219702 (diff) | |
Working on the creation of invasions.
Diffstat (limited to 'src/battle/struct')
| -rw-r--r-- | src/battle/struct/btl_character_turn_request.erl | 4 | ||||
| -rw-r--r-- | src/battle/struct/btl_player.erl | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/battle/struct/btl_character_turn_request.erl b/src/battle/struct/btl_character_turn_request.erl index a4f310d..c8508e2 100644 --- a/src/battle/struct/btl_character_turn_request.erl +++ b/src/battle/struct/btl_character_turn_request.erl @@ -13,7 +13,7 @@ ( type, { - player_id :: btl_player:id(), + player_id :: shr_player:id(), session_token :: binary(), battle_id :: binary(), character_ix :: non_neg_integer(), @@ -68,7 +68,7 @@ decode (Map) -> actions = Actions }. --spec get_player_id (type()) -> btl_player:id(). +-spec get_player_id (type()) -> shr_player:id(). get_player_id (Request) -> Request#type.player_id. -spec get_session_token (type()) -> binary(). diff --git a/src/battle/struct/btl_player.erl b/src/battle/struct/btl_player.erl index 1cb1d93..cedd9e7 100644 --- a/src/battle/struct/btl_player.erl +++ b/src/battle/struct/btl_player.erl @@ -3,14 +3,13 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --type id() :: binary(). -record ( player, { ix :: non_neg_integer(), - id :: id(), + id :: shr_player:id(), character_ix :: non_neg_integer(), timeline :: list(any()), is_active :: boolean() @@ -19,7 +18,7 @@ -opaque type() :: #player{}. --export_type([type/0, id/0]). +-export_type([type/0]). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -56,7 +55,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec get_id (type()) -> id(). +-spec get_id (type()) -> shr_player:id(). get_id (Player) -> Player#player.id. -spec get_index (type()) -> non_neg_integer(). @@ -86,7 +85,7 @@ add_to_timeline (NewEvents, Player) -> -spec reset_timeline (type()) -> type(). reset_timeline (Player) -> Player#player{ timeline = [] }. --spec new (non_neg_integer(), non_neg_integer(), id()) -> type(). +-spec new (non_neg_integer(), non_neg_integer(), shr_player:id()) -> type(). new (IX, CharacterIX, ID) -> #player { |