nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity
10,924 Commits 2 Branches 0 Tags
ef9caca4daa3d9d05d45aea29cb0c62c49604b21
Commit Graph
78 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek S. Ray 8798392e78 try not to miss ! marks 2015-06-21 20:59:17 -04:00
Derek S. Ray 2224df66f0 Slight improvement to handless pets' pickup changes 
Allow one item to be taken out of a pile, and leave framework in place
for partial splits so that all monsters will take up to their capacity,
rather than leaving the whole pile if it's too big to take all at once.
 2015-06-21 15:16:22 -04:00
Derek S. Ray 7f669de286 tiles.bmp doesn't need to be in the binary folder 2015-06-21 14:12:10 -04:00
Derek S. Ray c3d579007a strncmpi, not strcasecmp 2015-05-27 21:09:54 -04:00
Derek S. Ray f606b367ab no, really, use the right header 2015-05-27 21:00:00 -04:00
Derek S. Ray a65c568e49 New precompiled versions of these 2015-05-26 22:54:55 -04:00
Derek S. Ray b55f6f30ba ...don't forget to include the prebuilt headers 
derp.
 2015-05-09 20:50:07 -04:00
Derek S. Ray 42e7c050c2 catch this up on new features/changes 2015-05-09 15:25:37 -04:00
Derek S. Ray c429dc8722 Add token Visual Studio section 2015-05-09 15:13:00 -04:00
Derek S. Ray 6d232df8ab update pre-built versions of these 2015-05-09 14:47:46 -04:00
Derek S. Ray 1770591189 fix duplicated header lines 2015-05-09 14:35:12 -04:00
Derek S. Ray a3b260f390 Merge branch 'AlexK-misc' 
* AlexK-misc:
  erosion is not being removed after reading non-cursed scroll of enchant weapon
 2015-05-09 14:34:16 -04:00
Derek S. Ray a8f95494a1 fix whitespace errors from simultaneous commit 2015-05-09 14:20:36 -04:00
Derek S. Ray e124a61362 reorder onscary() logic to be in right order 2015-05-09 14:16:47 -04:00
Derek S. Ray d0fb68795d Merge branch 'derek-elbereth' 
* derek-elbereth:
  ensure that the 'safe' objects remain safe
  finish up the changes to trigger erosion on use
  initial pass for toning down Elbereth

Conflicts:
	dat/castle.des
	dat/sokoban.des
	include/extern.h
	src/engrave.c
	src/mklev.c
	src/monmove.c
	src/zap.c
 2015-05-09 11:58:36 -04:00
Derek S. Ray f0bf652df8 update fixes with a few things 2015-05-06 17:55:53 -04:00
Derek S. Ray be98bca06d cherry-pick the YACC/LEX upgrades from elsewhere 2015-05-06 17:55:50 -04:00
Derek S. Ray 9c19f55403 jonadab's patch for engraving on the drawbridge 
Should be splinters, not gravel.
Addendum to C343-239
 2015-05-06 17:51:18 -04:00
Derek S. Ray 586cad7fc9 limit obj manipulation by handless creatures 
something that is M1_NOHANDS ought not to be able to pick up a pile of
rocks, daggers, or gold pieces unless it has other features that would
permit such a thing.
 2015-04-30 18:34:32 -04:00
Derek S. Ray 9c8f4d1fad ensure that the 'safe' objects remain safe 
since Elbereth doesn't work if you're not on the square anymore, we need
to make sure that critters are discouraged from grabbing the sokoban
prize or the castle wand.

also, fix up the level compiler makefiles so that uncommenting the
YACC/LEX definitions (presuming you have the right tools installed)
works properly.
 2015-04-29 19:07:24 -04:00
Derek S. Ray fb8a071a39 finish up the changes to trigger erosion on use 
Elbereth is a magical power, and like everything else, magic eventually
gets used up... even for burned engravings.
 2015-04-27 18:18:16 -04:00
Derek S. Ray 22ffe3b84e initial pass for toning down Elbereth 2015-04-23 23:04:35 -04:00
Derek S. Ray 0bef94cfde Make coalescence message be smart about status 
- honor blindness and hallucination
- honor ability to see one of the mergees
- provide audible feedback if appropriate
- merging inside pack gets special-cased so player knows something
  different/unusual is happening
 2015-04-21 21:47:33 -04:00
Derek S. Ray 7c644c1507 Merge branch 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource into win32-x64-working 
* 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource: (27 commits)
  Makefile bit
  gcc Makefile updates for recent file additions
  ...

Conflicts:
	src/files.c
 2015-04-15 18:30:13 -04:00
