diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-22 21:57:35 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-22 21:57:35 +0000 |
| commit | ea78e3b88da2c70285b09f34c9c5d8230280405b (patch) | |
| tree | b4de694fd30792e67bf1ebde5e3f770794992949 /crawl-ref/source/religion.cc | |
| parent | f7cb474e41b75c37273b79d4fe5e7e24da81950d (diff) | |
| download | crawl-ref-ea78e3b88da2c70285b09f34c9c5d8230280405b.tar.gz crawl-ref-ea78e3b88da2c70285b09f34c9c5d8230280405b.zip | |
Swap '.' and '!' in the targetting interface.
Forbid bats wearing hats/caps or rings. (That makes amulets the only
type of equipment Vampires can keep on when transforming.) To make up
for it, increase their damage stats again. Also fix it being possible to
(un)equip the allowed items in Tiles while in bat form.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6055 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 01dbc8d09d..b9b2a994ae 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2150,8 +2150,8 @@ god_type string_to_god(const char *name) void god_speaks( god_type god, const char *mesg ) { - mpr( mesg, MSGCH_GOD, god ); -} // end god_speaks() + mpr(mesg, MSGCH_GOD, god); +} // This function is the merger of done_good() and naughty(). // Returns true if god was interested (good or bad) in conduct. @@ -2808,8 +2808,10 @@ static void _dock_piety(int piety_loss, int penance) else if (penance) // only if still in religion { if (last_penance_lecture != you.num_turns) + { god_speaks(you.religion, "\"You will pay for your transgression, mortal!\""); + } last_penance_lecture = you.num_turns; _inc_penance(penance); } @@ -2902,7 +2904,7 @@ void gain_piety(int pgn) const char first = pmsg[0]; if ( first ) { - if ( isupper(first) ) + if (isupper(first)) god_speaks(you.religion, pmsg); else { @@ -3244,9 +3246,9 @@ void lose_piety(int pgn) { const char* pmsg = god_lose_power_messages[you.religion][i]; const char first = pmsg[0]; - if ( first ) + if (first) { - if ( isupper(first) ) + if (isupper(first)) god_speaks(you.religion, pmsg); else { @@ -3255,7 +3257,7 @@ void lose_piety(int pgn) } } - if ( _need_water_walking() && !beogh_water_walk() ) + if (_need_water_walking() && !beogh_water_walk()) { fall_into_a_pool( you.x_pos, you.y_pos, true, grd[you.x_pos][you.y_pos] ); |