| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src/battle/struct')
| -rw-r--r-- | src/battle/struct/btl_battle.erl | 43 | ||||
| -rw-r--r-- | src/battle/struct/btl_player.erl | 11 |
2 files changed, 45 insertions, 9 deletions
diff --git a/src/battle/struct/btl_battle.erl b/src/battle/struct/btl_battle.erl index 01ab65b..aedd8da 100644 --- a/src/battle/struct/btl_battle.erl +++ b/src/battle/struct/btl_battle.erl @@ -56,6 +56,9 @@ ataxia_set_character/3, ataxia_set_character/4, + add_character/2, + ataxia_add_character/2, + set_players/2, ataxia_set_players/2, ataxia_set_players/3, @@ -64,6 +67,9 @@ ataxia_set_player/3, ataxia_set_player/4, + add_player/2, + ataxia_add_player/2, + set_current_player_turn/2, ataxia_set_current_player_turn/2, ataxia_set_current_player_turn/3, @@ -243,6 +249,27 @@ set_character (IX, Character, Battle) -> characters = orddict:store(IX, Character, Battle#battle.characters) }. +-spec add_character + ( + btl_character:unresolved(), + type() + ) + -> {non_neg_integer(), type()}. +add_character (Character, Battle) -> + IX = orddict:size(Battle#battle.characters), + {IX, set_character(IX, Character, Battle)}. + +-spec ataxia_add_character + ( + btl_character:unresolved(), + type() + ) + -> {non_neg_integer(), type(), ataxic:basic()}. +ataxia_add_character (Character, Battle) -> + IX = orddict:size(Battle#battle.characters), + {S0Battle, AtaxicUpdate} = ataxia_set_character(IX, Character, Battle), + {IX, S0Battle, AtaxicUpdate}. + -spec ataxia_set_character ( non_neg_integer(), @@ -373,6 +400,22 @@ ataxia_set_player (IX, Player, PlayerUpdate, Battle) -> ) }. +-spec add_player (btl_player:type(), type()) -> {non_neg_integer(), type()}. +add_player (Player, Battle) -> + IX = orddict:size(Battle#battle.players), + {IX, set_player(IX, Player, Battle)}. + +-spec ataxia_add_player + ( + btl_player:type(), + type() + ) + -> {non_neg_integer(), type(), ataxic:basic()}. +ataxia_add_player (Player, Battle) -> + IX = orddict:size(Battle#battle.players), + {S0Battle, AtaxicUpdate} = ataxia_set_player(IX, Player, Battle), + {IX, S0Battle, AtaxicUpdate}. + -spec set_current_player_turn (btl_player_turn:type(), type()) -> type(). set_current_player_turn (PlayerTurn, Battle) -> Battle#battle diff --git a/src/battle/struct/btl_player.erl b/src/battle/struct/btl_player.erl index 604efca..d677790 100644 --- a/src/battle/struct/btl_player.erl +++ b/src/battle/struct/btl_player.erl @@ -8,7 +8,6 @@ ( player, { - ix :: non_neg_integer(), id :: shr_player:id(), character_ix :: non_neg_integer(), timeline :: list(any()), @@ -29,7 +28,6 @@ ( [ get_id/1, - get_index/1, get_luck/1, get_summary_index/1, get_summary_category/1, @@ -59,7 +57,7 @@ -export ( [ - new/5 + new/4 ] ). @@ -73,9 +71,6 @@ -spec get_id (type()) -> shr_player:id(). get_id (Player) -> Player#player.id. --spec get_index (type()) -> non_neg_integer(). -get_index (Player) -> Player#player.ix. - -spec get_luck (type()) -> integer(). get_luck (Player) -> Player#player.luck. @@ -166,15 +161,13 @@ ataxia_reset_timeline (Player) -> -spec new ( non_neg_integer(), - non_neg_integer(), shr_player:id(), non_neg_integer(), shr_battle_summary:category() ) -> type(). -new (IX, CharacterIX, ID, SummaryIX, SummaryCategory) -> +new (CharacterIX, ID, SummaryIX, SummaryCategory) -> #player { - ix = IX, character_ix = CharacterIX, id = ID, is_active = true, |