nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Unify sleeping gas trap

Browse Source
This commit is contained in:
Pasi Kallinen
2020-12-10 19:04:30 +02:00
parent 0a47c3d4f2
commit 4974a57832
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trap.c
+25 -17
View File
@@ -17,7 +17,7 @@ static int FDECL(trapeffect_dart_trap, (struct monst *, struct trap *, unsigned)
static int FDECL(trapeffect_rocktrap, (struct monst *, struct trap *, unsigned)); static int FDECL(trapeffect_rocktrap, (struct monst *, struct trap *, unsigned));
static int FDECL(trapeffect_sqky_board, (struct monst *, struct trap *, unsigned)); static int FDECL(trapeffect_sqky_board, (struct monst *, struct trap *, unsigned));
static int FDECL(trapeffect_bear_trap, (struct monst *, struct trap *, unsigned)); static int FDECL(trapeffect_bear_trap, (struct monst *, struct trap *, unsigned));
static void FDECL(trapeffect_slp_gas_trap, (struct trap *, unsigned)); static int FDECL(trapeffect_slp_gas_trap, (struct monst *, struct trap *, unsigned));
static void FDECL(trapeffect_rust_trap, (struct trap *, unsigned)); static void FDECL(trapeffect_rust_trap, (struct trap *, unsigned));
static void FDECL(trapeffect_fire_trap, (struct trap *, unsigned)); static void FDECL(trapeffect_fire_trap, (struct trap *, unsigned));
static void FDECL(trapeffect_pit, (struct trap *, unsigned)); static void FDECL(trapeffect_pit, (struct trap *, unsigned));
@@ -1239,19 +1239,33 @@ unsigned trflags;
return 0; return 0;
} }
static void static int
trapeffect_slp_gas_trap(trap, trflags) trapeffect_slp_gas_trap(mtmp, trap, trflags)
struct monst *mtmp;
struct trap *trap; struct trap *trap;
unsigned trflags; unsigned trflags;
{ {
seetrap(trap); if (mtmp == &g.youmonst) {
if (Sleep_resistance || breathless(g.youmonst.data)) { seetrap(trap);
You("are enveloped in a cloud of gas!"); if (Sleep_resistance || breathless(g.youmonst.data)) {
You("are enveloped in a cloud of gas!");
} else {
pline("A cloud of gas puts you to sleep!");
fall_asleep(-rnd(25), TRUE);
}
(void) steedintrap(trap, (struct obj *) 0);
} else { } else {
pline("A cloud of gas puts you to sleep!"); boolean in_sight = canseemon(mtmp) || (mtmp == u.usteed);
fall_asleep(-rnd(25), TRUE);
if (!resists_sleep(mtmp) && !breathless(mtmp->data) && !mtmp->msleeping
&& mtmp->mcanmove) {
if (sleep_monst(mtmp, rnd(25), -1) && in_sight) {
pline("%s suddenly falls asleep!", Monnam(mtmp));
seetrap(trap);
}
}
} }
(void) steedintrap(trap, (struct obj *) 0); return 0;
} }
static void static void
@@ -1852,7 +1866,7 @@ unsigned trflags;
break; break;
case SLP_GAS_TRAP: case SLP_GAS_TRAP:
trapeffect_slp_gas_trap(trap, trflags); (void) trapeffect_slp_gas_trap(&g.youmonst, trap, trflags);
break; break;
case RUST_TRAP: case RUST_TRAP:
@@ -2574,13 +2588,7 @@ register struct monst *mtmp;
return trapeffect_bear_trap(mtmp, trap, 0); return trapeffect_bear_trap(mtmp, trap, 0);
break; break;
case SLP_GAS_TRAP: case SLP_GAS_TRAP:
if (!resists_sleep(mtmp) && !breathless(mptr) && !mtmp->msleeping return trapeffect_slp_gas_trap(mtmp, trap, 0);
&& mtmp->mcanmove) {
if (sleep_monst(mtmp, rnd(25), -1) && in_sight) {
pline("%s suddenly falls asleep!", Monnam(mtmp));
seetrap(trap);
}
}
break; break;
case RUST_TRAP: { case RUST_TRAP: {
struct obj *target; struct obj *target;