0c3b9642e4
add MALE, FEMALE, and gender-neutral names for individual monster species
to the mons array. The gender-neutral name (NEUTRAL) is mandatory, the
MALE and FEMALE versions are not.
replace code uses of the mname field of permonst with one of the three
potentially-available gender-specific names.
consolidate some separate mons entries that differed only by species into a
single mons entry (caveman, cavewoman and priest,priestess etc.)
consolidate several "* lord" and "* queen/* king" monst entries into
their single species, and allow both genders on some where it makes some
sense (there is probably more work and cleanup to come out of this at some
point, and the chosen gender-neutral name variations are not cast in stone
if someone has better suggestions).
related function or macro additions:
pmname(pm, gender) to get the gender variation of the permonst name. It
guards against monsters that haven't got anything except NEUTRAL naming
and falls back to the NEUTRAL version if FEMALE and MALE versions are
missing.
Ugender to obtain the current hero gender.
Mgender(mtmp) to obtain the gender of a monster
While the code can safely refer directly to pmnames[NEUTRAL] safely in the
code because it always exists, the other two (pmnames[MALE] and
pmnames[FEMALE] may not exist so use:
pmname(ptr, gidx)
where -ptr is a permonst *
-gidx is an index into the pmnames array field of the
permonst struct
pmname() checks for a valid index and checks for null-pointers for
pmnames[MALE] and pmnames[FEMALE], and will fall back to pmnames[NEUTRAL] if
the pointer requested if the requested variation is unavailable, or if the
gidx is out-of-range.
Allow code to specify makemon flags to request female or male (via MM_MALE
and MM_FEMALE flags respectively)to makedefs, since the species alone doesn't
distinguish male/female anymore. Specifying MM_MALE or MM_FEMALE won't
override the pm M2_MALE and M2_FEMALE flags on a mons[] entry.
male and female tiles have been added to win/share/monsters.txt.
The majority are duplicated placeholders except for those that were
separate mons entries before. Perhaps someone will contribute artwork in the
future to make the male and female variations visually distinguishable.
tilemapping via has the MALE tile indexes in the glyph2tile[]
array produced at build time. If a window port has information that the
FEMALE tile is required, it just has to increment the index returned
from the glyph2tile[] array by 1.
statues already preserved gender of the monster through STATUE_FEMALE
and STATUE_MALE, so ensure that pmnames takes that into consideration.
I expect some refinement will be required after broad play-testing puts it to
the test.
consolidate caveman,cavewoman and priest,priestess monst.c entries etc
This commit will require a bump of editlevel in patchlevel.h because it alters
the index numbers of the monsters due to the consolidation of some. Those
index numbers are saved in some other structures, even though the mons[] array
itself is not part of the savefile.
Window Port Interface Change
Also add a parameter to print_glyph to convey additional information beyond
the glyph to the window ports. Every single window port was calling back to
mapglyph for the information anyway, so just included it in the interface and
produce the information right in the display core.
The mapglyph() function uses will be eliminated, although there are still some
in the code yet to be dealt with.
win32, tty, x11, Qt, msdos window ports have all had adjustments done to
utilize the new parameter instead of calling mapglyph, but some of those
window ports have not been thoroughly tested since the changes.
Interface change additional info:
print_glyph(window, x, y, glyph, bkglyph, *glyphmod)
-- Print the glyph at (x,y) on the given window. Glyphs are
integers at the interface, mapped to whatever the window-
port wants (symbol, font, color, attributes, ...there's
a 1-1 map between glyphs and distinct things on the map).
-- bkglyph is a background glyph for potential use by some
graphical or tiled environments to allow the depiction
to fall against a background consistent with the grid
around x,y. If bkglyph is NO_GLYPH, then the parameter
should be ignored (do nothing with it).
-- glyphmod provides extended information about the glyph
that window ports can use to enhance the display in
various ways.
unsigned int glyphmod[NUM_GLYPHMOD]
where:
glyphmod[GM_TTYCHAR] is the text characters associated
with the original NetHack display.
glyphmod[GM_FLAGS] are the special flags that denote
additional information that window
ports can use.
glyphmod[GM_COLOR] is the text character
color associated with the original
NetHack display.
Support for including the glyphmod info in the display glyph buffer
alongside the glyph itself was added and is the default operation.
That can be turned off by defining UNBUFFERED_GLYPHMOD at compile time.
With UNBUFFERED_GLYPHMOD operation, a call will be placed to map_glyphmod()
immediately prior to every print_glyph() call.
INTRO ===== The "curses" windowport is a new text-based interface for NetHack, using high-level curses routines to control the display. Currently, it has been compiled and tested on Linux and Windows, but it should also be portable to a number of other systems, such as other forms of UNIX, Mac OS X, MSDOS, and OS/2. Some features of this interface compared to the traditional tty interface include: * Dynamic window resizing (e.g. maximizing a terminal window) * Dynamic configurable placement of status and message windows, relative to the map * Makes better use of larger terminal windows * Fancier display (e.g. window borders, optional popup dialogs) * "cursesgraphics" option for fancier line-drawing characters for drawing the dungeon - this should work on most terminals/platforms BUILDING ======== As of this writing code has been compiled on Linux and Windows. UNIX/Linux build instructions: Follow the instructions in sys/unix/Install.unx. By default, the Makefile is setup to compile against ncurses. Edit Makefile.src if you wish to compile against a different curses library, such as PDCurses for SDL. Windows build instructions: If you are using Mingw32 as your compiler, then follow the instructions in sys/winnt/Install.nt with the following changes: * After running nhsetup, manually copy the file cursmake.gcc to the src/ subdirectory * Instead of typing "mingw32-make -f Makefile.gcc install" you will type "mingw32-make -f cursmake.gcc install" If you are using a different compiler, you will have to manually modify the appropriate Makefile to include the curses windowport files. GAMEPLAY ======== Gameplay should be similar to the tty interface for NetHack; the differences are primarily visual. This windowport supports dymanic resizing of the terminal window, so you can play with it to see how it looks best to you during a game. Also, the align_status and align_message options may be set during the game, so you can experiment to see what arraingement looks best to you. For menus, in addition to the normal configurable keybindings for menu navigation descrived in the Guidebook, you can use the right and left arrows to to forward or backward one page, respectively, and the home and end keys to go to the first and last pages, respectively. Some configuration options that are specific to or relevant to the curses windowport are shown below. Copy any of these that you like to your nethack configuration file (e.g. .nethackrc for UNIX or NetHack.cnf for Windows): # # Use this if the binary was compiled with multiple window interfaces, # and curses is not the default OPTIONS=windowtype:curses # # Set this for Windows systems, or for PDCurses for SDL on any system. # The latter uses a cp437 font, which works with this option #OPTIONS=IBMgraphics # # Set this if IBMgraphics above won't work for your system. Mutually # exclusive with the above option, and should work on nearly any # system. OPTIONS=cursesgraphics # # Optionally specify the alignment of the message and status windows # relative to the map window. If not specified, the code will default # to the locations used in the tty interface: message window on top, # and status window on bottom. Placing either of these on the right or # left really only works well for winder terminal windows. OPTIONS=align_message:bottom,align_status:right # # Use a small popup "window" for short prompts, e.g. "Really save?". # If this is not set, the message window will be used for these as is # done for the tty interface. OPTIONS=popup_dialog # # Specify the initial window size for NetHack in units of characters. # This is supported on PDCurses for SDL as well as PDCurses for # Windows. OPTIONS=term_cols:110,term_rows:32 # # Controls the usage of window borders for the main NetHack windows # (message, map, and status windows). A value of 1 forces the borders # to be drawn, a value of 2 forces them to be off, and a value of 3 # allows the code to decide if they should be drawn based on the size # of the terminal window. OPTIONS=windowborders:3 CONTACT ======= Please send any bug reports, suggestions, patches, or miscellaneous feedback to me (Karl Garrison) at: kgarrison@pobox.com. Note that as of this writing, I only have sporatic Internet access, so I may not get back to you right away. Happy Hacking! Karl Garrison March, 2009