| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2019-04-23 10:02:00 +0200 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2019-04-23 10:02:00 +0200 |
| commit | c5422c4f90e135dbae1968db4b7fe996890e0efc (patch) | |
| tree | 05e678f0046f535cc2963669923956b845757cc7 /src/battle/struct/btl_battle.erl | |
| parent | d85264c80cf23d1e13ffed091141c3ab929e7f4a (diff) | |
| parent | fbd24da759636897ae224eea8627424bec4d6ed5 (diff) | |
Merge branch 'master' of dreamhost:~/repositories/git/tacticians-server
Diffstat (limited to 'src/battle/struct/btl_battle.erl')
| -rw-r--r-- | src/battle/struct/btl_battle.erl | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/battle/struct/btl_battle.erl b/src/battle/struct/btl_battle.erl index a5b5a06..46f8c10 100644 --- a/src/battle/struct/btl_battle.erl +++ b/src/battle/struct/btl_battle.erl @@ -12,7 +12,8 @@ related_inventory :: shr_inventory:type(), related_tile_ids :: ordsets:ordset(shr_tile:id()), map :: shr_map:type(), - characters :: orddict:orddict(non_neg_integer(), btl_character:type()), + characters :: + orddict:orddict(non_neg_integer(), btl_character:unresolved()), players :: orddict:orddict(non_neg_integer(), btl_player:type()), current_player_turn :: btl_player_turn:type() } @@ -96,10 +97,10 @@ get_map (Battle) -> Battle#battle.map. ( type() ) - -> orddict:orddict(non_neg_integer(), btl_character:type()). + -> orddict:orddict(non_neg_integer(), btl_character:unresolved()). get_characters (Battle) -> Battle#battle.characters. --spec get_character (non_neg_integer(), type()) -> btl_character:type(). +-spec get_character (non_neg_integer(), type()) -> btl_character:unresolved(). get_character (IX, Battle) -> orddict:fetch(IX, Battle#battle.characters). @@ -139,7 +140,7 @@ set_map (Map, Battle) -> -spec set_characters ( - orddict:orddict(non_neg_integer(), btl_character:type()), + orddict:orddict(non_neg_integer(), btl_character:unresolved()), type() ) -> type(). @@ -149,7 +150,13 @@ set_characters (Characters, Battle) -> characters = Characters }. --spec set_character (non_neg_integer(), btl_character:type(), type()) -> type(). +-spec set_character + ( + non_neg_integer(), + btl_character:unresolved(), + type() + ) + -> type(). set_character (IX, Character, Battle) -> Battle#battle { |