diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-28 23:07:35 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-28 23:07:35 +0000 |
commit | 6bf5bb925649736d9d313011523bdb429c225970 (patch) | |
tree | c874f9c4aa50725e1d48d7dbb624370e3823e8f2 /crawl-ref/source/randart.cc | |
parent | ca1e897a646bb9c098a1fc651a3b4aa6c976ddc7 (diff) | |
download | crawl-ref-6bf5bb925649736d9d313011523bdb429c225970.tar.gz crawl-ref-6bf5bb925649736d9d313011523bdb429c225970.zip |
Apply r6700 and r6706: Cleansing Flame harming helpless monsters and
angering TSO, !blood counting towards decks of summoning.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6710 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/randart.cc')
-rw-r--r-- | crawl-ref/source/randart.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc index d676e93813..65c2c512be 100644 --- a/crawl-ref/source/randart.cc +++ b/crawl-ref/source/randart.cc @@ -169,7 +169,7 @@ static std::string _replace_name_parts(const std::string name_in, if (god_gift == GOD_NO_GOD || god_gift == GOD_XOM) { name = replace_all(name, "@player_death@", - "@player_name@'s " + "@player_name@" + getRandNameString("killer_name")); name = replace_all(name, "@player_doom@", "@player_name@'s " @@ -177,7 +177,7 @@ static std::string _replace_name_parts(const std::string name_in, } else { - // simply overwrite the name with one of type "god's Favour" + // Simply overwrite the name with one of type "God's Favour". name = "of "; name += god_name(god_gift, false); name += "'s "; @@ -857,13 +857,13 @@ void static _get_randart_properties(const item_def &item, if (!done_powers && one_chance_in(4 + power_level) && (aclass != OBJ_JEWELLERY - || (atype != RING_PROTECTION_FROM_COLD - && atype != RING_FIRE - && atype != RING_ICE)) + || atype != RING_PROTECTION_FROM_COLD + && atype != RING_FIRE + && atype != RING_ICE) && (aclass != OBJ_ARMOUR - || (atype != ARM_DRAGON_ARMOUR - && atype != ARM_ICE_DRAGON_ARMOUR - && atype != ARM_GOLD_DRAGON_ARMOUR))) + || atype != ARM_DRAGON_ARMOUR + && atype != ARM_ICE_DRAGON_ARMOUR + && atype != ARM_GOLD_DRAGON_ARMOUR)) { proprt[RAP_COLD] = 1; if (one_chance_in(5)) |