summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-30 21:20:16 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-03-30 21:20:16 +0000
commit599dffd524dbfee7b7d9383c17b3963d418c9c13 (patch)
treeeb18de0383a6906a57967f751d1abed65cb853d1
parent997a1b0dbde19bb2e09fdc16ad7ac8d7997fc85b (diff)
downloadcrawl-ref-599dffd524dbfee7b7d9383c17b3963d418c9c13.tar.gz
crawl-ref-599dffd524dbfee7b7d9383c17b3963d418c9c13.zip
Wasp and lava changes reprise.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1136 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/docs/changes.stone_soup2
-rw-r--r--crawl-ref/source/dungeon.cc2
-rw-r--r--crawl-ref/source/fight.cc8
3 files changed, 8 insertions, 4 deletions
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index efc71148f8..248934c383 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -38,7 +38,7 @@ Stone Soup 0.2
* Minor tweaks to some unrand artifacts.
* Gourmand contaminated -> clean effect is also gradual now.
* Searching is more effective.
-* Abyssal god.
+* New god.
* Armour training tweaks.
* Full herbivorousness now happens only at level 3 of the mutation.
* Incremental butchering works now.
diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc
index 2bea533386..52a0400fc9 100644
--- a/crawl-ref/source/dungeon.cc
+++ b/crawl-ref/source/dungeon.cc
@@ -4833,7 +4833,7 @@ static void builder_monsters(int level_number, char level_type, int mon_wanted)
{
for (y = 0; y < GYM; y++)
{
- if (grd[x][y] == DNGN_LAVA)
+ if (grd[x][y] == DNGN_LAVA && level_number > 6)
{
lava_spaces++;
}
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index a59d082be9..a756d29d6a 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -2663,10 +2663,14 @@ void melee_attack::mons_do_poison(const mon_attack_def &attk)
void melee_attack::wasp_paralyse_defender()
{
// [dshaligram] Adopted 4.1.2's wasp mechanics, in slightly modified form.
- if (attacker->id() == MONS_RED_WASP)
+ if (attacker->id() == MONS_RED_WASP || one_chance_in(3))
defender->poison( attacker, coinflip()? 2 : 1 );
- if (!defender->res_poison() && one_chance_in( damage_done > 4? 3 : 20 ))
+ int paralyse_roll = (damage_done > 4? 3 : 20);
+ if (attacker->id() == MONS_YELLOW_WASP)
+ paralyse_roll += 3;
+
+ if (!defender->res_poison() && one_chance_in(paralyse_roll))
defender->paralyse( roll_dice(1, 3) );
else
defender->slow_down( roll_dice(1, 3) );