summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/godwrath.cc
diff options
context:
space:
mode:
authorChris Oelmueller <chris.oelmueller@gmail.com>2014-04-11 04:15:53 +0200
committerNicholas Feinberg <pleasingfung@gmail.com>2014-06-14 23:00:53 -0700
commit913e1e1b0aa38a63f6397ea793b3944d432afefc (patch)
tree2898391245534415677b909d60209d02c4c8f606 /crawl-ref/source/godwrath.cc
parentc9d9781072485459e38ff57c97428b82801c0d31 (diff)
downloadcrawl-ref-913e1e1b0aa38a63f6397ea793b3944d432afefc.tar.gz
crawl-ref-913e1e1b0aa38a63f6397ea793b3944d432afefc.zip
Plus2: Make weapons only generate with one plus
[Committer's note: Merged a few commits into this.]
Diffstat (limited to 'crawl-ref/source/godwrath.cc')
-rw-r--r--crawl-ref/source/godwrath.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/crawl-ref/source/godwrath.cc b/crawl-ref/source/godwrath.cc
index ef60fa3f23..eb06efb712 100644
--- a/crawl-ref/source/godwrath.cc
+++ b/crawl-ref/source/godwrath.cc
@@ -294,12 +294,9 @@ static void _ely_dull_inventory_weapons()
if (you.inv[i].base_type == OBJ_WEAPONS)
{
- // Don't dull artefacts at all, or weapons below -1/-1.
- if (is_artefact(you.inv[i])
- || you.inv[i].plus <= -1 && you.inv[i].plus2 <= -1)
- {
+ // Don't dull artefacts at all, or weapons below -1.
+ if (is_artefact(you.inv[i]) || you.inv[i].plus <= -1)
continue;
- }
// 2/3 of the time, don't do anything.
if (!one_chance_in(3))
@@ -313,8 +310,6 @@ static void _ely_dull_inventory_weapons()
// Dull the weapon.
if (you.inv[i].plus > -1)
you.inv[i].plus--;
- if (you.inv[i].plus2 > -1)
- you.inv[i].plus2--;
// Update the weapon display, if necessary.
if (wielded)
@@ -797,7 +792,6 @@ static bool _beogh_retribution()
set_item_ego_type(wpn, OBJ_WEAPONS, SPWPN_ELECTROCUTION);
wpn.plus = random2(3);
- wpn.plus2 = random2(3);
wpn.sub_type = wpn_type;
set_ident_flags(wpn, ISFLAG_KNOW_TYPE);