nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity
Files
0b4383e32ee3480f854959c9c60d3fbbe5021cfb
nethack/include
History
Derek S. Ray 0b4383e32e clean up handling, roll everything into merged() 
it should be possible to wish for globs now; also hero's
inventory, containers, ground, monster inventories will all
honor the globbiness.

basically, any way you bring two globs together (adjacent on floor,
same inventory, same bag) should cause them to merge, combining
weight and nutrition as appropriate.

20 seems low-ish on nutrition for a pudding (kelp fronds are 30!)
at first glance but this is easy enough to fix later; don't really
want players to be able to stock up on food _this_ way and accidentally
obsolete all the other food-generation methods.
2015-04-03 13:03:55 -04:00
..
.gitignore
add .gitignore entries: tile.h, NetHack.ad
2015-03-31 00:18:00 -07:00
align.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
amiconf.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
artifact.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
artilist.h
Make TOURIST unconditional.
2015-03-17 18:46:01 +02:00
attrib.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
beconf.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
bitmfile.h
*** empty log message ***
2002-01-05 21:05:47 +00:00
botl.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
color.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
config1.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
config.h
Define for generic usernames which prompt for name
2015-03-17 18:47:19 +02:00
context.h
Remember position of monster you hit with polearm
2015-03-27 23:34:13 +02:00
coord.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
decl.h
Add more explicit helpless reasons
2015-03-29 22:12:19 +03:00
def_os2.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
dgn_file.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
display.h
remove and transfer INVISIBLE_OBJECTS to branch
2015-03-17 18:46:49 +02:00
dlb.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
dungeon.h
Make DUNGEON_OVERVIEW unconditional.
2015-03-17 18:46:12 +02:00
engrave.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
extern.h
clean up handling, roll everything into merged()
2015-04-03 13:03:55 -04:00
flag.h
Use dark gray color for black glyphs in TTY
2015-03-29 15:51:11 +03:00
func_tab.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
gem_rsc.h
*** empty log message ***
2002-01-05 21:05:47 +00:00
global.h
Move some hard-coded string arrays into data files.
2015-03-18 22:05:10 +02:00
hack.h
DEBUG/debugpline() fixup
2015-03-17 18:47:31 +02:00
lev.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
load_img.h
*** empty log message ***
2002-01-05 21:05:47 +00:00
mac-carbon.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
mac-qt.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
mac-term.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
macconf.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
macpopup.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
mactty.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
macwin.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
mail.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
mextra.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
mfndpos.h
Make BARGETHROUGH unconditional.
2015-03-17 18:46:35 +02:00
micro.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
mkroom.h
New level compiler: code changes
2015-03-17 18:52:42 +02:00
monattk.h
Make SEDUCE unconditional.
2015-03-17 18:46:32 +02:00
mondata.h
Make BARGETHROUGH unconditional.
2015-03-17 18:46:35 +02:00
monflag.h
Make BARGETHROUGH unconditional.
2015-03-17 18:46:35 +02:00
monst.h
Make GOLDOBJ unconditional.
2015-03-17 18:46:23 +02:00
monsym.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
mttypriv.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
ntconf.h
Merge branch 'paxed-new_lev_comp' of https://rodney.nethack.org:20040/git/NHsource into paxed-new_lev_comp
2015-03-24 19:59:40 +02:00
obj.h
Merge branch 'master' into derek-farming
2015-04-01 17:40:25 -04:00
objclass.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
os2conf.h
Make REDO unconditional.
2015-03-17 18:46:41 +02:00
patchlevel.h
Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource into paxed-new_lev_comp
2015-04-01 16:09:53 +03:00
pcconf.h
Make REDO unconditional.
2015-03-17 18:46:41 +02:00
permonst.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
prop.h
Make TOURIST unconditional.
2015-03-17 18:46:01 +02:00
qt_clust.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
qt_kde0.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
qt_win.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
qt_xpms.h
*** empty log message ***
2002-01-05 21:05:48 +00:00
qtext.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
qttableview.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
quest.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
rect.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
region.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
rm.h
New level compiler: code changes
2015-03-17 18:52:42 +02:00
skills.h
Make STEED unconditional.
2015-03-17 18:45:49 +02:00
sp_lev.h
Catch up with post-343 lev_comp changes
2015-03-17 18:57:39 +02:00
spell.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
sys.h
Allow admin to disable explore mode
2015-03-31 18:14:16 +03:00
system.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
tcap.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
tile2x11.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
timeout.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
tosconf.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
tradstdc.h
Remove experimental Unicode support.
2015-03-17 18:46:45 +02:00
trampoli.h
Make WIZARD unconditional.
2015-03-17 18:46:17 +02:00
trap.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
unixconf.h
Implement fcntl(2) file locking
2015-03-17 18:47:17 +02:00
vision.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
vmsconf.h
Make REDO unconditional.
2015-03-17 18:46:41 +02:00
wceconf.h
Manually fix botched NHDT-Branch expansions.
2015-03-17 18:46:55 +02:00
winami.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
wingem.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
winGnome.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
winprocs.h
Use dark gray color for black glyphs in TTY
2015-03-29 15:51:11 +03:00
wintty.h
Fix TTY crashing when a location has more than 32k items
2015-03-17 18:47:14 +02:00
wintype.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
winX.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
xwindow.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
xwindowp.h
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
you.h
Options to create the character blind or nudist
2015-03-30 22:12:54 +03:00
youprop.h
Options to create the character blind or nudist
2015-03-30 22:12:54 +03:00