nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity
4,640 Commits 2 Branches 0 Tags
bac7654a75a5ff6e5423afd7d5a5ea89a0bfcc3a
Commit Graph
37 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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 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