"sh_" -> "shr_".

5 files changed, 55 insertions, 55 deletions

diff --git a/src/battle/struct/btl_attack.erl b/src/battle/struct/btl_attack.erl
index aa7659f..fae8341 100644
--- a/src/battle/struct/btl_attack.erl
+++ b/src/battle/struct/btl_attack.erl
@@ -47,15 +47,15 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 -spec roll_precision
    (
-      sh_statistics:type(),
-      sh_statistics:type()
+      shr_statistics:type(),
+      shr_statistics:type()
    )
    -> precision().
 roll_precision (AttackerStatistics, DefenderStatistics) ->
-   DefenderDodges = sh_statistics:get_dodges(DefenderStatistics),
-   AttackerAccuracy = sh_statistics:get_accuracy(AttackerStatistics),
+   DefenderDodges = shr_statistics:get_dodges(DefenderStatistics),
+   AttackerAccuracy = shr_statistics:get_accuracy(AttackerStatistics),
    MissChance = max(0, (DefenderDodges - AttackerAccuracy)),
-   case sh_roll:percentage() of
+   case shr_roll:percentage() of
       X when (X =< MissChance) -> misses;
       X when (X =< (MissChance * 2)) -> grazes;
       _ -> hits
@@ -63,25 +63,25 @@ roll_precision (AttackerStatistics, DefenderStatistics) ->
 
 -spec roll_damage
    (
-      sh_statistics:type(),
-      sh_statistics:type()
+      shr_statistics:type(),
+      shr_statistics:type()
    )
    -> {non_neg_integer(), boolean()}.
 roll_damage (AttackerStatistics, _DefenderStatistics) ->
    {MinimumDamage, MaximumDamage} =
-      sh_statistics:get_damages(AttackerStatistics),
+      shr_statistics:get_damages(AttackerStatistics),
    MaximumRoll = max(1, MaximumDamage - MinimumDamage),
    BaseDamage = MinimumDamage + (rand:uniform(MaximumRoll) - 1),
-   CriticalHitChance = sh_statistics:get_critical_hits(AttackerStatistics),
-   case sh_roll:percentage() of
+   CriticalHitChance = shr_statistics:get_critical_hits(AttackerStatistics),
+   case shr_roll:percentage() of
       X when (X =< CriticalHitChance) -> {(BaseDamage * 2), true};
       _ -> {BaseDamage, false}
    end.
 
--spec roll_parry (sh_statistics:type()) -> boolean().
+-spec roll_parry (shr_statistics:type()) -> boolean().
 roll_parry (DefenderStatistics) ->
