Commit Graph

5198 Commits

Author SHA1 Message Date
PatR
71d0e83e97 tribute: Feet of Clay 2015-08-04 19:55:02 -07:00
PatR
b3db52abc2 fix up Guidebook.mn's preface
Make the preface have an unnumbered header and force a new paragraph
  for its text;
remove the unterminated switch to bold font;
change "Terry Pratchett" from bold to italics to match Guidebook.tex's
  setting.
2015-08-04 17:41:54 -07:00
PatR
35cabe53bf wear/remove commands, P & R vs W & T
Allow 'P' and 'R' commands to accept armor and wear/take-off the chosen
item, and 'W' and 'T' commands to accept accessories and put-on/remove
the item.  The which-object prompt only lists the type(s) of items that
traditionally go with each command, as does an inventory menu if the
user picks '?', but items of the alternate type(s) can be chosen, by
unshown letter or by the inventory menu given for '*'.

There shouldn't be much difference if you continue picking items that
go with the original commands, although you will somestimes get
"which object? [*]" when the only choices are for alternate command.
And you won't see the all-four-accessories-are-already-worn message
for 'P' unless you also have something worn in all seven armor slots.

The Guidebook.mn changes have been tested (that's how/why I noticed
the preface glitch) but the corresponding Guidebook.tex ones haven't.
2015-08-03 18:38:38 -07:00
Sean Hunt
ff823095ee Revert "Add tombstone tribute to S.T.P. for 3.6.0"
This reverts commit 64dfb4fcc8.
2015-08-03 12:56:32 -04:00
Sean Hunt
9f0c9b4a0b Revert "Properly define NH360_DEDICATION in Makefiles"
This reverts commit 3db39ca221.
2015-08-03 12:56:26 -04:00
PatR
5e909d3b44 obj bypass: move vs turn
Reported by ais; clearing object bypass bits once per turn isn't often
enough.  Clear them after the hero moves (which might be more than once
in a turn) and before each monster moves (ditto) and after last monster
moves.  This might not be optimal but that shouldn't matter since it's
usually a no-op.
2015-08-02 01:54:51 -07:00
Pasi Kallinen
3db39ca221 Properly define NH360_DEDICATION in Makefiles 2015-07-31 15:51:01 +03:00
PatR
590aed1d25 tribute: Raising Steam
Plus a couple miscellaneous typo fixes.
2015-07-26 19:43:29 -07:00
PatR
2fd01af153 tribute typos 2015-07-26 17:41:29 -07:00
PatR
b8e35cac69 tribute: Maskerade 2015-07-25 20:32:12 -07:00
PatR
9034e2a7e5 W_WEAPON, W_ACCESSORY
Add macros W_WEAPON and W_ACCESSORY, similar to existing W_ARMOR, bitmask
of all the relevant worn bits.  Just for code readability; there should
be no change in behavior.

Also, reformat the "ugly checks" portion of getobj().  Slightly better
readability and fewer continuation lines, but only a modest improvement.
2015-07-25 19:19:58 -07:00
Sean Hunt
64dfb4fcc8 Add tombstone tribute to S.T.P. for 3.6.0
I've added build files for unices, but other platforms will need to define
NH360_DEDICATION on their own.
2015-07-19 12:42:23 -04:00
Sean Hunt
bda16a1703 A little bit more tribute.
Also clean up a pline->pline1 in the tribute code.
2015-07-19 12:34:25 -04:00
PatR
872c8e292c tribute: Interesting Times
I have several psssages for Maskerade too, but after the time and effort
spent fixing up the ones already present for that book, they'll have to
wait until some other occasion.
2015-07-18 19:36:51 -07:00
nhmall
ab5496cdbc Makefile typo 2015-07-18 09:02:54 -04:00
PatR
4ebe3978b6 tribute: Soul Music 2015-07-17 02:11:20 -07:00
PatR
2b2ee0fbab formatting fixup (1 of 2)
Replace instances of strings split across lines which rely on C89/C90
implicit concatenation of string literals to splice them together
with single strings that are outdented relative to the code that uses
them.  It's uglier but it won't break compile for pre-ANSI compilers.

This covers many files in src/ that only have one or two such split
strings.  There are several more files which have three or more.  Those
will eventually be '(2 of 2)'.

Noticed along the way:  the fake mail message/subject
  Report bugs to devteam@nethack.org.
wasn't using its format string of "Report bugs to %s.", so would have
just shown our email address.  Doesn't anybody enable fake mail anymore?

I modified that format to enclose the address within angle brackets and
made a similar change for the 'contact' choice of the '?' command.
2015-07-12 19:35:06 -07:00
Pasi Kallinen
f05f716dbc Fix dark_room glyphs when restored from save
If color or dark_room options were toggled during gameplay, and then
the game is saved and restored with different options, the dark room
glyphs were wrong.

Reported by both Boudewijn and Pat.
2015-07-10 16:17:04 +03:00
Pasi Kallinen
c1ef2e19df Fix more dark_room and nocolor
Fixes for example the case of searching while blind, as
reported by Boudewijn.
2015-07-10 16:04:04 +03:00
Pasi Kallinen
864fb1e203 Fix nocolor messing with dark_room on levelchange
As reported by Pat:
> After leaving a level and then returning, I'm seeing lit
> room squares as blank
> Options all have their default settings

