Commit Graph
100 Commits
Author SHA1 Message Date
nhmall 9130216545 Merge branch 'win-minor' into NetHack-3.6.2-beta01 2018-11-14 08:04:40 -05:00
nhmall 6764933413 newline at end of file 2018-11-14 07:51:25 -05:00
nhmall 8e907a0b0f Merge branch 'NetHack-3.6.2-beta01' into win-minor 2018-11-13 13:32:01 -05:00
nhmall 16e014b39f Merge branch 'win-minor' into NetHack-3.6.2-beta01 2018-11-12 23:15:13 -05:00
nhmall d89deb5bf7 Makefile update to reference recently added file 2018-11-12 23:10:42 -05:00
nhmall ed70005c9b Makefile build updates 2018-11-11 15:39:13 -05:00
nhmall e87496b897 merge fluff 2018-11-11 10:48:08 -05:00
nhmall a0b53ee391 merge 2018-11-11 10:29:52 -05:00
nhmall 359b59753f fixes update for odd wording 2018-11-07 17:08:41 -05:00
nhmall 6fb2000feb fix odd wording "The boulder triggers and fills a pit" 2018-11-07 17:06:45 -05:00
nhmall 0fb263ea88 fix broken build cause by missing semicolon 2018-11-05 15:33:02 -05:00
nhmall 4e98337abc grammar 2018-11-01 21:04:23 -04:00
nhmall 0ea7fbad7a single fixes36.2 entry for special case wish/genocide since release 2018-10-31 09:11:57 -04:00
nhmall 22b5abe4f4 watchmen at genocide prompt
Report stated:
	type "watchmen" into a genocide prompt, it says no such creatures exist in the world
	type "watchman" and it says "wiped out all watchmen"

fixes #151
2018-10-31 08:49:18 -04:00
nhmall 77c9930662 typo fix 2018-10-29 07:28:35 -04:00
nhmall aa0b973001 fix Guidebook.tex processing due to wrong brace used
[36] [37] [38] [39] [40] [41] [42] [43]
! Extra }, or forgotten \endgroup.
l.4602 ``{\tt up}'' and ``(\tt down}
                                    '' set the field attributes for when the...
2018-10-27 19:18:27 -04:00
nhmall 77376fc979 two more windows supporting bits 2018-10-20 23:14:34 -04:00
nhmall 270c228b60 windows build mods to support branch change
Changes to be committed:
	modified:   sys/winnt/Makefile.gcc
	modified:   sys/winnt/Makefile.msc
	modified:   win/win32/vs2015/NetHack.vcxproj
	modified:   win/win32/vs2015/NetHackW.vcxproj
	modified:   win/win32/vs2015/files.props
	modified:   win/win32/vs2017/NetHack.vcxproj
	modified:   win/win32/vs2017/NetHackW.vcxproj
	modified:   win/win32/vs2017/files.props
2018-10-20 23:14:33 -04:00
nhmall 530b2f06f1 Files merge cleanup 2018-10-19 18:13:26 -04:00
nhmall c8b73b08cd Revert "fix github issue #94 - files missing from Files"
This reverts commit ec19b52d8d.
2018-10-18 21:43:36 -04:00
nhmall e25c7be719 keyhelp missed during Windows build steps
BUG REPORT:

    comments:
    1. I start a new character.
    2. The first command I type is '&'
    3. I type "?" and "<enter key>" at the prompt.
    4. Cannot open "keyhelp" data file!--More--
       ?    give a help message.

1559
2018-10-12 20:57:26 -04:00
nhmall c6a5ec1ab6 ensure tmp_at() structures are initialized for all code paths when swallowed 2018-10-04 22:02:28 -04:00
nhmall 8ce1f88f53 Revert "ensure tmp_at() structures are initialized for all code paths when swallowed"
This reverts commit 39074d29fc.