-   DefenderParryChance = sh_statistics:get_parries(DefenderStatistics),
-   (sh_roll:percentage() =< DefenderParryChance).
+   DefenderParryChance = shr_statistics:get_parries(DefenderStatistics),
+   (shr_roll:percentage() =< DefenderParryChance).
 
 -spec effect_of_attack
    (
@@ -108,10 +108,10 @@ effect_of_attack (Order, Attacker, Defender, CanParry) ->
          false -> {Attacker, Defender}
       end,
 
-   ActualDefArmor = sh_armor:from_id(btl_character:get_armor_id(ActualDefender)),
+   ActualDefArmor = shr_armor:from_id(btl_character:get_armor_id(ActualDefender)),
    {ActualAtkWeaponID, _} = btl_character:get_weapon_ids(ActualAttacker),
    ActualAtkWeaponDmgType =
-      sh_weapon:get_damage_type(sh_weapon:from_id(ActualAtkWeaponID)),
+      shr_weapon:get_damage_type(shr_weapon:from_id(ActualAtkWeaponID)),
 
    Precision = roll_precision(ActualAtkStatistics, ActualDefStatistics),
    {Damage, IsCritical} = roll_damage(ActualAtkStatistics, ActualDefStatistics),
@@ -122,7 +122,7 @@ effect_of_attack (Order, Attacker, Defender, CanParry) ->
          hits -> Damage
       end,
    ArmorResistance =
-      sh_armor:get_resistance_to(ActualAtkWeaponDmgType, ActualDefArmor),
+      shr_armor:get_resistance_to(ActualAtkWeaponDmgType, ActualDefArmor),
    ActualDamage = max(0, (S0Damage - ArmorResistance)),
 
    #attack
@@ -160,9 +160,9 @@ get_description_of ({first, CanParry}, Attacker, Defender) ->
 get_description_of ({second, CanParry}, Attacker, Defender) ->
    AttackerStatistics = btl_character:get_statistics(Attacker),
    AttackerDoubleAttackChange =
-      sh_statistics:get_double_hits(AttackerStatistics),
+      shr_statistics:get_double_hits(AttackerStatistics),
 
-   case sh_roll:percentage() of
+   case shr_roll:percentage() of
       X when (X =< AttackerDoubleAttackChange) ->
          effect_of_attack (second, Attacker, Defender, CanParry);
 
@@ -252,28 +252,28 @@ when
 -spec get_sequence
    (
       non_neg_integer(),
-      sh_weapon:type(),
-      sh_weapon:type()
+      shr_weapon:type(),
+      shr_weapon:type()
    )
    -> list(step()).
 get_sequence (AttackRange, AttackerWeapon, DefenderWeapon) ->
    {AttackerDefenseRange, AttackerAttackRange} =
-      sh_weapon:get_ranges(AttackerWeapon),
+      shr_weapon:get_ranges(AttackerWeapon),
    {DefenderDefenseRange, DefenderAttackRange} =
-      sh_weapon:get_ranges(DefenderWeapon),
+      shr_weapon:get_ranges(DefenderWeapon),
 
    AttackerCanAttack = (AttackRange =< AttackerAttackRange),
    AttackerCanAttack = true,
    AttackerCanDefend =
       (AttackerCanAttack and (AttackRange > AttackerDefenseRange)),
    AttackerCanParry =
-      (AttackerCanDefend and sh_weapon:can_parry(AttackerWeapon)),
+      (AttackerCanDefend and shr_weapon:can_parry(AttackerWeapon)),
 
    DefenderCanAttack = (AttackRange =< DefenderAttackRange),
    DefenderCanDefend =
       (DefenderCanAttack and (AttackRange > DefenderDefenseRange)),
    DefenderCanParry =
-      (DefenderCanDefend and sh_weapon:can_parry(DefenderWeapon)),
+      (DefenderCanDefend and shr_weapon:can_parry(DefenderWeapon)),
 
    First = {first, DefenderCanParry},
    Second = {second, DefenderCanParry},
diff --git a/src/battle/struct/btl_battle.erl b/src/battle/struct/btl_battle.erl
index 8befc4e..dd68b42 100644
--- a/src/battle/struct/btl_battle.erl
+++ b/src/battle/struct/btl_battle.erl
@@ -10,8 +10,8 @@
    battle,
    {
       id :: id(),
-      used_armor_ids :: list(sh_armor:id()),
-      used_weapon_ids :: list(sh_weapon:id()),
+      used_armor_ids :: list(shr_armor:id()),
+      used_weapon_ids :: list(shr_weapon:id()),
       used_tile_ids :: list(btl_tile:id()),
       battlemap :: btl_battlemap:type(),
       characters :: array:array(btl_character:type()),
@@ -86,10 +86,10 @@ get_all_timelines (Result, CurrentIndex, EndPoint, ArraySize, Players) ->
 -spec get_id (type()) -> id().
 get_id (Battle) -> Battle#battle.id.
 
--spec get_used_weapon_ids (type()) -> list(sh_weapon:id()).
+-spec get_used_weapon_ids (type()) -> list(shr_weapon:id()).
 get_used_weapon_ids (Battle) -> Battle#battle.used_weapon_ids.
 
--spec get_used_armor_ids (type()) -> list(sh_armor:id()).
+-spec get_used_armor_ids (type()) -> list(shr_armor:id()).
 get_used_armor_ids (Battle) -> Battle#battle.used_armor_ids.
 
 -spec get_used_tile_ids (type()) -> list(btl_tile:id()).
@@ -187,8 +187,8 @@ set_current_player_turn (PlayerTurn, Battle) ->
       list(btl_player:type()),
       btl_battlemap:type(),
       list(btl_character:type()),
-      list(sh_weapon:id()),
-      list(sh_armor:id()),
+      list(shr_weapon:id()),
+      list(shr_armor:id()),
       list(btl_tile:id())
    )
    -> type().
diff --git a/src/battle/struct/btl_character.erl b/src/battle/struct/btl_character.erl
index 841f4ea..d9362ea 100644
--- a/src/battle/struct/btl_character.erl
+++ b/src/battle/struct/btl_character.erl
@@ -16,10 +16,10 @@
       rank :: rank(),
       icon :: binary(),
       portrait :: binary(),
-      attributes :: sh_attributes:type(),
-      statistics :: sh_statistics:type(),
-      weapon_ids :: {sh_weapon:id(), sh_weapon:id()},
-      armor_id :: sh_armor:id(),
+      attributes :: shr_attributes:type(),
+      statistics :: shr_statistics:type(),
+      weapon_ids :: {shr_weapon:id(), shr_weapon:id()},
+      armor_id :: shr_armor:id(),
       location :: {non_neg_integer(), non_neg_integer()},
       current_health :: integer(), %% Negative integers let us reverse attacks.
       is_active :: boolean(),
@@ -90,8 +90,8 @@
    )
    -> {non_neg_integer(), non_neg_integer()}.
 find_random_location (BattlemapWidth, BattlemapHeight, ForbiddenLocations) ->
