summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells4.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-04 20:50:21 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-04 20:50:21 +0000
commite828bafa67e06c97dad7b9fcf2851e6ab5b00f28 (patch)
tree77fbcd20c3485501851302796dfa70640a5e2c90 /crawl-ref/source/spells4.cc
parent07828b78525d85498811687311f0a9cff5901e03 (diff)
downloadcrawl-ref-e828bafa67e06c97dad7b9fcf2851e6ab5b00f28.tar.gz
crawl-ref-e828bafa67e06c97dad7b9fcf2851e6ab5b00f28.zip
Introduce a number of new uniques taken from a patch by castamir.
These are: * Roxanne (statue spellcaster) * Sonja (Kobold assassin) * Eustachio (human summoner, was: Francisco) * Azrael (efreet, was: Abdul) * Ilsuiw (Merfolk witch * Prince Ribbit (blink frog prince) * Nergalle (orc sorceress) * Saint Roka (orc priest of Beogh) Tweaked make_book_theme_randart() to allow for one forced spell and owner's name. Used to occasionally give Roxanne a randart book containing Statue Form. (Was: always book of earth) git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8207 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/spells4.cc')
-rw-r--r--crawl-ref/source/spells4.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/spells4.cc b/crawl-ref/source/spells4.cc
index 991f481542..8b840a214c 100644
--- a/crawl-ref/source/spells4.cc
+++ b/crawl-ref/source/spells4.cc
@@ -890,7 +890,8 @@ static int _distortion_monsters(coord_def where, int pow, int message)
int specdam = 0;
monsters *defender = &menv[monster_attacked];
- if (defender->type == MONS_BLINK_FROG) // any others resist?
+ if (defender->type == MONS_BLINK_FROG
+ || defender->type == MONS_PRINCE_RIBBIT) // any others resist?
{
int hp = defender->hit_points;
int max_hp = defender->max_hit_points;
@@ -963,7 +964,8 @@ int disperse_monsters(coord_def where, int pow, int message)
monsters *defender = &menv[monster_attacked];
- if (defender->type == MONS_BLINK_FROG)
+ if (defender->type == MONS_BLINK_FROG
+ || defender->type == MONS_PRINCE_RIBBIT)
{
simple_monster_message(defender, " resists.");
return 1;
@@ -1010,6 +1012,7 @@ static int _spell_swap_func(coord_def where, int pow, int message)
monsters *defender = &menv[monster_attacked];
if (defender->type == MONS_BLINK_FROG
+ || defender->type == MONS_PRINCE_RIBBIT
|| check_mons_resist_magic( defender, pow ))
{
simple_monster_message( defender, mons_immune_magic(defender) ?