Bad commit of do_throw
2018-10-04 22:00:51 -04:00
nhmall 67c80b2e4b Revert "fix up a bad commit"
This reverts commit 2eb8436db2.
2018-10-04 22:00:08 -04:00
nhmall 2eb8436db2 fix up a bad commit 2018-10-04 21:55:01 -04:00
nhmall 39074d29fc ensure tmp_at() structures are initialized for all code paths when swallowed 2018-10-04 21:49:16 -04:00
nhmall d9ecc42566 a couple of steed Flying messages 2018-09-30 10:01:43 -04:00
nhmall 85aef136d5 comment typo in music.c 2018-09-30 08:45:49 -04:00
nhmall 00dfed5b3a move assignment outside inner loop 2018-09-29 23:38:20 -04:00
nhmall ef199f3763 one more update for the right of the status line
This tracks the last character written on each row and clears
the previous content from the end independently of which field
is actually involved.
2018-09-29 23:21:11 -04:00
nhmall d1c5649890 revisit display artifact appearing to the right of status line
The prior fix for this was a bit flawed. It was only considering
the length of the last field, but what it really needed to do was
consider the placement of the last character of the last field
on the row relative to the placement of the last character of
the last field on the row previously.

If the new placement of that last character of the last field
is left of the previous placement, some clearing must be done.
2018-09-29 22:28:10 -04:00
nhmall 394c72d366 display cleanup only targets the right-most field where it's needed 2018-09-28 12:55:30 -04:00
nhmall bdc9a6b98e follow-up bit 2018-09-28 02:28:54 -04:00
nhmall b14d495ce4 Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2018-09-28 02:09:30 -04:00
nhmall 5639539568 tty: fix leftover display artifact when last field on the row got smaller 2018-09-28 02:09:07 -04:00
nhmall c5d0f6dd9d fix out of bounds error in tty_status_update() for BL_HUNGER case
The pointer could go out of bounds when decremented if it was pointing
at the start of the status_vals[BL_HUNGER] (empty string).

