]> granicus.if.org Git - nethack/log
nethack
5 years agoAdd some stair helper functions
Pasi Kallinen [Sat, 8 Feb 2020 15:02:18 +0000 (17:02 +0200)]
Add some stair helper functions

5 years agoFix digging through iron bars from adjacent pit
Pasi Kallinen [Sat, 8 Feb 2020 15:00:03 +0000 (17:00 +0200)]
Fix digging through iron bars from adjacent pit

It was possible to create a pit on top of iron bars, by first creating
a pit next to the bars, going down into the pit, and then digging sideways
towards the bars. This did not destroy the iron bars.

5 years agoMerge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into...
nhmall [Sat, 8 Feb 2020 12:40:47 +0000 (07:40 -0500)]
Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7

5 years agooptions.c initializers got misaligned
nhmall [Sat, 8 Feb 2020 12:39:21 +0000 (07:39 -0500)]
options.c initializers got misaligned

Correct the initializers in options.c for the cond_ options.

5 years agoUnify breamm and breamu
Pasi Kallinen [Sat, 8 Feb 2020 12:19:13 +0000 (14:19 +0200)]
Unify breamm and breamu

Monster vs monster breath attacks were using nearly the same code
as monster vs hero - unify the code

5 years agoOS X warning
nhmall [Sat, 8 Feb 2020 06:44:56 +0000 (01:44 -0500)]
OS X warning

5 years agofixes37.0 update for unexplored changes and new status conditions
nhmall [Sat, 8 Feb 2020 06:30:14 +0000 (01:30 -0500)]
fixes37.0 update for unexplored changes and new status conditions

5 years agoMerge branch 'new-status-conditions' into NetHack-3.7
nhmall [Sat, 8 Feb 2020 06:24:51 +0000 (01:24 -0500)]
Merge branch 'new-status-conditions' into NetHack-3.7

5 years agoexpand the pool of status condition fields
nhmall [Sat, 8 Feb 2020 06:03:25 +0000 (01:03 -0500)]
expand the pool of status condition fields

Most of the additional ones are "opt-in" meaning that unless you add them
to your config file to enable them, they won't show up.

Two that aren't "opt-in", but can be "opted-out" (as can they all) are
cond_grab (for an eel grabbing you and drowing being imminent) and
cond_lava which leads to a fatality.

All the ones that already existed are "opt-out" options, meaning that
they will still show if you do nothing.

Here's the complete list of status conditions following this patch:
 config option     internal     default mask id            mask        text1    tex2   text3
