| summaryrefslogtreecommitdiff | 
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2018-07-11 18:02:26 +0200 | 
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2018-07-11 18:02:26 +0200 | 
| commit | acb9dd3220a3edcac93aa11d1d74d008e2fb23ed (patch) | |
| tree | 98b45af3f7eb9c7d812ed33a07e6a0f665a7a8cd /src/battle/game-logic/btl_turn_actions.erl | |
| parent | fde827cba1ff3d889135c74ee1978098465fd200 (diff) | |
"sh_" -> "shr_".
Diffstat (limited to 'src/battle/game-logic/btl_turn_actions.erl')
| -rw-r--r-- | src/battle/game-logic/btl_turn_actions.erl | 26 | 
1 files changed, 13 insertions, 13 deletions
| 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 | 


