From c41e76dc8fcbef9b64bee69e921304a2cad2fdd4 Mon Sep 17 00:00:00 2001 From: nsensfel Date: Tue, 28 Aug 2018 18:30:19 +0200 Subject: Adds the structure for omnimods, merges *_tile.erl --- src/battle/reply/btl_add_tile.erl | 8 ++++---- src/battle/reply/btl_set_map.erl | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/battle/reply') diff --git a/src/battle/reply/btl_add_tile.erl b/src/battle/reply/btl_add_tile.erl index a7e8f31..c9cd18e 100644 --- a/src/battle/reply/btl_add_tile.erl +++ b/src/battle/reply/btl_add_tile.erl @@ -16,13 +16,13 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec generate (btl_tile:type()) -> {list(any())}. +-spec generate (shr_tile:type()) -> {list(any())}. generate (Tile) -> { [ {<<"msg">>, <<"add_tile">>}, - {<<"id">>, btl_tile:get_class_id(Tile)}, - {<<"nam">>, btl_tile:get_name(Tile)}, - {<<"ct">>, btl_tile:get_cost(Tile)} + {<<"id">>, shr_tile:get_class_id(Tile)}, + {<<"nam">>, shr_tile:get_name(Tile)}, + {<<"ct">>, shr_tile:get_cost(Tile)} ] }. diff --git a/src/battle/reply/btl_set_map.erl b/src/battle/reply/btl_set_map.erl index c0dd2ca..25e0541 100644 --- a/src/battle/reply/btl_set_map.erl +++ b/src/battle/reply/btl_set_map.erl @@ -27,7 +27,7 @@ generate (Map) -> <<"t">>, lists:map ( - fun btl_tile:instance_to_int_list/1, + fun shr_tile:instance_to_int_list/1, array:sparse_to_list(btl_map:get_tile_instances(Map)) ) } -- cgit v1.2.3-70-g09d2