"cond_barehanded"  bl_bareh     opt_in  BL_MASK_BAREH      0x00000001L Bare     Bar    Bh
"cond_blind"       bl_blind     opt_out BL_MASK_BLIND      0x00000002L Blind    Blnd   Bl
"cond_busy"        bl_busy      opt_in  BL_MASK_BUSY       0x00000004L Busy     Bsy    By
"cond_conf"        bl_conf      opt_out BL_MASK_CONF       0x00000008L Conf     Cnf    Cf
"cond_deaf"        bl_deaf      opt_out BL_MASK_DEAF       0x00000010L Deaf     Def    Df
"cond_iron"        bl_elf_iron  opt_out BL_MASK_ELF_IRON   0x00000020L Iron     Irn    Fe
"cond_fly"         bl_fly       opt_out BL_MASK_FLY        0x00000040L Fly      Fly    Fl
"cond_foodPois"    bl_foodpois  opt_out BL_MASK_FOODPOIS   0x00000080L FoodPois Fpois  Poi
"cond_glowhands"   bl_glowhands opt_in  BL_MASK_GLOWHANDS  0x00000100L Glow     Glo    Gl
"cond_grab"        bl_grab      opt_out BL_MASK_GRAB       0x00000200L Grab     Grb    Gr
"cond_hallu"       bl_hallu     opt_out BL_MASK_HALLU      0x00000400L Hallu    Hal    Hl
"cond_held"        bl_held      opt_in  BL_MASK_HELD       0x00000800L Held     Hld    Hd
"cond_ice"         bl_icy       opt_in  BL_MASK_ICY        0x00001000L Icy      Icy    Ic
"cond_lava"        bl_inlava    opt_out BL_MASK_INLAVA     0x00002000L Lava     Lav    La
"cond_lev"         bl_lev       opt_out BL_MASK_LEV        0x00004000L Lev      Lev    Lv
"cond_paralyze"    bl_parlyz    opt_in  BL_MASK_PARLYZ     0x00008000L Parlyz   Para   Par
"cond_ride"        bl_ride      opt_out BL_MASK_RIDE       0x00010000L Ride     Rid    Rd
"cond_sleep"       bl_sleeping  opt_in  BL_MASK_SLEEPING   0x00020000L Zzz      Zzz    Zz
"cond_slime"       bl_slime     opt_out BL_MASK_SLIME      0x00040000L Slime    Slim   Slm
"cond_slip"        bl_slippery  opt_in  BL_MASK_SLIPPERY   0x00080000L Slip     Sli    Sl
"cond_stone"       bl_stone     opt_out BL_MASK_STONE      0x00100000L Stone    Ston   Sto
"cond_strngl"      bl_strngl    opt_out BL_MASK_STRNGL     0x00200000L Strngl   Stngl  Str
"cond_stun"        bl_stun      opt_out BL_MASK_STUN       0x00400000L Stun     Stun   St
"cond_submerged"   bl_submerged opt_in  BL_MASK_SUBMERGED  0x00800000L Sub      Sub    Sw
"cond_termIll"     bl_termill   opt_out BL_MASK_TERMILL    0x01000000L TermIll  Ill    Ill
"cond_tethered"    bl_tethered  opt_in  BL_MASK_TETHERED   0x02000000L Teth     Tth    Te
"cond_trap"        bl_trapped   opt_in  BL_MASK_TRAPPED    0x04000000L Trap     Trp    Tr
"cond_unconscious" bl_unconsc   opt_in  BL_MASK_UNCONSC    0x08000000L Out      Out    KO
"cond_woundedl"    bl_woundedl  opt_in  BL_MASK_WOUNDEDL   0x10000000L Legs     Leg    Lg

5 years agomake a distinction between rock and unexplored area
nhmall [Sat, 8 Feb 2020 05:48:03 +0000 (00:48 -0500)]
make a distinction between rock and unexplored area

This adds a pair of new glyphs: GLYPH_UNEXPLORED and GLYPH_NOTHING

GLYPH_UNEXPLORED is meant to be the glyph for areas of the map that
haven't been explored yet.

GLYPH_NOTHING is a glyph that represents that which cannot be seen,
for instance the dark part of a room when the dark_room option is
not set.  Since the symbol for stone can now be overridden to
a players choice, it no longer made sense using S_stone for the
dark areas of the room with dark_room off. This allows the same
intended result even if S_stone symbol is mapped to something visible.

GLYPH_UNEXPLORED is what areas of the map get initialized to now
instead of STONE.

This adds a pair of new symbols: S_unexplored and S_nothing.

S_nothing is meant to be left as an unseen character (space) in
order to achieve the intended effect on the display.

S_unexplored is the symbol that is mapped to GLYPH_UNEXPLORED, and
is a distinct symbol from S_stone, even if they are set to the same
character. They don't have to be set to the same character.

Hopefully there are minimal bugs, but it is a deviation from a
fairly long-standing approach so there could be some unintended
glitches that will need repair.

5 years ago'travel' option
PatR [Fri, 7 Feb 2020 22:37:51 +0000 (14:37 -0800)]
'travel' option

Change '!travel' to only prevent travel-by-mouse and leave '_' alone.

5 years agoYAFM tweak
Pasi Kallinen [Fri, 7 Feb 2020 21:44:06 +0000 (23:44 +0200)]
YAFM tweak

5 years agoYAFM when sitting on a towel
Pasi Kallinen [Fri, 7 Feb 2020 21:15:43 +0000 (23:15 +0200)]
YAFM when sitting on a towel

(via xNetHack)

5 years agoYAFM when restoring a game while hallu
Pasi Kallinen [Fri, 7 Feb 2020 21:08:15 +0000 (23:08 +0200)]
YAFM when restoring a game while hallu

(via xNetHack)

5 years agoAllow #wizgenesis quantity in the prompt
Pasi Kallinen [Fri, 7 Feb 2020 17:11:13 +0000 (19:11 +0200)]
Allow #wizgenesis quantity in the prompt

The #wizgenesis command can also accept a quantity in the input prompt,
previously it only accepted a command repeat prefix.

(via UnNetHack, originally from NetHack4)

