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

Merge branch 'NetHack-3.6.0'

Browse Source
This commit is contained in:
keni
2016-06-21 10:29:14 -04:00
parent f48fcf7a9d d015cbec15
commit 8ff16b07c1
84 changed files with 3167 additions and 1281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

351
dat/cmdhelp
View File

@@ -1,127 +1,224 @@
^ Show the type of a trap
^[ Cancel command
^A Redo the previous command
^C Quit the game
^D Kick something (usually a door, chest, or box)
^E Search a room (available in debug mode only)
^F Map the level (available in debug mode only)
^G Create a monster (available in debug mode only)
^I Identify all items (available in debug mode only)
^O Show location of special levels (available in debug mode only)
^P Toggle through previously displayed game messages
^R Redraw screen
^T Teleport around level
^V Teleport between levels (available in debug mode only)
^W Wish (available in debug mode only)
^X Show your attributes (shows more in debug or explore mode)
^Z Suspend game (only if defined)
a Apply (use) a tool
A Remove all armor
b Go southwest 1 space
B Go southwest until you are on top of something
^B Go southwest until you are near something
c Close a door
C Call (name) a monster, an individual object, or a type of object
d Drop an item
D Drop specific item types
e Eat something
E Engrave writing on the floor
f Fire ammunition from quiver
F Followed by direction, fight a monster (even if you don't sense it)
g Followed by direction, move until you are near something
G Followed by direction, same as control-direction
h Go west 1 space (if number_pad is on, display help message)
H Go west until you are on top of something
^H Go west until you are near something
i Show your inventory
I Inventory specific item types
j Go south 1 space (or if number_pad is on, jump to another location)
J Go south until you are on top of something
^J Go south until you are near something
k Go north 1 space (or if number_pad is on, kick something)
K Go north until you are on top of something
^K Go north until you are near something
l Go east 1 space (or if number_pad is on, loot a box on the floor)
L Go east until you are on top of something
^L Go east until you are near something
m Followed by direction, move without picking anything up or fighting
M Followed by direction, move a distance without picking anything up
n Go southeast 1 space
N Go southeast until you are on something (if number_pad is on, name)
^N Go southeast until you are near something
o Open a door
O Show option settings, possibly change them
p Pay your shopping bill
P Put on an accessory (ring, amulet, etc)
q Quaff (drink) something (potion, water, etc)
Q Select ammunition for quiver
r Read a scroll or spellbook
R Remove an accessory (ring, amulet, etc)
s Search for traps and secret doors
S Save the game
t Throw something
T Take off one piece of armor
u Go northeast 1 space (or if number_pad is on, untrap something)
U Go northeast until you are on top of something
^U Go northeast until you are near something
v Show version
V Show long version and game history
w Wield (put in use) a weapon
W Wear a piece of armor
x Swap wielded and secondary weapons
X Toggle two-weapon combat
y Go northwest 1 space
Y Go northwest until you are on top of something
^Y Go northwest until you are near something
z Zap a wand
Z Zap (cast) a spell
< Go up a staircase
> Go down a staircase
/ Show what type of thing a symbol corresponds to
? Give a help message
& Tell what a command does
! Do a shell escape (only if defined)
\ Show what object types have been discovered
` Show discovered types for one class of objects
_ Travel via a shortest-path algorithm to a point on the map
. Rest one move while doing nothing
Rest one move while doing nothing (if rest_on_space option is on)
: Look at what is on the floor
; Show what type of thing a map symbol on the level corresponds to
, Pick up things at the current location
@ Toggle the pickup option on/off
) Show the weapon currently wielded
[ Show the armor currently worn
= Show the ring(s) currently worn
" Show the amulet currently worn
( Show the tools currently in use
* Show all equipment in use (combination of the ),[,=,",( commands)
$ Count your gold
+ List known spells
# Perform an extended command
M-? Display extended command help (if the platform allows this)
M-2 Toggle two-weapon combat (unless number_pad is enabled)
M-a Adjust inventory letters
M-A Annotate: supply a name for the current dungeon level
M-c Talk to someone
M-C Conduct: list voluntary challenges you have maintained
M-d Dip an object into something
M-e Advance or check weapons skills
M-f Force a lock
M-i Invoke an object's special powers
M-j Jump to another location
M-l Loot a box on the floor
M-m Use a monster's special ability
M-n Name a monster, an individual object, or a type of object
M-o Offer a sacrifice to the gods
M-O Overview: show a summary of the explored dungeon
M-p Pray to the gods for help
M-q Quit
M-r Rub a lamp
M-R Ride: mount or dismount a saddled steed
M-s Sit down
M-t Turn undead
M-T Tip: empty a container
M-u Untrap something (trap, door, or chest)
M-v Print compile time options for this version of NetHack
M-w Wipe off your face
&# cmdhelp
& Tell what command a keystroke invokes
^ Show the type of an adjacent trap
^[ Cancel command (same as ESCape key)
&? debug
^E Search for nearby traps, secret doors, and unseen monsters
^F Map level; reveals traps and secret corridors but not secret doors
^G Create a monster by name or class
^I View inventory with all items identified
^O List special level locations
^V Teleport between levels
^W Wish for something
&: #!debug
^E unavailable debugging command
^F unavailable debugging command
^G unavailable debugging command
^I unavailable debugging command
^O Shortcut for '#overview': list interesting levels you have visited
^V unavailable debugging command
^W unavailable debugging command
&. #?debug
&? number_pad=0,-1
b Go southwest 1 space
B Go southwest until you are on top of something
h Go west 1 space
H Go west until you are on top of something
j Go south 1 space
J Go south until you are on top of something
k Go north 1 space
K Go north until you are on top of something
l Go east 1 space
L Go east until you are on top of something
n Go southeast 1 space
N Go southeast until you are on something
u Go northeast 1 space
U Go northeast until you are on top of something
&# y,Y handled below
&: #number_pad=1,2,3,4
h Help: synonym for '?'
j Jump: shortcut for '#jump'
k Kick: synonym for '^D'
l Loot: shortcut for '#loot'
n Start a count; continue with digit(s)
N Name: shortcut for '#name'
u Untrap: shortcut for '#untrap'
&. #0,-1 vs 1,2,3,4
a Apply (use) a tool or break a wand
A Remove all armor and/or all accessories and/or unwield weapons
^A Redo the previous command
^B Go southwest until you are near something
c Close a door
C Call (name) a monster, an individual object, or a type of object
^C Interrupt: quit the game
d Drop an item
D Drop specific item types
^D Kick something (usually a door, chest, or box)
e Eat something
E Engrave writing on the floor
f Fire ammunition from quiver
F Followed by direction, fight a monster (even if you don't sense it)
g Followed by direction, move until you are near something
G Followed by direction, same as control-direction
^H Go west until you are near something
i Show your inventory
I Inventory specific item types
^J Go south until you are near something
^K Go north until you are near something
^L Go east until you are near something
m Followed by direction, move without picking anything up or fighting
M Followed by direction, move a distance without picking anything up
^N Go southeast until you are near something
o Open a door
O Show option settings, possibly change them
p Pay your shopping bill
P Put on an accessory (ring, amulet, etc; will work for armor too)
^P Toggle through previously displayed game messages
q Quaff (drink) something (potion, water, etc)
Q Select ammunition for quiver (use '#quit' to quit)
r Read a scroll or spellbook
R Remove an accessory (ring, amulet, etc; will work for armor too)
^R Redraw screen
s Search all immediately adjacent locations for traps and secret doors
S Save the game (and exit; there is no "save and keep going")
t Throw something (choose an item, then a direction--not a target)
T Take off one piece of armor (will work for accessories too)
^T Teleport around level
^U Go northeast until you are near something
v Show version ('#version' shows more information)
V Show history of game's development
w Wield a weapon (for dual weapons: 'w' secondary, 'x', 'w' primary, 'X')
W Wear a piece of armor (will work for accessories too)
x Swap wielded and secondary weapons
X Toggle two-weapon combat
^X Show your attributes (shows more in debug or explore mode)
&? number_pad=0,1,2,3,4
&? number_pad=0
y Go northwest 1 space
Y Go northwest until you are on top of something
&.
^Y Go northwest until you are near something
z Zap a wand
Z Zap (cast) a spell
&? suspend
^Z Suspend game; 'fg' (foreground) to resume
&:
^Z unavailable command: suspend
&.
&: number_pad=-1
y Zap a wand
Y Zap (cast) a spell
&? suspend
^Y Suspend game; 'fg' (foreground) to resume
&:
^Y unavailable command: suspend
&.
z Go northwest 1 space
Z Go northwest until you are on top of something
^Z Go northwest until you are near something
&. #0,1..4 vs -1
< Go up a staircase
> Go down a staircase
/ Show what type of thing a symbol corresponds to
? Give a help message
&? shell
! Do a shell escape; 'exit' shell to come back
&:
! unavailable command: shell
&.
\ Show what object types have been discovered
` Show discovered types for one class of objects
_ Travel via a shortest-path algorithm to a point on the map
. Rest one move while doing nothing
&? rest_on_space
Rest one move while doing nothing
&.
: Look at what is on the floor
; Show what type of thing a map symbol on the level corresponds to
, Pick up things at the current location
@ Toggle the pickup option on/off
) Show the weapon(s) currently wielded or readied
[ Show the armor currently worn
= Show the ring(s) currently worn
" Show the amulet currently worn
( Show the tools currently in use
* Show all equipment in use (combination of the ),[,=,",( commands)
$ Count your gold
+ List known spells
# Perform an extended command (use '#?' to list choices)
&# number_pad:
&# -1 = numpad off, swap y with z (including Y with Z, ^Y with ^Z, M-y &c)
&# 0 = numpad off (default)
&# 1 = numpad on, normal keypad layout, '5'->'g'
&# 2 = numpad on, normal keypad layout, '5'->'G'
&# 3 = numpad on, phone keypad layout, '5'->'g'
&# 4 = numpad on, phone keypad layout, '5'->'G'
&? number_pad = 1,2,3,4
0 Show inventory
4 Move west
6 Move east
- 'F' prefix; force fight
&: #-1,0
0 Continue a count
4 Start or continue a count
6 Start or continue a count
&. #1,2,3,4 vs -1,0
&? number_pad=1,2
7 Move northwest
8 Move north
9 Move northeast
1 Move southwest
2 Move south
3 Move southeast
&: number_pad=3,4
1 Move northwest
2 Move north
3 Move northeast
7 Move southwest
8 Move south
9 Move southeast
&: #-1,0
1 Start or continue a count
2 Start or continue a count
3 Start or continue a count
7 Start or continue a count
8 Start or continue a count
9 Start or continue a count
&. #1,2 vs 3,4 vs -1,0
&? number_pad=1,3
5 'g' movement prefix
M-5 'G' movement prefix
&: number_pad=2,4
5 'G' movement prefix
M-5 'g' movement prefix
M-0 Inventory specific item types
&: #-1,0
5 Start or continue a count
M-2 Toggle two-weapon combat
&. #1,3 vs 2,4 vs -1,0
M-? Display extended command help (if the platform allows this)
M-a Adjust inventory letters
M-A Annotate: supply a name for the current dungeon level
M-c Chat: talk to an adjacent creature
M-C Conduct: list voluntary challenges you have maintained
M-d Dip an object into something
M-e Enhance: check weapons skills, advance them if eligible
M-f Force a lock
M-i Invoke an object's special powers
M-j Jump to a nearby location
M-l Loot a box on the floor
M-m When polymorphed, use a monster's special ability
M-n Name a monster, an individual object, or a type of object
M-N Name a monster, an individual object, or a type of object
M-o Offer a sacrifice to the gods
M-O Overview: show a summary of the explored dungeon
M-p Pray to the gods for help
M-q Quit (exit without saving)
M-r Rub a lamp or a touchstone
M-R Ride: mount or dismount a saddled steed
M-s Sit down
M-t Turn undead
M-T Tip: empty a container
M-u Untrap something (trap, door, or chest)
M-v Print compile time options for this version of NetHack
M-w Wipe off your face

5
dat/hh
View File

@@ -36,6 +36,7 @@ V history display game history
^R redraw redraw the screen
^P prevmsg repeat previous message (subsequent ^P's repeat earlier ones)
# introduces an extended command (#? for a list of them)
& what-does describe the command a keystroke invokes
Game commands:
^D kick kick (a door, or something else)
@@ -60,7 +61,7 @@ o open open a door
p pay pay your bill (in a shop)
P puton put on an accessory (ring, amulet, etc)
q quaff drink something (potion, water, etc)
Q quiver select ammunition for quiver
Q quiver select ammunition for quiver (use '#quit' to quit)
r read read a scroll or spellbook
R remove remove an accessory (ring, amulet, etc)
s search search for secret doors, hidden traps and monsters
@@ -69,7 +70,7 @@ T takeoff take off some armor
w wield wield a weapon (w- wield nothing)
W wear put on some armor
x xchange swap wielded and secondary weapons
X twoweapon toggle two-weapon combat
X twoweapon toggle two-weapon combat (use '#explore' for explore mode)
z zap zap a wand (use y instead of z if number_pad is -1)
Z Zap cast a spell (use Y instead of Z if number_pad is -1)
< up go up the stairs

58
dat/keyhelp Normal file
View File

@@ -0,0 +1,58 @@
Depending upon hardware or operating system or NetHack's interface,
some keystrokes may be off-limits.
For example, ^S and ^Q are often used for XON/XOFF flow-control,
meaning that ^S suspends output and subsequent ^Q resumes suspended
output. When that it the case, neither of those characters will
reach NetHack when it is waiting for a command keystroke. So they
aren't used as commands, but 'whatdoes' might not be able to tell
you that if they don't get passed through to NetHack.
^M or <return> or <enter> is likely to be transformed into ^J or
<linefeed> or 'newline' before being passed to NetHack for handling.
So it isn't used as a command, and 'whatdoes' might seem as if it
is reporting the wrong character but will be operating correctly if
it describes ^J when you type ^M.
A NUL character, typed as ^<space> on some keyboards, ^@ on others,
and maybe not typeable at all on yet others. It is not used as a
command, and will be converted into ESC before reaching 'whatdoes'.
Unlike ^M, this transformation is performed by NetHack itself.
But like ^M, if you type NUL and get feedback about ESC, the
situation is expected.
ESC itself is a synonym for ^[, and is another source of oddity.
Various function keys, including cursor arrow keys, may transmit
an "escape sequence" of ESC + [ + other stuff, confusing NetHack
as to what command was intended since the ESC will be processed
and then whatever follows will seem to NetHack like--and be used
as--something typed by the user. (If you press a function key and
a menu of the armor your hero is wearing appears, what happened
was that an escape sequence was sent to NetHack, its ESC aborted
any pending key operation, its '[' was then treated as a command
to show worn armor, and the "other stuff" probably got silently
discarded as invalid choices while you dismissed the menu.)
If you have NetHack's 'altmeta' option enabled, meaning that the
<alt> or <option> key, when used as shift while typing some other
character, transmits ESC and then the other character so NetHack
should treat that other character as a meta-character, then ESC
takes on added potential for confusion. Implicit in the handling
of a two character sequence ESC + something is the fact that when
NetHack sees ESC, it needs to wait for another character before
it can decide what to do. So if you type ESC manually, you'll
need to type it a second time or NetHack will sit there waiting.
(It will then be treated as if you typed ESC rather than M-ESC.)
On some systems, typing ^\ will send a QUIT signal to the current
process, probably killing it and possibly causing it to save a
core dump. It is not used for any NetHack command, so don't type
that character.
One last note: characters shown as ^x mean that you should hold
down the <control> or <ctrl> key as a shift and then type 'x'.
Control characters are all implicitly uppercase, but you don't
need to press the shift key while typing them. The opposite is
true for meta-characters: they can be either case, so you need
to use shift as well as <meta> or <alt> to generate an uppercase
letter meta-character.

22
dat/knox.des
View File

@@ -12,13 +12,13 @@ MAP
----------------------------------------------------------------------------
| |........|...............................................................|
| |........|.................................................------------..|
| -------+--.................................................|..........|..|
| |........}}}}}}}....................}}}}}}}..........|..........|..|
| |........}-----}....................}-----}..........--+--+--...|..|
| ---........}|...|}}}}}}}}}}}}}}}}}}}}}}|...|}.................|...|..|
| |..........}---S------------------------S---}.................|...|..|
| |..........}}}|...............|..........|}}}.................+...|..|
| -------..........}|...............S..........|}...................|...|..|
| --S----S--.................................................|..........|..|
| # |........}}}}}}}....................}}}}}}}..........|..........|..|
| # |........}-----}....................}-----}..........--+--+--...|..|
| # ---........}|...|}}}}}}}}}}}}}}}}}}}}}}|...|}.................|...|..|
| # |..........}---S------------------------S---}.................|...|..|
| # |..........}}}|...............|..........|}}}.................+...|..|
| --S----..........}|...............S..........|}...................|...|..|
| |.....|..........}|...............|......\...S}...................|...|..|
| |.....+........}}}|...............|..........|}}}.................+...|..|
| |.....|........}---S------------------------S---}.................|...|..|
@@ -35,8 +35,8 @@ NON_DIGGABLE:(00,00,75,19)
# Portal arrival point
BRANCH:(08,16,08,16),(0,0,0,0)
# accessible via ^V in wizard mode; arrive near the portal
TELEPORT_REGION:(06,16,09,17),(0,0,0,0),up
TELEPORT_REGION:(06,16,09,17),(0,0,0,0),down
TELEPORT_REGION:(06,15,09,16),(0,0,0,0),up
TELEPORT_REGION:(06,15,09,16),(0,0,0,0),down
# Throne room, with Croesus on the throne
REGION:(37,08,46,11),lit,"throne"
# 50% chance each to move throne and/or fort's entry secret door up one row
@@ -82,6 +82,8 @@ DOOR:locked,(08,11)
DOOR:open,(68,11)
DOOR:closed,(63,14)
DOOR:closed,(66,14)
DOOR:closed,(04,03)
DOOR:closed,(04,09)
# Soldiers guarding the fort
MONSTER:('@',"soldier"),(12,14)
MONSTER:('@',"soldier"),(12,13)
@@ -100,6 +102,8 @@ MONSTER:('@',"soldier"),(54,13)
MONSTER:('@',"soldier"),(57,10)
MONSTER:('@',"soldier"),(57,09)
MONSTER:('@',"lieutenant"),(15,08)
# Possible source of a boulder
MONSTER:('H',"stone giant"),(03,01)
# Four dragons guarding each side
MONSTER:'D',(18,09)
MONSTER:'D',(49,10)

