diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-25 12:59:55 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-10-25 12:59:55 +0000 |
| commit | 9d23f407afdd9d219ffa8d564717404db27d78da (patch) | |
| tree | 91aa717132e5b82f053fc0657b03a8ed33e756d5 | |
| parent | 1ebe91d589aa94c080cc47e987da73e6fffd2387 (diff) | |
| download | crawl-ref-9d23f407afdd9d219ffa8d564717404db27d78da.tar.gz crawl-ref-9d23f407afdd9d219ffa8d564717404db27d78da.zip | |
Modified 'Portaled Projectile' description, and
random_undead_servant change for 0.3
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2562 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/dat/descript/spells.txt | 2 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 33 |
2 files changed, 13 insertions, 22 deletions
diff --git a/crawl-ref/source/dat/descript/spells.txt b/crawl-ref/source/dat/descript/spells.txt index 04c99f7d92..0c6ae8dc1d 100644 --- a/crawl-ref/source/dat/descript/spells.txt +++ b/crawl-ref/source/dat/descript/spells.txt @@ -473,7 +473,7 @@ This spell creates a gate allowing long-distance travel in relatively ordinary e %%%% Portaled Projectile -This spell teleports a missile directly to its target, greatly increasing its accuracy (but not damage.) +This spell teleports a fired or thrown missile directly to its target, greatly increasing its accuracy (but not damage). %%%% Projected Noise diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 7dbf06baa1..27c6c213e8 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -423,10 +423,10 @@ static void inc_gift_timeout(int val) you.gift_timeout += val; } // end inc_gift_timeout() -static int random_undead_servant(int religion) +static monster_type random_undead_servant(int religion /* unused */) { // error trapping {dlb} - int thing_called = MONS_PROGRAM_BUG; + monster_type thing_called = MONS_PROGRAM_BUG; int temp_rand = random2(100); thing_called = ((temp_rand > 66) ? MONS_WRAITH : // 33% (temp_rand > 52) ? MONS_WIGHT : // 12% @@ -631,7 +631,9 @@ static void do_god_gift(bool prayed_for) case GOD_YREDELEMNUL: if (random2(you.piety) > 80 && one_chance_in(5)) { - int thing_called = random_undead_servant(GOD_YREDELEMNUL); + monster_type thing_called = + random_undead_servant(GOD_YREDELEMNUL); + if (create_monster( thing_called, 0, BEH_FRIENDLY, you.x_pos, you.y_pos, you.pet_target, MAKE_ITEM_RANDOM_RACE ) @@ -1966,34 +1968,23 @@ static bool yredelemnul_retribution() // undead theme if (random2(you.experience_level) > 4) { - bool success = false; + int count = 0; int how_many = 1 + random2(1 + (you.experience_level / 5)); for (int i = 0; i < how_many; i++) { - const int temp_rand = random2(100); - - const monster_type punisher = - ((temp_rand > 66) ? MONS_WRAITH : // 33% - (temp_rand > 52) ? MONS_WIGHT : // 12% - (temp_rand > 40) ? MONS_SPECTRAL_WARRIOR : // 16% - (temp_rand > 31) ? MONS_ROTTING_HULK : // 9% - (temp_rand > 23) ? MONS_SKELETAL_WARRIOR : // 8% - (temp_rand > 16) ? MONS_VAMPIRE : // 7% - (temp_rand > 10) ? MONS_GHOUL : // 6% - (temp_rand > 4) ? MONS_MUMMY // 6% - : MONS_FLAYED_GHOST); // 5% + monster_type punisher = + random_undead_servant(GOD_YREDELEMNUL); if (create_monster( punisher, 0, BEH_HOSTILE, you.x_pos, you.y_pos, MHITYOU, 250 ) != -1) - success = true; + count++; } - simple_god_message(success ? - " sends a servant to punish you." : - "'s servant fails to arrive.", - god); + simple_god_message(count > 1? " sends servants to punish you." : + count > 0? " sends a servant to punish you." : + "'s servants fail to arrive.", god); } else { |