Fixes map addition.

7 files changed, 32 insertions, 47 deletions

diff --git a/src/login/lgn_shim.erl b/src/login/lgn_shim.erl
index 5231a31..df35d97 100644
--- a/src/login/lgn_shim.erl
+++ b/src/login/lgn_shim.erl
@@ -24,7 +24,7 @@ add_ref_to_event (BattleID, EventName, IsPlayersTurn, Player) ->
    Event =
       shr_battle_summary:new(BattleID, EventName, <<"Never">>, IsPlayersTurn),
 
-   Result = shr_player:set_event_summaries(array:from_list([Event]), Player),
+   Result = shr_player:set_event_summaries([Event], Player),
 
    Result.
 
@@ -38,7 +38,7 @@ add_ref_to_event (BattleID, EventName, IsPlayersTurn, Player) ->
 add_ref_to_map (MapID, EventName, Player) ->
    MapRef = shr_map_summary:new(MapID, EventName),
 
-   Result = shr_player:set_map_summaries(array:from_list([MapRef]), Player),
+   Result = shr_player:set_map_summaries([MapRef], Player),
 
    Result.
 
diff --git a/src/map/struct/map_map.erl b/src/map/struct/map_map.erl
index 0e9474b..cc30645 100644
--- a/src/map/struct/map_map.erl
+++ b/src/map/struct/map_map.erl
@@ -147,12 +147,5 @@ default (Owner) ->
       width = 32,
       height = 32,
       tile_instances =
-         array:new
-         (
-            [
-               {size, 1024},
-               {default, DefaultTileInstance},
-               {fixed, true}
-            ]
-         )
+         array:from_list(lists:duplicate(1024, DefaultTileInstance))
    }.
diff --git a/src/player/reply/plr_set_battles.erl b/src/player/reply/plr_set_battles.erl
index a45a49f..a0e6919 100644
--- a/src/player/reply/plr_set_battles.erl
+++ b/src/player/reply/plr_set_battles.erl
@@ -22,21 +22,21 @@ generate (Player) ->
       lists:map
       (
          fun shr_battle_summary:encode/1,
-         array:to_list(shr_player:get_campaign_summaries(Player))
+         shr_player:get_campaign_summaries(Player)
       ),
 
    InvasionList =
       lists:map
       (
          fun shr_battle_summary:encode/1,
-         array:to_list(shr_player:get_invasion_summaries(Player))
+         shr_player:get_invasion_summaries(Player)
       ),
 
    EventList =
       lists:map
       (
          fun shr_battle_summary:encode/1,
-         array:to_list(shr_player:get_event_summaries(Player))
+         shr_player:get_event_summaries(Player)
       ),
 
    {
diff --git a/src/player/reply/plr_set_player.erl b/src/player/reply/plr_set_player.erl
index 46f3747..de54fc0 100644
--- a/src/player/reply/plr_set_player.erl
+++ b/src/player/reply/plr_set_player.erl
@@ -22,28 +22,28 @@ generate (Player) ->
       lists:map
       (
          fun shr_map_summary:encode/1,
-         array:to_list(shr_player:get_map_summaries(Player))
+         shr_player:get_map_summaries(Player)
       ),
 
    CampaignList =
       lists:map
       (
          fun shr_battle_summary:encode/1,
-         array:to_list(shr_player:get_campaign_summaries(Player))
+         shr_player:get_campaign_summaries(Player)
       ),
 
    InvasionList =
       lists:map
       (
          fun shr_battle_summary:encode/1,
-         array:to_list(shr_player:get_invasion_summaries(Player))
+         shr_player:get_invasion_summaries(Player)
       ),
 
    EventList =
       lists:map
       (
          fun shr_battle_summary:encode/1,
-         array:to_list(shr_player:get_event_summaries(Player))
+         shr_player:get_event_summaries(Player)
       ),
 
    {
diff --git a/src/query/qry_shim.erl b/src/query/qry_shim.erl
index f9a959e..473a14c 100644
--- a/src/query/qry_shim.erl
+++ b/src/query/qry_shim.erl
@@ -22,7 +22,7 @@ generate_player_0 () ->
          <<"Player1@tacticians.online">>
       ),
 
-   spe_map:generate(shr_player:get_id(Player)),
+   spe_map:grant_additional(shr_player:get_id(Player)),
 
    Player.
 
@@ -37,7 +37,7 @@ generate_player_1 () ->
          <<"Player2@tacticians.online">>
       ),
 
-   spe_map:generate(shr_player:get_id(Player)),
+   spe_map:grant_additional(shr_player:get_id(Player)),
 
    Player.
 
diff --git a/src/shared/struct/shr_player.erl b/src/shared/struct/shr_player.erl
index 7cd60d7..5577615 100644
--- a/src/shared/struct/shr_player.erl
+++ b/src/shared/struct/shr_player.erl
@@ -16,10 +16,10 @@
       token :: binary(), % salt(crypto:strong_rand_bytes(512))
       email :: binary(),
       last_active :: integer(),
