summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2018-08-28 18:30:19 +0200
committernsensfel <SpamShield0@noot-noot.org>2018-08-28 18:30:19 +0200
commitc41e76dc8fcbef9b64bee69e921304a2cad2fdd4 (patch)
tree0df6e3d4647ef7860d4fb4dc5f5a9004e0dd7455 /src/battle/struct/btl_battle.erl
parentea42e4ea8667ddf8e9c30cbf234c109a139c25ff (diff)
Adds the structure for omnimods, merges *_tile.erl
Diffstat (limited to 'src/battle/struct/btl_battle.erl')
-rw-r--r--src/battle/struct/btl_battle.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle/struct/btl_battle.erl b/src/battle/struct/btl_battle.erl
index b7f158a..dec7fd7 100644
--- a/src/battle/struct/btl_battle.erl
+++ b/src/battle/struct/btl_battle.erl
@@ -12,7 +12,7 @@
id :: id(),
used_armor_ids :: list(shr_armor:id()),
used_weapon_ids :: list(shr_weapon:id()),
- used_tile_ids :: list(btl_tile:class_id()),
+ used_tile_ids :: list(shr_tile:class_id()),
map :: btl_map:type(),
characters :: array:array(btl_character:type()),
players :: array:array(btl_player:type()),
@@ -92,7 +92,7 @@ get_used_weapon_ids (Battle) -> Battle#battle.used_weapon_ids.
-spec get_used_armor_ids (type()) -> list(shr_armor:id()).
get_used_armor_ids (Battle) -> Battle#battle.used_armor_ids.
--spec get_used_tile_ids (type()) -> list(btl_tile:class_id()).
+-spec get_used_tile_ids (type()) -> list(shr_tile:class_id()).
get_used_tile_ids (Battle) -> Battle#battle.used_tile_ids.
-spec get_map (type()) -> btl_map:type().
@@ -189,7 +189,7 @@ set_current_player_turn (PlayerTurn, Battle) ->
list(btl_character:type()),
list(shr_weapon:id()),
list(shr_armor:id()),
- list(btl_tile:class_id())
+ list(shr_tile:class_id())
)
-> type().
new (ID, PlayersAsList, Map, CharactersAsList, UWIDs, UAIDs, UTIDs) ->