Merge pull request #45523 from kevingranade/weary-counter-check

Incorporate exertion penalty into counter cost check
CleverRaven · Nov 22, 2020 · e8a7cca · e8a7cca
2 parents c8149d5 + 3b8ab8f
commit e8a7cca
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/melee.cpp b/src/melee.cpp
@@ -1225,10 +1225,11 @@ matec_id Character::pick_technique( Creature &t, const item &weap,
 
         // Don't counter if it would exhaust moves.
         if( tec.block_counter || tec.dodge_counter ) {
-            int move_cost = attack_speed( used_weapon() );
+            float move_cost = attack_speed( used_weapon() );
             move_cost *= tec.move_cost_multiplier( *this );
             move_cost += tec.move_cost_penalty( *this );
-
+            float move_mult = exertion_adjusted_move_multiplier( EXTRA_EXERCISE );
+            move_cost *= ( 1.0f / move_mult );
             if( get_moves() + get_speed() - move_cost < 0 ) {
                 continue;
             }