diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-27 21:29:46 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-27 21:29:46 +0000 |
| commit | ed2216e8f9a93c5ba091659fd5e4ee5750187e80 (patch) | |
| tree | 7b9d050f00d0d608ace9c00303e29a5501f30605 /crawl-ref/source/randart.cc | |
| parent | abceff13c3921aa10542fb3079abb3ba113ece41 (diff) | |
| download | crawl-ref-ed2216e8f9a93c5ba091659fd5e4ee5750187e80.tar.gz crawl-ref-ed2216e8f9a93c5ba091659fd5e4ee5750187e80.zip | |
Fix 2028969: excess comma in autoinscriptions of brand-only artefacts.
Also: Tweak inscription prompt.
Fix 2027600: Don't prompt when attacking with inappropriate weapon while
confused.
Fix 2027328: Throwing projectiles at enslaved monsters.
When saccing to Nemelex, count chunks and !blood like corpses (deck of
summoning rather than wonder). Chunks used to be ignored completely but
since they're just chopped up corpses and corpses are worth much more
than 4 per piece I don't think it hurts. (Rotten chunks have a value of
zero.) Also, decrease !blood price to that of !porridge and lower.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6700 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)) |