5 years agopopulate insight.c
PatR [Fri, 7 Feb 2020 01:42:15 +0000 (17:42 -0800)]
populate insight.c

Move enlightenment and conduct from cmd.c to insight.c.  Also move
vanquished monsters plus genocided and/or extinct monsters from end.c
to there.  And move the one-line stethoscope/probing feedback for
self and for monsters from priest.c to there.

Achievement feedback has been overhauled a bit.  When no achievements
have been recorded, the header for them (after conducts) won't be
shown, and when at least one has been recorded, make the prompt for
asking whether to disclose conduct be about disclosing conduct and
achievements.  Also, describe achievements in the Guidebook.

I ran out of gas before updating Guidebook.tex; it will catch up to
Guidebook.mn eventually.

Some of the MS-DOS Makefiles haven't been updated yet so linking
without insight.{o,obj} will break there.

5 years agois_elf(), is_dwarf(), is_gnome(), is_orc(), is_human()
nhmall [Thu, 6 Feb 2020 17:09:24 +0000 (12:09 -0500)]
is_elf(), is_dwarf(), is_gnome(), is_orc(), is_human()

Those tests were only checking the permonst mflags2 field
so anytime those tests were used in the code, they came
up false for things like an elven ranger. An elven ranger
should return true for an is_elf() test, as an example.

That happens because the profession monsters in monst.c
are defined with M2_HUMAN.

This augments those is_*() race tests to also check for a
matching player race as well.

5 years agoresolve a couple of build failures when STATUS_HILITES is not defined
nhmall [Wed, 5 Feb 2020 17:24:15 +0000 (12:24 -0500)]
resolve a couple of build failures when STATUS_HILITES is not defined

This addresses the build failures but it is unknown
whether the logic remains sound.

5 years agoversion bit
nhmall [Tue, 4 Feb 2020 12:57:43 +0000 (07:57 -0500)]
version bit

5 years agofix copy-and-paste error
nhmall [Mon, 3 Feb 2020 08:54:14 +0000 (03:54 -0500)]
fix copy-and-paste error

5 years agoadd recent file addition to msdos Makefile2.cross
nhmall [Mon, 3 Feb 2020 08:51:30 +0000 (03:51 -0500)]
add recent file addition to msdos Makefile2.cross

5 years agoremove an argument that is no longer necessary from a few functions
nhmall [Mon, 3 Feb 2020 03:54:44 +0000 (22:54 -0500)]
remove an argument that is no longer necessary from a few functions

Passing a boolean 'ghostly' argument to some functions that are also passed
an NHFILE * is unnecessary now.

5 years agowindows vs Makefile follow-up bit
nhmall [Mon, 3 Feb 2020 02:04:45 +0000 (21:04 -0500)]
windows vs Makefile follow-up bit

5 years agoadd recent file addition to windows visual studio project and Makefile
nhmall [Mon, 3 Feb 2020 01:59:41 +0000 (20:59 -0500)]
add recent file addition to windows visual studio project and Makefile

5 years agoadd recent file addition to Xcode project
nhmall [Mon, 3 Feb 2020 01:43:00 +0000 (20:43 -0500)]
add recent file addition to Xcode project

5 years agomuse looting
PatR [Sun, 2 Feb 2020 23:22:42 +0000 (15:22 -0800)]
muse looting

Give better feedback than "<Monster> rummages through something"
when hero sees a monster looting a container.

Have monster take out up to 4 items at a time instead of always 1.
(Hero can take out an arbitrary number in one move.)

When deciding what to try to take out, 'count' (now 'nitems') was
initialized to 1 instead of 0, giving the monster a 1 out of N+1
chance of not trying to take anything out.  It wasn't clear whether
that was intentional (there's already a chance for not taking things
out when deciding whether to use the container).  I kept that result
in and made it more explicit now.

When deciding whether the chosen item could be moved from container
to monster's inventory, the can_carry(item) check was counting the
weight of the item twice, once explicitly when considering adding it
to minvent but also implicitly as part of the carried container's
weight already in minvent.

5 years agoAdding missing basic taste "umami" as hallucinatory color
Patric Mueller [Sun, 2 Feb 2020 19:15:45 +0000 (20:15 +0100)]
Adding missing basic taste "umami" as hallucinatory color

