summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/randart.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-19 11:35:34 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-19 11:35:34 +0000
commitb0b4d7e1fbb9efed46a590a0045ad270fa409305 (patch)
tree92d454732f1a9d891aa445e3346979a65e1450f7 /crawl-ref/source/randart.cc
parent811db79a78d57a056981f56879af1dcc5e3c6eea (diff)
downloadcrawl-ref-b0b4d7e1fbb9efed46a590a0045ad270fa409305.tar.gz
crawl-ref-b0b4d7e1fbb9efed46a590a0045ad270fa409305.zip
Don't add rF+/rC- to the autoinscriptions of randart rings of fire
(and vice versa for ice), since that's already what their base type does. Should the code ever be changed to allow them to get additional levels of resistance or susceptibility, the check is only done for the base stats (+1 and -1, respectively). git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4362 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/randart.cc')
-rw-r--r--crawl-ref/source/randart.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc
index 5e87296e72..8bd5d2f35a 100644
--- a/crawl-ref/source/randart.cc
+++ b/crawl-ref/source/randart.cc
@@ -1048,22 +1048,30 @@ void randart_wpn_properties( const item_def &item,
if (aclass == OBJ_JEWELLERY
&& (atype == RING_PROTECTION_FROM_FIRE || atype == RING_FIRE
|| atype == RING_ICE))
+ {
break; // already does this or something
+ }
if (aclass == OBJ_ARMOUR
&& (atype == ARM_DRAGON_ARMOUR || atype == ARM_ICE_DRAGON_ARMOUR
|| atype == ARM_GOLD_DRAGON_ARMOUR))
+ {
break;
+ }
proprt[RAP_FIRE] = -1;
break;
case 6: // susceptible to cold
if (aclass == OBJ_JEWELLERY
&& (atype == RING_PROTECTION_FROM_COLD || atype == RING_FIRE
|| atype == RING_ICE))
+ {
break; // already does this or something
+ }
if (aclass == OBJ_ARMOUR
&& (atype == ARM_DRAGON_ARMOUR || atype == ARM_ICE_DRAGON_ARMOUR
|| atype == ARM_GOLD_DRAGON_ARMOUR))
+ {
break;
+ }
proprt[RAP_COLD] = -1;
break;
case 7: // speed metabolism