summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/fight.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-23 15:45:28 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-23 15:45:28 +0000
commitddb4be75fa41e1ef1e52189d2742e4dea70c444b (patch)
tree15a6f330b73046d14c401429d711f4e81a29bcf9 /crawl-ref/source/fight.cc
parent55fad5689d5e6c03f665fdccfd38490784e47bd0 (diff)
downloadcrawl-ref-ddb4be75fa41e1ef1e52189d2742e4dea70c444b.tar.gz
crawl-ref-ddb4be75fa41e1ef1e52189d2742e4dea70c444b.zip
Set hard lower limit on attack cost of 2 (dis/jarpiain/dpeg).
Remove caps on monster shock and poison resistance - these resists are intended to be multi-level for monsters. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4543 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/fight.cc')
-rw-r--r--crawl-ref/source/fight.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 0bf23ee931..35d8e4e1e0 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2860,9 +2860,8 @@ void melee_attack::player_apply_attack_delay()
final_attack_delay = attack_delay;
- you.time_taken = (you.time_taken * final_attack_delay) / 10;
- if (you.time_taken < 1)
- you.time_taken = 1;
+ you.time_taken =
+ std::max(2, div_rand_round(you.time_taken * final_attack_delay, 10));
#if DEBUG_DIAGNOSTICS
mprf( MSGCH_DIAGNOSTICS,