summaryrefslogtreecommitdiffstats
path: root/trunk/source/religion.cc
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-08-02 12:54:15 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2006-08-02 12:54:15 +0000
commitd5e5340c3926d1cf97f6cba151ffaecb20bfb35f (patch)
treed1faf7d5b27df8f3c523a8dd33357804118e62b1 /trunk/source/religion.cc
parent7b2204d69f21d7075e4666ee032d7a129081bc4b (diff)
downloadcrawl-ref-d5e5340c3926d1cf97f6cba151ffaecb20bfb35f.tar.gz
crawl-ref-d5e5340c3926d1cf97f6cba151ffaecb20bfb35f.zip
Integrated travel patch as of 20060727
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'trunk/source/religion.cc')
-rw-r--r--trunk/source/religion.cc17
1 files changed, 11 insertions, 6 deletions
diff --git a/trunk/source/religion.cc b/trunk/source/religion.cc
index 2871b9bd8f..fc51bc28bd 100644
--- a/trunk/source/religion.cc
+++ b/trunk/source/religion.cc
@@ -273,7 +273,8 @@ void pray(void)
if (thing_created != NON_ITEM)
{
move_item_to_grid( &thing_created, you.x_pos, you.y_pos );
-
+ origin_acquired(mitm[thing_created], you.religion);
+
simple_god_message(" grants you a gift!");
more();
canned_msg(MSG_SOMETHING_APPEARS);
@@ -293,11 +294,11 @@ void pray(void)
if (you.religion == GOD_TROG
|| (you.religion == GOD_OKAWARU && coinflip()))
{
- success = acquirement(OBJ_WEAPONS);
+ success = acquirement(OBJ_WEAPONS, you.religion);
}
else
{
- success = acquirement(OBJ_ARMOUR);
+ success = acquirement(OBJ_ARMOUR, you.religion);
}
if (success)
@@ -386,7 +387,7 @@ void pray(void)
&& grd[you.x_pos][you.y_pos] != DNGN_DEEP_WATER))
{
if (gift == OBJ_RANDOM)
- success = acquirement(OBJ_BOOKS);
+ success = acquirement(OBJ_BOOKS, you.religion);
else
{
int thing_created = items(1, OBJ_BOOKS, gift, true, 1, 250);
@@ -396,7 +397,10 @@ void pray(void)
move_item_to_grid( &thing_created, you.x_pos, you.y_pos );
if (thing_created != NON_ITEM)
+ {
success = true;
+ origin_acquired(mitm[thing_created], you.religion);
+ }
}
if (success)
@@ -834,6 +838,7 @@ void Xom_acts(bool niceness, int sever, bool force_sever)
if (thing_created != NON_ITEM)
{
+ origin_acquired(mitm[thing_created], GOD_XOM);
canned_msg(MSG_SOMETHING_APPEARS);
more();
}
@@ -870,7 +875,7 @@ void Xom_acts(bool niceness, int sever, bool force_sever)
(temp_rand == 2) ? "Xom grants you an implement of death."
: "Xom smiles on you.");
- if (acquirement(OBJ_WEAPONS))
+ if (acquirement(OBJ_WEAPONS, GOD_XOM))
more();
done_good = true;
@@ -1138,7 +1143,7 @@ void gain_piety(char pgn)
(you.religion == GOD_MAKHLEB)
? "gain power from killing in Makhleb's name" :
(you.religion == GOD_OKAWARU)
- ? "give your great, but temporary, body strength" :
+ ? "give your body great, but temporary strength" :
(you.religion == GOD_TROG)
? "go berserk at will" :
(you.religion == GOD_ELYVILON)