3 files changed, 31 insertions, 31 deletions

diff --git a/src/battle/game-logic/btl_next_turn.erl b/src/battle/game-logic/btl_next_turn.erl
index 82eec98..9ed4926 100644
--- a/src/battle/game-logic/btl_next_turn.erl
+++ b/src/battle/game-logic/btl_next_turn.erl
@@ -17,7 +17,7 @@
 %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -spec set_player_turn_to_next (btl_battle:type())
-   -> {btl_battle:type(), sh_db_query:op()}.
+   -> {btl_battle:type(), shr_db_query:op()}.
 set_player_turn_to_next (Battle) ->
    Players = btl_battle:get_players(Battle),
    CurrentPlayerTurn = btl_battle:get_current_player_turn(Battle),
@@ -27,7 +27,7 @@ set_player_turn_to_next (Battle) ->
    UpdatedBattle = btl_battle:set_current_player_turn(NextPlayerTurn, Battle),
 
    DBQuery =
-      sh_db_query:set_field
+      shr_db_query:set_field
       (
          btl_battle:get_current_player_turn_field(),
          NextPlayerTurn
@@ -36,7 +36,7 @@ set_player_turn_to_next (Battle) ->
    {UpdatedBattle, DBQuery}.
 
 -spec reset_next_player_timeline (btl_battle:type())
-   -> {btl_battle:type(), btl_player:type(), sh_db_query:op()}.
+   -> {btl_battle:type(), btl_player:type(), shr_db_query:op()}.
 reset_next_player_timeline (Battle) ->
    NextPlayerTurn = btl_battle:get_current_player_turn(Battle),
    NextPlayerIX = btl_player_turn:get_player_ix(NextPlayerTurn),
@@ -47,24 +47,24 @@ reset_next_player_timeline (Battle) ->
       btl_battle:set_player(NextPlayerIX, UpdatedNextPlayer, Battle),
 
    DBQuery =
-      sh_db_query:update_indexed
+      shr_db_query:update_indexed
       (
          btl_battle:get_players_field(),
          NextPlayerIX,
-         [ sh_db_query:set_field(btl_player:get_timeline_field(), []) ]
+         [ shr_db_query:set_field(btl_player:get_timeline_field(), []) ]
       ),
 
    {UpdatedBattle, UpdatedNextPlayer, DBQuery}.
 
 
 -spec activate_next_players_characters (btl_battle:type(), btl_player:type())
-   -> {btl_battle:type(), list(sh_db_query:op())}.
+   -> {btl_battle:type(), list(shr_db_query:op())}.
 activate_next_players_characters (Battle, NextPlayer) ->
    NextPlayerIX = btl_player:get_index(NextPlayer),
    Characters = btl_battle:get_characters(Battle),
 
    {UpdatedCharacters, ModifiedIXs} =
-      sh_array_util:mapiff
+      shr_array_util:mapiff
       (
          fun (Character) ->
             (btl_character:get_player_index(Character) == NextPlayerIX)
@@ -79,12 +79,12 @@ activate_next_players_characters (Battle, NextPlayer) ->
       lists:map
       (
          fun (IX) ->
-            sh_db_query:update_indexed
+            shr_db_query:update_indexed
             (
                btl_battle:get_characters_field(),
                IX,
                [
-                  sh_db_query:set_field
+                  shr_db_query:set_field
                   (
                      btl_character:get_is_active_field(),
                      true
@@ -143,7 +143,7 @@ requires_update (Update) ->
    Battle = btl_character_turn_data:get_battle(Data),
    Characters = btl_battle:get_characters(Battle),
 
-   sh_array_util:none(fun btl_character:get_is_active/1, Characters).
+   shr_array_util:none(fun btl_character:get_is_active/1, Characters).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/src/battle/game-logic/btl_turn_actions.erl b/src/battle/game-logic/btl_turn_actions.erl
index 21205ac..e7153f9 100644
--- a/src/battle/game-logic/btl_turn_actions.erl
+++ b/src/battle/game-logic/btl_turn_actions.erl
@@ -33,7 +33,7 @@ handle_switch_weapon (Update) ->
 
    UpdatedWeaponIDs = {SecondaryWeaponID, PrimaryWeaponID},
    UpdatedCharacterStatistics =
-      sh_statistics:new(CharacterAttributes, UpdatedWeaponIDs, ArmorID),
+      shr_statistics:new(CharacterAttributes, UpdatedWeaponIDs, ArmorID),
    UpdatedCharacter =
       btl_character:set_statistics
       (
@@ -44,17 +44,17 @@ handle_switch_weapon (Update) ->
    TimelineItem = btl_turn_result:new_character_switched_weapons(CharacterIX),
 
    DBQuery =
-      sh_db_query:update_indexed
+      shr_db_query:update_indexed
       (
          btl_battle:get_characters_field(),
          CharacterIX,
          [
-            sh_db_query:set_field
+            shr_db_query:set_field
             (
                btl_character:get_weapons_field(),
                UpdatedWeaponIDs
             ),
-            sh_db_query:set_field
+            shr_db_query:set_field
             (
                btl_character:get_statistics_field(),
                UpdatedCharacterStatistics
@@ -117,7 +117,7 @@ assert_character_can_move (Data, Cost) ->
    Character = btl_character_turn_data:get_character(Data),
    CharacterStatistics = btl_character:get_statistics(Character),
    CharacterMovementPoints =
-      sh_statistics:get_movement_points(CharacterStatistics),
+      shr_statistics:get_movement_points(CharacterStatistics),
 
    true = (Cost =< CharacterMovementPoints),
 
@@ -143,12 +143,12 @@ commit_move (Update, Path, NewLocation) ->
       btl_turn_result:new_character_moved(CharacterIX, Path, NewLocation),
 
    DBQuery =
-      sh_db_query:update_indexed
+      shr_db_query:update_indexed
       (
          btl_battle:get_characters_field(),
          CharacterIX,
          [
-            sh_db_query:set_field
+            shr_db_query:set_field
             (
                btl_character:get_location_field(),
                NewLocation
@@ -258,8 +258,8 @@ get_attack_sequence (Character, TargetCharacter) ->
    {AttackingWeaponID, _} = btl_character:get_weapon_ids(Character),
    {DefendingWeaponID, _} = btl_character:get_weapon_ids(TargetCharacter),
 
-   AttackingWeapon = sh_weapon:from_id(AttackingWeaponID),
-   DefendingWeapon = sh_weapon:from_id(DefendingWeaponID),
+   AttackingWeapon = shr_weapon:from_id(AttackingWeaponID),
+   DefendingWeapon = shr_weapon:from_id(DefendingWeaponID),
 
    btl_attack:get_sequence(Range, AttackingWeapon, DefendingWeapon).
 
@@ -312,12 +312,12 @@ handle_attack (BattleAction, Update) ->
       ),
 
    DBQuery0 =
-      sh_db_query:update_indexed
+      shr_db_query:update_indexed
       (
          btl_battle:get_characters_field(),
          TargetIX,
          [
-            sh_db_query:set_field
+            shr_db_query:set_field
             (
                btl_character:get_current_health_field(),
                RemainingDefenderHealth
@@ -326,12 +326,12 @@ handle_attack (BattleAction, Update) ->
       ),
 
    DBQuery1 =
-      sh_db_query:update_indexed
+      shr_db_query:update_indexed
       (
          btl_battle:get_characters_field(),
          CharacterIX,
          [
-            sh_db_query:set_field
+            shr_db_query:set_field
             (
                btl_character:get_current_health_field(),
                RemainingAttackerHealth
diff --git a/src/battle/game-logic/btl_victory.erl b/src/battle/game-logic/btl_victory.erl
index eef42ad..5611302 100644
--- a/src/battle/game-logic/btl_victory.erl
+++ b/src/battle/game-logic/btl_victory.erl
@@ -23,7 +23,7 @@
       array:array(btl_character:type())
    ) -> {array:array(btl_character:type()), list(non_neg_integer())}.
 mark_players_characters_as_defeated (PlayerIX, Characters) ->
-   sh_array_util:mapiff
+   shr_array_util:mapiff
    (
       fun (Character) ->
          (btl_character:get_player_index(Character) == PlayerIX)
@@ -43,12 +43,12 @@ mark_players_characters_as_defeated (PlayerIX, Characters) ->
 add_db_query_to_mark_character_as_defeated (IX, Update) ->
    btl_character_turn_update:add_to_db
    (
-      sh_db_query:update_indexed
+      shr_db_query:update_indexed
       (
          btl_battle:get_characters_field(),
          IX,
          [
-            sh_db_query:set_field
+            shr_db_query:set_field
             (
                btl_character:get_is_defeated_field(),
                true
@@ -88,12 +88,12 @@ handle_player_defeat (PlayerIX, Update) ->
    S2Update = btl_character_turn_update:set_data(UpdatedData, S1Update),
 
    DBQuery =
-      sh_db_query:update_indexed
+      shr_db_query:update_indexed
       (
          btl_battle:get_players_field(),
          PlayerIX,
          [
-            sh_db_query:set_field
+            shr_db_query:set_field
             (
                btl_player:get_is_active_field(),
                false
@@ -129,7 +129,7 @@ actually_handle_character_lost_health (CharIX, Update) ->
       optional ->
          %% Let's not assume there is a commander
          StillHasAliveChar =
-            sh_array_util:any_indexed
+            shr_array_util:any_indexed
             (
                fun (IX, Char) ->
                   (
@@ -150,7 +150,7 @@ actually_handle_character_lost_health (CharIX, Update) ->
 
       target ->
          StillHasAliveChar =
-            sh_array_util:any_indexed
+            shr_array_util:any_indexed
             (
                fun (IX, Char) ->
                   (
@@ -188,7 +188,7 @@ handle_character_lost_health (CharIX, _Health, Update) ->
    S2Update = actually_handle_character_lost_health(CharIX, S1Update),
 
    S2Data = btl_character_turn_update:get_data(S2Update),
-   S3Data = btl_character_turn_data:refresh_character(S2Data),
+   S3Data = btl_character_turn_data:refreshr_character(S2Data),
    S3Update = btl_character_turn_update:set_data(S3Data, S2Update),
 
    S3Update.