Calculated expected attack delay.

calc_your_attack_delay gets a scale parameter, and an implementation
of R_EXPECTED which is correct except for the hand-and-a-half plus
shield case, since I'm lacking a formula for the expected value
of min(1dN+1dK, 1dN+1dK).

1 files changed, 3 insertions, 1 deletions

diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h
index 5b8adc2724..06d7f89684 100644
--- a/crawl-ref/source/fight.h
+++ b/crawl-ref/source/fight.h
@@ -64,7 +64,9 @@ bool monsters_fight(monsters* attacker, monsters* attacked,
 bool wielded_weapon_check(item_def *weapon, bool no_message = false);
 int calc_your_to_hit(bool random_factor);
 int calc_heavy_armour_penalty(bool random_factor);
-int calc_your_attack_delay(random_type rand, const item_def* weapon = NULL);
+int calc_your_attack_delay(random_type rand,
+                           int scale = 1,
+                           const item_def* weapon = NULL);
 
 unchivalric_attack_type is_unchivalric_attack(const actor *attacker,
                                               const actor *defender);