Derek S. Ray df52ba17ec add debugger window support via _RPT*; add regex 
currently it's locked behind _MSC_VER, but anything that runs on Win32
should be able to use those functions as long as it has something that
can pass as a debug window.

also, add a non-wildcard-accepting version of showdebug for the dumpit()
functions in dungeon.c and questpgr.c; this makes DEBUGFILES=* workable
without being excruciatingly painful
 2015-04-15 18:19:16 -04:00
Derek S. Ray f244fd34f8 cppregex target accidentally commented out; fix 2015-04-13 20:57:01 -04:00
Derek S. Ray 38861c1e0d add cppregex.cpp to NetHackW so it'll link properly 2015-04-12 11:46:56 -04:00
Derek S. Ray f448dfbbd6 add YY_NO_UNISTD_H into the levcomp projects 2015-04-10 23:52:15 -04:00
Derek S. Ray cdb1c264d9 fix misnumbered tiles in other.txt 
update version of renumtiles to work on all files
 2015-04-10 23:46:05 -04:00
Derek S. Ray 6f16530913 regex.h remains nonpossible on Win32; define it out 
Once cppregex.cpp is merged into this branch, this can be fixed
 2015-04-10 18:47:39 -04:00
Derek S. Ray 5c919d6930 restore accidentally consumed tmp_config 2015-04-10 18:18:05 -04:00
Derek S. Ray 8398e30dd1 turn off annoying warnings in Visual Studio 2015-04-10 17:14:41 -04:00
Derek S. Ray 9fc9a86d34 lock MENU_COLOR_REGEX away since it isn't Win32 yet 2015-04-10 17:08:31 -04:00
Derek S. Ray 32619fa8cc Merge branch 'master' into derek-farming 
Reverse merge before final reintegration.

* master: (40 commits)
  Fix magic mapped dark room symbols
  Disclose extinct species alongside genocided ones
  ...

Conflicts:
	doc/fixes35.0
	src/do.c
	src/files.c
	src/invent.c
	src/objnam.c
	sys/share/pcmain.c
 2015-04-10 16:56:30 -04:00
Derek S. Ray 61ffe9028d re-fix wintty.c; disable warnings on sp_lev.c 
don't ask me why wintty.c was actually compiling before.
also, make studio shut up about all the long-to-short stuff.
 2015-04-06 18:56:30 -04:00
Derek S. Ray aac78fe62e Fix up errors from mass manual conflict resolution 2015-04-06 17:18:48 -04:00
Derek S. Ray b4142b5894 Merge branch 'master' into win32-x64-working 
* master: (354 commits)
  Add missing protos
  a warning bout lc_error
  Add S_poisoncloud to Guidebooks
  ...

Conflicts:
	.gitattributes
	dat/.gitattributes
	doc/.gitattributes
	doc/Guidebook.mn
	include/config.h
	include/decl.h
	include/extern.h
	include/flag.h
	include/hack.h
	include/ntconf.h
	include/sys.h
	include/wceconf.h
	src/apply.c
	src/attrib.c
	src/bones.c
	src/botl.c
	src/dbridge.c
	src/dig.c
	src/do.c
	src/do_name.c
	src/dog.c
	src/dungeon.c
	src/eat.c
	src/end.c
	src/files.c
	src/fountain.c
	src/hack.c
	src/invent.c
	src/light.c
	src/makemon.c
	src/mhitu.c
	src/mklev.c
	src/mkmaze.c
	src/mkobj.c
	src/mkroom.c
	src/mon.c
	src/objnam.c
	src/options.c
	src/pager.c
	src/pickup.c
	src/potion.c
	src/pray.c
	src/questpgr.c
	src/read.c
	src/restore.c
	src/rnd.c
	src/role.c
	src/rumors.c
	src/save.c
	src/shk.c
	src/sit.c
	src/sp_lev.c
	src/sys.c
	src/teleport.c
	src/trap.c
	src/u_init.c
	src/uhitm.c
	src/wield.c
	src/worn.c
	src/zap.c
	sys/amiga/.gitattributes
	sys/mac/.gitattributes
	sys/msdos/.gitattributes
	sys/msdos/pctiles.c
	sys/msdos/vidvga.c
	sys/os2/.gitattributes
	sys/share/.gitattributes
	sys/share/pcmain.c
	sys/unix/.gitattributes
	sys/unix/hints/.gitattributes
	sys/unix/sysconf
	sys/unix/unixmain.c
	sys/vms/.gitattributes
	sys/wince/.gitattributes
	sys/wince/mhstatus.c
	sys/winnt/.gitattributes
	sys/winnt/Makefile.msc
	sys/winnt/nhsetup.bat
	util/lev_comp.l
	util/makedefs.c
	win/X11/winmenu.c
	win/X11/winstat.c
	win/gnome/gnstatus.c
	win/share/tilemap.c
	win/tty/termcap.c
	win/tty/topl.c
	win/tty/wintty.c
 2015-04-05 23:42:15 -04:00