5 years agoAllow monsters to rummage through containers
Pasi Kallinen [Sun, 2 Feb 2020 09:04:08 +0000 (11:04 +0200)]
Allow monsters to rummage through containers

5 years agofix github issue #285 - spellcasting monster
PatR [Sun, 2 Feb 2020 08:55:26 +0000 (00:55 -0800)]
fix github issue #285 - spellcasting monster

After casting a spell, a monster got a chance to make a regular attack
despite the apparent attempt to set up a return value indicating that
it wouldn't move.

When looking over the return value situation, I noticed 'wormhitu()'
for the first time.  It gives worms additional attacks when the hero
is adjacent to some of the tail, that only works if the head is within
reach of a melee attack.  The hidden tail segment at head's location
always met that criterium so gave an extra attack that didn't make
sense; change wormhitu() to skip that segment.

Do some formatting in mcastu.c; no change in actual code there.

Fixes #285

5 years agomention a pair of recent file additions in Cross-compiling
nhmall [Sun, 2 Feb 2020 03:49:21 +0000 (22:49 -0500)]
mention a pair of recent file additions in Cross-compiling

[skip travis]

5 years agomsdos fix from chasonr
nhmall [Sun, 2 Feb 2020 03:08:41 +0000 (22:08 -0500)]
msdos fix from chasonr

5 years agoMerge branch 'chasonr-statue-glyphs' into NetHack-3.7
nhmall [Sun, 2 Feb 2020 03:08:22 +0000 (22:08 -0500)]
Merge branch 'chasonr-statue-glyphs' into NetHack-3.7

5 years agoMerge branch 'statue-glyphs' of https://github.com/chasonr/NetHack into chasonr-statu...
nhmall [Sun, 2 Feb 2020 03:05:55 +0000 (22:05 -0500)]
Merge branch 'statue-glyphs' of https://github.com/chasonr/NetHack into chasonr-statue-glyphs

5 years agoinsert omitted 'static' for two sp_lev.c variables
PatR [Sun, 2 Feb 2020 02:27:36 +0000 (18:27 -0800)]
insert omitted 'static' for two sp_lev.c variables

5 years agoGuidebook.tex: fix formatting typos
keni [Sun, 2 Feb 2020 02:17:49 +0000 (21:17 -0500)]
Guidebook.tex: fix formatting typos

5 years agofailing level change messsage confusion
PatR [Sun, 2 Feb 2020 01:53:07 +0000 (17:53 -0800)]
failing level change messsage confusion

While testing the changes to dungeon and special level handling, I got
|A mysterious force prevents you from descending!
|You materialize on a different level!
The mystery force is handled by goto_level() so level_tele() doesn't
know that the failure is going to happen when it sets up the message
for deferred delivery.  Suppress the message if you don't change levels.

5 years agoget_table_str use
PatR [Sun, 2 Feb 2020 01:33:50 +0000 (17:33 -0800)]
get_table_str use

Some cleanup when chasing a memory leak.  get_table_str() and
get_table_str_opt() return a value from dupstr() and it wasn't always
being freed.  I'm not sure that I found the problem--maybe it involved
pointers turned over to Lua garbage collection--but did find a couple
of suspicious things in dungeon setup.

5 years agosp_lev.c private variables
PatR [Sat, 1 Feb 2020 23:44:42 +0000 (15:44 -0800)]
sp_lev.c private variables

Make a start at reducing the size of 'g' by removing some special
level stuff that doesn't need to be there.

5 years agoEnable statue glyphs for cross compile
Ray Chason [Sat, 1 Feb 2020 21:48:37 +0000 (16:48 -0500)]
Enable statue glyphs for cross compile

5 years agoRemove code fragment causing compile error
Ray Chason [Sat, 1 Feb 2020 21:48:07 +0000 (16:48 -0500)]
Remove code fragment causing compile error

5 years agoDehardcode sanctum temple secret door
Pasi Kallinen [Sat, 1 Feb 2020 19:30:50 +0000 (21:30 +0200)]
Dehardcode sanctum temple secret door

5 years agoDehardcode wizard1 morgue secret door
Pasi Kallinen [Sat, 1 Feb 2020 18:18:56 +0000 (20:18 +0200)]
Dehardcode wizard1 morgue secret door

5 years agosplitting cmd.c, phase 1B
PatR [Sat, 1 Feb 2020 17:14:18 +0000 (09:14 -0800)]
splitting cmd.c, phase 1B

I neglected to use -f with 'git add' and the stub file didn't make
it into the previous commit.

5 years agosplitting cmd.c, phase I
PatR [Sat, 1 Feb 2020 16:59:19 +0000 (08:59 -0800)]
splitting cmd.c, phase I

Preparation for moving enlightenment and conduct into new source
file insight.c.  Right now it's a stub that shouldn't break anything
whether included or omitted.  Once makefiles and project files have
been updated to compile and link it, the actual code will be moved.

unix/Makefile.src has been updated;
vms/Makefile.src and vmsbuild.com have been updated but not tested.

5 years agoDehardcode minefill
Pasi Kallinen [Sat, 1 Feb 2020 16:29:55 +0000 (18:29 +0200)]
Dehardcode minefill

Instead of hardcoding the minefill levels in the core,
allow defining fill levels for a dungeon branch in the dungeon.lua

5 years agoloadlua() simplification
PatR [Fri, 31 Jan 2020 21:36:22 +0000 (13:36 -0800)]
loadlua() simplification

nhl_loadlua() went from too simple to too complicated, now somewhere
in between.  Still doesn't assume that an entire file can be scooped
up with a single fread(), but no longer mucks about with the contents
of the file in order to insert a comment containing the file's name.
In order to have useful filename feedback in Lua error messages, just
use a different liblua routine to feed the file's contents to it.

5 years agofix 'Couldn't place lregion type 1' on Orc town
PatR [Fri, 31 Jan 2020 20:58:24 +0000 (12:58 -0800)]
fix 'Couldn't place lregion type 1' on Orc town

Stairs up from Orcish Town variation of Mine Town were being forced
to be near the bottom of the left side of the level due to a bogus
exclusion region in the level description.  If that small area was all
solid rock then a warning was issued and no stairs up were created.

5 years agoroyal jelly
PatR [Fri, 31 Jan 2020 13:10:00 +0000 (05:10 -0800)]
royal jelly

Applying royal jelly listed all of inventory as likely candidates for
  what to rub it on, including itself.
Applying it to anything took no time.
After the "you smear royal jelly on <foo>" message,
  unsuccessfully applying it to non-eggs gave no other feedback;
  successfully applying it to eggs gave no additional feedback.

Allow #rub to use royal jelly too.

Also, require hands to apply or #rub anything.

Not done:  fumbling and/or slippery fingers should have a chance to
  drop the jelly or to drop whatever gets rubbed with it.

5 years agoAllow applying royal jelly on an egg
Pasi Kallinen [Fri, 31 Jan 2020 08:39:37 +0000 (10:39 +0200)]
Allow applying royal jelly on an egg

Royal jelly applied on an egg will change a killer bee egg to
a queen bee egg. Cursed jelly will kill the egg, uncursed and blessed
will revive it. Blessed jelly will also make the creature think
you're the parent.

Original patch was by Kenneth Call

5 years agoupdate EDITLEVEL for achievement tracking
PatR [Fri, 31 Jan 2020 02:28:55 +0000 (18:28 -0800)]
update EDITLEVEL for achievement tracking

5 years agomore simplification of achievement tracking
PatR [Fri, 31 Jan 2020 01:35:32 +0000 (17:35 -0800)]
more simplification of achievement tracking

Instead of hardcoding the "prize" type and then watching for that
to be created, specify it in the level description.

Also, instead of giving both Sokoban end levels 50:50 chance for
either prize, bias the one that used to always have the bag of
holding to now have 75% chance for that and 25% chance for amulet
of reflection, with the other one having those chances reversed.
So still 50:50 overall.

5 years agoreformatting for sp_lev.c
PatR [Fri, 31 Jan 2020 00:48:55 +0000 (16:48 -0800)]
reformatting for sp_lev.c

Also change a bunch of automatic arrays with initializers to static
so that they won't be reinitialized every time their block is entered.

get_table_buc() is changed to support bless/curse specifiers for
"not-cursed", "not-uncursed", and "not-blessed" but they aren't used
yet.

5 years agoreformatting for nhlua.c
PatR [Thu, 30 Jan 2020 23:44:55 +0000 (15:44 -0800)]
reformatting for nhlua.c

