nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity
4,282 Commits 2 Branches 0 Tags
6fcfa55f36d65b5dc3c1894c8652d6f56911feea
Commit Graph
17 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 1e76ed28ae Initial version of simple recipes file 2015-03-12 22:47:44 -04: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 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