diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-09 10:45:04 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-09 10:45:04 +0000 |
| commit | 94c4ea8713f2337b462252fcc38bbe9f843c7913 (patch) | |
| tree | 24ff2fc4a69b7b373889e69b47722b5499626ace /crawl-ref | |
| parent | d3cb6838b377b68074ffe35669fd4a3fa8a767c0 (diff) | |
| download | crawl-ref-94c4ea8713f2337b462252fcc38bbe9f843c7913.tar.gz crawl-ref-94c4ea8713f2337b462252fcc38bbe9f843c7913.zip | |
Bug 1889975: Fix randart rings of teleportation not getting
life protection.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3410 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/makeitem.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/randart.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 1f8b8db137..f36735c5ba 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -1998,9 +1998,9 @@ static special_armour_type determine_armour_ego(const item_def& item, const int tmp = random2(600) + 200 * (item.sub_type != ARM_BOOTS); rc = (tmp < 200) ? SPARM_RUNNING : - (tmp < 400) ? SPARM_LEVITATION : - (tmp < 600) ? SPARM_STEALTH : - (tmp < 700) ? SPARM_COLD_RESISTANCE : SPARM_FIRE_RESISTANCE; + (tmp < 400) ? SPARM_LEVITATION : + (tmp < 600) ? SPARM_STEALTH : + (tmp < 700) ? SPARM_COLD_RESISTANCE : SPARM_FIRE_RESISTANCE; break; } diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc index 5c32515e91..a0477e5a60 100644 --- a/crawl-ref/source/randart.cc +++ b/crawl-ref/source/randart.cc @@ -1415,7 +1415,7 @@ void randart_wpn_properties( const item_def &item, /* prot_life - no necromantic brands on weapons allowed */ if (!done_powers && one_chance_in(4 + power_level) - && (aclass != OBJ_JEWELLERY || atype != RING_TELEPORTATION) + && (aclass != OBJ_JEWELLERY || atype != RING_LIFE_PROTECTION) && proprt[RAP_BRAND] != SPWPN_DRAINING && proprt[RAP_BRAND] != SPWPN_VAMPIRICISM && proprt[RAP_BRAND] != SPWPN_PAIN) |