44
dat/symbols
View File

@@ -194,20 +194,6 @@ start: RogueEpyx
Restrictions: rogue
Handling: IBM
Color: Yes
S_weapon: \x18 # up arrow
S_armor: \x0a # Vert rect with o
S_ring: \x09 # circle with arrow
S_amulet: \x0c # "female" symbol
S_food: \x05 # club (as in cards)
S_potion: \xad # upside down '!'
S_scroll: \x0e # musical note
S_wand: \xe7 # greek tau
S_coin: \x0f # yes it's the same as gems
S_gem: \x0f # fancy '*'
S_rock: \x60
S_ball: \x30
S_chain: \x5f
S_venom: \x2e
S_vwall: \xba # all walls now use
S_hwall: \xcd # double line graphics
S_tlcorn: \xc9
@@ -249,18 +235,24 @@ start: RogueEpyx
S_magic_trap: \x04
S_anti_magic_trap: \x04
S_polymorph_trap: \x04
S_weapon: \x18
S_armor: \x5b
S_ring: \x3d
S_amulet: \xc
S_tool: \x28
S_food: \x5
S_potion: \xad
S_scroll: \xe
S_book: \x2b
S_wand: \xe7
S_coin: \xf
S_gem: \xf
S_weapon: \x18 # up arrow
# ^J S_armor: \x0a # Vert rect with o
S_armor: \x5b # default: '['
# ^I S_ring: \x09 # circle with arrow
S_ring: \x3d # default: '='
S_amulet: \x0c # "female" symbol
S_tool: \x28 # default: '('
S_food: \x05 # club (as in cards)
S_potion: \xad # upside down '!'
S_scroll: \x0e # musical note
S_book: \x2b # default: '+'
S_wand: \xe7 # greek tau
S_coin: \x0f # yes it's the same as gems
S_gem: \x0f # fancy '*'
S_rock: \x60
S_ball: \x30
S_chain: \x5f
S_venom: \x2e
S_rock: \x60
S_ball: \x30
S_chain: \x5f

10
dat/wizhelp
View File

@@ -1,13 +1,13 @@
Debug-Mode Quick Reference:
^E == detect secret doors and traps.
^F == do magic mapping.
^G == create monster.
^F == map level; reveals traps and secret corridors but not secret doors.
^G == create monster by name or class.
^I == identify items in pack.
^O == tell locations of special levels.
^T == do intra-level teleport.
^V == do trans-level teleport.
^W == make wish.
^W == make a wish for an item or a trap or a limited subset of terrain.
^X == show attributes including intrinsic attributes.
#levelchange == change experience level
@@ -19,5 +19,9 @@ Debug-Mode Quick Reference:
#stats == show memory statistics
#timeout == look at timeout queue
#vision == show vision array
#vanquished == disclose counts of dead monsters
#wizsmell == smell a monster
#wizintrinsic == set selected intrinsic timeouts
#wizrumorcheck == validate first and last rumor for true and false set
#wmode == show wall modes