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

Samurai "moat"

Browse Source 
Samurai home level has two isolated moat spots, each within a set
of four solid stone pillars (depicted here as 'X' instead of blank).
|..X..
|.X}X.
|..X..

Having them be described as "moat" looked pretty silly.  Keep them
moat but special case their description to be "water".  It would be
simpler to change them to be pools, but that would make a slight
change in behavior (pools can be boiled away to become pits, moats
can't; probably should have made the simpler change anyway...).
This commit is contained in:
PatR
2021-08-02 17:40:28 -07:00
parent ef17c0fa82
commit 5e4150be9a
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/fixes37.0
View File

@@ -1,4 +1,4 @@
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.610 $ $NHDT-Date: 1627505147 2021/07/28 20:45:47 $
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.614 $ $NHDT-Date: 1627951222 2021/08/03 00:40:22 $
General Fixes and Modified Features
-----------------------------------
@@ -580,6 +580,8 @@ monster wearing an alchemy smock was only getting poison resistance from it,
not acid resistance; give both properties, just like for hero
in wizard mode, knowing teleport away spell resulted in ^T always attempting
the spell instead of teleporting on demand
describe a couple of isolated moat spots on Samurai quest home level as water
rather than as moat
Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

7
src/mkmaze.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 mkmaze.c $NHDT-Date: 1596498182 2020/08/03 23:43:02 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.114 $ */
/* NetHack 3.7 mkmaze.c $NHDT-Date: 1627951223 2021/08/03 00:40:23 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.122 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2018. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1616,7 +1616,10 @@ waterbody_name(xchar x, xchar y)
; /* fall through to default return value */
else if (Is_juiblex_level(&u.uz))
return "swamp";
else if (ltyp == MOAT && !Is_medusa_level(&u.uz))
else if (ltyp == MOAT && !Is_medusa_level(&u.uz)
/* samurai has two moat spots on quest home level that seem
silly if described as such (maybe change them to pools?) */
&& !(Role_if(PM_SAMURAI) && Is_qstart(&u.uz)))
return "moat";
return hliquid("water");