diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-25 21:56:12 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-25 21:56:12 +0000 |
| commit | 9703c86777b2d8acabc5a25f407c9ee0d045b0e1 (patch) | |
| tree | 169ac249b0b30d0a65cedfd46d5ea6c39a59f274 /crawl-ref | |
| parent | 358edd6228b76ca77afa2c77e024bef6f2bc4295 (diff) | |
| download | crawl-ref-9703c86777b2d8acabc5a25f407c9ee0d045b0e1.tar.gz crawl-ref-9703c86777b2d8acabc5a25f407c9ee0d045b0e1.zip | |
Add miscellaneous minor fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6992 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/describe.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/item_use.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 10232ec6dc..a25f8fe3b4 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -3146,9 +3146,9 @@ void describe_god( god_type which_god, bool give_title ) } else if (which_god == GOD_YREDELEMNUL) { - have_any = true; if (!player_under_penance() && you.piety >= piety_breakpoint(0)) { + have_any = true; cprintf("%s mirrors your injuries on your foes " "during prayer." EOL, god_name(which_god).c_str()); } diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index bf63dff657..46c97586b4 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3921,7 +3921,7 @@ static bool _vorpalise_weapon() torment_monsters(you.pos(), 0, TORMENT_GENERIC); success = false; - // Is only naughty if you know you're doing it. + // This is only naughty if you know you're doing it. // XXX: assumes this can only happen from Vorpalise Weapon scroll. did_god_conduct(DID_UNHOLY, 10, get_ident_type(OBJ_SCROLLS, SCR_VORPALISE_WEAPON) @@ -4436,9 +4436,9 @@ void read_scroll( int slot ) break; case SCR_TORMENT: - torment( TORMENT_SCROLL, you.pos() ); + torment(TORMENT_SCROLL, you.pos()); - // Is only naughty if you know you're doing it. + // This is only naughty if you know you're doing it. did_god_conduct(DID_UNHOLY, 10, item_type_known(scroll)); break; diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 2d35d8938e..0530683596 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2203,8 +2203,11 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, break; } piety_change = -level; - if (known || DID_ATTACK_HOLY && victim->attitude != ATT_HOSTILE) + if (known || thing_done == DID_ATTACK_HOLY + && victim->attitude != ATT_HOSTILE) + { penance = level * ((you.religion == GOD_SHINING_ONE) ? 2 : 1); + } ret = true; break; default: |