-   X = sh_roll:between(0, (BattlemapWidth - 1)),
-   Y = sh_roll:between(0, (BattlemapHeight - 1)),
+   X = shr_roll:between(0, (BattlemapWidth - 1)),
+   Y = shr_roll:between(0, (BattlemapHeight - 1)),
 
    IsForbidden = lists:member({X, Y}, ForbiddenLocations),
 
@@ -129,16 +129,16 @@ get_icon (Char) -> Char#character.icon.
 -spec get_portrait (type()) -> binary().
 get_portrait (Char) -> Char#character.portrait.
 
--spec get_attributes (type()) -> sh_attributes:type().
+-spec get_attributes (type()) -> shr_attributes:type().
 get_attributes (Char) -> Char#character.attributes.
 
--spec get_armor_id (type()) -> sh_armor:id().
+-spec get_armor_id (type()) -> shr_armor:id().
 get_armor_id (Char) -> Char#character.armor_id.
 
--spec get_weapon_ids (type()) -> {sh_weapon:id(), sh_weapon:id()}.
+-spec get_weapon_ids (type()) -> {shr_weapon:id(), shr_weapon:id()}.
 get_weapon_ids (Char) -> Char#character.weapon_ids.
 
--spec get_statistics (type()) -> sh_statistics:type().
+-spec get_statistics (type()) -> shr_statistics:type().
 get_statistics (Char) -> Char#character.statistics.
 
 -spec get_location (type()) -> {non_neg_integer(), non_neg_integer()}.
@@ -205,14 +205,14 @@ set_is_defeated (Defeated, Char) ->
       is_defeated = Defeated
    }.
 
--spec set_armor_id (sh_armor:id(), type()) -> type().
+-spec set_armor_id (shr_armor:id(), type()) -> type().
 set_armor_id (ArmorID, Char) ->
    Char#character
    {
       armor_id = ArmorID
    }.
 
