From f286cbea0ccc47a5d9c6a113f1d40460f7197a78 Mon Sep 17 00:00:00 2001 From: haranp Date: Thu, 15 Nov 2007 22:06:31 +0000 Subject: Added an option, always_confirm_butcher. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2857 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/fight.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'crawl-ref/source/fight.cc') diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index e132835e88..50b5869f77 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -111,7 +111,7 @@ bool test_melee_hit(int to_hit, int ev) if (to_hit >= AUTOMATIC_HIT) return (true); - else if (random2(1000) < 10 * MIN_HIT_MISS_PERCENTAGE) + else if (random2(100) < MIN_HIT_MISS_PERCENTAGE) margin = (coinflip() ? 1 : -1) * AUTOMATIC_HIT; else { @@ -123,12 +123,11 @@ bool test_melee_hit(int to_hit, int ev) float miss; if (to_hit < ev) - miss = 100.0 - static_cast( MIN_HIT_MISS_PERCENTAGE ) / 2.0; + miss = 100.0 - MIN_HIT_MISS_PERCENTAGE / 2.0; else { - miss = static_cast( MIN_HIT_MISS_PERCENTAGE ) / 2.0 - + static_cast( (100 - MIN_HIT_MISS_PERCENTAGE) * ev ) - / static_cast( to_hit ); + miss = MIN_HIT_MISS_PERCENTAGE / 2.0 + + ((100.0 - MIN_HIT_MISS_PERCENTAGE) * ev) / to_hit; } mprf( MSGCH_DIAGNOSTICS, -- cgit v1.2.3-54-g00ecf