salamanders

If salamanders are made immune to slime, then all the other places in the
code which check for fire creatures should be modified too.
This commit is contained in:
arromdee
2002-02-06 05:11:25 +00:00
parent 78f59d2046
commit 9aa253c8ab
5 changed files with 5 additions and 1 deletions
+1
View File
@@ -491,6 +491,7 @@ register int pm;
if (!Slimed && !Unchanging && if (!Slimed && !Unchanging &&
youmonst.data != &mons[PM_FIRE_VORTEX] && youmonst.data != &mons[PM_FIRE_VORTEX] &&
youmonst.data != &mons[PM_FIRE_ELEMENTAL] && youmonst.data != &mons[PM_FIRE_ELEMENTAL] &&
youmonst.data != &mons[PM_SALAMANDER] &&
youmonst.data != &mons[PM_GREEN_SLIME]) { youmonst.data != &mons[PM_GREEN_SLIME]) {
You("don't feel very well."); You("don't feel very well.");
Slimed = 10L; Slimed = 10L;
+1
View File
@@ -1018,6 +1018,7 @@ label2: if (mdef->mhp > 0) return 0;
case AD_SLIM: case AD_SLIM:
if (!rn2(4) && mdef->data != &mons[PM_FIRE_VORTEX] && if (!rn2(4) && mdef->data != &mons[PM_FIRE_VORTEX] &&
mdef->data != &mons[PM_FIRE_ELEMENTAL] && mdef->data != &mons[PM_FIRE_ELEMENTAL] &&
mdef->data != &mons[PM_SALAMANDER] &&
mdef->data != &mons[PM_GREEN_SLIME]) { mdef->data != &mons[PM_GREEN_SLIME]) {
if (vis) pline("%s turns into slime.", Monnam(mdef)); if (vis) pline("%s turns into slime.", Monnam(mdef));
(void) newcham(mdef, &mons[PM_GREEN_SLIME], FALSE); (void) newcham(mdef, &mons[PM_GREEN_SLIME], FALSE);
+1
View File
@@ -1416,6 +1416,7 @@ do_stone:
hitmsg(mtmp, mattk); hitmsg(mtmp, mattk);
if (!uncancelled) break; if (!uncancelled) break;
if (youmonst.data == &mons[PM_FIRE_VORTEX] || if (youmonst.data == &mons[PM_FIRE_VORTEX] ||
youmonst.data == &mons[PM_SALAMANDER] ||
youmonst.data == &mons[PM_FIRE_ELEMENTAL]) { youmonst.data == &mons[PM_FIRE_ELEMENTAL]) {
pline_The("slime burns away!"); pline_The("slime burns away!");
dmg = 0; dmg = 0;
+1 -1
View File
@@ -404,7 +404,7 @@ int mntmp;
You("no longer feel sick."); You("no longer feel sick.");
} }
if (Slimed) { if (Slimed) {
if (mntmp == PM_FIRE_VORTEX || mntmp == PM_FIRE_ELEMENTAL) { if (mntmp == PM_FIRE_VORTEX || mntmp == PM_FIRE_ELEMENTAL || mntmp == PM_SALAMANDER) {
pline_The("slime burns away!"); pline_The("slime burns away!");
Slimed = 0L; Slimed = 0L;
flags.botl = 1; flags.botl = 1;
+1
View File
@@ -1444,6 +1444,7 @@ register struct attack *mattk;
case AD_SLIM: case AD_SLIM:
if (!rn2(4) && mdef->data != &mons[PM_FIRE_VORTEX] && if (!rn2(4) && mdef->data != &mons[PM_FIRE_VORTEX] &&
mdef->data != &mons[PM_FIRE_ELEMENTAL] && mdef->data != &mons[PM_FIRE_ELEMENTAL] &&
mdef->data != &mons[PM_SALAMANDER] &&
mdef->data != &mons[PM_GREEN_SLIME]) { mdef->data != &mons[PM_GREEN_SLIME]) {
You("turn %s into slime.", mon_nam(mdef)); You("turn %s into slime.", mon_nam(mdef));
(void) newcham(mdef, &mons[PM_GREEN_SLIME], FALSE); (void) newcham(mdef, &mons[PM_GREEN_SLIME], FALSE);