Commit Graph

5160 Commits

Author SHA1 Message Date
nhmall
a7076bc165 guidebook 2015-06-22 12:56:03 -04:00
nhmall
735539461c Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-06-21 22:41:43 -04:00
nhmall
dc04bae08f we left one beta tester off the list somehow
Changes to be committed:
	modified:   dat/history
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
2015-06-21 22:40:45 -04:00
Derek S. Ray
8798392e78 try not to miss ! marks 2015-06-21 20:59:17 -04:00
nhmall
993ea2e41f update beta #
I cut a new windows binary for one of the beta testers.
2015-06-21 15:51:40 -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
Pasi Kallinen
866b5caee0 Text tombstone overflow and helpless
Betatesters noticed the death message could overflow the text tombstone,
because the helpless reason was also shown there.

So don't show the helpless at all in the tombstone.  The helpless is
still put in the record, logfile, and as a separate while-field in xlogfile.
2015-06-21 17:57:17 +03:00
nhmall
429ac2d52e fix creeping indent in table in Guidebook.tex
Changes to be committed:
	modified:   doc/Guidebook.tex
2015-06-21 09:59:34 -04:00
nhmall
7e389a5d24 update Guidebook date 2015-06-21 09:37:21 -04:00
nhmall
86ab646af9 change method of including underscores in Guidebook.tex
Changes to be committed:
	modified:   doc/Guidebook.tex
2015-06-21 09:31:52 -04:00
nhmall
26baa53f2b project count (visual studio instructions) 2015-06-20 09:21:13 -04:00
nhmall
fa00bb060e visual studio updates 2015-06-20 09:17:34 -04:00
nhmall
6be4506fb6 more windows instruction cleanup 2015-06-20 09:00:20 -04:00
nhmall
4a9953ae0d more pilemark and win32 changes
Changes to be committed:
	modified:   Files
	deleted:    sys/winnt/Makefile.bcc
	modified:   sys/winnt/Makefile.gcc
	modified:   win/win32/winMS.h

Since borland Makefile isn't operational, remove it for
this release as recommended.

Changes to install.nt pending.
2015-06-20 08:50:32 -04:00
nhmall
d07e92f882 Merge branch 'master' into win32-x64-working 2015-06-20 08:40:13 -04:00
nhmall
32200de64c more pilemark 2015-06-20 08:38:11 -04:00
nhmall
385d4c4293 Pilemark support for windows
Changes to be committed:
	modified:   win/win32/mhmap.c
	modified:   win/win32/winMS.h
	modified:   win/win32/winhack.c
2015-06-20 08:33:49 -04:00
Pasi Kallinen
c574df1239 Prevent unique monsters waking up prematurely
Reported by Stefan:
> I just did the valkyrie quest. When I arrived on quest goal, I took only
> a few steps away from the upstairs and Lord Surtur jumped me. One of the
> monsters in his lair had stepped on one of the guaranteed squeaky boards

Squeaky boards (and other noisy things) woke up monsters that were
meditating. Unfortunately this also woke up such meditating monsters
as the Wiz, or the quest nemesis.

Prevent unique monsters with waiting strategy being woken up by the noise.
2015-06-20 14:15:08 +03:00
nhmall
cba799172f I'm also told "no quotation marks" in the books for Death
Changes to be committed:
	modified:   src/sounds.c
2015-06-19 17:47:38 -04:00
nhmall
5fb16cfe0f typos 2015-06-19 17:27:57 -04:00
nhmall
d167f86f1d I'm told Death is absent from two titles 2015-06-19 17:23:51 -04:00
nhmall
876b96c5ae I'm told that Death does not appear in two titles.
Changes to be committed:
	modified:   src/sounds.c
2015-06-19 17:17:40 -04:00
PatR
60e974e9f1 reformat objects.c
Manually reformat objects.c so that it's a bit easier to work with,
prior to possibly modifying it.  I wrote objects[] and obj_descr[].*
to files before and after and they were byte-for-byte identical, so
the revised objects.c hasn't introduced any changes.  It was done
from scratch rather than reverting to the pre-clang-format edition.

