Adds the structure for omnimods, merges *_tile.erl

8 files changed, 17 insertions, 134 deletions

diff --git a/src/battle/btl_shim.erl b/src/battle/btl_shim.erl
index 8819f33..f5fa735 100644
--- a/src/battle/btl_shim.erl
+++ b/src/battle/btl_shim.erl
@@ -289,7 +289,7 @@ generate_random_battle () ->
          fun (_IX, TileInstance, CurrentTileIDs) ->
             sets:add_element
             (
-               btl_tile:extract_main_class_id(TileInstance),
+               shr_tile:extract_main_class_id(TileInstance),
                CurrentTileIDs
             )
          end,
diff --git a/src/battle/game-logic/btl_movement.erl b/src/battle/game-logic/btl_movement.erl
index ec903e8..dd7eff9 100644
--- a/src/battle/game-logic/btl_movement.erl
+++ b/src/battle/game-logic/btl_movement.erl
@@ -31,9 +31,9 @@ cross (_Map, _ForbiddenLocations, [], Cost, Location) ->
 cross (Map, ForbiddenLocations, [Step|NextSteps], Cost, Location) ->
    NextLocation = btl_location:apply_direction(Step, Location),
    NextTileInstance = btl_map:get_tile_instance(NextLocation, Map),
-   NextTileClassID = btl_tile:extract_main_class_id(NextTileInstance),
-   NextTile = btl_tile:from_class_id(NextTileClassID),
-   NextCost = (Cost + btl_tile:get_cost(NextTile)),
+   NextTileClassID = shr_tile:extract_main_class_id(NextTileInstance),
+   NextTile = shr_tile:from_class_id(NextTileClassID),
+   NextCost = (Cost + shr_tile:get_cost(NextTile)),
    IsForbidden =
       lists:foldl
       (
diff --git a/src/battle/query/btl_load.erl b/src/battle/query/btl_load.erl
index a93120e..35ad6f9 100644
--- a/src/battle/query/btl_load.erl
+++ b/src/battle/query/btl_load.erl
@@ -131,7 +131,7 @@ generate_reply (QueryState, Input) ->
       lists:map
       (
          fun (TileClassID) ->
-            btl_add_tile:generate(btl_tile:from_class_id(TileClassID))
+            btl_add_tile:generate(shr_tile:from_class_id(TileClassID))
          end,
          btl_battle:get_used_tile_ids(Battle)
       ),
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))
             )
          }
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) ->
diff --git a/src/battle/struct/btl_map.erl b/src/battle/struct/btl_map.erl
index ddf2bb1..c784bca 100644
--- a/src/battle/struct/btl_map.erl
+++ b/src/battle/struct/btl_map.erl
@@ -12,7 +12,7 @@
       id :: id(),
       width :: integer(),
       height :: integer(),
-      tile_ids :: array:array(btl_tile:instance())
+      tile_ids :: array:array(shr_tile:instance())
    }
 ).
 
@@ -72,10 +72,10 @@ get_width (Map) -> Map#map.width.
 -spec get_height (type()) -> integer().
 get_height (Map) -> Map#map.height.
 
--spec get_tile_instances (type()) -> array:array(btl_tile:instance()).
+-spec get_tile_instances (type()) -> array:array(shr_tile:instance()).
 get_tile_instances (Map) -> Map#map.tile_ids.
 
--spec get_tile_instance (btl_location:type(), type()) -> btl_tile:instance().
+-spec get_tile_instance (btl_location:type(), type()) -> shr_tile:instance().
 get_tile_instance (Location, Map) ->
    TileIX = location_to_array_index(Map#map.width, Location),
    array:get(TileIX, Map#map.tile_ids).
@@ -89,7 +89,7 @@ get_tile_instance (Location, Map) ->
    )
    -> type().
 from_list (ID, Width, Height, List) ->
-   TileInstances = lists:map(fun btl_tile:instance_from_ints/1, List),
+   TileInstances = lists:map(fun shr_tile:instance_from_ints/1, List),
 
    #map
    {
diff --git a/src/battle/struct/btl_tile.erl.m4 b/src/battle/struct/btl_tile.erl.m4
deleted file mode 100644
index 12653b7..0000000
--- a/src/battle/struct/btl_tile.erl.m4
+++ /dev/null
@@ -1,117 +0,0 @@
--module(btl_tile).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--record
-(
-   tile,
-   {
-      id :: class_id(),
-      name :: binary(),
-      cost :: non_neg_integer()
-   }
-).
-
--opaque class_id() :: non_neg_integer().
--opaque instance() :: list(non_neg_integer()).
--opaque border() :: list(non_neg_integer()).
-
--opaque type() :: #tile{}.
-
--export_type([type/0, class_id/0, instance/0, border/0]).
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export
-(
-   [
-      get_class_id/1,
-      get_name/1,
-      get_cost/1,
-      from_class_id/1,
-      cost_when_oob/0
-   ]
-).
-
--export
-(
-   [
-      instance_to_int_list/1,
-      instance_from_ints/1
-   ]
-).
-
--export
-(
-   [
-      extract_main_class_id/1,
-      extract_variant_ix/1,
-      extract_borders/1
-   ]
-).
-
--export
-(
-   [
-      extract_border_main_class_id/1,
-      extract_border_variant_ix/1
-   ]
-).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec extract_main_class_id (instance()) -> class_id().
-extract_main_class_id (I) -> lists:nth(1, I).
-
--spec extract_borders (instance()) -> list(border()).
-extract_borders (I) ->
-   [_|[_|Result]] = I,
-   Result.
-
--spec extract_variant_ix (instance()) -> non_neg_integer().
-extract_variant_ix (I) -> lists:nth(2, I).
-
--spec extract_border_main_class_id (border()) -> class_id().
-extract_border_main_class_id (B) -> lists:nth(1, B).
-
--spec extract_border_variant_ix (border()) -> non_neg_integer().
-extract_border_variant_ix (B) -> lists:nth(2, B).
-
--spec from_class_id (class_id()) -> type().
-m4_include(__MAKEFILE_DATA_DIR/tile/global.m4.conf)m4_dnl
-m4_include(__MAKEFILE_DATA_DIR/tile/error.m4d)m4_dnl
-m4_include(__MAKEFILE_DATA_DIR/tile/grassland.m4d)m4_dnl
-m4_include(__MAKEFILE_DATA_DIR/tile/mud.m4d)m4_dnl
-m4_include(__MAKEFILE_DATA_DIR/tile/water.m4d)m4_dnl
-from_class_id(_) ->
-   from_class_id(0).
-
--spec cost_when_oob () -> non_neg_integer().
-cost_when_oob () -> __TILE_COST_WHEN_OOB.
-
--spec get_class_id (type()) -> non_neg_integer().
-get_class_id (Tile) -> Tile#tile.id.
-
--spec get_cost (type()) -> non_neg_integer().
-get_cost (Tile) -> Tile#tile.cost.
-
--spec get_name (type()) -> binary().
-get_name (Tile) -> Tile#tile.name.
-
--spec instance_from_ints (list(non_neg_integer())) -> instance().
-instance_from_ints (L) ->
-   LLength = length(L),
-
-   case (((LLength rem 2) == 0) and (LLength /= 0)) of
-      true -> L;
-      _ -> [0, 0]
-   end.
-
--spec instance_to_int_list (instance()) -> list(non_neg_integer()).
-instance_to_int_list (I) -> I.