FR 1840678: upon failed sacrifice give hint on correct item class part of FR 1857701: Give a message when a weapon of returning does NOT return (and add a message_colour line in init.txt)
Also, change Zin's donation messages to reflect the piety status the player will have once the piety pool has emptied into the actual piety, and modify descriptions of the good gods (by David).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3274 c06c8d41-db1a-0410-9941-cceddc491573
72CQFK27NR37P2WQ32U4PEXXKMRIO7JEMJN2ZCPNVPZMT7UPFJJAC
LHHRXD4GGPHSU6OGOVJEHDHYJA3Q5X45VKMZYUWZP3VXOLYZRTIAC
WL5WZXFJ6TONUQRSHUY4GQ5USU47ILWNN5X2JDQZO4CRJJZSRQIAC
FD2HXXWW7BLKG7G27VXGP67TXDCODDK3CXFEZOJFXNB7IF2GHKFAC
2SNCC2NXKFVBYTWH7THU2QELHONTOBRNCWH6FWYORKKCWZAXTTVAC
VMIKJGB6CSFVZS6VMQNP33ALEDEO2TARDICVGDJFMZ4WSPTV3LFAC
W74555HMPXUQ72AGKBXC5P3STMMX5DZAW6ZESUDLNVJBCAG43PLAC
DK362IHKSDADMUPD35NOTKM4WESQM37KG2PNOJRV2FGELDWULYPQC
AXQJOPTECRU3ECV3ICDUR6SGBIOIZT5HIOSJ77MRLF5ECGOITMDQC
K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC
WYMN37VYSETF56RTTJ45VMB2YS4OUUKRL2JNWJSUKNLBFGGGECNQC
PL6I2CMSTHY5ZHWVMIQE5YTM5S5VPKBNZM6QJVHZSSKOJGIJ5W4AC
HPIKUZQ7VB5J2GC3O5TZ7URTXELEVKEIIINX4XKORPCDMFIFEEAAC
WT66JDIRTLLP37SHTV4GI3V64JFJ4D25LNRLGCHFG6CLEFKJ3QGQC
XKAJWK6MPHS3ZCZIPPLTIMOPF6AROGLRDDCS6EFE3IGE4AHT7MYQC
4O3VTUJT5T7NBNF3Q45XO2WHS6TCJXVLH6CKX4K36WUBDRT5F6KAC
IQGGFC563RBS7GDOACKCLXK752EE5RC3T6G5L6H446SXTMSA7T2AC
E42EFZ3RINKLTGOJJZAH2N5QF3P4S5NCO5T52HLXJRMBPP463HTAC
FA2V3G4NYTWJWUT7EWH75L3YOUX6YVOZ5LNRSFLO2XF273JKSUTAC
RPOZZWKG5GLPHVZZ7ZKMKS64ZMV2LDCQSARBJFJ6FZOTOKCQO7FAC
GT7BSR54BVJKHUCLEBTELGBMNBFFDQW52EVC4XKVEMUVG2UGZMDAC
TQLWCGVXVZ75H7MDBJD3DJDUFNW62WOAEDJUVKCHQTAXKBP47CSAC
SDLKLUNFGVKDS55DDJZCBAVIB7NL3RRYPTACAY65SCUQKV6APFSAC
VNIAJEGE3PYE6F6EAMCQDWMAS52EQTKJUPAFXK7ARCITZ326WTTQC
VCG3BRIYRTNNWYC3LOXD6KFGXOX37HAFW2HNV7WXVG2V7EUHLDZQC
I7QLYOTE6DLQZM7YWUWYLKHRJRB2A3STQ42ALSRGQICEWKD2QTEQC
W2KRIXSCRJPS6WDIYTHVF5IRMF3V5DWECRAWUPVTB7VZ6A2BLD4QC
QQGVX3ZTIN4TB4C2QGUS7DWG4Q2LKVTJRF6UFFWZJ7KZP7HPVVBQC
RVST2QHYJ757ZHK4AUJ5NGPDZ44AD6RVFVXYPKQIBJXZBDNUCHXQC
5RK245FAGZFCDDYG4AZAXSC7JPVIJG4DSAVAKHWWVBUNGICHYNJQC
V2OQTNDCAEYXJRGSU7BG4TMLIQLT7X32ILOXW7KEWVL2R33B6XJQC
XPCGZBHHSL6MB3ORMUJI64BAERU6AZTIY6RK56BBW7SNB3IK24IAC
EHSY6DVGUMI6C67WKET3GDJVLWJWGYBYQONNDK5JVT7BCTHBEZVAC
if (Options.stair_item_brand
&& is_stair(grid_value) && igrd[x][y] != NON_ITEM)
if (Options.feature_item_brand
&& (is_stair(grid_value) || grid_altar_god(grid_value) != GOD_NO_GOD
|| grid_value == DNGN_ENTER_SHOP || grid_is_portal(grid_value))
&& igrd[x][y] != NON_ITEM)
else if (donation_value <= 5) // $100 or more
simple_god_message(" is satisfied with your donation.");
else if (donation_value <= 20) // about $400 or more
simple_god_message(" is pleased about your sacrifice.");
else if (donation_value <= 50) // about $1500 or more
simple_god_message(" is impressed by your generosity.");
else // about $3000 or more
simple_god_message(" is deeply moved by your generosity.");
int estimated_piety = you.piety + donation_value;
std::string result = god_name(GOD_ZIN) + " will soon be ";
result +=
(estimated_piety > 130) ? "exalted by your worship" :
(estimated_piety > 100) ? "extremely pleased with you" :
(estimated_piety > 70) ? "greatly pleased with you" :
(estimated_piety > 40) ? "most pleased with you" :
(estimated_piety > 20) ? "pleased with you" :
(estimated_piety > 5) ? "noncommittal"
: "displeased";
if (donation_value >= 30 && you.piety <= 170)
result += "!";
else
result += ".";
mpr(result.c_str());
}
else if (!num_sacced) // explanatory messages if nothing sacrificed
{
if (you.religion == GOD_KIKUBAAQUDGHA || you.religion == GOD_TROG)
simple_god_message(" only cares about primal sacrifices!", you.religion);
else if (you.religion == GOD_NEMELEX_XOBEH)
simple_god_message(" expects you to use your decks, not offer them!", you.religion);
// everyone else was handled above (Zin!) or likes everything
}
friend_brand = CHATTR_NORMAL;
stab_brand = CHATTR_NORMAL;
may_stab_brand = CHATTR_NORMAL;
heap_brand = CHATTR_REVERSE;
stair_item_brand = CHATTR_REVERSE;
trap_item_brand = CHATTR_NORMAL;
friend_brand = CHATTR_NORMAL;
stab_brand = CHATTR_NORMAL;
may_stab_brand = CHATTR_NORMAL;
heap_brand = CHATTR_REVERSE;
feature_item_brand = CHATTR_REVERSE;
trap_item_brand = CHATTR_NORMAL;
unsigned heap_brand; // Highlight heaps of items
unsigned stab_brand; // Highlight monsters that are stabbable
unsigned may_stab_brand; // Highlight potential stab candidates
unsigned stair_item_brand; // Highlight stairs covered by items.
unsigned trap_item_brand; // Highlight traps covered by items.
unsigned heap_brand; // Highlight heaps of items
unsigned stab_brand; // Highlight monsters that are stabbable
unsigned may_stab_brand; // Highlight potential stab candidates
unsigned feature_item_brand; // Highlight features covered by items.
unsigned trap_item_brand; // Highlight traps covered by items.
Zin is an ancient and revered God, dedicated to the establishment of
order and the destruction of the forces of chaos and night. Valued
worshippers can gain sustenance in times of need and a variety of
powers useful in the fight against chaos, but are required to remain
pure of body and soul, in particular abstain from the consumption of
corpses of intelligent beings, and the use of necromancy and mutating
substances. Zin values selflessness and appreciates long-standing
faith.
Zin is an ancient and revered God, dedicated to the establishment of
order. Worshippers are required to remain pure of body and soul, in
particular to abstain from the consumption of corpses of intelligent
beings, and the use of necromancy and deliberate mutations. They can
gain a variety of powers useful against chaos, including a divine
refuge. Zin values selflessness and appreciates long-standing faith.
Zin is a good god, and does not mind switching to another good god.
The Shining One is a powerful crusading deity, allied with Zin in the
fight against evil. Followers may be granted blessings on their
weapons and the ability to summarily dispense the wrath of heaven, but
must never use any form of evil magic and should fight honourably. The
Shining One appreciates long-standing persistence in the endless
crusade, as well as the dedicated destruction of unholy creatures.
The Shining One is a powerful crusading deity. Followers may be
granted blessings on their weapons and the ability to summarily
dispense the wrath of heaven, but must never use any form of evil
magic and should fight honourably. The Shining One appreciates
long-standing persistence in the endless crusade, as well as the
dedicated destruction of unholy creatures.
The Shining One is a good god, and does not mind switching to another
good god.
stair_item_brand = reverse
Brands stairs that would otherwise be hidden by items. If you
use this brand, the items on the square are hidden by the stair
symbol (<, >, or portal) and the stair symbol is branded.
feature_item_brand = reverse
Brands features (stairs, shops, altars) that would otherwise be
hidden by items. If you use this brand, the items on the square
are hidden by the feature symbol and the feature symbol is
branded.