-      maps :: array:array(shr_map_summary:type()),
-      campaigns :: array:array(shr_battle_summary:type()),
-      invasions :: array:array(shr_battle_summary:type()),
-      events :: array:array(shr_battle_summary:type()),
+      maps :: list(shr_map_summary:type()),
+      campaigns :: list(shr_battle_summary:type()),
+      invasions :: list(shr_battle_summary:type()),
+      events :: list(shr_battle_summary:type()),
       roster_id :: binary(),
       inventory_id :: binary()
    }
@@ -115,7 +115,6 @@ secure_value (Salt, Val) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -spec new (binary(), binary(), binary(), binary()) -> type().
 new (ID, Username, Password, Email) ->
-   EmptyArray = array:new(),
    Result =
       #player
       {
@@ -125,10 +124,10 @@ new (ID, Username, Password, Email) ->
          token = <<"">>,
          email = Email,
          last_active = 0,
-         maps = EmptyArray,
-         campaigns = EmptyArray,
-         invasions = EmptyArray,
-         events = EmptyArray,
+         maps = [],
+         campaigns = [],
+         invasions = [],
+         events = [],
          inventory_id = <<"0">>,
          roster_id = <<"0">>
       },
@@ -158,16 +157,16 @@ get_email (Player) -> Player#player.email.
 -spec get_last_active (type()) -> integer().
 get_last_active (Player) -> Player#player.last_active.
 
--spec get_map_summaries (type()) -> array:array(shr_map_summary:type()).
+-spec get_map_summaries (type()) -> list(shr_map_summary:type()).
 get_map_summaries (Player) -> Player#player.maps.
 
--spec get_campaign_summaries (type()) -> array:array(shr_battle_summary:type()).
+-spec get_campaign_summaries (type()) -> list(shr_battle_summary:type()).
 get_campaign_summaries (Player) -> Player#player.campaigns.
 
--spec get_invasion_summaries (type()) -> array:array(shr_battle_summary:type()).
+-spec get_invasion_summaries (type()) -> list(shr_battle_summary:type()).
 get_invasion_summaries (Player) -> Player#player.invasions.
 
--spec get_event_summaries (type()) -> array:array(shr_battle_summary:type()).
+-spec get_event_summaries (type()) -> list(shr_battle_summary:type()).
 get_event_summaries (Player) -> Player#player.events.
 
 -spec get_roster_id (type()) -> binary().
@@ -209,12 +208,12 @@ refresh_active (Player) ->
       last_active = erlang:system_time(second)
    }.
 
--spec set_map_summaries (array:array(shr_map_summary:type()), type()) -> type().
+-spec set_map_summaries (list(shr_map_summary:type()), type()) -> type().
 set_map_summaries (Maps, Player) -> Player#player{ maps = Maps }.
 
 -spec set_campaign_summaries
    (
-      array:array(shr_battle_summary:type()),
+      list(shr_battle_summary:type()),
       type()
    )
    -> type().
@@ -226,7 +225,7 @@ set_campaign_summaries (Campaigns, Player) ->
 
 -spec set_invasion_summaries
    (
-      array:array(shr_battle_summary:type()),
+      list(shr_battle_summary:type()),
       type()
    )
    -> type().
@@ -236,12 +235,7 @@ set_invasion_summaries (Invasions, Player) ->
       invasions = Invasions
    }.
 
--spec set_event_summaries
-   (
-      array:array(shr_battle_summary:type()),
-      type()
-   )
-   -> type().
+-spec set_event_summaries (list(shr_battle_summary:type()), type()) -> type().
 set_event_summaries (Events, Player) ->
    Player#player
    {
diff --git a/src/special/spe_map.erl b/src/special/spe_map.erl
index f12b0aa..418d6b5 100644
--- a/src/special/spe_map.erl
+++ b/src/special/spe_map.erl
@@ -7,7 +7,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([generate/1]).
+-export([grant_additional/1]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -16,8 +16,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec generate (binary()) -> map_map:type().
-generate (OwnerID) ->
+-spec grant_additional (binary()) -> map_map:type().
+grant_additional (OwnerID) ->
    Map = map_map:default(OwnerID),
 
    {ok, MapID} =
@@ -29,12 +29,10 @@ generate (OwnerID) ->
          Map
       ),
 
-   MapSummary = shr_map_summary:new(<<"Untitled Map">>, MapID),
+   MapSummary = shr_map_summary:new(MapID, <<"Untitled Map">>),
 
    PlayerUpdateQueryOps =
       [
-         %% FIXME: shr_db_query:add_to_field handles lists,
-         %% shr_player:get_map_summaries_field() points to an array.
          shr_db_query:add_to_field
          (
             shr_player:get_map_summaries_field(),