summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-10 17:18:39 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-10 17:18:39 +0530
commit1acfe36802a6db5f6d2d6ed47b57c210b4136e72 (patch)
tree213a5bd7d41dd0221bc72da582c6ef9a35510bd3 /crawl-ref/source
parent241dd89547a430160f86f81b9e33a3893422a6d0 (diff)
downloadcrawl-ref-1acfe36802a6db5f6d2d6ed47b57c210b4136e72.tar.gz
crawl-ref-1acfe36802a6db5f6d2d6ed47b57c210b4136e72.zip
Reduce berserk hp scaling to 1.5.
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/main.cc2
-rw-r--r--crawl-ref/source/misc.cc2
-rw-r--r--crawl-ref/source/monster.cc4
3 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index 0d327cd180..5a8a06dca9 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -2531,7 +2531,7 @@ static void _decrement_durations()
you.hunger = std::max(50, you.hunger);
// 1KB: No berserk healing.
- you.hp = (you.hp + 1) / 2;
+ you.hp = (you.hp + 1) * 2 / 3;
calc_hp();
learned_something_new(TUT_POSTBERSERK);
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 5b07af973f..f2e27c5174 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2713,7 +2713,7 @@ bool go_berserk(bool intentional, bool potion)
you.increase_duration(DUR_BERSERKER, berserk_duration);
calc_hp();
- you.hp *= 2;
+ you.hp = you.hp * 3 / 2;
deflate_hp(you.hp_max, false);
diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc
index c67ad4785b..9bb2e8a298 100644
--- a/crawl-ref/source/monster.cc
+++ b/crawl-ref/source/monster.cc
@@ -4138,7 +4138,7 @@ void monsters::add_enchantment_effect(const mon_enchant &ench, bool quiet)
case ENCH_INSANE:
case ENCH_BERSERK:
// Inflate hp.
- scale_hp(2, 1);
+ scale_hp(3, 2);
if (has_ench(ENCH_SUBMERGED))
del_ench(ENCH_SUBMERGED);
@@ -4357,7 +4357,7 @@ void monsters::remove_enchantment_effect(const mon_enchant &me, bool quiet)
// deliberate fall through
case ENCH_BERSERK:
- scale_hp(1, 2);
+ scale_hp(2, 3);
break;
case ENCH_HASTE: