1 files changed, 20 insertions, 12 deletions

diff --git a/src/battlemap_shim.erl b/src/battlemap_shim.erl
index 37a953b..af76554 100644
--- a/src/battlemap_shim.erl
+++ b/src/battlemap_shim.erl
@@ -1,18 +1,16 @@
 -module(battlemap_shim).
-
--export(
+-export
+(
    [
       generate/2
    ]
 ).
 
-generate_tile (0) ->
-   {0, 1};
-generate_tile (1) ->
-   {1, 2};
-generate_tile (2) ->
-   {2, 99}.
+-include("timed_cache_data.hrl").
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% LOCAL %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 generate(_Prev, Result, _X, 0, _BaseWidth) ->
    Result;
 generate(Prev, Result, 0, Y, BaseWidth) ->
@@ -20,18 +18,28 @@ generate(Prev, Result, 0, Y, BaseWidth) ->
 generate(Prev, Result, X, Y, BaseWidth) ->
    case rand:uniform(6) of
       N when (N > 3) ->
-         generate(Prev, [generate_tile(Prev)|Result], (X - 1), Y, BaseWidth);
+         generate(Prev, [Prev|Result], (X - 1), Y, BaseWidth);
 
       N ->
          NewTileType = (N - 1),
-         generate(
+         generate
+         (
             NewTileType,
-            [generate_tile(NewTileType)|Result],
+            [NewTileType|Result],
             (X - 1),
             Y,
             BaseWidth
          )
    end.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% EXPORTED %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 generate (Width, Height) ->
-   {Width, Height, generate(0, [], Width, Height, Width)}.
+   #battlemap
+   {
+      id = <<"0">>,
+      width = Width,
+      height = Height,
+      content = array:from_list(generate(0, [], Width, Height, Width))
+   }.