Commit Graph

6176 Commits

Author SHA1 Message Date
PatR
bd3244835e spell of protection
Another item from the "A few bugs" mail.  Casting spell of protection
when previous casting(s) hadn't timed out yet miscalculated the new AC
boost.  At low levels--when this spell probably gets its most use--the
bug wasn't noticeable.  (At high levels when someone might cast it a
whole bunch of times in succession, the effect could be noticed but
was probably just assumed to be working as intended.  Its behavior is
somewhat convoluted.)
2015-10-08 02:19:58 -07:00
PatR
b2dd4bb410 MUSE for branch stairs
Fix another item in the "A few bugs" mail.  Monsters who wanted to flee
weren't able to use 'sstairs' (extra stairway leading to different branch
of dungeon) due to a logic error in the find_defensive() choices.
  if (terrain==STAIR) {
  } else if (terrain==LADDER) {
  } else if (x==sstairs.sx && y==sstairs.sy) {
  } else { /* check traps */
  }
wouldn't find 'sstairs' because they have terrain type STAIRS.  (Also,
the sstairs check wasn't screening out immobile monsters, but that bug
didn't have a chance to manifest.)

There's a bunch of reformatting, and some code re-organization to improve
other formatting, and some additional logic fixes.
2015-10-07 16:32:10 -07:00
PatR
ea0729c5ca some mthrowu.c formatting cleanup 2015-10-07 15:49:59 -07:00
Pasi Kallinen
8212ddd69e setmnotwielded should always MON_NOWEP
Instead of making the caller remember to use MON_NOWEP, make
setmnotwielded handle that automatically.  This fixes the
"bad monster weapon restore" errors I've been seeing.

Also adds sanity checks for this.
2015-10-06 18:47:55 +03:00
PatR
a51531776d flesh golem healing
Fix one of the entries in the "A few bugs" mail.  Flesh golems hit by
electric damage calculated a healing amount of dam/6, then ignored it
and used dam instead.  Probably never noticed in actual play....
2015-10-05 18:32:40 -07:00
PatR
9656225247 sanity check for embedded dragon scales
The problem discovered with sanity checking of embedded dragon scales
was with the checking, not with the object flagged "embedded in skin".
I thought W_ARM got cleared when switching 'uarm' object to 'uskin',
but it isn't.
2015-10-05 18:18:03 -07:00
PatR
d0217160bb tribute: Capre Jugulum 2015-10-02 23:35:41 -07:00
Pasi Kallinen
1fe0f03f8c Document persistent options
Some options are applied from config file only to new games,
so document those.
2015-10-01 13:33:19 +03:00
PatR
154c9f164f tribute: The Last Continent 2015-09-30 15:33:58 -07:00
Pasi Kallinen
59af4e9a49 Refer to relevant config options in the Guidebook
Give the reader a hint what to look for if they want to configure
the message line.
2015-09-30 12:41:03 +03:00
Pasi Kallinen
d9bc2fb621 Add paranoid option for breaking a wand
Add OPTION=paranoid_confirm:wand to prevent accidental
wand breaking - suggested by scorchgeek
2015-09-27 19:13:20 +03:00
PatR
58b9391de8 tribute typos 2015-09-25 15:56:35 -07:00
PatR
08947dcdfa tribute: Jingo 2015-09-24 18:52:39 -07:00
PatR
55e1a50512 tribute: Hogfather
I changed the first quote to use the American spelling (snowplow vs
snowplough) found in the edition I have on hand.