OPTIONS=nocolor is the default; we should probably change this
sometime, because nearly everyone plays with color.
2015-07-10 15:49:33 +03:00
PatR
3caa4e2adb quest message summaries: knight and monk
Six roles down, seven to go....
2015-07-10 01:08:45 -07:00
PatR
72303206fc questpgr: plural neuter pronoun
%o[hij] relied on makesingular() converting "the Eyes of the Overworld"
into "the Eye of the Overworld" to recognize when it should use
they/them/their instead of it/it/its, but makesingular() was changed to
keep "eyes" intract instead of stripping the 's'.  So qtext_pronoun()
needs to check for "Eyes" itself.
2015-07-10 01:00:07 -07:00
PatR
e571b18985 healer quest messsage summaries
Add summary lines for the deliver-by-window messages of the Healer
quest.  Also, replace a bunch of hard-coded pronouns for leader,
nemesis, and in one case, patron deity in the Healer messages plus
the three roles which precede it (Arc, Bar, Cav).
2015-07-08 02:19:08 -07:00
PatR
7684076e09 tribute: Men at Arms
The breakfast+coffee+doughnut one is by the far the longest we've had,
but I decided not to try trimming any of it out.  It was at the start
of a 10 page stretch that has six good passages, but I've only included
three of them.

I've got passages for two more books queued up, but transcribing and
proofreading is a chore....
2015-07-07 02:23:27 -07:00
PatR
63736ba33b '/' enhancement
Add new entries to the menu used for the '/' command:  describe nearby
monsters, describe all shown monsters, describe nearby objects, and
describe all shown objects.  It makes a text window listing monsters--
or objects--currently displayed on the map, showing lines of
X  r,c  monster-or-object description
where 'X' is symbol (monster or object class letter for tty), 'r,c' is
row and column separated by comma, and description is similar to what
using '/y' or ';' manually would provide (how-seen info is omitted
when listing monsters).

Originally intended for blind players using screen readers to describe
what is displayed, but will probably get used by other players too.

The map doesn't use a separate set of glyphs for objects which are the
tops of piles, so the information that there are additional objects
beneath the ones shown isn't available to '/' and ';'.  That feels like
a bug to me....
2015-07-06 19:07:26 -07:00
PatR
fe09f7156d vampshifter messages
If you've just received the "dead bat revives as a vampire" message,
suppress the rather obscure "Maybe not..." message given when an unseen
creature gets life-saved since it ends up being out of sequence.  You
could get them both when the death/revival was sensed via telepathy
without being in sight.

Also, some formatting cleanup and a couple miscellaneous code tweaks.
2015-07-06 18:24:13 -07:00
PatR
c64036c97b \#overview quest feedback
Implement the requested feature to have an automatic annotation on the
dungeon level with the quest entry portal where you sense the leader
summoning you.  It stays even after entering the portal (which results
in another automatic annotation of "portal to quest"), up until you
return to that level after having completed the quest.

Add a second one for the quest home level once the leader has given
you the go ahead to start the quest.  After completing the quest that
one remains but its wording is changed.

This ought to haved incremented EDITLEVEL but I decided to risk leaving
current save files viable.  That should work ok for anyone who isn't
overriding the default definition of Bitfield(), although odd behavior
could conceivably occur.  New games have nothing to worry about.
2015-07-04 20:06:31 -07:00
PatR
60de579757 another do.c formatting bit 2015-07-04 17:49:47 -07:00
PatR
b1d8ce0993 do.c formatting
Fix a couple of instances of a mis-indented block comment which happens
to be immediately preceded by an end-of-line comment.  Change a couple of
|  if (condition)
|    something;
|  else {
|    other_stuff;
|  }
to have braces around the 'then' part.  Remove some gratuitous 'register'
declarations.
2015-07-04 17:07:41 -07:00
PatR
8f758cce25 boot weights
Make both pairs of iron boots weigh the same (kicking boots become
heavier).  Make boots of water walking weigh the same as levitation
and elven boots (slightly lighter; 3/4 as much as speed, fumbling,
and mundane high boots).
2015-07-04 16:28:08 -07:00
PatR
e832da49ec epitaph punctuation
Clean up some of the epitaphs.  Mostly to always use two spaces when
separating sentences.

A lot of them have terminating punctuation, and a lot of them don't.
I mostly left those alone; should they be made consistent?
2015-07-02 18:58:01 -07:00
Pasi Kallinen
fe073055b6 Comment typofix 2015-06-25 08:08:39 +03:00
Pasi Kallinen
9dc979d414 TTY: Separate hilite_pile option 2015-06-23 07:43:52 +03:00
nhmall
c2de8d3f6b relocate a couple of options in the Guidebook 2015-06-22 16:02:58 -04:00
nhmall
5df350d548 separate option to toggle hilite_pile
Beta tester report.

The use of use_inverse meant that you couldn't selectively
choose to hilite pets but not piles. Add its own option.
2015-06-22 15:51:43 -04:00
nhmall
3ba5def8f1 fix windows console bug reveals monster (console tty) 2015-06-22 15:06:00 -04:00
nhmall
00c89bc631 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-06-22 12:56:41 -04:00
nhmall
a7076bc165 guidebook 2015-06-22 12:56:03 -04:00
Pasi Kallinen
bf9bd54b4a Force full-level wallify for orctown
Betatesters noted the "Orc town" variant of minetown had
"black" (solid stone) walls, so fix those.
2015-06-22 18:44:29 +03: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