There was nothing particularly wrong with the uniform spacing
produced by the automated reformat, but organizing things in columns
and/or controlling where the line splits occur make changes and
comparisons easier.

artilist.h and monst.c should probably be redone too, but I don't
think I going to get around to tackling them.
2015-06-18 19:07:43 -07:00
nhmall
bb435761b4 Fix a comment in the Death Quotes section
Changes to be committed:
	modified:   dat/tribute
2015-06-18 22:01:05 -04:00
nhmall
33b948e452 increment the beta version number 2015-06-18 19:17:29 -04:00
Pasi Kallinen
2094aa16ad Fix default boulder symbol
Previous boulder symbol fix unearthed another problem:
When no boulder symbol was defined in config file, the default
iflags.bouldersym null value was used as a symbol.
2015-06-18 20:55:19 +03:00
Pasi Kallinen
6bbf7c9444 Fix boulder symbol changing
Boulder symbol could not be changed in config file with
"SYMBOLS=S_boulder:0" because the glyph code was checking
iflags.bouldersym; that is only set if boulder symbol
is changed with the deprecated "OPTIONS=boulder:0" way.
2015-06-18 20:18:44 +03:00
Pasi Kallinen
9ce8be8e60 Add NHAccess symset description 2015-06-18 16:10:23 +03:00
nhmall
72a0841dbb Merge branch 'master' into win32-x64-working 2015-06-17 19:39:24 -04:00
Alex Kompel
598ee94628 win32_gui: load pile mark bitmap on startup 2015-06-17 11:32:07 -07:00
Pasi Kallinen
1df377b951 Lights are floaters
From Boudewijn:
> y a light (tame yellow light called Snertkat) [seen: normal vision,
> infravision]
> Snertkat deliberately jumps onto a polymorph trap!

So make yellow and black lights floaters.
2015-06-17 13:44:02 +03:00
PatR
da1ae4a7da Make #tip at a location which has multiple containers honor menustyle
rather than always use a menu.  Only affects menustyle:traditional and
can be overridden at the time by using the 'm' prefix before the #tip
command.

When using the menu, add an explicit pick-from-inventory choice.  The
behavior there stays the same:  ask about inventory if no floor container
is chosen.
2015-06-16 19:23:43 -07:00
nhmall
5dc0a5747a majority opinion on cppregex.cpp declaration 2015-06-16 21:45:59 -04:00
nhmall
2939a28aa1 avoid complaints regarding "and" placement 2015-06-16 21:37:12 -04:00
PatR
e676663a64 tribute bits
Fix a couple of transcription typos and change the abbreviation of page
from 'pg.' to 'p.' since pg looks like it could refer to passage or
paragraph.
2015-06-16 16:35:54 -07:00
nhmall
833d308c7e Merge branch 'master' into win32-x64-working
Conflicts:
	include/flag.h
2015-06-16 06:34:05 -04:00
nhmall
b33c3381e6 update master's version of display.c
Incorporate a few pieces of in-progress code into master
so that it isn't left in an odd state, thus prompting
patches.
2015-06-16 06:23:28 -04:00
nhmall
c289784d49 revert recent const addition in cppregex.cpp 2015-06-16 06:05:06 -04:00
nhmall
fccf0e8c23 Merge branch 'master' into win32-x64-working
Conflicts:
	src/display.c
2015-06-16 05:59:07 -04:00
PatR
f6e46d286d another recent bit of lint 2015-06-16 02:42:17 -07:00
PatR
1547e676f3 finish implementing pmatchregex
I started out cleaning up a bit of lint in the recent run-time options
handling and discovered that pmatchregex wasn't finished.  Finish it and
also deal with the version lint.  Argument declarations for function
definitions in pmatchregex.c have been switched to K&R style.  (The ones
in posixregex.c have been left in ANSI style.)

