Commit Graph
4614 Commits
Author SHA1 Message Date
Pasi Kallinen de2364da94 Save playmode in xlogfile 2015-03-29 14:56:23 +03:00
nhmall 5855deae6e doc/fixes update for C343-357 2015-03-28 18:20:19 -04: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
nhmall 011520d61a Guidebook transcription typo 2015-03-28 15:23:28 -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
Pasi Kallinen cbb155b0e6 YAFMs when trying to pick up terrain features 2015-03-28 19:31:01 +02:00
Pasi Kallinen 9a4fefb5ad Add missing prototype 2015-03-28 19:21:49 +02:00
nhmall 9b328f1ad6 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-03-28 11:23:47 -04:00
Pasi Kallinen 0e4317fa6b Balsa wands break easily 2015-03-28 17:20:57 +02:00
nhmall c035402c14 flavor enhance zap downwards/upwards when hiding
Changes to be committed:
	modified:   doc/fixes35.0
	modified:   include/extern.h
	modified:   src/apply.c
	modified:   src/zap.c

    On 3/23/2015 6:41 PM, a bug reporter wrote:
    > When you're hiding under an item (e.g. via garter snake polyform), and
    > that item gets polyshuddered into nonexistence, you continue hiding
    > (under nothing).
    This was addressed previously.

    > (Incidentally, it's a bit weird that you use > to aim at items that are
    > flavorwise above you at the time.)

    This addresses the flavorwise concern.
