noisytoot/notnotdnethack
1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-04-04 07:30:42 +01:00
Code Issues Activity

Allow #swim if PC is able to survive underwater and flying/wwalking

Browse source 
No paranoid swim checks, because it's hard to accidentally do #swim
and I'm not sure if they'd be more helpful or annoying.  Also this is
an old patch that predates paranoid swim applied with only minor
messaging changes.
This commit is contained in:
Ron Nazarov 2024-10-10 20:23:16 +01:00
parent d848fa3230
commit 6708c86eed
Signed by: noisytoot
GPG key ID: 1D43EF4F4492268B
3 changed files with 15 additions and 6 deletions

1
changelog-nndnh.txt
View file

@ -106,3 +106,4 @@ New option: QUERYTYPE
QUERYTYPE=yn "^Are you sure you want to cast that spell at yourself\?$"
# Reset everything to default
#QUERYTYPE=default ".*"
#swim works when flying/water-walking if you are able to survive underwater

4
src/hack.c
View file

@ -1919,11 +1919,11 @@ spoteffects(boolean pick)
goto stillinwater;
else if (Levitation)
You("pop out of the water like a cork!");
else if (Flying)
else if (Flying && !Underwater)
You("fly out of the water.");
else if (uarmf && uarmf->oartifact == ART_FROST_TREADS)
You("climb stairs of ice out of the water.");
else if (Wwalking)
else if (Wwalking && !Underwater)
You("slowly rise above the surface.");
else
goto stillinwater;

16
src/trap.c
View file

@ -3742,27 +3742,34 @@ drown(void)
int
dodeepswim(void)
{
if(u.uinwater && Swimming){
if((u.uinwater && Swimming) || ((Flying || Wwalking) && (Swimming || Amphibious) && !Levitation && is_pool(u.ux, u.uy, FALSE))){
if(u.usubwater){
if(is_3dwater(u.ux, u.uy)){
pline("There is no surface!");
return MOVE_CANCELLED;
} else {
You("swim up to the surface.");
if (Flying)
You("fly out of the water.");
else if (Wwalking)
You("slowly rise above the surface.");
else
You("swim up to the surface.");
u.usubwater = 0;
if (Flying || Wwalking) u.uinwater = 0;
vision_recalc(2); /* unsee old position */
vision_full_recalc = 1;
doredraw();
return MOVE_STANDARD;
}
} else {
if(ACURR(A_CON) > 5){
if(ACURR(A_CON) > 5 || Amphibious){
if(Is_waterlevel(&u.uz)){
You("are already under water!");
return MOVE_CANCELLED;
} else {
You("dive below the surface.");
u.usubwater = 1;
if (Flying || Wwalking) u.uinwater = 1;
under_water(1);
vision_recalc(2); /* unsee old position */
vision_full_recalc = 1;
@ -3772,8 +3779,9 @@ dodeepswim(void)
return MOVE_CANCELLED;
}
} else {
if(!u.uinwater) You("can't dive unless you're swimming!");
if(!is_pool(u.ux, u.uy, FALSE)) You("can't dive into the %s!", surface(u.ux, u.uy));
else if(!Swimming) You("can't swim!");
else if(Levitation) You("can't reach the water!");
return MOVE_CANCELLED;
}
}