summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
authorEino Keskitalo <evktalo@users.sourceforge.net>2009-10-30 01:54:14 +0200
committerEino Keskitalo <evktalo@users.sourceforge.net>2009-10-30 01:54:14 +0200
commit99e4ad77265f9c3a891c5b8f863abd81f6e288d7 (patch)
tree5b305c94f55ed7f02c80e8b377b7e5fdaf0701fa /crawl-ref
parent86b09e2f211714a23a44dc39d58dd5fb2fe50214 (diff)
downloadcrawl-ref-99e4ad77265f9c3a891c5b8f863abd81f6e288d7.tar.gz
crawl-ref-99e4ad77265f9c3a891c5b8f863abd81f6e288d7.zip
Generate the new ammo brands randomly.
Weights now being: Flame 3 Frost 3 Poiso 2 Penet 1 Reapi 1 Silve 1 Steel 1 Dispe 1 Explo 2 Also gave all the new brands a shopping price multiplier - *30, same as curare. Signed-off-by: Eino Keskitalo <evktalo@users.sourceforge.net>
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/makeitem.cc18
-rw-r--r--crawl-ref/source/shopping.cc6
2 files changed, 21 insertions, 3 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 77db9297c3..7eddd6fdb4 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -1726,12 +1726,24 @@ static special_missile_type _determine_missile_brand(const item_def& item,
const int temp_rand =
(force_good ? random2(150) : random2(2000 - 55 * item_level));
- if (temp_rand < 60)
+ if (temp_rand < 30)
rc = SPMSL_FLAME;
- else if (temp_rand < 120)
+ else if (temp_rand < 60)
rc = SPMSL_FROST;
- else if (temp_rand < 150)
+ else if (temp_rand < 80)
rc = SPMSL_POISONED;
+ else if (temp_rand < 90)
+ rc = SPMSL_PENETRATION;
+ else if (temp_rand < 100)
+ rc = SPMSL_REAPING;
+ else if (temp_rand < 110)
+ rc = SPMSL_SILVER;
+ else if (temp_rand < 120)
+ rc = SPMSL_STEEL;
+ else if (temp_rand < 130)
+ rc = SPMSL_DISPERSAL;
+ else if (temp_rand < 150)
+ rc = SPMSL_EXPLODING;
else
rc = SPMSL_NORMAL;
}
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 1cfc7df4fd..5a82028d8c 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -1093,6 +1093,12 @@ unsigned int item_value( item_def item, bool ident )
break;
case SPMSL_CURARE:
+ case SPMSL_PENETRATION:
+ case SPMSL_REAPING:
+ case SPMSL_SILVER:
+ case SPMSL_STEEL:
+ case SPMSL_DISPERSAL:
+ case SPMSL_EXPLODING:
valued *= 30;
break;