5 years agomore sys/winnt/Makefile.msc
nhmall [Thu, 30 Jan 2020 19:04:10 +0000 (14:04 -0500)]
more sys/winnt/Makefile.msc

Remove nmake conditional bits for some things that
aren't optional anymore

5 years agoupdates for Windows command line Makefile with visual studio
nhmall [Thu, 30 Jan 2020 18:50:26 +0000 (13:50 -0500)]
updates for Windows command line Makefile with visual studio

5 years agoThis is cron-daily v1-Jan-20-2020. guidebook updated: doc/Guidebook.txt
nhw_cron [Thu, 30 Jan 2020 01:17:10 +0000 (20:17 -0500)]
This is cron-daily v1-Jan-20-2020.  guidebook updated: doc/Guidebook.txt

5 years agoGuidebook bits
PatR [Thu, 30 Jan 2020 01:10:38 +0000 (17:10 -0800)]
Guidebook bits

"The 'm' prefix before a movement command can be used" is awkwardly
worded.

"Various ... variations" is redundant all by itself but doubly so
when "various" is used again two sentences later.

mention_decor is missing a sentence between "Normally only shown
when obscured" and then an exception when it is enabled.

5 years agoThis is cron-daily v1-Jan-20-2020. guidebook updated: doc/Guidebook.txt
nhw_cron [Wed, 29 Jan 2020 18:17:12 +0000 (13:17 -0500)]
This is cron-daily v1-Jan-20-2020.  guidebook updated: doc/Guidebook.txt

5 years ago'make depend' for unix/Makefile.src
PatR [Wed, 29 Jan 2020 20:16:24 +0000 (12:16 -0800)]
'make depend' for unix/Makefile.src

Add the new header file to HACKINCL which only matters to HSOURCES
which only matters for the 'tags' target.

'make depend' reordered some stuff that could have stayed as-is but
also found a missing dependency for nhlobj.{c,o}.

5 years agowands vs no-hands
PatR [Wed, 29 Jan 2020 18:35:02 +0000 (10:35 -0800)]
wands vs no-hands

Hero shouldn't be able to zap wands when polymorphed into a form which
lacks hands.

The other tweaks to dozap() shouldn't produce any change in behavior.

5 years agonew 'mention_decor' option
PatR [Wed, 29 Jan 2020 17:47:36 +0000 (09:47 -0800)]
new 'mention_decor' option

Somewhat similar to 'mention_walls', 'mention_decor' is a way to
request additional feedback when moving around the map.  It reports
furniture or unusual terrain when you step on that.  Normally stepping
on furniture only mentions it when it is covered by object(s).  And
moving onto (rather than into) water or lava or ice doesn't bother
saying anything at all.  With the new option set there will be a
message.  It uses Norep so won't repeat when moving from one water
spot to another or one lava spot to another or one ice spot to another
unless there has been at least one intervening message.  There is also
a one-shot message when moving from water or lava or ice onto ordinary
terrain (not Norep, just once since there's no land to land message).

Having the verbose flag Off doesn't inhibit these new messages but it
does shorten them: "A fountain." instead of "There is a fountain here."

The Guidebook gets a new subsection "Movement feedback" of the "Rooms
and corridors" section and it covers more than just 'mention_decor'.
As usual, Guidebook.tex is untested.

'mention_decor' persists across save/restore, so 'struct flags' has
changed and EDITLEVEL is being bumped, hence save files are invalided.

5 years agofnamesiz comment bit
nhmall [Wed, 29 Jan 2020 15:29:37 +0000 (10:29 -0500)]
fnamesiz comment bit

5 years agoFix quest text mistake
Pasi Kallinen [Wed, 29 Jan 2020 15:24:58 +0000 (17:24 +0200)]
Fix quest text mistake

5 years agoThis is cron-daily v1-Jan-20-2020. files updated: Files
nhw_cron [Wed, 29 Jan 2020 15:17:10 +0000 (10:17 -0500)]
This is cron-daily v1-Jan-20-2020.  files updated: Files

5 years agofnamesiz bit
nhmall [Wed, 29 Jan 2020 15:09:45 +0000 (10:09 -0500)]
fnamesiz bit

5 years agorename new header file to fnamesiz.h
nhmall [Wed, 29 Jan 2020 14:56:43 +0000 (09:56 -0500)]
rename new header file to fnamesiz.h
Changes to be committed:
renamed:    include/filesize.h -> include/fnamesiz.h

5 years agorecover fix
nhmall [Wed, 29 Jan 2020 14:15:55 +0000 (09:15 -0500)]
recover fix

recover had deviated somewhat from NetHack in its
file expectations:
1) A couple of 3.7 fields needed to be accommodated.
2) hard-coded file size values had deviated.

