From 82081d45fd64294f4bc417085e06284f3487b32f Mon Sep 17 00:00:00 2001 From: nsensfel Date: Wed, 6 Jun 2018 16:42:42 +0200 Subject: ... --- src/battlemap/game-logic/bm_next_turn.erl | 2 +- src/battlemap/game-logic/bm_turn_actions.erl | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/battlemap/game-logic') diff --git a/src/battlemap/game-logic/bm_next_turn.erl b/src/battlemap/game-logic/bm_next_turn.erl index 3628111..abe286e 100644 --- a/src/battlemap/game-logic/bm_next_turn.erl +++ b/src/battlemap/game-logic/bm_next_turn.erl @@ -127,7 +127,7 @@ requires_update (Update) -> ( bm_character_turn_update:type() ) - -> character_turn_update:type(). + -> bm_character_turn_update:type(). update_if_needed (Update) -> case requires_update(Update) of true -> update(Update); diff --git a/src/battlemap/game-logic/bm_turn_actions.erl b/src/battlemap/game-logic/bm_turn_actions.erl index 9664283..bf4075f 100644 --- a/src/battlemap/game-logic/bm_turn_actions.erl +++ b/src/battlemap/game-logic/bm_turn_actions.erl @@ -32,7 +32,7 @@ handle_switch_weapon (Update) -> UpdatedWeaponIDs = {SecondaryWeaponID, PrimaryWeaponID}, UpdatedCharacterStatistics = - bm_statistics:new(CharacterAttributes, UpdatedWeaponIDs), + sh_statistics:new(CharacterAttributes, UpdatedWeaponIDs), UpdatedCharacter = bm_character:set_statistics ( @@ -115,7 +115,7 @@ assert_character_can_move (Data, Cost) -> Character = bm_character_turn_data:get_character(Data), CharacterStatistics = bm_character:get_statistics(Character), CharacterMovementPoints = - bm_statistics:get_movement_points(CharacterStatistics), + sh_statistics:get_movement_points(CharacterStatistics), true = (Cost =< CharacterMovementPoints), @@ -247,10 +247,10 @@ handle_attack_sequence bm_character:type(), bm_character:type() ) - -> list(attack:step()). + -> list(bm_attack:step()). get_attack_sequence (Character, TargetCharacter) -> Range = - location:dist + bm_location:dist ( bm_character:get_location(Character), bm_character:get_location(TargetCharacter) @@ -259,8 +259,8 @@ get_attack_sequence (Character, TargetCharacter) -> {AttackingWeaponID, _} = bm_character:get_weapon_ids(Character), {DefendingWeaponID, _} = bm_character:get_weapon_ids(TargetCharacter), - AttackingWeapon = bm_weapon:from_id(AttackingWeaponID), - DefendingWeapon = bm_weapon:from_id(DefendingWeaponID), + AttackingWeapon = sh_weapon:from_id(AttackingWeaponID), + DefendingWeapon = sh_weapon:from_id(DefendingWeaponID), bm_attack:get_sequence(Range, AttackingWeapon, DefendingWeapon). -- cgit v1.2.3-70-g09d2