Also, guard tty_status_update() from an out of range index being
passed to it (botl shouldn't do that, but...).

The legal 1st parameter values for tty_status_update() in 3.6.2 are

	BL_RESET     (-2)
	BL_FLUSH     (-1)
	BL_TITLE     ( 0)
	...though to...
	BL_CONDITION (22)

  count MAXBLSTATS = (BL_CONDITION + 1)

There's a BL_CHARACTERISTIC (-3) defined in the botl.h header file,
but it is not used in wintty.c and is now screened out along with
everything lower and everything MAXBLSTATS and above.

closes #142
fixes #141
2018-09-26 17:18:09 -04:00
nhmall 74b7829957 engr follow-up bit 2018-09-26 01:35:48 -04:00
nhmall 0fecf19789 wand of polymorph engrave for blind writers
Don't provide any discerning feedback on the blind player's turn
but do allow the wand to exercise its magic in a manner reflective
of blind writers
2018-09-26 01:10:27 -04:00
nhmall 2a92111223 fix missing space in "would flyif you weren't levitating"
Fixes #140
2018-09-25 23:28:20 -04:00
nhmall eb63d6a023 Merge branch 'copperwater-flyif_fix' into NetHack-3.6.2-beta01 2018-09-25 23:24:44 -04:00
nhmall cd0a29eae8 Merge branch 'flyif_fix' of https://github.com/copperwater/NetHack into copperwater-flyif_fix 2018-09-25 23:22:11 -04:00
nhmall 039ad51660 don't impact player stats with wizard mode ^T 2018-09-25 23:08:09 -04:00
nhmall 3f5ef9bdf3 make long extended commands list be more navigable 2018-09-24 16:45:38 -04:00
nhmall 22d69d2424 update tournament reference 2018-09-24 15:59:38 -04:00
nhmall 02b1ce2d9a no leash-related message is given when leashed pet yellow light explodes
mondead() -> m_detach() -> m_unleash() suppresses
the m_unleash() slack message, so deliver it in
the caller explmm() in those circumstances.

(The issue of whether it should be possible to leash light
is side-stepped.)

bug H7406, 1548
2018-09-23 14:06:18 -04:00
nhmall 2813e42b22 known bear trap forgotton by player polymorphed into a flyer
The original report stated:

     "I located a bear trap as a human and just ignored it
     for the time. I polymporphed into a Vampire Lord, then
     went to #untrap the bear trap.  On the first attempt,
     I stood beside the trap and attempted to #untrap.  I
     received the 'Whoops!' message and automatically moved
     onto the trap square as a result. The bear trap vanished!
     I obviously wasn't trapped since I'm polymorphed into a
     flying monster, but the trap glyph was no longer present.
     The glyph looked like regular floor - as if I had
     untrapped the bear trap and taken the trap with me."

The trap was actually still there but became hidden intentionally
for other valid scenarios, but was an unintended side-effect for
this scenario.

Fix it by failing the #untrap operation for a Flyer earlier on,
and in a more benign manner, since the Flyer ultimately doesn't
end up in the trap anyway.  You'll still get the "Whoops!",
followed by a message, but that's as far as the "failed" #untrap
attempt will go under the circumstances.
2018-09-23 11:16:09 -04:00
nhmall 76bffe5ba4 drum of earthquake causing deafness inappropriately
Address a drum of earthquake inconsistency reported 2017-03-23:
"Drum of earthquake does not make you deaf.  Leather drum or depleted
drum of earthquake does."

bug 1099
2018-09-23 10:11:02 -04:00
nhmall 84c17d2e21 two typo/follow-up bits 2018-09-22 23:01:39 -04:00
nhmall 21a81d0294 BL_RESET usage for window port status line updating
Like BL_FLUSH, only send BL_RESET if the window port has
indicated it wants them via setting the appropriate WC2
bits in its window_procs structure. Update documentation.
2018-09-22 22:41:02 -04:00
nhmall bbb81700f5 sunsword vs gremlin
The original report complained that gremlins seemed impervious to
Sunsword's light yet a flash from a camera caused them to cry out in pain
despite "The long sword named Sunsword begins to shine brilliantly!"

This commit does two things:
1. A dmg bonus is applied against gremlins using a lit Sunsword.
2. Gremlins will generally avoid the light emitted by Sunsword.
There's a few minor flavor bits thrown in also.

It is understood that this effectively makes Sunsword provide
"gremlin-proofing", but the gremlin myth and Sunsword's characteristic
feature pretty much demand it.

bug 42
2018-09-22 14:08:28 -04:00
nhmall 6a86cafa90 X11 exposed a genl_status_update negative index issue 2018-09-22 10:20:08 -04:00
nhmall faf1a83fd0 follow-up bit 2018-09-22 09:24:20 -04:00
nhmall fe68925100 another BL_CHARACTERISTICS fix
With the code as it stood, receipt of BL_CHARACTERISTICS would
trigger a flush of output which may not have been the
intention.

Ensure the flush code is only on BL_FLUSH (or BL_RESET).
2018-09-22 09:11:51 -04:00
nhmall 0aa9e00099 Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2018-09-22 09:01:37 -04:00
nhmall 0a52543076 avoid illegal array indexes now that the enum treads beyond BL_FLUSH 2018-09-22 08:58:38 -04:00
nhmall 8e4ce066c9 fix C343-331 mirrors & sleeping mon
This outstanding bug was complicated slightly because the same
code was used for a sleeping mon as for a paralyzed mon so
message phrasing was called into question.

Just flip the phrasing to be about what you are able to discern
under those circumstances, which is very little, and don't have
the sleeping or paralyzed monster react to the mirror.
2018-09-21 23:34:00 -04:00
nhmall b5f9a8c722 transcription bit 2018-09-21 16:36:38 -04:00
nhmall 825a9498b4 more historical fixes info 2018-09-21 16:33:48 -04:00
nhmall 94e630e2e7 include some fixes files from older versions in the distribution
new file:   doc/fixes23.e
	new file:   doc/fixes30.pl01
	new file:   doc/fixes30.pl02
	new file:   doc/fixes30.pl03
	new file:   doc/fixes30.pl04
	new file:   doc/fixes30.pl05
	new file:   doc/fixes30.pl06
	new file:   doc/fixes30.pl07
	new file:   doc/fixes30.pl08
	new file:   doc/fixes30.pl09
	new file:   doc/fixes30.pl10
2018-09-21 14:57:12 -04:00
nhmall 25fcaa614c another orctown follow-up tuning bit 2018-09-21 11:54:43 -04:00
nhmall 6c41eb3f91 fixes bit 2018-09-21 11:42:16 -04:00
nhmall a18ae517f8 some orctown follow-up bits, fix Bad fruit #0 and some minor tuning 2018-09-21 11:31:01 -04:00
nhmall 3edc6d3147 Merge branch 'mogigoma-fix-grammar-and-punctuation' into NetHack-3.6.2-beta01 2018-09-20 18:03:42 -04:00
nhmall de7121ea5d cannot alter doc/tmac.n 2018-09-20 18:02:48 -04:00
nhmall 672e28d294 Merge branch 'fix-grammar-and-punctuation' of https://github.com/mogigoma/NetHack into mogigoma-fix-grammar-and-punctuation 2018-09-20 18:01:32 -04:00
nhmall 9c6fe0b377 initialize a supplement buffer 2018-09-20 17:58:10 -04:00
nhmall bfc46cbcdb Merge branch 'winX-comment-typo' of https://github.com/nikolas/NetHack into nikolas 2018-09-19 23:40:31 -04:00
nhmall 647b671c76 some data.base bits
Take some of the entries from the github pull request.

resolves #35
2018-09-19 23:30:19 -04:00
nhmall 5a1b8fdf96 Merge branch 'fix-other-spelling-issues' of https://github.com/mogigoma/NetHack into mogigoma-fix-other-spelling-issues 2018-09-19 23:02:14 -04:00
nhmall 3a1413b36a Merge branch 'mogigoma' into NetHack-3.6.2-beta01 2018-09-19 20:46:25 -04:00
nhmall 807b4a2d25 Merge branch 'fix-dat-and-devel' of https://github.com/mogigoma/NetHack into mogigoma 2018-09-19 20:45:17 -04:00
nhmall 0a1c908503 fixes36.2 entry for the orctown changes 2018-09-18 20:19:06 -04:00
nhmall b816283fa5 Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2018-09-18 20:16:45 -04:00
nhmall 1cef842786 some orctown tuning bits 2018-09-18 20:15:13 -04:00
nhmall 9eb7830819 Gnomish Mines changes involving "Orctown" level variant
Changes to be committed:
	modified:   include/decl.h
	modified:   include/dungeon.h
	modified:   include/extern.h
	modified:   include/hack.h
	modified:   src/decl.c
	modified:   src/do_name.c
	modified:   src/dog.c
	modified:   src/dokick.c
	modified:   src/makemon.c
	modified:   src/mkmaze.c
	modified:   src/mkobj.c
	modified:   src/pager.c

This commit is an attempt to address the complaints about
the orc town variation taking away lots of stuff that is
normally available in mine town. The statement in the level
description says "A tragic accident has occurred in Frontier
Town...It has been overrun by orcs."

The changes in this commit attempt to uphold that premise,
while making things a bit more interesting and perhaps
more palatable for the player.

This update does the following in keeping with the mythos:
- While many of the orcs still remain to wander about the
  level, many of the orcs took off deeper into the mines with
  some of the stuff that they plundered. You may now be
  able to hunt some of it down.

- Adds some appearance of this particular horde of marauding
  orcs working as part of a larger collective.

- This evolves the Orc Town mine town variation into a
  a feature over multiple levels of The Gnomish Mines,
  rather than just the single-level "feature" that it was
  previously.

- You may have to work longer and a bit harder for some
  things than other mine town variations, but at least with
  these changes, there is hope that some of it may be found
  elsewhere.

Game mechanics notes (maybe spoily?)

- Add mechanism to place objects into limbo (okay, really
  place them onto the migrating_objs list for transferring
  between levels etc.) and destine them
  to become part of the monster inventory of a particular
  species. In this particular usage case, it's using the
  M2_ORC flag setting to identify the recipients.

- At present, there is no mechanism in the level compiler
  for placing objects onto the migrating objects, nor
  with more sophisticated landing logic, so a somewhat
  kludgy hard-coded fixup and supporting routines were used.
  Some day the need for that might change if additional
  capabilities move to the level compiler.

This is a NetHack-3.6.2-beta01 update. Please give it a workout.

Fixes #127
2018-09-18 18:35:13 -04:00
nhmall 7123812327 try to coax an error code for display on tile_file failure
If the underlying error is that Windows LoadImage() just
wasn't happy with the format of the image file, you'll just
get a 0x0 result, which won't help much.

If, however, it shows a 0x2 result that means it couldn't
find the file to load it.
2018-09-17 15:46:47 -04:00
nhmall 7d4a7a1f42 tty column placement of BL_HUNGER and BL_CAP could collide
Change the placement of the code that makes a replica of the
current status fields for later comparison.

A loop shortcut was causing it to be skipped under some
circumstances and that was negatively impacting the placement
of status field values that were further to the right.
2018-09-12 19:42:45 -04:00
nhmall 59019910b5 heed OPTIONS=symset:default in config file in windows and msdos 2018-09-10 15:27:05 -04:00
nhmall 4be2467cc9 win32 gui bits
fix an index out-of-bounds
status hitpoint bar behavior at zero hp to match tty
2018-09-08 08:54:35 -04:00
nhmall c00b698b4a hitpointbar bit for prior commit 2018-09-05 20:47:16 -04:00
nhmall ec43a80e9e stop tty hitpointbar from jumping to 100% health at zero hit points 2018-09-05 20:21:59 -04:00
nhmall 878823ad8a another mswproc bit - remove enum values from comments 2018-09-03 08:52:16 -04:00
nhmall ec2258ae70 mswproc.c bit 2018-09-03 08:49:47 -04:00
nhmall a417d67572 status_update distinguish new BL_RESET from BL_FLUSH
This adds BL_RESET to status_update to send a flag to a window
port that every field should be updated because something has
happened in the core to make current values shown to be
untrustworthy or potentially obliterated.

That is now distinguished from BL_FLUSH, which now has no
bearing on whether every field needs to be redone, and instead
can be used by a window port indicator that it is time to render
any buffered status field changes to the display.

tty port now sets WC2_FLUSH_STATUS indicator for BL_FLUSH support
and now does one rendering per bot() call, instead of up to 22.

Side note: The tty hitpoint bar code was relying on the old
behavior of redrawing everything upon BL_FLUSH apparently, so it
initially had some color change lag issues, corrected by marking
BL_STATUS as dirty (in need of updating) in tty_status_update()
whenever BL_HP was marked as dirty.
2018-09-03 08:18:18 -04:00
nhmall 0b32735ff8 ensure BL_FLUSH always sent when context.botlx is set
ensure BL_FLUSH always gets sent down to the window port whenever bot() is
called with context.botlx set so that status updates work as
expected after full screen clear after a level change

Fixes #107
2018-09-02 18:26:42 -04:00
nhmall 6594805811 transformation message when you apply a figurine
make the transformation message of a deliberate apply of a figurine seem
a bit less definite when blind. Put 'I' unseen monster marker at the spot
you expect it to be.
2018-09-02 18:20:40 -04:00
nhmall 7bc0ce66e6 Revert "transformation message when you apply a figurine"
This reverts commit e2b187f2f1.
2018-09-02 18:11:03 -04:00
nhmall 9323f074f7 Revert "ensure BL_FLUSH always gets sent down to the window port whenever bot() is"
This reverts commit ee4c12b238.
2018-09-02 18:10:40 -04:00
nhmall ee4c12b238 ensure BL_FLUSH always gets sent down to the window port whenever bot() is
called with context.botlx set so that status updates work as
expected after full screen clear after a level change

Fixes #107
2018-09-02 18:05:16 -04:00
nhmall e2b187f2f1 transformation message when you apply a figurine
make transformation message of a deliberate apply of a figurine seem a bit
less definite when blind. Put 'I' unseen monster marker at the spot you
expect it to be.
2018-09-02 17:54:00 -04:00
nhmall b77f559d58 quiet a new visual studio compiler complaint from recent code change
..\src\hack.c(2553): warning C4113: 'int (__cdecl *)()' differs in parameter lists from 'int (__cdecl *)(void)'
2018-09-01 15:07:19 -04:00
nhmall d32347aae3 Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2018-09-01 14:54:36 -04:00
nhmall 1462f69f54 reports on windows of partial status lines after level change
tty: turn off an optimization that is the suspected cause of Windows reported
	partial status lines following level changes. It was turned on for
        non-unix platforms only
2018-09-01 14:52:47 -04:00
nhmall cd9c0e880a adjust wizidentify title and prompt 2018-09-01 11:16:08 -04:00
nhmall 5a44a34420 wizidentify suppress unnecessary prompt; allow individual items for perm ID
Don't display the selection to identify all items if there are none.

Complete an item marked ToDo in cmd.c: allow selection of one or more
particular items to permanently identify rather than just all or nothing.
2018-09-01 10:43:26 -04:00
nhmall 1d4b2f7b19 adjust wording on recent install.mw change 2018-08-12 10:21:52 -04:00
nhmall efedd48e7d previous change bit 2018-08-12 09:06:47 -04:00
nhmall a105df7320 inconsistency going down a hole/trapdoor accidentally vs deliberately
Noted on rgrn, after being told that you don't fit upon discovery
of a hole or trap door you could then immediately use '>' to
proceed down.

The deliberate situation remains possible and has some
inherent risk.
2018-08-12 08:40:55 -04:00
nhmall 42b5415d6d further OS X clarification 2018-08-06 08:03:46 -04:00
nhmall fedc093f23 Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2018-08-03 06:23:32 -04:00