The file sizes are now in an added header file named "filesize.h",
which is included at the bottom of config.h.

There will likely be another commit to write the filename size ahead
of the file name so that the precise number of characters can be read,
but since that will break existing saves, it can go in along with another
save-breaking commit.

This commit doesn't not alter savefiles written by nethack so does not
require an editlevel bump. It does alter the read-in expectation in
recover to match the game and this get recover working again.

5 years agoThis is cron-daily v1-Jan-20-2020. files updated: Files
nhw_cron [Wed, 29 Jan 2020 00:17:10 +0000 (19:17 -0500)]
This is cron-daily v1-Jan-20-2020.  files updated: Files

5 years agomsdos has been tested with 3.7
nhmall [Wed, 29 Jan 2020 00:16:07 +0000 (19:16 -0500)]
msdos has been tested with 3.7

5 years agoMerge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into...
nhmall [Wed, 29 Jan 2020 00:10:07 +0000 (19:10 -0500)]
Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7

5 years agoupdate some version bits
nhmall [Wed, 29 Jan 2020 00:09:40 +0000 (19:09 -0500)]
update some version bits

5 years agolevel teleport "you materialize" mesg sequencing
PatR [Tue, 28 Jan 2020 23:28:31 +0000 (15:28 -0800)]
level teleport "you materialize" mesg sequencing

If level teleport took you somewhere special, things like shop entry
or quest summons or valley atmosphere messages were being given first,
then "you materialize on a different level" after.  schedule_goto()
takes before-change-message and after-change-message arguments; it
ought to be extended to have a mid-change-message one too but I didn't
think of that until just now.

5 years agoblack and white ice
PatR [Tue, 28 Jan 2020 23:01:41 +0000 (15:01 -0800)]
black and white ice

