Removes any use of arrays.

13 files changed, 305 insertions, 181 deletions

diff --git a/src/battle/game-logic/btl_next_turn.erl b/src/battle/game-logic/btl_next_turn.erl
index a0ea499..ed6eadd 100644
--- a/src/battle/game-logic/btl_next_turn.erl
+++ b/src/battle/game-logic/btl_next_turn.erl
@@ -50,7 +50,7 @@ reset_next_player_timeline (Battle) ->
       ataxic:update_field
       (
          btl_battle:get_players_field(),
-         ataxic_sugar:update_array_cell
+         ataxic_sugar:update_orddict_element
          (
             NextPlayerIX,
             ataxic:update_field
@@ -70,15 +70,36 @@ activate_next_players_characters (Battle, NextPlayer) ->
    NextPlayerIX = btl_player:get_index(NextPlayer),
    Characters = btl_battle:get_characters(Battle),
 
-   {UpdatedCharacters, ModifiedIXs} =
-      shr_array_util:mapiff
+   {UpdatedCharacters, AtaxicUpdates} =
+      orddict:fold
       (
-         fun (Character) ->
-            (btl_character:get_player_index(Character) == NextPlayerIX)
-         end,
-         fun (Character) ->
-            btl_character:set_is_active(true, Character)
+         fun (IX, Character, {Prev, Updates}) ->
+            case (btl_character:get_player_index(Character) == NextPlayerIX) of
+               true ->
+                  {
+                     orddict:store
+                     (
+                        IX,
+                        btl_character:set_is_active(true, Character),
+                        Prev
+                     ),
+                     [
+                        ataxic_sugar:update_orddict_element
+                        (
+                           IX,
+                           ataxic:update_field
+                           (
+                              btl_character:get_is_active_field(),
+                              ataxic:constant(true)
+                           )
+                        )
+                     ]
+                  };
+
+               false -> {Prev, Updates}
+            end
          end,
+         {Characters, []},
          Characters
       ),
 
@@ -86,24 +107,7 @@ activate_next_players_characters (Battle, NextPlayer) ->
       ataxic:update_field
       (
          btl_battle:get_characters_field(),
-         ataxic:sequence
-         (
-            lists:map
-            (
-               fun (IX) ->
-                  ataxic_sugar:update_array_cell
-                  (
-                     IX,
-                     ataxic:update_field
-                     (
-                        btl_character:get_is_active_field(),
-                        ataxic:constant(true)
-                     )
-                  )
-               end,
-               ModifiedIXs
-            )
-         )
+         ataxic:sequence(AtaxicUpdates)
       ),
 
    UpdatedBattle = btl_battle:set_characters(UpdatedCharacters, Battle),
@@ -154,7 +158,16 @@ requires_update (Update) ->
    Battle = btl_character_turn_data:get_battle(Data),
    Characters = btl_battle:get_characters(Battle),
 
-   shr_array_util:none(fun btl_character:get_is_active/1, Characters).
+   (not
+      (lists:any
+         (
+            fun ({_IX, Char}) ->
+               btl_character:get_is_active(Char)
+            end,
+            orddict:to_list(Characters)
+         )
+      )
+   ).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/battle/game-logic/btl_turn_actions.erl b/src/battle/game-logic/btl_turn_actions.erl
index ee39ba1..4e469f1 100644
--- a/src/battle/game-logic/btl_turn_actions.erl
+++ b/src/battle/game-logic/btl_turn_actions.erl
@@ -46,7 +46,7 @@ mod_current_health (CurrentMaxHealth, PreviousMaxHealth, Update) ->
       ataxic:update_field
       (
          btl_battle:get_characters_field(),
-         ataxic_sugar:update_array_cell
+         ataxic_sugar:update_orddict_element
          (
             CharacterIX,
             ataxic:update_field
diff --git a/src/battle/game-logic/btl_turn_actions_attack.erl b/src/battle/game-logic/btl_turn_actions_attack.erl
index 9d1cd87..52dd3fb 100644
--- a/src/battle/game-logic/btl_turn_actions_attack.erl
+++ b/src/battle/game-logic/btl_turn_actions_attack.erl
@@ -169,7 +169,7 @@ handle (BattleAction, Update) ->
       ataxic:update_field
       (
          btl_battle:get_characters_field(),
-         ataxic_sugar:update_array_cell
+         ataxic_sugar:update_orddict_element
          (
             TargetIX,
             ataxic:update_field
@@ -184,7 +184,7 @@ handle (BattleAction, Update) ->
       ataxic:update_field
       (
          btl_battle:get_characters_field(),
-         ataxic_sugar:update_array_cell
+         ataxic_sugar:update_orddict_element
          (
             CharacterIX,
             ataxic:update_field
diff --git a/src/battle/game-logic/btl_turn_actions_move.erl b/src/battle/game-logic/btl_turn_actions_move.erl
index f94f8aa..80e5170 100644
--- a/src/battle/game-logic/btl_turn_actions_move.erl
+++ b/src/battle/game-logic/btl_turn_actions_move.erl
@@ -29,17 +29,18 @@ get_path_cost_and_destination (Data, Path) ->
    Map = btl_battle:get_map(Battle),
 
    ForbiddenLocations =
-      array:foldl
+      orddict:fold
       (
          fun (IX, Char, Prev) ->
             IsAlive = btl_character:get_is_alive(Char),
             if
                (IX == CharacterIX) -> Prev;
                (not IsAlive) -> Prev;
-               true -> [btl_character:get_location(Char)|Prev]
+               true ->
+                  ordsets:add_element(btl_character:get_location(Char), Prev)
             end
          end,
-         [],
+         ordsets:new(),
          btl_battle:get_characters(Battle)
       ),
 
@@ -97,12 +98,12 @@ commit_move (PreviousCurrentData, Update, Path, NewLocation) ->
       ataxic:update_field
       (
          btl_battle:get_characters_field(),
-         ataxic_sugar:update_array_cell
+         ataxic_sugar:update_orddict_element
          (
             CharacterIX,
             ataxic:update_field
             (
-               btl_character:get_locatiupdate_field(),
+               btl_character:get_location_field(),
                ataxic:constant(NewLocation)
             )
          )
diff --git a/src/battle/game-logic/btl_turn_actions_switch_weapon.erl b/src/battle/game-logic/btl_turn_actions_switch_weapon.erl
index 264bcb5..e32a283 100644
--- a/src/battle/game-logic/btl_turn_actions_switch_weapon.erl
+++ b/src/battle/game-logic/btl_turn_actions_switch_weapon.erl
@@ -54,7 +54,7 @@ handle (Update) ->
       ataxic:update_field
       (
          btl_battle:get_characters_field(),
-         ataxic_sugar:update_array_cell
+         ataxic_sugar:update_orddict_element
          (
             CharacterIX,
             ataxic:update_field
diff --git a/src/battle/game-logic/btl_victory.erl b/src/battle/game-logic/btl_victory.erl
index 42a5594..089af81 100644
--- a/src/battle/game-logic/btl_victory.erl
+++ b/src/battle/game-logic/btl_victory.erl
@@ -20,45 +20,45 @@
 -spec mark_players_characters_as_defeated
    (
       non_neg_integer(),
-      array:array(btl_character:type())
-   ) -> {array:array(btl_character:type()), list(non_neg_integer())}.
+      orddict:orddict(non_neg_integer(), btl_character:type())
+   )
+   ->
+   {
+      orddict:orddict(non_neg_integer(), btl_character:type()),
+      list(ataxic:basic())
+   }.
 mark_players_characters_as_defeated (PlayerIX, Characters) ->
-   shr_array_util:mapiff
+   orddict:fold
    (
-      fun (Character) ->
-         (btl_character:get_player_index(Character) == PlayerIX)
-      end,
-      fun (Character) ->
-         btl_character:set_is_defeated(true, Character)
+      fun (IX, Character, {Dict, Updates}) ->
+         case (btl_character:get_player_index(Character) == PlayerIX) of
+            false -> {Dict, Updates};
+            true ->
+               {
+                  orddict:store
+                  (
+                     IX,
+                     btl_character:set_is_defeated(true, Character),
+                     Dict
+                  ),
+                  [
+                     ataxic_sugar:update_orddict_element
+                     (
+                        IX,
+                        ataxic:update_field
+                        (
+                           btl_character:get_is_defeated_field(),
+                           ataxic:constant(true)
+                        )
+                     )
+                  ]
+               }
+         end
       end,
+      {Characters, []},
       Characters
    ).
 
--spec add_db_query_to_mark_character_as_defeated
-   (
-      non_neg_integer(),
-      btl_character_turn_update:type()
-   )
-   -> btl_character_turn_update:type().
-add_db_query_to_mark_character_as_defeated (IX, Update) ->
-   btl_character_turn_update:add_to_db
-   (
-      ataxic:update_field
-      (
-         btl_battle:get_characters_field(),
-         ataxic_sugar:update_array_cell
-         (
-            IX,
-            ataxic:update_field
-            (
-               btl_character:get_is_defeated_field(),
-               ataxic:constant(true)
-            )
-         )
-      ),
-      Update
-   ).
-
 -spec handle_player_defeat
    (
       non_neg_integer(),
@@ -72,48 +72,59 @@ handle_player_defeat (PlayerIX, Update) ->
 
    %% FIXME [FUNCTION: battle][MEDIUM]: The controlled character might slip
    %% through.
-   {UpdatedCharacters, ModifiedIXs} =
+   {UpdatedCharacters, AtaxicUpdates} =
       mark_players_characters_as_defeated(PlayerIX, Characters),
 
-   S1Update =
-      lists:foldl
+   S0Battle = btl_battle:set_characters(UpdatedCharacters, Battle),
+   S1Battle =
+      btl_battle:set_player
       (
-         fun add_db_query_to_mark_character_as_defeated/2,
-         Update,
-         ModifiedIXs
+         PlayerIX,
+         btl_player:set_is_active
+         (
+            false,
+            btl_battle:get_player(PlayerIX, S0Battle)
+         ),
+         S0Battle
       ),
 
-   %% TODO [FUNCTION: battle][MEDIUM]: Battle.player[PlayerIX].is_active <-
-   %% false
-
-   UpdatedBattle = btl_battle:set_characters(UpdatedCharacters, Battle),
-   UpdatedData = btl_character_turn_data:set_battle(UpdatedBattle, Data),
-   S2Update = btl_character_turn_update:set_data(UpdatedData, S1Update),
+   UpdatedData = btl_character_turn_data:set_battle(S1Battle, Data),
+   S0Update = btl_character_turn_update:set_data(UpdatedData, Update),
 
    DBQuery =
-      ataxic:update_field
+      ataxic:sequence
       (
-         btl_battle:get_players_field(),
-         ataxic_sugar:update_array_cell
-         (
-            PlayerIX,
+         [
             ataxic:update_field
             (
-               btl_player:get_is_active_field(),
-               ataxic:constant(false)
+               btl_battle:get_players_field(),
+               ataxic_sugar:update_orddict_element
+               (
+                  PlayerIX,
+                  ataxic:update_field
+                  (
+                     btl_player:get_is_active_field(),
+                     ataxic:constant(false)
+                  )
+               )
+            ),
+            ataxic:update_field
+            (
+               btl_battle:get_characters_field(),
+               ataxic:sequence(AtaxicUpdates)
             )
-         )
+         ]
       ),
 
-   S3Update =
+   S1Update =
       btl_character_turn_update:add_to_timeline
       (
          btl_turn_result:new_player_lost(PlayerIX),
          DBQuery,
-         S2Update
+         S0Update
       ),
 
-   S3Update.
+   S1Update.
 
 
 -spec actually_handle_character_lost_health
@@ -133,16 +144,16 @@ actually_handle_character_lost_health (CharIX, Update) ->
       optional ->
          %% Let's not assume there is a commander
          StillHasAliveChar =
-            shr_array_util:any_indexed
+            lists:any
             (
-               fun (IX, Char) ->
+               fun ({IX, Char}) ->
                   (
                      (CharacterPlayerIX == btl_character:get_player_index(Char))
                      and (IX /= CharIX)
                      and btl_character:get_is_alive(Char)
                   )
                end,
-               Characters
+               orddict:to_list(Characters)
             ),
 
          case StillHasAliveChar of
@@ -154,17 +165,16 @@ actually_handle_character_lost_health (CharIX, Update) ->
 
       target ->
          StillHasAliveChar =
-            shr_array_util:any_indexed
+            lists:any
             (
-               fun (IX, Char) ->
+               fun ({IX, Char}) ->
                   (
                      (CharacterPlayerIX == btl_character:get_player_index(Char))
                      and (IX /= CharIX)
                      and btl_character:get_is_alive(Char)
-                     and (btl_character:get_rank(Char) == target)
                   )
                end,
-               Characters
+               orddict:to_list(Characters)
             ),
 
          case StillHasAliveChar of
diff --git a/src/battle/query/btl_character_turn.erl b/src/battle/query/btl_character_turn.erl
index 76613ba..32ec9be 100644
--- a/src/battle/query/btl_character_turn.erl
+++ b/src/battle/query/btl_character_turn.erl
@@ -85,7 +85,7 @@ assert_user_owns_played_character (Data, Request) ->
    Players = btl_battle:get_players(Battle),
    Character = btl_character_turn_data:get_character(Data),
    CharacterPlayerIX = btl_character:get_player_index(Character),
-   CharacterPlayer = array:get(CharacterPlayerIX, Players),
+   CharacterPlayer = orddict:fetch(CharacterPlayerIX, Players),
    CharacterPlayerID = btl_player:get_id(CharacterPlayer),
 
    true = (PlayerID == CharacterPlayerID),
@@ -130,7 +130,7 @@ finalize_character (Update) ->
       ataxic:update_field
       (
          btl_battle:get_characters_field(),
-         ataxic_sugar:update_array_cell
+         ataxic_sugar:update_orddict_element
          (
             btl_character_turn_data:get_character_ix(Data),
             ataxic:update_field
@@ -182,7 +182,7 @@ update_timeline (Update) ->
       ataxic:update_field
       (
          btl_battle:get_players_field(),
-         ataxic_sugar:update_array_cell
+         ataxic_sugar:update_orddict_element
          (
             PlayerIX,
             ataxic:update_field
diff --git a/src/battle/query/btl_load.erl b/src/battle/query/btl_load.erl
index 64e9354..7c7d4ab 100644
--- a/src/battle/query/btl_load.erl
+++ b/src/battle/query/btl_load.erl
@@ -85,13 +85,13 @@ generate_reply (QueryState, Input) ->
    Battle = QueryState#query_state.battle,
    Players = btl_battle:get_players(Battle),
 
-   PlayerIX =
-      shr_array_util:first
+   {value, {PlayerIX, _Player}} =
+      shr_lists_util:search
       (
-         fun (Player) ->
+         fun ({_PlayerIX, Player}) ->
             (btl_player:get_id(Player) == PlayerID)
          end,
-         Players
+         orddict:to_list(Players)
       ),
 
    true = (PlayerIX >= 0),
@@ -105,15 +105,21 @@ generate_reply (QueryState, Input) ->
    SetMap = btl_set_map:generate(btl_battle:get_map(Battle)),
 
    AddCharList =
-      array:sparse_to_list
+      lists:map
+      (
+         fun ({IX, Character}) ->
+            btl_add_char:generate(IX, Character, PlayerIX)
+         end,
+         orddict:to_list(btl_battle:get_characters(Battle))
+      ),
+
+   AddPortraitList =
+      lists:map
       (
-         array:map
-         (
-            fun (IX, Character) ->
-               btl_add_char:generate(IX, Character, PlayerIX)
-            end,
-            btl_battle:get_characters(Battle)
-         )
+         fun (PortraitID) ->
+            btl_add_portrait:generate(shr_portrait:from_id(PortraitID))
+         end,
+         ordsets:to_list(btl_battle:get_used_portrait_ids(Battle))
       ),
 
    AddWeaponList =
@@ -122,7 +128,7 @@ generate_reply (QueryState, Input) ->
          fun (WeaponID) ->
             btl_add_weapon:generate(shr_weapon:from_id(WeaponID))
          end,
-         btl_battle:get_used_weapon_ids(Battle)
+         ordsets:to_list(btl_battle:get_used_weapon_ids(Battle))
       ),
 
    AddArmorList =
@@ -131,7 +137,7 @@ generate_reply (QueryState, Input) ->
          fun (ArmorID) ->
             btl_add_armor:generate(shr_armor:from_id(ArmorID))
          end,
-         btl_battle:get_used_armor_ids(Battle)
+         ordsets:to_list(btl_battle:get_used_armor_ids(Battle))
       ),
 
    AddTileList =
@@ -140,16 +146,18 @@ generate_reply (QueryState, Input) ->
          fun (TileClassID) ->
             btl_add_tile:generate(shr_tile:from_class_id(TileClassID))
          end,
-         btl_battle:get_used_tile_ids(Battle)
+         ordsets:to_list(btl_battle:get_used_tile_ids(Battle))
       ),
 
    OutputList =
       (
          AddTileList
          ++ [SetTimeline, SetMap | AddWeaponList]
+         ++ AddPortraitList
          ++ AddArmorList
          ++ AddCharList
       ),
+
    Output = jiffy:encode(OutputList),
 
    Output.
diff --git a/src/battle/reply/btl_set_map.erl b/src/battle/reply/btl_set_map.erl
index e4a638e..3be6985 100644
--- a/src/battle/reply/btl_set_map.erl
+++ b/src/battle/reply/btl_set_map.erl
@@ -28,7 +28,7 @@ generate (Map) ->
             lists:map
             (
                fun shr_tile:instance_to_binary_list/1,
-               array:sparse_to_list(btl_map:get_tile_instances(Map))
+               tuple_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 5cc7bc3..b2bd4f1 100644
--- a/src/battle/struct/btl_battle.erl
+++ b/src/battle/struct/btl_battle.erl
@@ -3,7 +3,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--type id() :: binary().
+-type id() :: ataxia_id:type().
 
 -record
 (
@@ -12,10 +12,11 @@
       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()),
       used_tile_ids :: ordsets:ordset(shr_tile:class_id()),
       map :: btl_map:type(),
-      characters :: array:array(btl_character:type()),
-      players :: array:array(btl_player:type()),
+      characters :: orddict:orddict(non_neg_integer(), btl_character:type()),
+      players :: orddict:orddict(non_neg_integer(), btl_player:type()),
       current_player_turn :: btl_player_turn:type()
    }
 ).
@@ -32,6 +33,7 @@
 (
    [
       get_id/1,
+      get_used_portrait_ids/1,
       get_used_weapon_ids/1,
       get_used_armor_ids/1,
       get_used_tile_ids/1,
@@ -43,13 +45,21 @@
       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,
+      set_used_armor_ids/2,
       set_characters/2,
       set_character/3,
       set_players/2,
       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,
       get_characters_field/0,
       get_players_field/0,
       get_current_player_turn_field/0
@@ -59,7 +69,7 @@
 -export
 (
    [
-      new/7
+      new/1
    ]
 ).
 
@@ -67,7 +77,7 @@
 %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 get_all_timelines (Result, CurrentIndex, EndPoint, ArraySize, Players) ->
-   Player = array:get(CurrentIndex, Players),
+   Player = orddict:fetch(CurrentIndex, Players),
    Timeline = btl_player:get_timeline(Player),
    NextIndex = ((CurrentIndex + 1) rem ArraySize),
    NextResult = (Timeline ++ Result),
@@ -79,6 +89,7 @@ get_all_timelines (Result, CurrentIndex, EndPoint, ArraySize, Players) ->
          get_all_timelines(NextResult, NextIndex, EndPoint, ArraySize, Players)
    end.
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -86,6 +97,9 @@ get_all_timelines (Result, CurrentIndex, EndPoint, ArraySize, Players) ->
 -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.
+
 -spec get_used_weapon_ids (type()) -> ordsets:ordset(shr_weapon:id()).
 get_used_weapon_ids (Battle) -> Battle#battle.used_weapon_ids.
 
@@ -98,20 +112,28 @@ get_used_tile_ids (Battle) -> Battle#battle.used_tile_ids.
 -spec get_map (type()) -> btl_map:type().
 get_map (Battle) -> Battle#battle.map.
 
--spec get_characters (type()) -> array:array(btl_character:type()).
+-spec get_characters
+   (
+      type()
+   )
+   -> orddict:orddict(non_neg_integer(), btl_character:type()).
 get_characters (Battle) -> Battle#battle.characters.
 
 -spec get_character (non_neg_integer(), type()) -> btl_character:type().
 get_character (IX, Battle) ->
-   array:get(IX, Battle#battle.characters).
+   orddict:fetch(IX, Battle#battle.characters).
 
--spec get_players (type()) -> array:array(btl_player:type()).
+-spec get_players
+   (
+      type()
+   )
+   -> orddict:orddict(non_neg_integer(), btl_player:type()).
 get_players (Battle) ->
    Battle#battle.players.
 
 -spec get_player (non_neg_integer(), type()) -> btl_player:type().
 get_player (IX, Battle) ->
-   array:get(IX, Battle#battle.players).
+   orddict:fetch(IX, Battle#battle.players).
 
 -spec get_current_player_turn (type()) -> btl_player_turn:type().
 get_current_player_turn (Battle) ->
@@ -123,10 +145,17 @@ get_encoded_last_turns_effects (Battle) ->
    Players = Battle#battle.players,
    CurrentPlayerIX = btl_player_turn:get_player_ix(CurrentPlayerTurn),
 
-   PlayersCount = array:size(Players),
+   PlayersCount = orddict:size(Players),
    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
@@ -134,7 +163,12 @@ set_map (Map, Battle) ->
       map = Map
    }.
 
--spec set_characters (array:array(btl_character:type()), type()) -> type().
+-spec set_characters
+   (
+      orddict:orddict(non_neg_integer(), btl_character:type()),
+      type()
+   )
+   -> type().
 set_characters (Characters, Battle) ->
    Battle#battle
    {
@@ -145,33 +179,62 @@ set_characters (Characters, Battle) ->
 set_character (IX, Character, Battle) ->
    Battle#battle
    {
-      characters =
-         array:set
-         (
-            IX,
-            Character,
-            Battle#battle.characters
-         )
+      characters = orddict:store(IX, Character, Battle#battle.characters)
    }.
 
--spec set_players (array:array(btl_player:type()), type()) -> type().
+-spec set_players
+   (
+      orddict:orddict(non_neg_integer(), btl_player:type()),
+      type()
+   )
+   -> type().
 set_players (Players, Battle) ->
    Battle#battle
    {
       players = Players
    }.
 
+-spec set_used_portrait_ids
+   (
+      ordsets:ordset(shr_portrait:id()),
+      type()
+   )
+   -> type().
+set_used_portrait_ids (UPIDs, Battle) ->
+   Battle#battle
+   {
+      used_portrait_ids = UPIDs
+   }.
+
+-spec set_used_weapon_ids
+   (
+      ordsets:ordset(shr_weapon:id()),
+      type()
+   )
+   -> type().
+set_used_weapon_ids (UPIDs, Battle) ->
+   Battle#battle
+   {
+      used_weapon_ids = UPIDs
+   }.
+
+-spec set_used_armor_ids
+   (
+      ordsets:ordset(shr_armor:id()),
+      type()
+   )
+   -> type().
+set_used_armor_ids (UPIDs, Battle) ->
+   Battle#battle
+   {
+      used_armor_ids = UPIDs
+   }.
+
 -spec set_player (non_neg_integer(), btl_player:type(), type()) -> type().
 set_player (IX, Player, Battle) ->
    Battle#battle
    {
-      players =
-         array:set
-         (
-            IX,
-            Player,
-            Battle#battle.players
-         )
+      players = orddict:store(IX, Player, Battle#battle.players)
    }.
 
 -spec set_current_player_turn (btl_player_turn:type(), type()) -> type().
@@ -181,34 +244,39 @@ set_current_player_turn (PlayerTurn, Battle) ->
       current_player_turn = PlayerTurn
    }.
 
--spec new
-   (
-      id(),
-      list(btl_player:type()),
-      btl_map:type(),
-      list(btl_character:type()),
-      ordsets:ordset(shr_weapon:id()),
-      ordsets:ordset(shr_armor:id()),
-      ordsets:ordset(shr_tile:class_id())
-   )
-   -> type().
-new (ID, PlayersAsList, Map, CharactersAsList, UWIDs, UAIDs, UTIDs) ->
+-spec new (btl_map:type()) -> type().
+new (Map) ->
+   EmptySet = ordsets:new(),
+   EmptyDict = orddict:new(),
+
    #battle
    {
-      id = ID,
-      used_weapon_ids = UWIDs,
-      used_armor_ids = UAIDs,
-      used_tile_ids = UTIDs,
+      id = ataxia_id:null(),
+      used_portrait_ids = EmptySet,
+      used_weapon_ids = EmptySet,
+      used_armor_ids = EmptySet,
+      used_tile_ids = btl_map:get_used_tile_ids(Map),
       map = Map,
-      characters = array:from_list(CharactersAsList),
-      players = array:from_list(PlayersAsList),
+      characters = EmptyDict,
+      players = EmptyDict,
       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.
 
+-spec get_used_portrait_ids_field () -> non_neg_integer().
+get_used_portrait_ids_field () -> #battle.used_portrait_ids.
+
+-spec get_used_weapon_ids_field () -> non_neg_integer().
+get_used_weapon_ids_field () -> #battle.used_weapon_ids.
+
+-spec get_used_armor_ids_field () -> non_neg_integer().
+get_used_armor_ids_field () -> #battle.used_armor_ids.
+
 -spec get_players_field () -> non_neg_integer().
 get_players_field () -> #battle.players.
 
diff --git a/src/battle/struct/btl_character.erl b/src/battle/struct/btl_character.erl
index 8c04cd8..84eecfb 100644
--- a/src/battle/struct/btl_character.erl
+++ b/src/battle/struct/btl_character.erl
@@ -56,7 +56,7 @@
 
       get_rank_field/0,
       get_weapons_field/0,
-      get_locatiupdate_field/0,
+      get_location_field/0,
       get_current_health_field/0,
       get_is_active_field/0,
       get_is_defeated_field/0
@@ -255,8 +255,8 @@ new
 get_rank_field () -> #character.rank.
 -spec get_weapons_field() -> non_neg_integer().
 get_weapons_field () -> #character.weapon_ids.
--spec get_locatiupdate_field() -> non_neg_integer().
-get_locatiupdate_field () -> #character.location.
+-spec get_location_field() -> non_neg_integer().
+get_location_field () -> #character.location.
 -spec get_current_health_field() -> non_neg_integer().
 get_current_health_field () -> #character.current_health.
 -spec get_is_active_field() -> non_neg_integer().
diff --git a/src/battle/struct/btl_map.erl b/src/battle/struct/btl_map.erl
index e4aa88b..17a272b 100644
--- a/src/battle/struct/btl_map.erl
+++ b/src/battle/struct/btl_map.erl
@@ -9,7 +9,7 @@
    {
       width :: integer(),
       height :: integer(),
-      tile_ids :: array:array(shr_tile:instance())
+      tile_ids :: shr_tile:instances_tuple()
    }
 ).
 
@@ -27,7 +27,8 @@
       get_width/1,
       get_height/1,
       get_tile_instances/1,
-      get_tile_instance/2
+      get_tile_instance/2,
+      get_used_tile_ids/1
    ]
 ).
 
@@ -35,20 +36,20 @@
 (
    [
       from_list/3,
-      from_array/3
+      from_instances_tuple/3
    ]
 ).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--spec location_to_array_index
+-spec location_to_index
    (
       non_neg_integer(),
       btl_location:type()
    )
    -> ('error' | non_neg_integer()).
-location_to_array_index (ArrayWidth, {X, Y}) ->
+location_to_index (ArrayWidth, {X, Y}) ->
    if
       (X < 0) -> error;
       (Y < 0) -> error;
@@ -66,13 +67,13 @@ get_width (Map) -> Map#map.width.
 -spec get_height (type()) -> integer().
 get_height (Map) -> Map#map.height.
 
--spec get_tile_instances (type()) -> array:array(shr_tile:instance()).
+-spec get_tile_instances (type()) -> shr_tile:instances_tuple().
 get_tile_instances (Map) -> Map#map.tile_ids.
 
 -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).
+   TileIX = location_to_index(Map#map.width, Location),
+   element((TileIX + 1), Map#map.tile_ids).
 
 -spec from_list
    (
@@ -88,20 +89,38 @@ from_list (Width, Height, List) ->
    {
       width = Width,
       height = Height,
-      tile_ids = array:from_list(TileInstances)
+      tile_ids = list_to_tuple(TileInstances)
    }.
 
--spec from_array
+-spec from_instances_tuple
    (
       non_neg_integer(),
       non_neg_integer(),
-      array:array(shr_tile:instance())
+      shr_tile:instances_tuple()
    )
    -> type().
-from_array (Width, Height, TileInstances) ->
+from_instances_tuple (Width, Height, TileInstances) ->
    #map
    {
       width = Width,
       height = Height,
       tile_ids = TileInstances
    }.
+
+-spec get_used_tile_ids (type()) -> ordsets:ordset(shr_tile:class_id()).
+get_used_tile_ids (Map) ->
+   UsedTileIDs =
+      lists:foldl
+      (
+         fun (TileInstance, CurrentTileIDs) ->
+            ordsets:add_element
+            (
+               shr_tile:extract_main_class_id(TileInstance),
+               CurrentTileIDs
+            )
+         end,
+         ordsets:new(),
+         tuple_to_list(Map#map.tile_ids)
+      ),
+
+   UsedTileIDs.
diff --git a/src/battle/struct/btl_player_turn.erl b/src/battle/struct/btl_player_turn.erl
index e0665f4..6bd823f 100644
--- a/src/battle/struct/btl_player_turn.erl
+++ b/src/battle/struct/btl_player_turn.erl
@@ -43,14 +43,14 @@
 -spec next_valid_player
    (
       non_neg_integer(),
-      array:array(btl_player:type()),
+      orddict:orddict(non_neg_integer(), btl_player:type()),
       non_neg_integer(),
       non_neg_integer()
    ) -> non_neg_integer().
 next_valid_player (StartingPoint, _Players, _PlayersCount, StartingPoint) ->
    StartingPoint;
 next_valid_player (CandidateIX, Players, PlayersCount, StartingPoint) ->
-   Candidate = array:get(CandidateIX, Players),
+   Candidate = orddict:fetch(CandidateIX, Players),
 
    case btl_player:get_is_active(Candidate) of
       true -> CandidateIX;
@@ -82,11 +82,16 @@ get_number (PlayerTurn) -> PlayerTurn#player_turn.number.
 -spec get_player_ix (type()) -> non_neg_integer().
 get_player_ix (PlayerTurn) -> PlayerTurn#player_turn.player_ix.
 
--spec next (array:array(btl_player:type()), type()) -> type().
+-spec next
+   (
+      orddict:orddict(non_neg_integer(), btl_player:type()),
+      type()
+   )
+   -> type().
 next (Players, CurrentPlayerTurn) ->
    CurrentPlayerIX = CurrentPlayerTurn#player_turn.player_ix,
    CurrentTurnNumber = CurrentPlayerTurn#player_turn.number,
-   PlayersCount = array:size(Players),
+   PlayersCount = orddict:size(Players),
 
    NextPlayerIX =
       next_valid_player