Removes 'id' field from ataxia entry values.

While sometimes usefull as a way to retrieve the object's ID, they were
both redundant (you can't get the object without its ID anyway) and
bothersome to maintain (insert + update, which would have required
setting up a bounty for any insert).

14 files changed, 53 insertions, 165 deletions

diff --git a/src/battle/struct/btl_battle.erl b/src/battle/struct/btl_battle.erl
index b2bd4f1..7acdc13 100644
--- a/src/battle/struct/btl_battle.erl
+++ b/src/battle/struct/btl_battle.erl
@@ -9,7 +9,6 @@
 (
    battle,
    {
-      id :: id(),
       used_armor_ids :: ordsets:ordset(shr_armor:id()),
       used_weapon_ids :: ordsets:ordset(shr_weapon:id()),
       used_portrait_ids :: ordsets:ordset(shr_portrait:id()),
@@ -32,7 +31,6 @@
 -export
 (
    [
-      get_id/1,
       get_used_portrait_ids/1,
       get_used_weapon_ids/1,
       get_used_armor_ids/1,
@@ -45,7 +43,6 @@
       get_current_player_turn/1,
       get_encoded_last_turns_effects/1,
 
-      set_id/2,
       set_map/2,
       set_used_portrait_ids/2,
       set_used_weapon_ids/2,
@@ -56,7 +53,6 @@
       set_player/3,
       set_current_player_turn/2,
 
-      get_id_field/0,
       get_used_armor_ids_field/0,
       get_used_weapon_ids_field/0,
       get_used_portrait_ids_field/0,
@@ -94,9 +90,6 @@ get_all_timelines (Result, CurrentIndex, EndPoint, ArraySize, Players) ->
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%% Accessors
--spec get_id (type()) -> id().
-get_id (Battle) -> Battle#battle.id.
-
 -spec get_used_portrait_ids (type()) -> ordsets:ordset(shr_portrait:id()).
 get_used_portrait_ids (Battle) -> Battle#battle.used_portrait_ids.
 
@@ -149,13 +142,6 @@ get_encoded_last_turns_effects (Battle) ->
    StartingPoint = ((CurrentPlayerIX + 1) rem PlayersCount),
    get_all_timelines([], StartingPoint, CurrentPlayerIX, PlayersCount, Players).
 
--spec set_id (id(), type()) -> type().
-set_id (ID, Battle) ->
-   Battle#battle
-   {
-      id = ID
-   }.
-
 -spec set_map (btl_map:type(), type()) -> type().
 set_map (Map, Battle) ->
    Battle#battle
@@ -251,7 +237,6 @@ new (Map) ->
 
    #battle
    {
-      id = ataxia_id:null(),
       used_portrait_ids = EmptySet,
       used_weapon_ids = EmptySet,
       used_armor_ids = EmptySet,
@@ -262,9 +247,6 @@ new (Map) ->
       current_player_turn = btl_player_turn:new(0, 0)
    }.
 
--spec get_id_field () -> non_neg_integer().
-get_id_field () -> #battle.characters.
-
 -spec get_characters_field () -> non_neg_integer().
 get_characters_field () -> #battle.characters.
 
diff --git a/src/battle/struct/btl_pending_battle.erl b/src/battle/struct/btl_pending_battle.erl
index cecaeb5..a69e6ce 100644
--- a/src/battle/struct/btl_pending_battle.erl
+++ b/src/battle/struct/btl_pending_battle.erl
@@ -3,13 +3,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--type id() :: binary().
+-type id() :: ataxia_id:type().
 
 -record
 (
    pending_battle,
    {
-      id :: id(),
       free_slots :: non_neg_integer(),
       battle :: btl_battle:type()
    }
@@ -29,7 +28,6 @@
 -export
 (
    [
-      get_id/1,
       get_battle/1,
       get_free_slots/1,
 
@@ -44,7 +42,7 @@
 -export
 (
    [
-      new/3
+      new/2
    ]
 ).
 
@@ -55,19 +53,15 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec new (id(), non_neg_integer(), btl_battle:type()) -> type().
-new (ID, FreeSlots, Battle) ->
+-spec new (non_neg_integer(), btl_battle:type()) -> type().
+new (FreeSlots, Battle) ->
    #pending_battle
    {
-      id = ID,
       free_slots = FreeSlots,
       battle = Battle
    }.
 
 %%%% Accessors
--spec get_id (type()) -> id().
-get_id (PBattle) -> PBattle#pending_battle.id.
-
 -spec get_battle (type()) -> btl_battle:type().
 get_battle (PBattle) -> PBattle#pending_battle.battle.
 
diff --git a/src/bounty/bnt_generate_player.erl b/src/bounty/bnt_generate_player.erl
index e02a94b..8612042 100644
--- a/src/bounty/bnt_generate_player.erl
+++ b/src/bounty/bnt_generate_player.erl
@@ -69,7 +69,7 @@ finalize_login (UsernameLC, EmailLC, PlayerID) ->
 
    'ok'.
 
--spec generate_inventory (ataxia_id:type()) -> ataxia_id:type().
+-spec generate_inventory (shr_player:id()) -> shr_inventory:id().
 generate_inventory (PlayerID) ->
    Inventory = shr_inventory:new(PlayerID),
 
@@ -84,7 +84,7 @@ generate_inventory (PlayerID) ->
 
    InventoryID.
 
--spec generate_roster (ataxia_id:type()) -> ataxia_id:type().
+-spec generate_roster (shr_player:id()) -> rst_roster:id().
 generate_roster (PlayerID) ->
    Roster = rst_roster:new(PlayerID),
    {ok, RosterID} =
@@ -101,14 +101,20 @@ generate_roster (PlayerID) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec attempt (binary(), binary(), binary()) -> shr_player:type().
+-spec attempt
+   (
+      binary(),
+      binary(),
+      binary()
+   )
+   -> {shr_player:id(), shr_player:type()}.
 attempt (Username, Password, Email) ->
    UsernameLC = string:lowercase(Username),
    EmailLC = string:lowercase(Email),
 
    ok = reserve_login(UsernameLC, EmailLC),
 
-   Player = shr_player:new(<<"">>, Username, Password, Email),
+   Player = shr_player:new(Username, Password, Email),
 
    JanitorOnlyPermission =
       ataxia_security:allow_only(ataxia_security:janitor()),
@@ -138,11 +144,6 @@ attempt (Username, Password, Email) ->
                   [
                      ataxic:update_field
                      (
-                        shr_player:get_id_field(),
-                        ataxic:constant(PlayerID)
-                     ),
-                     ataxic:update_field
-                     (
                         shr_player:get_inventory_id_field(),
                         ataxic:constant(InvID)
                      ),
@@ -185,7 +186,4 @@ attempt (Username, Password, Email) ->
          PlayerID
       ),
 
-
-   Result = shr_player:set_id(PlayerID, Player),
-
-   Result.
+   {PlayerID, Player}.
diff --git a/src/bounty/bnt_grant_land.erl b/src/bounty/bnt_grant_land.erl
index 1a8a62e..d12d30c 100644
--- a/src/bounty/bnt_grant_land.erl
+++ b/src/bounty/bnt_grant_land.erl
@@ -16,7 +16,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec attempt (ataxia_id:type()) -> map_map:type().
+-spec attempt (shr_player:id()) -> map_map:type().
 attempt (OwnerID) ->
    Map = map_map:default(OwnerID),
 
diff --git a/src/bounty/bnt_join_battle.erl b/src/bounty/bnt_join_battle.erl
index f97b20b..5daa548 100644
--- a/src/bounty/bnt_join_battle.erl
+++ b/src/bounty/bnt_join_battle.erl
@@ -413,13 +413,12 @@ generate_battle (PlayerID, MapID) ->
       map_map:id(),
       list(non_neg_integer())
    )
-   -> btl_pending_battle:type().
+   -> {btl_pending_battle:id(), btl_pending_battle:type()}.
 generate (PlayerID, MapID, SelectedRosterCharacterIXs) ->
    Battle = generate_battle(PlayerID, MapID),
    PendingBattle =
       btl_pending_battle:new
       (
-         <<"">>,
          % TODO: More options than 1 vs N.
          (length(SelectedRosterCharacterIXs) * 2),
          Battle
@@ -433,7 +432,7 @@ generate (PlayerID, MapID, SelectedRosterCharacterIXs) ->
       list(non_neg_integer()),
       btl_pending_battle:type()
    )
-   -> btl_pending_battle:type().
+   -> {btl_pending_battle:id(), btl_pending_battle:type()}.
 attempt (PlayerID, SelectedRosterCharacterIXs, PendingBattle) ->
    Battle = btl_pending_battle:get_battle(PendingBattle),
    RemainingSlots =
@@ -476,7 +475,7 @@ attempt (PlayerID, SelectedRosterCharacterIXs, PendingBattle) ->
 
    {S1PendingBattle, Update},
 
-   S1PendingBattle.
+   {ataxia_id:null(), S1PendingBattle}.
 
    % TODO:
    % if RemainingSlots = 0 -> del this, new Battle.
diff --git a/src/login/lgn_shim.erl b/src/login/lgn_shim.erl
deleted file mode 100644
index df35d97..0000000
--- a/src/login/lgn_shim.erl
+++ /dev/null
@@ -1,77 +0,0 @@
--module(lgn_shim).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([generate_random_player/4]).
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec add_ref_to_event
-   (
-      binary(),
-      binary(),
-      boolean(),
-      shr_player:type()
-   )
-   -> shr_player:type().
-add_ref_to_event (BattleID, EventName, IsPlayersTurn, Player) ->
-   Event =
-      shr_battle_summary:new(BattleID, EventName, <<"Never">>, IsPlayersTurn),
-
-   Result = shr_player:set_event_summaries([Event], Player),
-
-   Result.
-
--spec add_ref_to_map
-   (
-      binary(),
-      binary(),
-      shr_player:type()
-   )
-   -> shr_player:type().
-add_ref_to_map (MapID, EventName, Player) ->
-   MapRef = shr_map_summary:new(MapID, EventName),
-
-   Result = shr_player:set_map_summaries([MapRef], Player),
-
-   Result.
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec generate_random_player
-   (
-      binary(),
-      binary(),
-      binary(),
-      binary()
-   )
-   -> shr_player:type().
-generate_random_player (ID, Username, Password, Email) ->
-   Result = shr_player:new(ID, Username, Password, Email),
-
-   S0Result =
-      case ID of
-         <<"0">> ->
-            S0 = add_ref_to_event(<<"0">>, <<"Test Battle">>, true, Result),
-            S1 = shr_player:set_roster_id(<<"0">>, S0),
-            S2 = add_ref_to_map(<<"0">>, <<"Test Map 0">>, S1),
-            S2;
-
-         <<"1">> ->
-            S0 = add_ref_to_event(<<"0">>, <<"Test Battle">>, false, Result),
-            S1 = shr_player:set_roster_id(<<"1">>, S0),
-            S2 = add_ref_to_map(<<"1">>, <<"Test Map 1">>, S1),
-
-            S2;
-
-         _ -> Result
-      end,
-
-   S0Result.
diff --git a/src/login/query/lgn_sign_in.erl b/src/login/query/lgn_sign_in.erl
index 6d4892d..c1db8f6 100644
--- a/src/login/query/lgn_sign_in.erl
+++ b/src/login/query/lgn_sign_in.erl
@@ -18,7 +18,7 @@
 (
    query_state,
    {
-      player_id :: binary(),
+      player_id :: shr_player:id(),
       player :: shr_player:type()
    }
 ).
@@ -122,8 +122,9 @@ commit_update (QueryState) ->
 -spec generate_reply(query_state()) -> binary().
 generate_reply (QueryState) ->
    Player = QueryState#query_state.player,
+   PlayerID = QueryState#query_state.player_id,
 
-   SetSession = lgn_set_session:generate(Player),
+   SetSession = lgn_set_session:generate(PlayerID, Player),
    Output = jiffy:encode([SetSession]),
 
    Output.
diff --git a/src/login/query/lgn_sign_up.erl b/src/login/query/lgn_sign_up.erl
index 0d974ff..2ab8ef3 100644
--- a/src/login/query/lgn_sign_up.erl
+++ b/src/login/query/lgn_sign_up.erl
@@ -19,7 +19,8 @@
 (
    query_state,
    {
-      player :: shr_player:type()
+      player :: shr_player:type(),
+      player_id :: shr_player:id()
    }
 ).
 
@@ -54,18 +55,21 @@ register_user (Input) ->
    Password = Input#input.password,
    Email = Input#input.email,
 
-   GeneratedPlayer = bnt_generate_player:attempt(Username, Password, Email),
+   {GeneratedPlayerID, GeneratedPlayer} =
+      bnt_generate_player:attempt(Username, Password, Email),
 
    #query_state
    {
-      player = GeneratedPlayer
+      player = GeneratedPlayer,
+      player_id = GeneratedPlayerID
    }.
 
 -spec generate_reply(query_state()) -> binary().
 generate_reply (QueryState) ->
    Player = QueryState#query_state.player,
+   PlayerID = QueryState#query_state.player_id,
 
-   SetSession = lgn_set_session:generate(Player),
+   SetSession = lgn_set_session:generate(PlayerID, Player),
    Output = jiffy:encode([SetSession]),
 
    Output.
diff --git a/src/login/reply/lgn_set_session.erl b/src/login/reply/lgn_set_session.erl
index f033d91..233f8db 100644
--- a/src/login/reply/lgn_set_session.erl
+++ b/src/login/reply/lgn_set_session.erl
@@ -7,7 +7,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([generate/1]).
+-export([generate/2]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -16,15 +16,14 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec generate (shr_player:type()) -> {list(any())}.
-generate (Player) ->
-   PID = shr_player:get_id(Player),
+-spec generate (shr_player:id(), shr_player:type()) -> {list(any())}.
+generate (PlayerID, Player) ->
    SessionToken = shr_player:get_token(Player),
 
    {
       [
          {<<"msg">>, <<"sse">>},
-         {<<"pid">>, PID},
+         {<<"pid">>, PlayerID},
          {<<"stk">>, SessionToken}
       ]
    }.
diff --git a/src/player/query/plr_load.erl b/src/player/query/plr_load.erl
index c73c6bd..278f568 100644
--- a/src/player/query/plr_load.erl
+++ b/src/player/query/plr_load.erl
@@ -73,10 +73,11 @@ fetch_data (Input) ->
 
 
 -spec generate_reply(query_state(), input()) -> binary().
-generate_reply (QueryState, _Input) ->
+generate_reply (QueryState, Input) ->
    Player = QueryState#query_state.player,
+   PlayerID = Input#input.target_id,
 
-   Output = jiffy:encode([plr_set_player:generate(Player)]),
+   Output = jiffy:encode([plr_set_player:generate(PlayerID, Player)]),
 
    Output.
 
diff --git a/src/player/reply/plr_set_player.erl b/src/player/reply/plr_set_player.erl
index de54fc0..2a4b7f6 100644
--- a/src/player/reply/plr_set_player.erl
+++ b/src/player/reply/plr_set_player.erl
@@ -7,7 +7,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--export([generate/1]).
+-export([generate/2]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -16,8 +16,8 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec generate (shr_player:type()) -> {list(any())}.
-generate (Player) ->
+-spec generate (shr_player:id(), shr_player:type()) -> {list(any())}.
+generate (PlayerID, Player) ->
    MapList =
       lists:map
       (
@@ -49,7 +49,7 @@ generate (Player) ->
    {
       [
          {<<"msg">>, <<"set_plr">>},
-         {<<"id">>, shr_player:get_id(Player)},
+         {<<"id">>, PlayerID},
          {<<"nme">>, shr_player:get_username(Player)},
          {<<"maps">>, MapList},
          {<<"cmps">>, CampaignList},
diff --git a/src/query/qry_shim.erl b/src/query/qry_shim.erl
index 3933c73..c02a017 100644
--- a/src/query/qry_shim.erl
+++ b/src/query/qry_shim.erl
@@ -14,7 +14,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -spec generate_player_0 () -> shr_player:type().
 generate_player_0 () ->
-   Player =
+   {PlayerID, Player} =
       bnt_generate_player:attempt
       (
          <<"Player1">>,
@@ -22,14 +22,14 @@ generate_player_0 () ->
          <<"Player1@tacticians.online">>
       ),
 
-   bnt_grant_land:attempt(shr_player:get_id(Player)),
+   bnt_grant_land:attempt(PlayerID),
 
    Player.
 
 
 -spec generate_player_1 () -> shr_player:type().
 generate_player_1 () ->
-   Player =
+   {PlayerID, Player} =
       bnt_generate_player:attempt
       (
          <<"Player2">>,
@@ -37,7 +37,7 @@ generate_player_1 () ->
          <<"Player2@tacticians.online">>
       ),
 
-   bnt_grant_land:attempt(shr_player:get_id(Player)),
+   bnt_grant_land:attempt(PlayerID),
 
    Player.
 
diff --git a/src/shared/struct/shr_inventory.erl b/src/shared/struct/shr_inventory.erl
index 0225fcb..1f04533 100644
--- a/src/shared/struct/shr_inventory.erl
+++ b/src/shared/struct/shr_inventory.erl
@@ -3,6 +3,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-type id() :: ataxia_id:type().
 -record
 (
    inventory,
@@ -18,7 +19,7 @@
 
 -opaque type() :: #inventory{}.
 
--export_type([type/0]).
+-export_type([type/0, id/0]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/shared/struct/shr_player.erl b/src/shared/struct/shr_player.erl
index eabca96..076c685 100644
--- a/src/shared/struct/shr_player.erl
+++ b/src/shared/struct/shr_player.erl
@@ -3,13 +3,12 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--type id() :: binary().
+-type id() :: ataxia_id:type().
 
 -record
 (
    player,
    {
-      id :: id(),
       username :: binary(),
       % {salt(crypto:strong_rand_bytes(128)), hash(sha384)}
       password :: {binary(), binary()},
@@ -35,7 +34,7 @@
 -export
 (
    [
-      new/4
+      new/3
    ]
 ).
 
@@ -43,7 +42,6 @@
 -export
 (
    [
-      get_id/1,
       get_username/1,
       get_password/1,
       get_token/1,
@@ -56,7 +54,6 @@
       get_inventory_id/1,
       get_roster_id/1,
 
-      set_id/2,
       set_username/2,
       set_password/2,
       new_token/1,
@@ -74,7 +71,6 @@
 -export
 (
    [
-      get_id_field/0,
       get_username_field/0,
       get_password_field/0,
       get_token_field/0,
@@ -113,13 +109,12 @@ secure_value (Salt, Val) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec new (binary(), binary(), binary(), binary()) -> type().
-new (ID, Username, Password, Email) ->
+-spec new (binary(), binary(), binary()) -> type().
+new (Username, Password, Email) ->
    EmptyBattleSlot = shr_battle_summary:none(),
    Result =
       #player
       {
-         id = ID,
          username = Username,
          password = {<<"">>, <<"">>},
          token = <<"">>,
@@ -160,8 +155,8 @@ new (ID, Username, Password, Email) ->
                EmptyBattleSlot,
                EmptyBattleSlot
             ],
-         inventory_id = <<"0">>,
-         roster_id = <<"0">>
+         inventory_id = ataxia_id:null(),
+         roster_id = ataxia_id:null()
       },
 
    S0Result = set_password(Password, Result),
@@ -171,9 +166,6 @@ new (ID, Username, Password, Email) ->
    S2Result.
 
 %%%% Accessors
--spec get_id (type()) -> id().
-get_id (Player) -> Player#player.id.
-
 -spec get_username (type()) -> binary().
 get_username (Player) -> Player#player.username.
 
@@ -207,9 +199,6 @@ get_roster_id (Player) -> Player#player.roster_id.
 -spec get_inventory_id (type()) -> binary().
 get_inventory_id (Player) -> Player#player.inventory_id.
 
--spec set_id (binary(), type()) -> type().
-set_id (Val, Player) -> Player#player{ id = Val }.
-
 -spec set_username (binary(), type()) -> type().
 set_username (Val, Player) -> Player#player{ username = Val }.
 
@@ -280,9 +269,6 @@ set_roster_id (RosterID, Player) -> Player#player{ roster_id = RosterID }.
 -spec set_inventory_id (binary(), type()) -> type().
 set_inventory_id (InvID, Player) -> Player#player{ inventory_id = InvID }.
 
--spec get_id_field () -> non_neg_integer().
-get_id_field () -> #player.id.
-
 -spec get_username_field () -> non_neg_integer().
 get_username_field () -> #player.username.