diff options
author | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-18 13:46:55 -0600 |
---|---|---|
committer | David Lawrence Ramsey <dolorous@users.sourceforge.net> | 2009-11-18 13:46:55 -0600 |
commit | cd7d5deb2327bb1f4dda96fc50ba56b674a2569f (patch) | |
tree | c32ccc1ca489296cf3d1b91e35d2f9215eb28f81 /crawl-ref/source/spells2.cc | |
parent | 2a6fe1009197349537396b5e9f208f1db4e48c8a (diff) | |
download | crawl-ref-cd7d5deb2327bb1f4dda96fc50ba56b674a2569f.tar.gz crawl-ref-cd7d5deb2327bb1f4dda96fc50ba56b674a2569f.zip |
Remove Zin's summoning-based wrath, as it no longer fits.
First, Jiyva considers eyeballs slimes for his purposes. Second, insect
plagues are more suited to old Zin, who coupled them with angels for an
Old Testament theme, so to speak. (The latter is most closely suited to
Fedhas, or it would be if he were the god of nature in general instead
of just plants and fungi. It's also inappropriate for Zin now, since
one of the insects summoned causes disease and is, hence, chaotic.)
Diffstat (limited to 'crawl-ref/source/spells2.cc')
-rw-r--r-- | crawl-ref/source/spells2.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index ab3c2d378f..52b6ac829d 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -1208,12 +1208,10 @@ bool cast_summon_scorpions(int pow, god_type god) // Creates a mixed swarm of typical swarming animals. // Number, duration and friendlinesss depend on spell power. -bool cast_summon_swarm(int pow, god_type god, - bool force_hostile, - bool permanent) +bool cast_summon_swarm(int pow, god_type god) { bool success = false; - const int dur = permanent ? 0 : std::min(2 + (random2(pow) / 4), 6); + const int dur = std::min(2 + (random2(pow) / 4), 6); const int how_many = stepdown_value(2 + random2(pow)/10 + random2(pow)/25, 2, 2, 6, 8); @@ -1228,12 +1226,12 @@ bool cast_summon_swarm(int pow, god_type god, }; const monster_type mon = RANDOM_ELEMENT(swarmers); - const bool friendly = force_hostile ? false : (random2(pow) > 7); + const bool friendly = (random2(pow) > 7); if (create_monster( mgen_data(mon, friendly ? BEH_FRIENDLY : BEH_HOSTILE, &you, - dur, !permanent ? SPELL_SUMMON_SWARM : 0, + dur, SPELL_SUMMON_SWARM : 0, you.pos(), MHITYOU, 0, god)) != -1) |