Commit Graph

6469 Commits

Author SHA1 Message Date
Pasi Kallinen
2643a5c311 Show stinking cloud valid positions 2015-04-05 13:51:30 +03:00
Pasi Kallinen
056565fe75 Make all elementals breathless
It makes no sense that air, fire and water elementals
would choke in stinking cloud.
2015-04-05 12:47:27 +03:00
Pasi Kallinen
71401a7db8 Add poison cloud glyph, fumaroles to fire plane.
When a gas cloud that deals damage is created, it uses
a poison cloud glyph instead of the cloud glyph.
(A bright green '#', or a bright-green recolor of the
cloud tile)

The plane of fire has random "stinking clouds", or
fumaroles, centered on lava pools.

Also make poison cloud glyph override lava, pool and
moat glyphs.
2015-04-05 12:31:55 +03:00
nhmall
1e74df8b08 Changes to be committed:
modified:   src/shknam.c
	modified:   src/trap.c
	modified:   src/zap.c

While polymorph was clearing the name because poly_obj
actually creates a brand new obj and copies field values
over, water_damage does not so the name persisted on
the blank spellbook. In this case, that isn't really
appropriate. Clear the name.

Ensure that cancellation has no effect on these
ordinary books.

Make the second-hand bookstore an option for holding
the book tribute item too.
2015-04-05 00:20:42 -04:00
nhmall
a8261cd10a correct something spotted in email diff 2015-04-04 21:38:43 -04:00
nhmall
b383cc6a2c update book tribute
Changes to be committed:
	modified:   doc/fixes35.0
	modified:   include/extern.h
	modified:   src/do_name.c
	modified:   src/objnam.c

This pretty much completes the code portion of the book tribute.
- The book will appear in the rare books shop.
- When you read the book, a random passage is drawn for a
  tribute file (suggested by Mike).
- The book cannot be renamed because it already has a
  name (observed/suggested by Sean).

The data file (dat/tribute) has a few test passages, but needs to be
filled out. Sean and Mike Stephenson have indicated that
possibly they may be able to help contribute to that. Ideally,
there should be at least one passage from each of the books.
2015-04-04 21:20:34 -04:00
nhmall
5432ba7f44 Merge branch 'master' into nhmall-booktribute 2015-04-04 08:31:14 -04:00
nhmall
fff3b12de0 Merge branch 'nhmall-booktribute' of https://rodney.nethack.org:20040/git/NHsource into nhmall-booktribute 2015-04-04 08:22:05 -04:00
Sean Hunt
d5a2dcf8c7 Fix the Unix build. 2015-04-04 00:39:11 -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
Pasi Kallinen
fdc7e980ea Prevent segfaults, makemon can return null 2015-04-03 14:46:28 +03:00
Pasi Kallinen
30bce1ec6b Suggest only accessible positions for polearms and jumping 2015-04-03 12:29:58 +03:00
Pasi Kallinen
0344771b12 Silence warnings 2015-04-03 08:33:14 +03:00
nhmall
c43e8f9d31 Merge branch 'master' into nhmall-booktribute
Conflicts:
	include/context.h
2015-04-02 19:19:50 -04:00
Derek S. Ray
e2f839efbd fix whiny compiler 2015-04-02 17:14:48 -04:00
Pasi Kallinen
c8e781c418 Add menucolors
-Add a boolean option menucolors to toggle menu color
-Add MENUCOLOR -config file option

TODO:
-Better support for win32
-Support more windowports
-Update Guidebook
-Allow changing menucolor lines in-game
2015-04-02 20:16:25 +03:00
Pasi Kallinen
9f66b234ed Separate splev stack pops 2015-04-02 16:08:15 +03:00
Pasi Kallinen
f150adf0ce Silence GCC warnings 2015-04-02 14:04:31 +03:00
Pasi Kallinen
884d9d4be5 Record in xlogfile if any bones were loaded 2015-04-02 13:06:45 +03:00
PatR
066e415c3e some lint cleanup
Mostly local variables using the same name as other things.
2015-04-01 17:29:26 -07: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
Pasi Kallinen
d883da2353 Add doors correctly 2015-04-01 23:01:25 +03:00
Pasi Kallinen
f3bbd833c0 Fix mazes not getting stocked 2015-04-01 18:30:35 +03:00
Pasi Kallinen
97fe3214c7 Remove unused code 2015-04-01 18:24:15 +03:00
Pasi Kallinen
7d94548951 Doors must be linked afterwards 2015-04-01 17:39:51 +03:00
Pasi Kallinen
fa4dda377d Move isqrt into hacklib, other minor fixage 2015-04-01 16:38:56 +03:00
Pasi Kallinen
323b8b4038 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource into paxed-new_lev_comp
Conflicts:
	src/trap.c
	sys/winnt/Makefile.msc
