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).

2 files changed, 4 insertions, 28 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.