There wasn't any build rule for pmatchregex.o; now there is (for Unix).
posixregex.o is still the default.

There isn't any build rule for cppregex.o (again, for Unix); the change
to cppregex.cpp is untested.
2015-06-16 02:29:22 -07:00
nhmall
666e4976b5 fix another logic error for nowin_buf read_tribute 2015-06-15 23:28:41 -04:00
nhmall
d196965397 logic bit
Fix a logic mistake in the nowin_buf scenario
of read_tribute.
2015-06-15 22:44:38 -04:00
nhmall
0353207f02 a couple more tribute easter eggs
Changes to be committed:
	modified:   include/context.h
	modified:   include/extern.h
	modified:   src/files.c
	modified:   src/invent.c
	modified:   src/sounds.c
	modified:   src/spell.c

Add a couple more tribute easter eggs.

 - can lead to a remark by Death if you happen to have a pratchett book on
   your person, as suggested by M. Stephenson (fat chance you will, or
   think to #chat if you do, but it could be a tournament novelty or something
   obscure to strive for).
 - can draw some additional Death quotes from the tribute file. (There's two
   in there right now. If anyone wants to add or suggest some more, please go
   ahead. The Death quotes are at the end of the tribute file. One-liners
   only please or the code will only pull the last line.
2015-06-15 22:22:56 -04:00
PatR
8848c8d7ae tribute: Lords and Ladies
It's a lot of passages, even when leaving out ones about Cresote and
King Midas (or whatever name his Discworld analog has), Nanny Ogg's cat,
Ridcully's custom made wizard hat, and the mention of a law which
requires that bystanders be warned before commencing to play folk music.
2015-06-15 18:16:03 -07:00
PatR
710a8fb0e2 rising from the dead during panic
Prevent rising from the dead as a giant ant if the game panics during
initialization.
2015-06-15 15:47:47 -07:00
nhmall
5c6a849d2d Merge branch 'master' into win32-x64-working 2015-06-15 16:49:31 -04:00
PatR
29f9a8a33d #overview, level difficulty
Three fixes, the first leading to the need to fix the second, and that
fix making dealing with the third be straightforward.

First, make the furthest level reached in any given branch be considered
interesting by #overview, even if no interesting features have been
encountered.  This will result in listing Gnomish Mines and their first
level when someone goes down the stairs and immediately back up.  It will
also produce a reminder of how far you've been--in each branch--after
retreating for any reason, without the need to manually add an annotation.

Second, #overview was suppressing the range of level numbers for Sokoban
because the author realized that the values were wrong.  The record of
the furthest level reached was incorrect for builds-up branches, always
sticking with the deepest level even though it was the entrance.  The
overview patch neglected to do the same suppression for Vlad's Tower and
the level range ("36 to 38" or similar) there was wrong.  This fixes the
furthest level reached problem and also fixes #overview's level range
handling for builds-up branches.

Third and last, a long-standing issue which I don't think has ever been
formally reported:  the level difficulty calculation used for monster
creation treated the upper (harder to get to) levels of builds-up branches
as if they were easier since they're closer to the surface as the gopher
burrows.  So sokoban generated easier monsters on its final level than on
the ones leading up to that.  Make depth for difficulty purposes account
for descent to the entrance and then ascent to the level of interest.

There was a distressing amount of trial and error involved.  The dungeon
layout structures are not exactly easy to work with, and I never managed
to get builds_up() based on branch data to work correctly.  Basing it on
dungeon data works as intended provided the branch has more than one
level, but it will yield incorrect result if we ever add a single-level
branch reached via stairs up rather than stairs down.
2015-06-14 18:14:14 -07:00
nhmall
c56a76086c some typos spotted in tribute
Changes to be committed:
	modified:   dat/tribute

There are probably more.
2015-06-14 19:59:37 -04:00