Like lava when that looks the same as water with color Off, render ice
in inverse video if it looks the same as the floor of a room.  (I tried
bold first but the result didn't look very good.)

Done for tty and curses; others may want to follow suit.

5 years agobeauty no longer in eye of the beholder
PatR [Tue, 28 Jan 2020 20:49:38 +0000 (12:49 -0800)]
beauty no longer in eye of the beholder

There was a complaint that despite charisma of 13 being above average,
the character was described as "ugly".  The cut-off was actually >14
for "beautiful" or "handsome" vs <=14 for "ugly".  This adds several
more grades of appearance.

5 years agowhitespace cleanup on options.c
nhmall [Tue, 28 Jan 2020 01:54:09 +0000 (20:54 -0500)]
whitespace cleanup on options.c

5 years agomsdos follow-up bit
nhmall [Mon, 27 Jan 2020 22:54:13 +0000 (17:54 -0500)]
msdos follow-up bit

5 years agoMerge recent changes into NetHack-3.7 NetHack-3.7.0_WIP
nhmall [Mon, 27 Jan 2020 21:49:31 +0000 (16:49 -0500)]
Merge recent changes into NetHack-3.7

5 years agoAnother VMS tweak NetHack-3.6.5_PostRelease NetHack-3.6.5_Released
PatR [Mon, 27 Jan 2020 20:14:19 +0000 (12:14 -0800)]
Another VMS tweak

One of the new paragraphs inadvertently duplicated an existing one.

5 years agoone more missed inconsistency and README updates
nhmall [Mon, 27 Jan 2020 20:05:45 +0000 (15:05 -0500)]
one more missed inconsistency and README updates

5 years agoReadme tweaks
PatR [Mon, 27 Jan 2020 19:53:18 +0000 (11:53 -0800)]
Readme tweaks

Replace a few tabs, remove a few trailing spaces, and shorten a few
long lines.

Readme still needs another fix:  if falsely claims to contain all bug
fixes since 3.6.4.  I wasn't sure how to reword that so didn't try.

Also, fix a couple of old typos in Install.vms.

5 years agobit
nhmall [Mon, 27 Jan 2020 19:44:29 +0000 (14:44 -0500)]
bit

5 years agoRevert "This is cron-daily v1-Jan-20-2020. manpages updated: makedefs.txt"
nhmall [Mon, 27 Jan 2020 19:42:39 +0000 (14:42 -0500)]
Revert "This is cron-daily v1-Jan-20-2020.  manpages updated: makedefs.txt"

This reverts commit 9e0c450d2e266ed207d731162b7d65271a01db14.

5 years agoThis is cron-daily v1-Jan-20-2020. manpages updated: makedefs.txt
nhw_cron [Mon, 27 Jan 2020 19:17:12 +0000 (14:17 -0500)]
This is cron-daily v1-Jan-20-2020.  manpages updated: makedefs.txt

5 years agoThis is cron-daily v1-Jan-20-2020. files updated: Files
nhw_cron [Mon, 27 Jan 2020 19:17:12 +0000 (14:17 -0500)]
This is cron-daily v1-Jan-20-2020.  files updated: Files

5 years agoMerge branch 'NetHack-3.7-Jan2020' into NetHack-3.7
nhmall [Mon, 27 Jan 2020 18:24:15 +0000 (13:24 -0500)]
Merge branch 'NetHack-3.7-Jan2020' into NetHack-3.7

5 years agomore typo propagation
nhmall [Mon, 27 Jan 2020 17:56:34 +0000 (12:56 -0500)]
more typo propagation

5 years agoanother typo
nhmall [Mon, 27 Jan 2020 17:27:41 +0000 (12:27 -0500)]
another typo

5 years agotypo
nhmall [Mon, 27 Jan 2020 16:50:19 +0000 (11:50 -0500)]
typo

5 years agotravis updates
nhmall [Mon, 27 Jan 2020 16:28:21 +0000 (11:28 -0500)]
travis updates

5 years agoUse nh_getenv just in case
Pasi Kallinen [Mon, 27 Jan 2020 16:03:22 +0000 (18:03 +0200)]
Use nh_getenv just in case

5 years agoquiet a couple of warnings
nhmall [Mon, 27 Jan 2020 15:54:39 +0000 (10:54 -0500)]
quiet a couple of warnings

..\src\nhlua.c(893): warning C4113: 'int (__cdecl *)()' differs in parameter lists from 'lua_CFunction'
..\src\nhlua.c(894): warning C4113: 'int (__cdecl *)()' differs in parameter lists from 'lua_CFunction'

5 years agodoc/Guidebook.txt update from daily cron
nhmall [Mon, 27 Jan 2020 15:31:37 +0000 (10:31 -0500)]
doc/Guidebook.txt update from daily cron

5 years agoThis is cron-daily v1-Jan-20-2020. guidebook updated: doc/Guidebook.txt
nhw_cron [Mon, 27 Jan 2020 15:17:10 +0000 (10:17 -0500)]
This is cron-daily v1-Jan-20-2020.  guidebook updated: doc/Guidebook.txt

5 years agoGuidebook date-stamp
nhmall [Mon, 27 Jan 2020 14:27:03 +0000 (09:27 -0500)]
Guidebook date-stamp

5 years agoGuidebook date stamp
nhmall [Mon, 27 Jan 2020 14:25:40 +0000 (09:25 -0500)]
Guidebook date stamp

5 years agoMerge updates from 'NetHack-3.6' into NetHack-3.7-Jan2020
nhmall [Mon, 27 Jan 2020 14:02:05 +0000 (09:02 -0500)]
Merge updates from 'NetHack-3.6' into NetHack-3.7-Jan2020

5 years agoMerge branch 'NetHack-3.7' into NetHack-3.7-Jan2020
nhmall [Mon, 27 Jan 2020 13:52:17 +0000 (08:52 -0500)]
Merge branch 'NetHack-3.7' into NetHack-3.7-Jan2020

5 years agoavoid link error with gcc 10 which enables -fno-common by default
nhmall [Mon, 27 Jan 2020 13:23:56 +0000 (08:23 -0500)]
avoid link error with gcc 10 which enables -fno-common by default

5 years agoavoid link error with gcc 10 which enables -fno-common by default
nhmall [Mon, 27 Jan 2020 13:23:56 +0000 (08:23 -0500)]
avoid link error with gcc 10 which enables -fno-common by default

5 years agoInstall.vms update
PatR [Mon, 27 Jan 2020 10:20:47 +0000 (02:20 -0800)]
Install.vms update