summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2018-06-18 18:35:53 +0200
committernsensfel <SpamShield0@noot-noot.org>2018-06-18 18:35:53 +0200
commitb251f5165ea3530747657b522773c4a8f44b16fa (patch)
tree68d830acec3fe8c171429ac903a16944ed31120c /src/battlemap/struct/bm_battle.erl
parenta174bc2cc95b94c0b7d786e764c48de72206d7c5 (diff)
Separates tiles from their icon images IDs.
The client has yet to be updated to support the new exchanges.
Diffstat (limited to 'src/battlemap/struct/bm_battle.erl')
-rw-r--r--src/battlemap/struct/bm_battle.erl15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/battlemap/struct/bm_battle.erl b/src/battlemap/struct/bm_battle.erl
index c4207e8..4c93460 100644
--- a/src/battlemap/struct/bm_battle.erl
+++ b/src/battlemap/struct/bm_battle.erl
@@ -10,8 +10,9 @@
battle,
{
id :: id(),
- used_armor_ids:: list(sh_armor:id()),
+ used_armor_ids :: list(sh_armor:id()),
used_weapon_ids :: list(sh_weapon:id()),
+ used_tile_ids :: list(bm_tile:id()),
battlemap :: bm_battlemap:type(),
characters :: array:array(bm_character:type()),
players :: array:array(bm_player:type()),
@@ -33,6 +34,7 @@
get_id/1,
get_used_weapon_ids/1,
get_used_armor_ids/1,
+ get_used_tile_ids/1,
get_battlemap/1,
get_characters/1,
get_character/2,
@@ -57,7 +59,7 @@
-export
(
[
- new/6
+ new/7
]
).
@@ -90,6 +92,9 @@ get_used_weapon_ids (Battle) -> Battle#battle.used_weapon_ids.
-spec get_used_armor_ids (type()) -> list(sh_armor:id()).
get_used_armor_ids (Battle) -> Battle#battle.used_armor_ids.
+-spec get_used_tile_ids (type()) -> list(bm_tile:id()).
+get_used_tile_ids (Battle) -> Battle#battle.used_tile_ids.
+
-spec get_battlemap (type()) -> bm_battlemap:type().
get_battlemap (Battle) -> Battle#battle.battlemap.
@@ -183,15 +188,17 @@ set_current_player_turn (PlayerTurn, Battle) ->
bm_battlemap:type(),
list(bm_character:type()),
list(sh_weapon:id()),
- list(sh_armor:id())
+ list(sh_armor:id()),
+ list(bm_tile:id())
)
-> type().
-new (ID, PlayersAsList, Battlemap, CharactersAsList, UWIDs, UAIDs) ->
+new (ID, PlayersAsList, Battlemap, CharactersAsList, UWIDs, UAIDs, UTIDs) ->
#battle
{
id = ID,
used_weapon_ids = UWIDs,
used_armor_ids = UAIDs,
+ used_tile_ids = UTIDs,
battlemap = Battlemap,
characters = array:from_list(CharactersAsList),
players = array:from_list(PlayersAsList),