summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-03 01:59:46 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-03 02:01:46 +0530
commit4688d2108941bcd8ae38ee3997144f876faa2b1c (patch)
tree9f01f88b884cb6af6cda95b96580c9b275b78556
parent2f88dcd080dc115c59d8cd993f1b302a4594b1fa (diff)
downloadcrawl-ref-4688d2108941bcd8ae38ee3997144f876faa2b1c.tar.gz
crawl-ref-4688d2108941bcd8ae38ee3997144f876faa2b1c.zip
New gold acquirement formula (dpeg).
-rw-r--r--crawl-ref/source/effects.cc5
-rw-r--r--crawl-ref/source/makeitem.cc8
2 files changed, 7 insertions, 6 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index f43c3843ed..3402037d7e 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -2159,10 +2159,7 @@ int acquirement_create_item(object_class_type class_wanted,
// Easier to read this way.
item_def& thing(mitm[thing_created]);
- // Give some more gold.
- if (class_wanted == OBJ_GOLD)
- thing.quantity += 150;
- else if (class_wanted == OBJ_WANDS)
+ if (class_wanted == OBJ_WANDS)
thing.plus = std::max((int) thing.plus, 3 + random2(3));
else if (quant > 1)
thing.quantity = quant;
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 82a0160978..af66f2386a 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -3214,8 +3214,12 @@ int items(int allow_uniques, // not just true-false,
item.base_type = OBJ_GOLD;
if (force_good)
{
- item.quantity = 150 + random2(150)
- + random2(random2(random2(2000)));
+ // New gold acquirement formula from dpeg.
+ item.quantity = 10 * (20
+ + roll_dice(1, 20)
+ + (roll_dice(1, 8)
+ * roll_dice(1, 8)
+ * roll_dice(1, 8)));
}
else
item.quantity = 1 + random2avg(19, 2) + random2(item_level);