Passages for several more books are still queued up.  Transcribing them
is very tedious.
2015-09-20 16:31:25 -07:00
Pasi Kallinen
798b2e76f9 One more scroll name, a tongue twister 2015-09-17 19:32:28 +03:00
Pasi Kallinen
c48b3c4556 Jump-and-bump should wake up monsters
It was possible to wake up single monsters by jumping at the monster.
Make such bumping somewhat noisy.
2015-09-15 16:17:16 +03:00
PatR
80ca4e9837 novel bit
Feedback phrasing:  don't refer to a novel as a "spellbook" when
rejecting the attempt to write on one with a magic marker.
2015-09-14 17:18:05 -07:00
PatR
29f1470ec6 tribute: Small Gods 2015-09-14 17:15:15 -07:00
Pasi Kallinen
6ba0baa4cd Improve wand of nothing randomizing
As per Sean's suggestion, just use rn2. This means the line
can also be moved to better place, with the other object
init stuff.
2015-09-13 08:53:23 +03:00
Pasi Kallinen
0ee1f31601 Make wand of nothing zap ID harder
Just to mess with zap identification, make wands of nothing
either ask for direction or not, determined at game start.
2015-09-11 18:42:06 +03:00
PatR
27efe608d7 VMS update from KevinS (2 of 2: sys/vms)
Update the command procedure that can be used to compile and link
everything.  The sys/vms Makefiles still need updating.

I added 'tribute' to the command procedure used to create and populate
the plaground directory but am not able to test it.
2015-09-08 16:46:07 -07:00
PatR
ba6c2c1f9f VMS updates from KevinS (1 of 2: core)
His changes add file_exists() to sys/vms/vmsfiles.c, which might be
needed in the future but is not useful here.  Checking for 'gbd' and
'grep' for PANICTRACE support (which I had working on Alpha--and
ought to work on VAX, no idea about IA64--before losing access to vms)
is pointless since neither is used.

src/files.c
  SYSCF support, parse_config_line():
    #if VMS, ignore GDBPATH and GREPPATH if present in sysconf;

  SYSCF support, assure_syscf_file():
    #if VMS, force open()'s optional third argument since the macro
    which redirects open to vms_open requires it.

src/sp_lev.c
  selection_do_randline():
    use configuration-specified 'Rand()' rather than raw 'rand()'.
2015-09-08 16:12:27 -07:00
Pasi Kallinen
9a4d29b365 Add new scroll names
via UnNetHack, with some slight changes:

1) Folded the two Portal references into one
2) Removed "ACHAT SHTAYIM SHALOSH" ("One Two Three" in Hebrew and apparently
   Uri Geller's catchphrase) - I know nothing about Hebrew nor Geller, or
   whether this would be appropriate to add.
3) Added "XOR OTA" ("Atorox", reference to Finnish fandom and early scifi)
2015-08-30 21:29:08 +03:00
Pasi Kallinen
25ea071aaa Fix typo "promt" 2015-08-30 20:34:07 +03:00
PatR
96f9997164 unicorn horn vs deafness
Implement the suggestion that applying a non-cursed unicorn horn can
cure deafness like other similar troubles.  Also, applying a cursed one
can cause deafness, although I made the chance be half of what it is
for the other troubles since they tend to be more significant.

This is entry #2 on the bugzilla list, but I haven't figured out how to
update that yet.
2015-08-20 18:31:12 -07:00
PatR
791c41e6b4 branch traversal via W quest artifact
Require the hero to pass the next_to_u() check when using the Eye of the
Aethiopica to portal to another dungeon branch.  Even though the reported
exploit of having a steed which is carrying the Amulet bring it along had
already been prevented, this changes the temporary portal behavior to be
like level teleport.  A steed carrying the Amulet or a non-adjacent pet
on a cursed leash will inhibit the attempted change of location.
2015-08-14 19:18:12 -07:00
PatR
a5d450898d couple of tribute typos 2015-08-14 19:06:31 -07:00
Pasi Kallinen
50eb826c0f Add a chroot install hints file for linux
This makes installing NetHack on a public server much easier.
Required some minor changes to the unix top-level Makefile, and
the other hints files; Makefile variable HACKDIR may not be a
full path anymore, use INSTDIR instead.
2015-08-13 16:30:57 +03:00
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