--spec set_weapon_ids ({sh_weapon:id(), sh_weapon:id()}, type()) -> type().
+-spec set_weapon_ids ({shr_weapon:id(), shr_weapon:id()}, type()) -> type().
 set_weapon_ids (WeaponIDs, Char) ->
    Char#character
    {
@@ -221,7 +221,7 @@ set_weapon_ids (WeaponIDs, Char) ->
 
 -spec set_statistics
    (
-      sh_statistics:type(),
+      shr_statistics:type(),
       type()
    )
    -> type().
@@ -244,10 +244,10 @@ set_statistics (Stats, Char) ->
 random (ID, PlayerIX, BattlemapWidth, BattlemapHeight, ForbiddenLocations) ->
    Location =
       find_random_location(BattlemapWidth, BattlemapHeight, ForbiddenLocations),
-   WeaponIDs = {sh_weapon:random_id(), sh_weapon:random_id()},
-   ArmorID = sh_armor:random_id(),
-   Attributes = sh_attributes:random(),
-   Statistics = sh_statistics:new(Attributes, WeaponIDs, ArmorID),
+   WeaponIDs = {shr_weapon:random_id(), shr_weapon:random_id()},
+   ArmorID = shr_armor:random_id(),
+   Attributes = shr_attributes:random(),
+   Statistics = shr_statistics:new(Attributes, WeaponIDs, ArmorID),
    IDAsListString = integer_to_list(ID),
    IDAsBinaryString = list_to_binary(IDAsListString),
 
@@ -269,7 +269,7 @@ random (ID, PlayerIX, BattlemapWidth, BattlemapHeight, ForbiddenLocations) ->
       armor_id = ArmorID,
       statistics = Statistics,
       location = Location,
-      current_health = sh_statistics:get_health(Statistics),
+      current_health = shr_statistics:get_health(Statistics),
       is_active = false,
       is_defeated = false
    }.
diff --git a/src/battle/struct/btl_character_turn_data.erl b/src/battle/struct/btl_character_turn_data.erl
index 31a4b7d..64df29f 100644
--- a/src/battle/struct/btl_character_turn_data.erl
+++ b/src/battle/struct/btl_character_turn_data.erl
@@ -40,7 +40,7 @@
 (
    [
       clean_battle/1,
-      refresh_character/1
+      refreshr_character/1
    ]
 ).
 
@@ -101,8 +101,8 @@ clean_battle (Data) ->
          )
    }.
 
--spec refresh_character (type()) -> type().
-refresh_character (Data) ->
+-spec refreshr_character (type()) -> type().
+refreshr_character (Data) ->
    Data#type
    {
       dirty = false,
diff --git a/src/battle/struct/btl_character_turn_update.erl b/src/battle/struct/btl_character_turn_update.erl
index a6b29d9..d63e437 100644
--- a/src/battle/struct/btl_character_turn_update.erl
+++ b/src/battle/struct/btl_character_turn_update.erl
@@ -9,7 +9,7 @@
    {
       data :: btl_character_turn_data:type(),
       timeline :: list(any()),
-      db :: list(sh_db_query:op())
+      db :: list(shr_db_query:op())
    }
 ).
 
@@ -57,7 +57,7 @@ get_data (Update) -> Update#type.data.
 -spec get_timeline (type()) -> list(any()).
 get_timeline (Update) -> Update#type.timeline.
 
--spec get_db (type()) -> list(sh_db_query:op()).
+-spec get_db (type()) -> list(shr_db_query:op()).
 get_db (Update) -> Update#type.db.
 
 -spec set_data (btl_character_turn_data:type(), type()) -> type().
@@ -67,7 +67,7 @@ set_data (Data, Update) ->
 -spec add_to_timeline
    (
       btl_turn_result:type(),
-      sh_db_query:op(),
+      shr_db_query:op(),
       type()
    ) -> type().
 add_to_timeline (Item, DBUpdate, Update) ->
@@ -80,6 +80,6 @@ add_to_timeline (Item, DBUpdate, Update) ->
       }
    ).
 
--spec add_to_db (sh_db_query:op(), type()) -> type().
+-spec add_to_db (shr_db_query:op(), type()) -> type().
 add_to_db (Item, Update) ->
    Update#type{ db = [Item|Update#type.db] }.