summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/religion.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-29 11:45:50 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-29 11:45:50 +0000
commit00af579c24de8cec2ed28065c30164f30ccac64e (patch)
tree7bf11cb690abbc5005fd8c58d93972caca59ecd7 /crawl-ref/source/religion.cc
parent45afdf8ec9515a1510b08acdde4e5f65b9c30262 (diff)
downloadcrawl-ref-00af579c24de8cec2ed28065c30164f30ccac64e.tar.gz
crawl-ref-00af579c24de8cec2ed28065c30164f30ccac64e.zip
Add gods' powers and abilities to their descriptions, viewable via ^!
(as well as when praying at an altar) and when searching the database. Texts might need to be tweaked a bit but it's a *huge* improvement. (Thanks to whoever had that idea!) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6216 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
-rw-r--r--crawl-ref/source/religion.cc25
1 files changed, 17 insertions, 8 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index cc198b1ec7..f6413ca393 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -455,23 +455,33 @@ bool is_priest_god(god_type god)
bool god_gives_permanent_followers(god_type god)
{
- // Only TSO, Yredelemnul, and Beogh do this, but if you switch from
- // TSO to another good god, you keep your (non-daeva) permanent
+ // Only TSO, Yredelemnul, Kikubaaqudgha and Beogh do this, but if you
+ // switch from TSO to another good god, you keep your (non-daeva) permanent
// followers, so count the other good gods here as well.
return (god == GOD_SHINING_ONE
- || you.worshipped[GOD_SHINING_ONE] && is_good_god(god)
+ || god == GOD_BEOGH
|| god == GOD_YREDELEMNUL
- || god == GOD_BEOGH);
+ || god == GOD_KIKUBAAQUDGHA
+ || you.worshipped[GOD_SHINING_ONE] && is_good_god(god));
}
+std::string get_god_powers(god_type which_god)
+{
+ // Return early for the special cases.
+ if (which_god == GOD_NO_GOD || which_god == GOD_XOM)
+ return "";
+
+ std::string result = getLongDescription(god_name(which_god) + " powers");
+ return (result);
+}
-std::string print_god_likes(god_type which_god, bool verbose)
+std::string get_god_likes(god_type which_god, bool verbose)
{
// Return early for the special cases.
if (which_god == GOD_NO_GOD || which_god == GOD_XOM)
return "";
- std::string text = god_name(which_god);
+ std::string text = god_name(which_god);
std::vector<std::string> likes;
// Unique/unusual piety gain methods first.
@@ -615,8 +625,7 @@ std::string print_god_likes(god_type which_god, bool verbose)
return (text);
}
-// verbose currently unused
-std::string print_god_dislikes(god_type which_god, bool /*verbose*/)
+std::string get_god_dislikes(god_type which_god, bool /*verbose*/)
{
// Return early for the special cases.
if (which_god == GOD_NO_GOD || which_god == GOD_XOM)