diff options
| author | Nicholas Feinberg <pleasingfung@gmail.com> | 2014-05-14 17:51:06 -0700 |
|---|---|---|
| committer | reaverb <reaverb.Crawl@gmail.com> | 2014-05-14 22:48:19 -0400 |
| commit | 2df4b55dccf5a1cc596366a982a007ca3158665e (patch) | |
| tree | ef560e937a2ab7ebe8461ba89024d4b8a819edf5 /crawl-ref/source/mon-util.cc | |
| parent | e31251231736f9371999ccadea973b450281b6e3 (diff) | |
| download | crawl-ref-2df4b55dccf5a1cc596366a982a007ca3158665e.tar.gz crawl-ref-2df4b55dccf5a1cc596366a982a007ca3158665e.zip | |
Fix slimes being worth less XP when merged (notcluie)
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index a4f3d7cdad..6ddaeab006 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2152,11 +2152,6 @@ int exper_value(const monster* mon, bool real) x_val /= 10; } - // Slime creature exp hack part 2: Scale exp back up by the number - // of blobs merged. -cao - if (mon->type == MONS_SLIME_CREATURE && mon->number > 1) - x_val *= mon->number; - // Scale starcursed mass exp by what percentage of the whole it represents if (mon->type == MONS_STARCURSED_MASS) x_val = (x_val * mon->number) / 12; @@ -2171,6 +2166,13 @@ int exper_value(const monster* mon, bool real) if (x_val > 750) x_val = 750 + (x_val - 750) / 3; + // Slime creature exp hack part 2: Scale exp back up by the number + // of blobs merged. -cao + // Has to be after the stepdown to prevent issues with 4-5 merged slime + // creatures. -pf + if (mon->type == MONS_SLIME_CREATURE && mon->number > 1) + x_val *= mon->number; + // Guarantee the value is within limits. if (x_val <= 0) x_val = 1; |