diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-02 23:55:20 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-02 23:55:20 +0000 |
| commit | 948c3f23296a777e2005f083576200d9d8711bbc (patch) | |
| tree | 39fa5afc8e77f87c484153fc4330937c93ed03f4 /crawl-ref | |
| parent | 2d1079de4a7bca25573f3a4e737a9079a183a5b9 (diff) | |
| download | crawl-ref-948c3f23296a777e2005f083576200d9d8711bbc.tar.gz crawl-ref-948c3f23296a777e2005f083576200d9d8711bbc.zip | |
Add proper sources for Zin's and TSO's holy word effects (from the
sanctuary and the weapon blessing, respectively).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4817 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/effects.cc | 8 | ||||
| -rw-r--r-- | crawl-ref/source/enum.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spells3.cc | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 3a97f65896..b0b0b33115 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -88,6 +88,14 @@ bool holy_word_player(int pow, int caster) case HOLY_WORD_SCROLL: aux = "scroll of holy word"; break; + + case HOLY_WORD_ZIN: + aux = "Zin's holy word"; + break; + + case HOLY_WORD_SHINING_ONE: + aux = "The Shining One's holy word"; + break; } caster = HOLY_WORD_GENERIC; diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 7b6c9062db..aa28986432 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1233,7 +1233,9 @@ enum holy_word_source_type { HOLY_WORD_GENERIC = -1, HOLY_WORD_SCROLL = -2, - HOLY_WORD_SPELL = -3 // SPELL_HOLY_WORD + HOLY_WORD_SPELL = -3, // SPELL_HOLY_WORD + HOLY_WORD_ZIN = -4, // Zin effect + HOLY_WORD_SHINING_ONE = -5 // TSO effect }; enum hunger_state // you.hunger_state diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index b80a849057..3f372efab0 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -4340,7 +4340,7 @@ static bool _bless_weapon( god_type god, int brand, int colour ) if ( god == GOD_SHINING_ONE ) { - holy_word(100, HOLY_WORD_GENERIC, you.x_pos, you.y_pos, true); + holy_word(100, HOLY_WORD_SHINING_ONE, you.x_pos, you.y_pos, true); // Un-bloodify surrounding squares. for (int i = -3; i <= 3; i++) diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index 00be555070..26444302ad 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -984,7 +984,7 @@ bool cast_sanctuary(const int power) you.flash_colour = WHITE; viewwindow( true, false ); - holy_word(100, HOLY_WORD_GENERIC, you.x_pos, you.y_pos, true); + holy_word(100, HOLY_WORD_ZIN, you.x_pos, you.y_pos, true); #ifndef USE_TILE delay(1000); #endif |