Reworded some of the extra god help, removed unnecessary meta-information about Trog not needing Invocations and Nemelex using Evocations. Such things can be left to the player to discover without affecting their enjoyment of the game.
Extra religion help is now in lightgrey (darkgrey presents display problems on 8-colour terms).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2013 c06c8d41-db1a-0410-9941-cceddc491573
VEOWM6UDFNWRAXP5YUO7XBH4ZALAJXCWRA4IRDITXJ3QWH42CTWAC
SYXSZQICCRNKCSZ4HDO24JIE5HBVMWFWLXXM26MS3OKB37PJOAVQC
K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC
2BTN774TDEFKS7L23YNEDQJSLSUWWKXPC5GA73ZGKLCKDHVEWSJAC
RPOZZWKG5GLPHVZZ7ZKMKS64ZMV2LDCQSARBJFJ6FZOTOKCQO7FAC
LOJYD6QZRNLNDDZJKVBMKQIBPTKSRN2ETCYGNVV47M7L3QLUJUJAC
CQ24AVAI6SW3AHTIDMLPSTRRBEU6FHRF5I5FD6G5QIYE6PO4BQMQC
WHY6LRRJ5T2NSBE3IUCR4X3TOAH7TTK5NPUPUIFT7TPNJ6J4HBDAC
JIMH7VEMQ7QF6VV2D65UISCRG5W55UX5YSQLLUW6SZNSTZMFWQ5AC
SWOYPTHJAWFEDBMB3ROT33VQZIXGZD5UOXEV456DDUENW2HGA66QC
case GOD_ZIN:
case GOD_SHINING_ONE:
if (!player_under_penance() && you.piety > 160
&& !you.num_gifts[god])
{
result += "Pray at an altar to get a ";
result += (god == GOD_ZIN ? "mace" : "long sword");
result += " blessed by ";
result += god_name(god);
result += ".";
break;
} // else fall through
case GOD_XOM:
case GOD_SIF_MUNA:
case GOD_KIKUBAAQUDGHA:
case GOD_YREDELEMNUL:
default:
result += "Praying is not necessary with this god.";
case GOD_ZIN:
case GOD_SHINING_ONE:
if (!player_under_penance() && you.piety > 160
&& !you.num_gifts[god])
{
result += "You can pray at an altar to ask "
+ std::string(god_name(god)) + " to bless a ";
result += (god == GOD_ZIN ? "mace" : "long sword");
result += ".";
}
break;
case GOD_LUGONU:
if (!player_under_penance() && you.piety > 160
&& !you.num_gifts[god])
{
result += "You can pray at an altar to ask "
+ std::string(god_name(god)) + " to bless your weapon." EOL;
} // fall through
case GOD_OKAWARU:
case GOD_MAKHLEB:
case GOD_BEOGH:
case GOD_TROG:
result = "You can sacrifice corpses by dissecting "
"them during prayer.";
break;
case GOD_LUGONU:
if (!player_under_penance() && you.piety > 160
&& !you.num_gifts[god])
{
result += "Pray at an altar to get your weapon blessed." EOL;
} // fall through
case GOD_OKAWARU:
case GOD_MAKHLEB:
case GOD_BEOGH:
result = "Use prayer to announce the sacrifice of corpses.";
break;
case GOD_TROG:
result += "Use prayer to announce the sacrifice of corpses." EOL
"Trog does not demand training of the Invocations skill.";
break;
case GOD_NEMELEX_XOBEH:
result += "A prayer will sacrifice all items on your spot. Inscribe "
"items with !p or !* to avoid accidentally sacrificing "
"them." EOL
"Followers of Nemelex Xobeh use Evocations, not Invocations.";
break;
case GOD_NEMELEX_XOBEH:
result += "You can pray to sacrifice all items on your square. "
"Inscribe items with !p or !* to avoid sacrificing "
"them accidentally.";
break;
"dungeon. Only proper orcs may devote their service to Beogh, proving "
"their devotion with kills and remnants. Pious orcs may gain the "
"priestly power of smiting. "
EOL
"Also, there are rumours that the orcs still look out for "
"their Messiah. "
"dungeon. Only orcs may devote their service to Beogh, and must prove "
"their devotion by bloodshed and sacrifice. Devout followers of Beogh "
"can smite their foes, and especially fervent devotees of Beogh may "
"even gain followers of their own, for the orcs still look for their "
"Messiah."
cprintf("%s", (which_god == GOD_SHINING_ONE) ? "Champion of Law" :
(which_god == GOD_ZIN) ? "Divine Warrior" :
(which_god == GOD_ELYVILON) ? "Champion of Light" :
(which_god == GOD_OKAWARU) ? "Master of a Thousand Battles" :
(which_god == GOD_YREDELEMNUL) ? "Master of Eternal Death" :
(which_god == GOD_KIKUBAAQUDGHA) ? "Lord of Darkness" :
(which_god == GOD_MAKHLEB) ? "Champion of Chaos" :
(which_god == GOD_VEHUMET) ? "Lord of Destruction" :
(which_god == GOD_TROG) ? "Great Slayer" :
(which_god == GOD_NEMELEX_XOBEH) ? "Great Trickster" :
(which_god == GOD_SIF_MUNA) ? "Master of the Arcane" :
(which_god == GOD_LUGONU) ? "Agent of Entropy" :
(which_god == GOD_BEOGH) ? "Messiah" :
(which_god == GOD_XOM) ? "Teddy Bear" :
"Bogy the Lord of the Bugs"); // Xom and no god is handled before
cprintf(
"%s", (which_god == GOD_SHINING_ONE) ? "Champion of Law" :
(which_god == GOD_ZIN) ? "Divine Warrior" :
(which_god == GOD_ELYVILON) ? "Champion of Light" :
(which_god == GOD_OKAWARU) ? "Master of a Thousand Battles" :
(which_god == GOD_YREDELEMNUL) ? "Master of Eternal Death" :
(which_god == GOD_KIKUBAAQUDGHA) ? "Lord of Darkness" :
(which_god == GOD_MAKHLEB) ? "Champion of Chaos" :
(which_god == GOD_VEHUMET) ? "Lord of Destruction" :
(which_god == GOD_TROG) ? "Great Slayer" :
(which_god == GOD_NEMELEX_XOBEH) ? "Great Trickster" :
(which_god == GOD_SIF_MUNA) ? "Master of the Arcane" :
(which_god == GOD_LUGONU) ? "Agent of Entropy" :
(which_god == GOD_BEOGH) ? "Messiah" :
(which_god == GOD_XOM) ? "Teddy Bear" :
"Bogy the Lord of the Bugs");
create_monster( MONS_DANCING_WEAPON, power_level + 3,
friendly ? BEH_FRIENDLY : BEH_HOSTILE,
you.x_pos, you.y_pos,
friendly ? you.pet_target : MHITYOU,
250 );
// Intentionally not setting hard_reset here. Maybe this should
// depend on power_level?
const int mon = create_monster( MONS_DANCING_WEAPON, power_level + 3,
friendly ? BEH_FRIENDLY : BEH_HOSTILE,
you.x_pos, you.y_pos,
friendly ? you.pet_target : MHITYOU,
250 );
// Given the abundance of Nemelex decks, not setting hard reset
// leaves a trail of weapons behind, most of which just get
// offered to Nemelex again, adding an unnecessary source of
// piety.
if (mon != -1)
menv[mon].flags |= MF_HARD_RESET;