yield more varied choices. Also add dozens of synonyms to godspeak.txt.
Tweak religious favour descriptions for good gods to only say that their "wrath is upon you" if you now worship a god they hate (evil god, or Xom, for Zin).
Ely will now also heal/protect holy beings, and only protect allies the player can see. Otherwise they can't do anything to prevent its death anyway.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3857 c06c8d41-db1a-0410-9941-cceddc491573
VS3WVE6ORJ76O3TRRJCR4JJVFVRKKFK5YHZ6AA4AU63DWM3KR3UAC
MPQIZUHUAHOF2CKNTLSYCGMR7FIC3EPA2RHZIY6JOQKAS6H6YY4AC
AWPVLDOOVIARJANEGN2TXGMZSSHJI4WMGMYRH6OOSFSEQUIDY6GQC
K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC
EOJPYR3QD5GGS7GB2P7SBLMOP7YC57YMIVR7VKCOMWNCKNBPESBQC
KFULGQQOHWUTXOM3BXCCYPGGVGGY4Z6265XUFRCBPNLTZAEHJZSQC
RPOZZWKG5GLPHVZZ7ZKMKS64ZMV2LDCQSARBJFJ6FZOTOKCQO7FAC
XDJGQNFELURGXMUAOOVALQMSLAJVHMG63KPKVA33HTJFVZROGZ4AC
2P3IJKK547AOEFWKXEAL73QFKW423GGAZEZHW6OZ6QB7YUSDNC3AC
23PFLB2E4QHL5SF3Q2YV5FXRH6MFHENEU2ACVC572ZCYDXCBZVQAC
G4TVXOLIF5X2MWV7I4UPT3MSQHRMGME6QRIIFAQ64C45JGYK7SIAC
NMZFCCM6O3KO2GJWKOSULN27B3QIZKWPBOB62PAILXMRQD4JMIMAC
LM764EO6YIFOKMRXWZ5S4GYZB4BHZQDTEFP7MEVYO4NN4EDOFGNQC
if (player_monster_visible(monster) && mons_near(monster))
{
monster->hit_points = 1;
snprintf(info, INFO_SIZE, " protects %s%s from harm!%s",
mons_is_unique(monster->type) ? "" : "your ",
monster->name(DESC_PLAIN).c_str(),
coinflip() ? "" : " You feel responsible.");
simple_god_message(info);
}
monster->hit_points = 1;
snprintf(info, INFO_SIZE, " protects %s%s from harm!%s",
mons_is_unique(monster->type) ? "" : "your ",
monster->name(DESC_PLAIN).c_str(),
coinflip() ? "" : " You feel responsible.");
simple_god_message(info);
(penance >= 20) ? "You've transgressed heavily! Be penitent!" :
(penance >= 5 ) ? "You are under penance."
: "You should show more discipline.";
(penance >= 20) ? "You've transgressed heavily! Be penitent!" :
(penance >= 5 ) ? "You are under penance."
: "You should show more discipline.";
static bool _god_hates_your_god( god_type which_god )
{
// non-good gods always hate your current god
if (!is_good_god(which_god))
return (true);
// Zin hates Xom and Makhleb
if (which_god == GOD_ZIN && is_chaotic_god(you.religion))
return (true);
return (is_evil_god(you.religion));
}
cprintf( (you.penance[which_god] >= 50) ? "%s's wrath is upon you!" :
(you.penance[which_god] >= 20) ? "%s is annoyed with you." :
(you.penance[which_god] >= 5) ? "%s well remembers your sins." :
(you.penance[which_god] > 0) ? "%s is ready to forgive your sins." :
(you.worshipped[which_god]) ? "%s is ambivalent towards you."
: "%s is neutral towards you.",
int which_god_penance = you.penance[which_god];
// give more appropriate for the good gods
if (which_god_penance > 0 && is_good_god(which_god))
{
if (is_good_god(you.religion))
which_god_penance = 0;
else if (!_god_hates_your_god(which_god) && which_god_penance >= 5)
which_god_penance = 2; // == "Come back to the one true church!"
}
cprintf( (which_god_penance >= 50) ? "%s's wrath is upon you!" :
(which_god_penance >= 20) ? "%s is annoyed with you." :
(which_god_penance >= 5) ? "%s well remembers your sins." :
(which_god_penance > 0) ? "%s is ready to forgive your sins." :
(you.worshipped[which_god]) ? "%s is ambivalent towards you."
: "%s is neutral towards you.",
subject
# used for "explaining the importance of ..."
important_subject
# law
w:50
@axioms_of_law@
the eternal Law.
obedience to the Law.
the one true way.
# purity
purity of body and mind.
preserving your bodily integrity.
keeping your body clean and pure.
proper care of body and soul.
# mutations
avoiding mutations.
just saying no to mutations.
# respecting intelligent beings
proper burial practice.
# demons
not dealing with demons.
rejecting the service of demons.
%%%%
# the subject of your recital/lecture/whatever
# needs the full dot or exclamation mark
recite_subject
w:120
@important_subject@
# first, law and order
w:80
@axioms_of_law@
the Law and the prophets.
the importance of the Law.
# anti-mutation
mutations, and how to avoid them.
potions of Mutation - the devil's brew!
Neqoxecs and Cacodemons -- may they all be destroyed!
# respecting intelligent beings
a proper diet respecting intelligent beings.
# necromancy and evil
the evils of necromancy.
undead, and why they are evil.
# the gods
the fall of Lugonu.