Derek S. Ray 07e0bc592c fire effects should burn green slime globs, too 
On floor, in inventory, whatever. This probably needs to be extended to
support a much wider group of objects, but this will do to start.
 2015-04-05 21:56:15 -04:00
Derek S. Ray b3e2772f7b several fixes for farming changes 
* don't let player wish for multiple globs
* use newsym() to clean up merged globs on floor
* food effects should match original corpse effects
* tidy up remaining crash when merging in place
 2015-04-05 18:04:22 -04:00
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
Derek S. Ray e2f839efbd fix whiny compiler 2015-04-02 17:14:48 -04:00
Derek S. Ray af5ed436b8 Merge branch 'master' into derek-farming 
* master: (160 commits)
  Add doors correctly
  bug fixes for nhsub
  Generate oracle monsters after subroom
  Generate minetown guards after subrooms
  ...

Conflicts:
	src/do.c
	src/files.c
	src/hack.c
	src/mon.c
	src/vision.c
 2015-04-01 17:40:25 -04:00
Derek S. Ray ca60cac105 Merge branch 'master' into derek-farming 
* master: (41 commits)
  Add more explicit helpless reasons
  add data.base suggestion for whistle
  Use existing function to count containers
  ...

Conflicts:
	src/do.c
	src/hack.c
	src/invent.c
	src/mon.c
	src/objnam.c
 2015-03-29 17:32:12 -04:00
Derek S. Ray 6fcfa55f36 Win32 should use USERPROFILE and COMMONPROGRAMFILES 
more standard locations for each of these, plus supports multi-user
Windows machines a bit better
 2015-03-25 22:35:24 -04:00
Derek S. Ray 335c7fc003 Merge branch 'master' into derek-farming 
* master: (49 commits)
  Fix 'fetch' syntax, include sparkly 'git log' trick
  Show object symbols in menu headings
  Fix a memory leak on termination.
  ...

Conflicts:
	include/obj.h
	src/do.c
	src/files.c
	src/hack.c
	src/invent.c
	src/mkobj.c
	src/mon.c
	src/objnam.c
 2015-03-25 17:23:59 -04:00
Derek S. Ray 12ca92aa42 Fix 'fetch' syntax, include sparkly 'git log' trick 
And bolt a couple more Win32-folders onto .gitignore.
 2015-03-25 17:07:10 -04:00
Derek S. Ray 5ccae41702 add glob merging for obvious cases 
flooreffects() covers most dropped/thrown/etc. cases, and the hooks in
invent and mon handle "deathdrops" along with picking up items.
still need to check putting into/removing from containers
 2015-03-23 23:13:53 -04:00
Derek S. Ray daf3343dae pull the globs outside the Meaty Sequence 
update tiles textfile, too
 2015-03-20 11:37:50 -04:00
Derek S. Ray 7f03ee4216 Changes for Win32; update precompiled files 
Also fix Orctown probabilities; fixed support for snprintf;
update Win32 makefile to allow level compiler use

Conflicts:
	win/win32/levstuff.mak
 2015-03-20 15:14:31 +02:00
Derek S. Ray b1835cc65d Swap out Frontier Town with Orctown 2015-03-20 15:09:51 +02:00
Derek S. Ray b6ec0f066e finally remember to add the 'nh-' versions 2015-03-17 18:47:38 +02:00
Derek S. Ray 4c28a96b92 Some few updates/additions; clean up formatting 2015-03-17 18:47:29 +02:00
Derek S. Ray 3b89c474ab Initial version of simple recipes file 2015-03-17 18:47:27 +02:00
Derek S. Ray 66289b13ab remove and transfer INVISIBLE_OBJECTS to branch 2015-03-17 18:46:49 +02:00
Derek S. Ray 8fa8e02415 Remove unused size from questpgr.c 2015-03-17 18:46:48 +02:00
Derek S. Ray e1e55c31c7 more win32-specific pieces 2015-03-17 18:44:54 +02:00
Derek 4c496d089e Exclude all the Win32 build artifacts (Studio and otherwise) 
Squashed commit of the following:

