From e35684648a9339dda9e4e28974c0f446809639c7 Mon Sep 17 00:00:00 2001
From: Nicholas Feinberg <pleasingfung@gmail.com>
Date: Wed, 14 May 2014 17:51:06 -0700
Subject: [PATCH] Fix slimes being worth less XP when merged

---
 crawl-ref/source/mon-util.cc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index a4f3d7c..6ddaeab 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;
-- 
1.8.5.2 (Apple Git-48)