2015-03-28 11:20:44 -04:00
Pasi Kallinen b17ecb149b Use existing function to count containers 2015-03-28 16:24:25 +02:00
Pasi Kallinen 2fce0074b3 Show legal polearm hit positions
User can press $ to display valid positions when asked
for a position to pick, and the positions will be hilighted
2015-03-28 13:32:24 +02:00
Pasi Kallinen c7d92a47e1 Remove migrating monster from polearm targeting 2015-03-28 10:55:41 +02:00
Pasi Kallinen c6faa08b8f Add sysconf for linux-X11 2015-03-28 10:00:44 +02:00
nhmall ec456ade9f a couple of substitution errors in Guidebook.tex 2015-03-28 01:06:28 -04:00
nhmall cb79a82bfb fix up some syntax errors in Guidebook.tex 2015-03-28 00:49:38 -04:00
keni 952fb0dccf Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-03-27 21:38:25 -04:00
keni 78452809bc regenerate Guidebook.txt 2015-03-27 21:31:25 -04:00
PatR 45c5a79681 tty menu hack for ':'
Looting a container generates a menu which contains ': - look inside'
but the recent change to make ':' be a menu command for selecting
items which match a search string made it impossible to pick that item.
(Well, I suppose you could enter a search string which matched it, but
that's a nuisance compared to just directly picking a choice.)  This
makes menu selection for tty give precedence to menu choice characters
over mapped menu commands when some character happens to be both.  I'm
not sure whether it ought to be expended to group accelerators too, so
didn't do that.

There's bound to be a better way to do this, but it works.
2015-03-27 18:24:53 -07:00
nhmall 4a3a130795 subsitution gone amuck
Changes to be committed:
	modified:   doc/Guidebook.mn
2015-03-27 19:56:04 -04:00
nhmall 67cbd0c8e9 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-03-27 19:48:17 -04:00
nhmall 76ee82b7d3 more doc updates
Changes to be committed:
	modified:   dat/history
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
2015-03-27 19:47:17 -04:00
Pasi Kallinen 13645dcd2a Automatically find monster to target with polearm
If there's only one suitable monster within range, automatically
suggest it for targeting with the polearm
2015-03-28 00:32:54 +02:00
Pasi Kallinen 5bb4a02ffe Remember position of monster you hit with polearm
If you hit a monster with a polearm, following polearm applications
will try to automatically suggest the monster's position
2015-03-27 23:34:13 +02:00
Pasi Kallinen 5c87641985 Update fixes35.0 with t-shirt text disclose 2015-03-27 22:13:35 +02:00
Pasi Kallinen c5ea073569 Update fixes35.0 with reading items 2015-03-27 22:11:41 +02:00
Pasi Kallinen 870b124f14 Allow reading many more items
You can now also read alchemy smocks, credit cards, cans of grease,
magic markers, gold, the Orb of Fate, and candy bars.
2015-03-27 21:04:18 +02:00
Pasi Kallinen 2e2d020a59 Show t-shirt text at end of game inventory disclose
Restricting the text display only to the end of game disclose,
so it doesn't clutter the inventory during gameplay and so that
the readability of t-shirts is not given away.
2015-03-27 16:08:06 +02:00
Pasi Kallinen 911a3756c6 TTY: Guard against impossible x coord
If a menu item was longer than terminal width, the menu wasn't
cleared away after it was finished with.  This easily happened
when an inventory item was named.
2015-03-27 15:29:54 +02:00
Pasi Kallinen 08654c213c Fix passing non-static buffer out of scope 2015-03-27 15:12:34 +02:00
PatR ed85d3f158 objnam formatting for bag of tricks
Bag of tricks that had been used at least once was being described
as "empty" regardless of charge count, because it always fails the
Has_contents() test.  After half this patch fixed that, it started
being flagged as "empty" as soon as the last charge was used rather
than after attempting to use it again after that, since 'cknown' was
being set whenever it was used.  Only set that flag when applying
the bag has been observed to fail.
2015-03-27 00:21:40 -07:00
nhmall f9e8e80589 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-03-26 12:41:26 -04:00
nhmall 896fb15249 sync docs
Pasi pointed it out that the SYSCF stuff was only added
to Guidebook.mn not Guidebook.tex
2015-03-26 12:40:22 -04:00
Pasi Kallinen 8c94f93370 Catch up and sync Guidebooks 2015-03-26 16:46:41 +02:00
Pasi Kallinen 9c29d74fed Fix typo in Guidebook.tex 2015-03-26 16:14:33 +02:00
nhmall 7d4298655d names of public servers and tournament contrib
Changes to be committed:
	modified:   dat/history
2015-03-26 08:05:23 -04:00
Pasi Kallinen 4f0dc123c6 Fix Guidebook typos 2015-03-26 11:41:05 +02:00
Pasi Kallinen f4776d515d Fix typos in fixes35.0 2015-03-26 08:44:24 +02: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
PatR b1df164a3b fix acid_damage() crash
My dog bit an acid blob and triggered a crash, caught by SYSCF panictrace
but yielding confusing information.  The backtrace included a call from
'rustm()+N' that turned out to be passivemm(), which was deferencing a
null pointer since no weapon was involved.
2015-03-25 18:04:50 -07: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
Pasi Kallinen 2be9f41885 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-03-25 22:15:16 +02:00
Pasi Kallinen f41c51aef0 Show object symbols in menu headings
... in menus where those object symbols act as menu accelerators.
Toggleable via "menu_objsyms" boolean option, defaults to off.
2015-03-25 22:13:28 +02:00
Sean Hunt 907a2dfee0 Fix a memory leak on termination.
Found by Alex Smith.
2015-03-25 14:34:28 -04:00
nhmall a355911c2c no hiding under nothing
On 3/23/2015 6:41 PM, a bug reporter wrote:
> When you're hiding under an item (e.g. via garter snake polyform), and
> that item gets polyshuddered into nonexistence, you continue hiding
> (under nothing).

This addresses the "hiding under nothing" bug, but does not
address this flavor comment also included in the report:
> (Incidentally, it's a bit weird that you use > to aim at items that are
> flavorwise above you at the time.)
2015-03-24 22:07:16 -04:00
nhmall dde4f6322c Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-03-24 19:29:11 -04:00
nhmall a1cc33d6ae fix invalid pointer dereference in morguemon
On 3/23/2015 6:41 PM, a bug reporter wrote:
> If the game generates a graveyard, the graveyard places a normal
> demon, but all normal demons are extinct at the time, then morguemon (at
> mkroom.c line 423) indexes mons with NON_PM (the return value of
> ndemon() if it can't find a reference), which is an invalid pointer
> dereference. According to the testbench, this mostly seems to happen on
> dlvl 12.

This fixes the code violation, but the logic will now drop down to the
ghost/wraith/zombie code when that happens.

Is that desireable, or should something else happen (for variety)?
2015-03-24 19:20:14 -04:00