summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-24 11:25:44 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-24 11:25:44 +0000
commitc5ddf02b87cb6c998abb5c849b188d66b65104fb (patch)
tree7a40a1c190edde8cdbdb34d170cfb4b68622fd0f
parent055b1b95f819e47fa87040fbec291b88dd17475a (diff)
downloadcrawl-ref-c5ddf02b87cb6c998abb5c849b188d66b65104fb.tar.gz
crawl-ref-c5ddf02b87cb6c998abb5c849b188d66b65104fb.zip
Dropped early melee boost and Sigmund's max hp to get closer to the 0.1.7
combat feel. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1086 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/fight.cc3
-rw-r--r--crawl-ref/source/mon-data.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 201bc02a90..d50d64d5b4 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -1959,7 +1959,8 @@ void melee_attack::player_calc_hit_damage()
// (before randomization -- some of these rings
// are stupidly powerful) -- GDL
potential_damage += slaying_bonus(PWPN_DAMAGE);
- damage_done = potential_damage > 0? 1 + random2(potential_damage) : 0;
+ damage_done =
+ potential_damage > 0? coinflip() + random2(potential_damage) : 0;
damage_done = player_apply_weapon_skill(damage_done);
damage_done = player_apply_fighting_skill(damage_done, false);
damage_done = player_apply_misc_modifiers(damage_done);
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 71a61c5185..71d1b4cd81 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -2975,7 +2975,7 @@
MR_NO_FLAGS,
0, 20, MONS_HUMAN, MONS_HUMAN, MH_NATURAL, -3,
{ {AT_HIT, AF_PLAIN, 5}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0}, {AT_NONE, AF_PLAIN, 0} },
- { 3, 0, 0, 35 },
+ { 3, 0, 0, 30 },
0, 11, 10, 7, MST_ORC_WIZARD_II, CE_CONTAMINATED, Z_SMALL, S_SHOUT, I_NORMAL,
MONUSE_WEAPONS_ARMOUR, SIZE_MEDIUM
}