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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-02-27 08:20:38 -05:00
parent 42e7f6fcba e33767c38d
commit 4f679352b7
15 changed files with 246 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sit.c
View File

@@ -116,12 +116,13 @@ dosit()
You("sit down.");
dotrap(trap, VIASITTING);
}
} else if (Underwater || Is_waterlevel(&u.uz)) {
} else if ((Underwater || Is_waterlevel(&u.uz))
&& !eggs_in_water(g.youmonst.data)) {
if (Is_waterlevel(&u.uz))
There("are no cushions floating nearby.");
else
You("sit down on the muddy bottom.");
} else if (is_pool(u.ux, u.uy)) {
} else if (is_pool(u.ux, u.uy) && !eggs_in_water(g.youmonst.data)) {
in_water:
You("sit in the %s.", hliquid("water"));
if (!rn2(10) && uarm)
@@ -297,8 +298,18 @@ dosit()
} else if (u.uhunger < (int) objects[EGG].oc_nutrition) {
You("don't have enough energy to lay an egg.");
return 0;
} else if (eggs_in_water(g.youmonst.data)) {
if (!(Underwater || Is_waterlevel(&u.uz))) {
pline("A splash tetra you are not.");
return 0;
}
if (Upolyd &&
(g.youmonst.data == &mons[PM_GIANT_EEL]
|| g.youmonst.data == &mons[PM_ELECTRIC_EEL])) {
You("yearn for the Sargasso Sea.");
return 0;
}
}
uegg = mksobj(EGG, FALSE, FALSE);
uegg->spe = 1;
uegg->quan = 1L;
@@ -306,7 +317,7 @@ dosit()
/* this sets hatch timers if appropriate */
set_corpsenm(uegg, egg_type_from_parent(u.umonnum, FALSE));
uegg->known = uegg->dknown = 1;
You("lay an egg.");
You("%s an egg.", eggs_in_water(g.youmonst.data) ? "spawn" : "lay");
dropy(uegg);
stackobj(uegg);
morehungry((int) objects[EGG].oc_nutrition);