2015-04-01 16:09:53 +03:00
nhmall
8fb23b4a41 non-Unix build was broken today
Changes to be committed:
	modified:   src/cmd.c

../src/cmd.c(515) : warning C4013: 'check_user_string' undefined; assuming extern returning int)
link error - cmd.o : error LNK2019:
unresolved external symbol _check_user_string referenced in function _enter_explore_mode
2015-03-31 19:07:25 -04:00
Pasi Kallinen
055cc1b4d5 Show legal jumping positions 2015-03-31 21:40:49 +03:00
Pasi Kallinen
322d004e12 Some spam for mail daemon to deliver 2015-03-31 18:32:23 +03:00
Pasi Kallinen
ca80675d59 Allow admin to disable explore mode
Some public servers want to disable explore mode, so
make it configurable in sysconf.
2015-03-31 18:14:16 +03:00
Pasi Kallinen
cbd1657976 Use a menu when user wants to query a glyph
When user presses '/', pop up a meny asking what the user wants to
look at:

What do you want to look at:

a - something on the map
b - something you're carrying
c - something else

This replaces the "Specify unknown object by cursor?" -prompt,
while keepng backwards compatibility, and also allows querying
about items in the inventory.
2015-03-31 12:59:48 +03:00
Pasi Kallinen
9f605ed2b3 Moving clouds on the plane of air
Reusing the plane of water air bubbles code
2015-03-31 11:46:46 +03:00
Pasi Kallinen
19aeb91dc4 Revert one GCC warning 2015-03-31 10:20:20 +03:00
PatR
cc00b21178 bhitpile lint bit
The 'zdir' function parameter has the same name as 'zdir' global
variable, triggering a 'shadowing' warning.  I had to read the 'if'
statement multiple times to convince myself it was doing what was
intended.  It was, but I think this rewrite is easier to understand
(at least for my feeble reptilian brain).

I don't know who Tim Wright is, but his 15 mintues of fame has
lasted for at least a decade so I cut his comment out.  (The 28.5
year old GAN one a dozen lines lower was a tempting target for
removal, but I managed to stop myself; otherwise it never ends.)
2015-03-31 00:13:20 -07:00
Pasi Kallinen
aa7144daf6 Bear traps wound legs 2015-03-31 09:38:38 +03:00
Pasi Kallinen
f2d97b2d00 Silence GCC warnings
...when compiling with -Wall --pedantic
2015-03-31 08:36:36 +03:00
Pasi Kallinen
84a067a016 Options to create the character blind or nudist
For those pro players who really want to try their hand
at that zen samurai, without needing to reroll thousands
of times to start with blindfold.  Nudist starts without
any armor, and keeps tabs whether you wore any during
the game, for even more bragging rights.

Also makes the Book of the Dead readable even while
blind, for obvious reasons.
2015-03-30 22:12:54 +03:00
Pasi Kallinen
e305b8a51e New T-shirt texts, bogusmon, one YAFM 2015-03-30 17:09:12 +03:00
nhmall
5a90f5f366 fix some compiler warnings windows cmdline
Changes to be committed:
	modified:   src/hack.c
	modified:   src/vision.c
2015-03-29 20:07:41 -04:00
Sean Hunt
2a9c913c1c Add new hallucinatory gods. 2015-03-29 19:10:46 -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
Pasi Kallinen
411ee58593 Add more explicit helpless reasons
Instead of just "while helpless", the death reason will tell
more explicitly why the player was helpless.  For example:
"while frozen by a monster's gaze"
2015-03-29 22:12:19 +03:00
Pasi Kallinen
6c58e7f03f Kicking a grave may topple the gravestone
...with similar alignment hit as when digging up a grave.
2015-03-29 17:45:45 +03:00
Pasi Kallinen
1e49567937 Use dark gray color for black glyphs in TTY
This is Michael Deutschmann's use_darkgray -patch.
Adds a boolean option use_darkgray, settable in config file.

This patch has been in use on NAO for years, and I have heard
once someone say their terminal didn't support the dark gray
color.
2015-03-29 15:51:11 +03:00
Pasi Kallinen
de2364da94 Save playmode in xlogfile 2015-03-29 14:56:23 +03:00
nhmall
e69b5ae944 fix C343-357 Rust monsters may chew non-ferrous items
Changes to be committed:
	modified:   src/mon.c

website should be updated to reflect this bug closure.

C343-357 Rust monsters may chew non-ferrous items.
2015-03-28 18:08:09 -04:00
nhmall
35d80f5922 remove #ifdef TOURIST straggler
Changes to be committed:
	modified:   src/worn.c
2015-03-28 18:05:42 -04:00
Pasi Kallinen
4cd14a7a2a It's Wonka Bar, not just Wonka 2015-03-28 20:39:40 +02:00
Pasi Kallinen
cf7143094f Feedback when boomerang hits sink 2015-03-28 19:38:15 +02:00