commit e37c7626f035a29321c9ac12cca83a0af2132abb
commit 86ebb3e66aedb6b5a31d61d57c39cf84c12d2276
commit 6cd677c8fca4102f223fb1708d00a65c2ded6658
Author: Derek <derekray@gmail.com>
Date:   Fri Feb 13 13:24:29 2015 -0500
 2015-03-17 18:44:53 +02:00
Derek S. Ray 7fc2a7a115 check %USERPROFILE% first for config on win32 
USERPROFILE is always set on a Win32 box, and doesn't conflict in the
case of an MSDOS box. so look for our config file in this order:

1) USERPROFILE\defaults.nh
2) CWD\defaults.nh
3) USERPROFILE\NetHack.cnf
4) CWD\NetHack.cnf

after that, the settings inside can take over (PREFIXES_IN_USE).
 2015-03-16 18:33:58 -04:00
Derek S. Ray 4914e256bf finally remember to add the 'nh-' versions 2015-03-16 17:26:31 -04:00
Derek S. Ray 68b8931918 further ongoing changes 
Swap out single object for four separate ones to support tiles
rename to 'glob' to avoid confusion with acid/quivering blobs
 2015-03-15 21:46:26 -04:00
Derek S. Ray b8dc3a6e43 Initial farming-mitigation changes 
Remove deathdrops completely for cloned monsters
Revert corpse frequency decrementing for cloned monsters
Add new object 'blob of pudding' and corresponding tile
Set 'P' monsters to create that object on corpsification

...add script to go through and auto-renumber objects.txt
because there's no way i'm doing that by hand
 2015-03-15 18:29:43 -04:00
Derek S. Ray ea8eb14abe clean up uninitialized-pointer warnings 2015-03-15 15:57:58 -04:00
Derek S. Ray de8e1a5a9d Some few updates/additions; clean up formatting 2015-03-15 14:28:01 -04:00
Derek S. Ray 3e94fa63c7 get rid of code-analysis clutter 2015-03-15 13:44:26 -04:00
Derek S. Ray 1e76ed28ae Initial version of simple recipes file 2015-03-12 22:47:44 -04:00
Derek S. Ray 6ebb7db138 fix build order for nhdefkey, add to nhsetup 
also minor cosmetics; clean up two warnings in Release mode,
turn off multi-processor, and fix /Oi /Oi- discrepancy
 2015-02-28 22:56:03 -05:00
Derek S. Ray 528e8b34e0 fix (hopefully) last few warnings; fix Release too 
VS2013 _really_ doesn't like having shared directories for
any sort of intermediate files, and will generate a nice little
pile of useless warnings as a result.
 2015-02-27 23:08:20 -05:00
Derek S. Ray 335bdeb042 clean up all the miscellaneous warnings 
shared-intermediate-directory fixed
linker weirdness fixed
 2015-02-27 22:26:59 -05:00
Derek S. Ray b1a7bbbbdb pull in the recent unconditionals merge from master 2015-02-27 21:25:00 -05:00
Derek S. Ray 4dddb97301 remove and transfer INVISIBLE_OBJECTS to branch 2015-02-27 19:34:32 -05:00
Derek S. Ray 5ee52039ca Remove unused size from questpgr.c 2015-02-27 19:34:31 -05:00
Derek S. Ray 7f0ff8f011 Make nhsetup smart enough to see VC2013, VC2010 
Only detects Express editions for now until I can verify
what registry keys correspond to each set of full editions.
 2015-02-27 18:14:10 -05:00
Derek S. Ray f15a640120 remove old projects from root win/win32 directory 2015-02-27 16:06:47 -05:00
Derek S. Ray 2f8d6502fd Initial changes to support both VS2010 and VS2013 
Mostly it's just project formats, but VS2013 does require
parallel compilation to be turned off and synchronous
PDB writes to be turned on (since we reuse intermediate
output directories).

Cleaning that up is for some time in the future.
 2015-02-27 16:00:58 -05:00
Derek S. Ray 18ca81d963 token .gitignore change to differentiate branch 2015-02-26 21:57:47 -05:00
Derek S. Ray d34bab1509 more win32-specific pieces 2015-02-15 14:45:36 -05:00
Derek f5089838c1 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-02-13 13:29:23 -05:00
Derek bae3c6088f Exclude all the Win32 build artifacts (Studio and otherwise) 
Squashed commit of the following:

commit e37c7626f035a29321c9ac12cca83a0af2132abb
commit 86ebb3e66aedb6b5a31d61d57c39cf84c12d2276
commit 6cd677c8fca4102f223fb1708d00a65c2ded6658
Author: Derek <derekray@gmail.com>
Date:   Fri Feb 13 13:24:29 2015 -0500
 2015-02-13 13:26:05 -05:00