]> granicus.if.org Git - nethack/log
nethack
3 years agoUnify domove and lookaround trap/liquid avoidance code
Pasi Kallinen [Fri, 25 Feb 2022 19:49:38 +0000 (21:49 +0200)]
Unify domove and lookaround trap/liquid avoidance code

Nearly same code was in two places - the only difference was
how g.context.run == 1 was handled.  Previously, if you were
blind, and knew about the water or lava, you still ran into it.
Now, we always avoid the dunking if running/rushing.

3 years agoremove references to old Qt 'moc' timestamp files
PatR [Fri, 25 Feb 2022 18:39:45 +0000 (10:39 -0800)]
remove references to old Qt 'moc' timestamp files

src/moc.qt[56] existed briefly but got replaced by src/Qt[56].h-t
(controlled by hints/include/compiler.370).  The old names were
deliberately left in src/.gitignore and sys/unix/Makefile.src's
'clean' target to give some time for anyone who had generated them
to run 'make clean' to get rid of them.  That time is now up.  It's
only been about three weeks but if I wait any longer I'll probably
forget.

3 years agoMinor code clarification
Pasi Kallinen [Fri, 25 Feb 2022 17:48:17 +0000 (19:48 +0200)]
Minor code clarification

3 years agoSplit movement out of bounds check out of domove
Pasi Kallinen [Fri, 25 Feb 2022 16:33:50 +0000 (18:33 +0200)]
Split movement out of bounds check out of domove

3 years agoSplit carrying too much check out of domove
Pasi Kallinen [Fri, 25 Feb 2022 16:12:55 +0000 (18:12 +0200)]
Split carrying too much check out of domove

3 years agomore thrown object cleanup
PatR [Fri, 25 Feb 2022 15:10:30 +0000 (07:10 -0800)]
more thrown object cleanup

Handle thrown or kicked object that's in transit for hangup save and
panic save in addition to normal end of game.  Affects ball and chain
placement too, if they've been temporarily taken off the map.

3 years agoSplit impaired movement code out of domove
Pasi Kallinen [Fri, 25 Feb 2022 15:06:25 +0000 (17:06 +0200)]
Split impaired movement code out of domove

3 years agoSplit water turbulence code out of domove
Pasi Kallinen [Fri, 25 Feb 2022 14:59:52 +0000 (16:59 +0200)]
Split water turbulence code out of domove

3 years agoSplit ice fumbling code out of domove
Pasi Kallinen [Fri, 25 Feb 2022 14:43:09 +0000 (16:43 +0200)]
Split ice fumbling code out of domove

3 years agoWizard-mode wishing for (melting) ice
Pasi Kallinen [Fri, 25 Feb 2022 14:42:08 +0000 (16:42 +0200)]
Wizard-mode wishing for (melting) ice

3 years agoSplit air turbulence code out of domove
Pasi Kallinen [Fri, 25 Feb 2022 14:13:27 +0000 (16:13 +0200)]
Split air turbulence code out of domove

3 years agoSplit force-fighting empty square out of domove
Pasi Kallinen [Fri, 25 Feb 2022 13:19:51 +0000 (15:19 +0200)]
Split force-fighting empty square out of domove

3 years agoSplit swapping places with pet code out of domove
Pasi Kallinen [Fri, 25 Feb 2022 13:09:56 +0000 (15:09 +0200)]
Split swapping places with pet code out of domove

3 years agoChange unknown mintrap result into impossible
Pasi Kallinen [Fri, 25 Feb 2022 12:57:03 +0000 (14:57 +0200)]
Change unknown mintrap result into impossible

3 years agoSplit force-fight iron bars code out of domove
Pasi Kallinen [Fri, 25 Feb 2022 12:54:33 +0000 (14:54 +0200)]
Split force-fight iron bars code out of domove

3 years agoSplit some code out of domove
Pasi Kallinen [Fri, 25 Feb 2022 12:46:38 +0000 (14:46 +0200)]
Split some code out of domove

Should have no change in behaviour.

3 years agoplace_object() bit: panic/impossible decl
PatR [Fri, 25 Feb 2022 02:15:48 +0000 (18:15 -0800)]
place_object() bit: panic/impossible decl

3 years agolost objects thrown by monsters
PatR [Fri, 25 Feb 2022 02:10:52 +0000 (18:10 -0800)]
lost objects thrown by monsters

Reported by entrez:  if a monster or explosion kills the hero with an
object that has timers or is a light source, it could trigger a panic
when end of game cleanup can't find it because it has been removed
from the map or monster's inventory and not placed back on the map
yet.  This isn't much different from something thrown by hero which
had a similar situation dealt with a long time ago.  Fix by setting
'thrownobj' for monster-launched and explosion-launched missiles.
That way done_object_cleanup() called from really_done() will place the
missile on the map where saving bones or general cleanup can find it.

It doesn't bother dealing with exploding a lit potion of oil that
kills the hero by missile damage before the potion explodes.  If that
ends up in bones, it should still be lit and might blow up before the
new character reaches it.  (Not verified.)

The code for a hero polymorphed into a unicorn and catching a thrown
gem has been moved into its own routine.  No change in behavior, just
less clutter in the thrown-object-hits-hero section of the monster
throwing routine.

3 years agotrap followup
PatR [Thu, 24 Feb 2022 20:17:21 +0000 (12:17 -0800)]
trap followup

Make the flags argument to dotrap() and mintrap() and the constants
passed to them all have consistent type: unsigned int.

3 years agoMove output delay from walk_path to mhurtle_step
Pasi Kallinen [Thu, 24 Feb 2022 17:50:27 +0000 (19:50 +0200)]
Move output delay from walk_path to mhurtle_step

... in case walk_path is ever used for something that
doesn't need the delay.  The hero hurtling already had
delay, so it was done twice.

3 years agoMoving a monster with telekinesis hurles it through the air
Pasi Kallinen [Thu, 24 Feb 2022 17:27:56 +0000 (19:27 +0200)]
Moving a monster with telekinesis hurles it through the air

... and at the end of the flight, it can't avoid a trap, if it
lands on one.

3 years agoMost traps now require touching the floor to trigger
Pasi Kallinen [Thu, 24 Feb 2022 16:55:11 +0000 (18:55 +0200)]
Most traps now require touching the floor to trigger

It was silly how some clearly mechanical traps didn't consider
flight or levitation when to trigger.  Do those checks in dotrap/mintrap
making hero and monster trap triggering match more closely.

3 years agoGet rid of force_mintrap, allow passing flags to mintrap
Pasi Kallinen [Thu, 24 Feb 2022 15:13:20 +0000 (17:13 +0200)]
Get rid of force_mintrap, allow passing flags to mintrap

It uses the same flags as dotrap, so simulate force_mintrap
by passing FORCETRAP flag.

3 years agoMake trap return values more consistent
Pasi Kallinen [Thu, 24 Feb 2022 14:23:56 +0000 (16:23 +0200)]
Make trap return values more consistent

Instead of returning monster's mtrapped-state, return specific
trap return values.
Add one extra trap return value, for when a monster was
moved by the trap.

3 years agoRemove forced trap activation from mhurtle
Pasi Kallinen [Thu, 24 Feb 2022 13:18:00 +0000 (15:18 +0200)]
Remove forced trap activation from mhurtle

3 years agoAllow using #wiztelekinesis on yourself
Pasi Kallinen [Thu, 24 Feb 2022 13:10:39 +0000 (15:10 +0200)]
Allow using #wiztelekinesis on yourself

3 years agoFix: monster hurtling and liquid
Michael Meyer [Wed, 23 Feb 2022 17:58:43 +0000 (12:58 -0500)]
Fix: monster hurtling and liquid

A monster hurtling over liquid would drown immediately the instant it
touched the first square of water, even if normally it would have kept
moving (e.g. hurtling over a short moat).  Additionally, its placement
on liquid would not take into consideration other monsters, so it could
overwrite an existing monster on that spot and lead to an impossible,
and/or two monsters occupying a single position.

Fix these issues, so that liquid effects like drowning only happen if
the monster ends up in liquid at the end of the hurtle, and so that
other monsters in the way will stop it early even if they're floating
over or swimming on a pool/water/lava square.

Also use canspotmon instead of canseemon for the wiztelekinesis debug
command.

3 years agoUse u_at macro
Pasi Kallinen [Wed, 23 Feb 2022 18:28:35 +0000 (20:28 +0200)]
Use u_at macro

3 years agofix #K3529 - perm_invent not IDing blank scroll
PatR [Wed, 23 Feb 2022 17:50:25 +0000 (09:50 -0800)]
fix #K3529 - perm_invent not IDing blank scroll

Report was for curses but issue is in the core so any interface
that supports persistent inventory is affected.  Reading a not-yet-
discovered scroll of blank paper wasn't always updating perm_invent
to show change in formatted description when it became discovered.

Would only happen on turn #1 (so the scroll needed to be acquired
via autopickup at starting location or via wizard mode wish so that
it could be read before any game time elapsed) when the object
discovery routine deliberately avoided updating perm_invent.  Fix
by using a different way than moves==1 to decide whether an object
is being discovered because it is part of hero's initial inventory.

3 years agoFix the force_mintrap
Pasi Kallinen [Wed, 23 Feb 2022 17:11:32 +0000 (19:11 +0200)]
Fix the force_mintrap

3 years agoHurtling monster always triggers a trap
Pasi Kallinen [Wed, 23 Feb 2022 16:59:57 +0000 (18:59 +0200)]
Hurtling monster always triggers a trap

3 years agoWall of water stops monster hurtling
Pasi Kallinen [Wed, 23 Feb 2022 11:54:07 +0000 (13:54 +0200)]
Wall of water stops monster hurtling

3 years agoGive message trying to hurtle immovable monster
Pasi Kallinen [Wed, 23 Feb 2022 11:42:05 +0000 (13:42 +0200)]
Give message trying to hurtle immovable monster

If the monster is too big, stuck to hero, or trapped.

3 years agoUse IS_WATERWALL and is_waterwall
Pasi Kallinen [Wed, 23 Feb 2022 10:53:09 +0000 (12:53 +0200)]
Use IS_WATERWALL and is_waterwall

3 years agoFix comment, mhurtle now handles pools and lava
Pasi Kallinen [Wed, 23 Feb 2022 09:34:35 +0000 (11:34 +0200)]
Fix comment, mhurtle now handles pools and lava

3 years agoMake minliquid handle walls of water
Pasi Kallinen [Wed, 23 Feb 2022 09:30:51 +0000 (11:30 +0200)]
Make minliquid handle walls of water

3 years agoSome spell code reorg
Pasi Kallinen [Wed, 23 Feb 2022 08:45:14 +0000 (10:45 +0200)]
Some spell code reorg

Keep the internal spell array index inside spell.c,
and refer to spells outside of it with the otyp id.

3 years agoupdates from cron job
nhmall [Wed, 23 Feb 2022 01:14:44 +0000 (20:14 -0500)]
updates from cron job

3 years agomore sleeping monster
PatR [Tue, 22 Feb 2022 20:12:13 +0000 (12:12 -0800)]
more sleeping monster

Extend the PR#660 change that shows whether a monster is asleep when
examined by farlook/quicklook/autodescribe to monsters that aren't
moving due to timed sleep as well as those that are asleep for an
unspecified amount of time.  Unfortunately 'mfrozen' isn't specific
about why a monster can't move so the phrasing is less than ideal.

3 years agowhitelist a new warning in cmd.c
nhmall [Tue, 22 Feb 2022 20:10:33 +0000 (15:10 -0500)]
whitelist a new warning in cmd.c

src/cmd.c(1253): warning: conditional expression is constant

3 years agopull request #660 from NullCGT - sleeping monsters
Kestrel Gregorich-Trevor [Thu, 20 Jan 2022 16:24:10 +0000 (10:24 -0600)]
pull request #660 from NullCGT - sleeping monsters

Indicate to players that monsters are sleeping.

Closes #660

3 years agoHandle water and lava when hurtling a monster
Pasi Kallinen [Tue, 22 Feb 2022 14:51:13 +0000 (16:51 +0200)]
Handle water and lava when hurtling a monster

Also delay the output, showing the hurtle animation.

3 years agoAdd #wiztelekinesis for testing purposes
Pasi Kallinen [Tue, 22 Feb 2022 13:54:02 +0000 (15:54 +0200)]
Add #wiztelekinesis for testing purposes

For testing mhurtle, which is used for jousting or
bare-handed combat.

Improve mhurtle_step to handle bumping into another monster,
and when the monster gets killed or stuck in a trap.

3 years agoMake wood golem death drops more varied
Pasi Kallinen [Tue, 22 Feb 2022 12:57:41 +0000 (14:57 +0200)]
Make wood golem death drops more varied

3 years agoChange kitchen sink glyph and color
Pasi Kallinen [Tue, 22 Feb 2022 12:41:15 +0000 (14:41 +0200)]
Change kitchen sink glyph and color

The default sink glyph is already used for many other things:
iron bars, trees, corridors, drawbridges, and clouds.

Change the glyph to {, and change the color to white.
The glyph is only used for fountains, so it makes "safe"
water-related glyphs match.

3 years agoHuge monsters easily climb out of pits
Pasi Kallinen [Tue, 22 Feb 2022 11:07:59 +0000 (13:07 +0200)]
Huge monsters easily climb out of pits

Also, give a message when a monster trapped in a pit, a web,
or a bear trap frees itself.

3 years agoStart with a level 1 spell and enough power
Pasi Kallinen [Tue, 22 Feb 2022 10:26:03 +0000 (12:26 +0200)]
Start with a level 1 spell and enough power

Ensure the first spell - if any - given to the hero in initial
inventory is level 1 - otherwise you can end up with a situation
where the hero knows level 3 spells, but won't have enough power
to cast them.

If the hero starts out with a spell, ensure enough power (5)
to cast that level 1 spell.

3 years agoCasting a forgotten spell uses some random amount of power
Pasi Kallinen [Tue, 22 Feb 2022 09:32:04 +0000 (11:32 +0200)]
Casting a forgotten spell uses some random amount of power

... in addition to the confusion/stunning it does.

3 years agoElves and rangers get alignment penalty for cutting down trees
Pasi Kallinen [Tue, 22 Feb 2022 09:13:59 +0000 (11:13 +0200)]
Elves and rangers get alignment penalty for cutting down trees

3 years agoHobbits getting a sling also get some ammo
Pasi Kallinen [Tue, 22 Feb 2022 08:01:55 +0000 (10:01 +0200)]
Hobbits getting a sling also get some ammo

3 years agoFlint and hard gems break less often when thrown
Pasi Kallinen [Tue, 22 Feb 2022 08:01:17 +0000 (10:01 +0200)]
Flint and hard gems break less often when thrown

3 years agoAdjust sleep spell, and monk starting spell
Pasi Kallinen [Tue, 22 Feb 2022 07:13:28 +0000 (09:13 +0200)]
Adjust sleep spell, and monk starting spell

Tone down sleep level to 3 (hitting a monster does tend to wake
it up), and replace the random monk starting sleep spell with
confuse monster, which fits nicely with monk's bare-handed
fighting style.

3 years agoChargeable rings may get charged when hit with electricity
Pasi Kallinen [Mon, 21 Feb 2022 19:04:50 +0000 (21:04 +0200)]
Chargeable rings may get charged when hit with electricity

... instead of being destroyed. Normal charging limits apply.

3 years agoUnix command line bit
PatR [Mon, 21 Feb 2022 18:59:42 +0000 (10:59 -0800)]
Unix command line bit

For the !SYSCF configuration, the command line processing still checks
for a value for maximum number of simultaneous players.  The recent
revisions would have accepted a negative value.  I don't know whether
anything interesting would have happened if someone did that.

3 years agoAdjust enchantment spell levels
Pasi Kallinen [Mon, 21 Feb 2022 17:30:52 +0000 (19:30 +0200)]
Adjust enchantment spell levels

The enchantment spells were skewed towards lower spell levels,
and didn't seem to correspond with the spell effectiveness or
power.  Adjust the spell levels:

- Confuse monster is probably the least powerful enchantment, and
  also requires touch to work, so make it the new level 1 spell.

- Sleep is quite powerful, and ray, bump it to level 4.

- Charm monster is even more powerful so make it level 5.
  (Considering that create familiar is level 6)

                 old   new
sleep             1     4
confuse monster   2     1
slow monster      2     2
cause fear        3     3
charm monster     3     5

Also swap sleep and confuse monster generation probability.

3 years agonethack.6 bits
nhkeni [Mon, 21 Feb 2022 16:18:58 +0000 (11:18 -0500)]
nethack.6 bits

Restore hard-coded author name.
Fix overlong line causing wrapping error.

3 years agoupdates from cron job
nhmall [Mon, 21 Feb 2022 15:16:44 +0000 (10:16 -0500)]
updates from cron job

3 years agofixes entry for pull request #683 - just picked
PatR [Sun, 20 Feb 2022 22:46:59 +0000 (14:46 -0800)]
fixes entry for pull request #683 - just picked

Pull request from argrath:  the code that decides whether to add 'B'
for blessed items, 'X' for unknown bless/curse state and so forth
when setting up prompting for the 'I' command was counting up the
recently introduced "just picked up" category using an uninitialized
variable.  So it might erroneously include 'P' as a choice when no
such items were present.

Closes #683

3 years agoadd missing initializer of jcp
SHIRAKATA Kentaro [Sun, 20 Feb 2022 21:18:46 +0000 (06:18 +0900)]
add missing initializer of jcp

3 years agomakedefs exit control
PatR [Sun, 20 Feb 2022 21:52:18 +0000 (13:52 -0800)]
makedefs exit control

Have makedefs do through a common point when exiting, in case it ever
needs extra memory or scratch file cleanup.

While testing, I discovered that the reference use of 'makedefs -o' to
build obsolete onames.h didn't work anymore because of the change to
not require object probabilities to add up to 1000 within classes.
I think fixing that is the only change besides new 'makedefs_exit()'.

3 years agomemory management for 'nomakedefs'
PatR [Sun, 20 Feb 2022 21:47:31 +0000 (13:47 -0800)]
memory management for 'nomakedefs'

The nomakedefs struct starts out with static values, then if/when
populate_nomakedefs() is called, the fields are given dynamic values.
free_nomakedefs() needs to know what state it's in.

A big chunk of this if just formatting for indentation.

3 years agoIlliterate hero will learn spells directly from deity
Pasi Kallinen [Sun, 20 Feb 2022 20:05:30 +0000 (22:05 +0200)]
Illiterate hero will learn spells directly from deity

... instead of receiving a spellbook.

3 years agoFix old-style function def
Pasi Kallinen [Sun, 20 Feb 2022 19:18:03 +0000 (21:18 +0200)]
Fix old-style function def

3 years agoClean up some spell-related code
Pasi Kallinen [Sun, 20 Feb 2022 19:12:23 +0000 (21:12 +0200)]
Clean up some spell-related code

Add two helper functions and use those outside of spell.c,
instead of iterating through all the spells.

3 years agoAlways give a message when monster changes form via polytrap
Pasi Kallinen [Sun, 20 Feb 2022 17:40:52 +0000 (19:40 +0200)]
Always give a message when monster changes form via polytrap

... if the hero can see it.  This was an accessibility issue.

3 years agoMake looting less tedious
Pasi Kallinen [Sun, 20 Feb 2022 16:27:23 +0000 (18:27 +0200)]
Make looting less tedious

I've seen complaints how looting containers is tedious, and
since multiple containers in the same location are now (and have
been for a while) handled with a menu, the yes-no-quit prompt
for a single container doesn't really mean anything.

Remove that prompt, and remove the "open carefully" message too,
so when you're looting a location with a single container, the
command will drop straight into the loot-in-out -menu.  Also
adjust one looting message to explicitly mention the container
if there are other objects on top of it.

Removing the prompt means you can't loot a saddle from a tame
monster with plain loot when standing on a container - you need
to prefix the loot command with 'm' prefix in that case.

3 years agoSplit sitting code into smaller parts
Pasi Kallinen [Sun, 20 Feb 2022 15:28:48 +0000 (17:28 +0200)]
Split sitting code into smaller parts

Split sitting on a throne and laying an egg into their
own functions.  No changes to behaviour.

3 years agoEngraving with Fire Brand burns the text on the floor
Pasi Kallinen [Sun, 20 Feb 2022 13:58:20 +0000 (15:58 +0200)]
Engraving with Fire Brand burns the text on the floor

3 years agoThrown items can get stuck in webs
Pasi Kallinen [Sun, 20 Feb 2022 10:23:00 +0000 (12:23 +0200)]
Thrown items can get stuck in webs

3 years agofixes entry for pull request 682 - ravens lay eggs
PatR [Sun, 20 Feb 2022 01:32:52 +0000 (17:32 -0800)]
fixes entry for pull request 682 - ravens lay eggs

Pull request by entrez:  make ravens oviparous.

Closes #682

3 years agoMake ravens oviparous
Michael Meyer [Fri, 18 Feb 2022 22:33:00 +0000 (16:33 -0600)]
Make ravens oviparous

Ravens are birds, so they should be able to lay eggs.

3 years agosome formatting bits in dogmove.c
PatR [Sat, 19 Feb 2022 22:55:01 +0000 (14:55 -0800)]
some formatting bits in dogmove.c

3 years agogamelog: hit with wielded weapon for first time
PatR [Sat, 19 Feb 2022 19:24:28 +0000 (11:24 -0800)]
gamelog: hit with wielded weapon for first time

Reordering "killed for the first time" and "hit with a wielded weapon
for the first time" was done by moving the latter to hmon().  Hitting
with an applied polearm also gave the first-hit message since it
bypassed the routine that had been doing so.  But the throwing code
that handles applied polearms calls hmon() for damage, so after that
reordering, the first-hit log message became duplicated if triggered
by polearm usage.

Also, fix a quibble with the wizard mode conduct message given after
never-hit-with-wielded-weapon conduct has been broken.  The message
said "used a wielded weapon N times" when it meant "hit with a wielded
weapon N times".  "Used" is misleading if that wielded weapon happens
to be a pick-axe, so change the message to say "hit with".

3 years agoImps and others cussing the hero wake up nearby monsters
Pasi Kallinen [Sat, 19 Feb 2022 15:18:07 +0000 (17:18 +0200)]
Imps and others cussing the hero wake up nearby monsters

3 years agoMake killer bee - queen bee transformation apply to hero
Pasi Kallinen [Sat, 19 Feb 2022 15:06:33 +0000 (17:06 +0200)]
Make killer bee - queen bee transformation apply to hero

if they've polyformed to a killer bee and eat royal jelly.

3 years agoReading a magic marker shows the specific red ink color
Pasi Kallinen [Sat, 19 Feb 2022 11:11:20 +0000 (13:11 +0200)]
Reading a magic marker shows the specific red ink color

3 years agoAllow creating unhidden traps in special levels
Pasi Kallinen [Sat, 19 Feb 2022 10:38:24 +0000 (12:38 +0200)]
Allow creating unhidden traps in special levels

des.trap({ type = "rust", seen = true });

3 years agoKnight quest home level has some saddled warhorses
Pasi Kallinen [Sat, 19 Feb 2022 09:51:06 +0000 (11:51 +0200)]
Knight quest home level has some saddled warhorses

Also, when creating a saddle in a monster inventory in special
level lua code, automatically saddle the monster, if possible.

3 years agoTowels should weigh more than blindfolds
Pasi Kallinen [Sat, 19 Feb 2022 08:32:54 +0000 (10:32 +0200)]
Towels should weigh more than blindfolds

There's more cloth in a towel than in a blindfold.

3 years agoCandy bars are bright blue in text mode
Pasi Kallinen [Sat, 19 Feb 2022 08:24:50 +0000 (10:24 +0200)]
Candy bars are bright blue in text mode

There's lots of brown comestibles, but no bright blue.

3 years agoUnix command line parsing
PatR [Fri, 18 Feb 2022 22:38:24 +0000 (14:38 -0800)]
Unix command line parsing

Move a bunch of stuff out of main() into new early_options(): '-dpath'
playground directory handling, '-s ...' show scores instead of playing,
and the 'argcheck()' options:  --version, --showpaths, --dumpenums,
and --debug (not to be confused with -D).  Also introduce
| --nethackrc=filename
| --no-nethackrc
to control RC file without using NETHACKOPTIONS so that that is still
available for setting other options.  They can start with either one
or two dashes.  --no-nethackrc is just --nethackrc=/dev/null under the
hood.  '-dpath' can now be '--directory=path' or '--directory path'
but the old syntax should still work.  '-s ...' can be '--scores ...'.

Basic call sequence in unixmain relating to options is now
|main() {
|  early_options(argc, argv[]);
|  initoptions(); /* process sysconf, .nethackrc, NETHACKOPTIONS */
|  process_options(possibly_modified_argc, possibly_modified_argv[]);
|}
Options processed by early_options() that don't terminate the program
are moved to the end of argv[], with argc reduced accordingly.  Then
process_options() only sees the ones that early_options() declines to
handle.

Most early options were using plain exit() instead of nh_terminate()
so not performing any nethack-specific cleanup.  However, since they
run before the game starts, there wasn't much cleanup being overlooked.

chdirx() takes a boolean as second argument but all its callers were
passing int (with value of 1 or 0, so it still worked after being
implicitly fixed by prototype).  Change them to pass TRUE or FALSE.

argcheck() was refusing (argc,argv[]) with count of 1 but then it was
checking 0..N-1 rather than 1..N-1, so it tested whether argv[0] was
an argument instead of skipping that as the program name.  Change to
allow count of 1 with modified argv that has an option name in argv[0].
That happens to fit well with how early_options() wanted to use it.

3 years agoKnights get no caitiff penalty against undead
Pasi Kallinen [Fri, 18 Feb 2022 19:29:31 +0000 (21:29 +0200)]
Knights get no caitiff penalty against undead

3 years agoMartial arts users never deal no damage with a clumsy kick
copperwater [Mon, 13 Apr 2020 00:56:44 +0000 (20:56 -0400)]
Martial arts users never deal no damage with a clumsy kick

From EvilHack, under the basis that anyone trained in martial arts (or
is in a powerful kicking polyform or wearing kicking boots) should be
immune from landing such a poor kick. This bypass used to happen only
50% of the time; now it happens all the time.

Note that this only averts the "Your clumsy kick does no damage" case:
it remains possible for a powerfully kicking player to kick clumsily and
have the monster evade or block, for example if they are fumbling or
wearing bulky armor.

Also, documentation: I added a comment explaining what the incredibly
dense and confusing logic is with i and j happening here, for the next
poor soul that has to read that code.

3 years agoUse defines for pet hunger limits
Pasi Kallinen [Thu, 17 Feb 2022 18:03:39 +0000 (20:03 +0200)]
Use defines for pet hunger limits

3 years agoWield and swapweapon ext cmd fail return values
Pasi Kallinen [Thu, 17 Feb 2022 09:06:28 +0000 (11:06 +0200)]
Wield and swapweapon ext cmd fail return values

3 years agoFix fire auto-swapweaponing to polearm
Pasi Kallinen [Thu, 17 Feb 2022 07:12:03 +0000 (09:12 +0200)]
Fix fire auto-swapweaponing to polearm

When you have a polearm as secondary weapon, have a fireassist on,
and press 'f' to fire, the code tries to swapweapon to the polearm.
This failed badly and got stuck in a loop if you were also wearing
a shield - as polearms are two-handed and shield prevents wielding
those.

Add a new "command failed" result, and clear the command queue
in that case. Also make swapweapon and wield actually return
the ECMD flags back to the rhack loop.

3 years agoZombies groan
Pasi Kallinen [Wed, 16 Feb 2022 21:03:18 +0000 (23:03 +0200)]
Zombies groan

3 years agobuild tested with visual studio 2022 17.1.0
nhmall [Wed, 16 Feb 2022 20:57:03 +0000 (15:57 -0500)]
build tested with visual studio 2022 17.1.0

3 years agoHallucinatory rays
Pasi Kallinen [Wed, 16 Feb 2022 19:09:20 +0000 (21:09 +0200)]
Hallucinatory rays

When hallucinating, use nonsensical names for the rays
(wands, spells, and breath weapons), and random ray glyphs.

Original code from xNetHack by copperwater <aosdict@gmail.com>,
inspired by a YANI by Kahran042.

3 years agogroundwork for nethackrc name on command line
PatR [Wed, 16 Feb 2022 08:36:26 +0000 (00:36 -0800)]
groundwork for nethackrc name on command line

I've implemented 'nethack -nethackrc=filename' as an alternative to
'NETHACKOPTIONS='@filename' nethack' but at the moment it doesn't
work because the command line parsing comes after the run-time config
file has already been processed.  But this part should work, or maybe
have problems spotted and fixed if it doesn't.  The RC file part of
initoptions_finish() has been rewritten so that it won't need extra
replication of
|  set_error_handling()
|  process_file()
|  reset_error_handling()
|  if (NETHACKOPTIONS) {
|    set_error_handling()
|    process_options()
|    reset_error_handling()
|  }
I've tried to test all the combinations mentioned in the comment but
am not sure that I covered everything, particulary for repeating
earlier tests after making incremental changes.

3 years agoLooting will fall through to force
Pasi Kallinen [Wed, 16 Feb 2022 06:49:12 +0000 (08:49 +0200)]
Looting will fall through to force

If you have autounlock on, and don't have unlocking tool, but
are wielding a weapon usable for forcing the lock.

3 years agoobsolete nhlan.c follow-up
nhmall [Tue, 15 Feb 2022 20:22:34 +0000 (15:22 -0500)]
obsolete nhlan.c follow-up

- visual studio project files
- .gitattributes

3 years agoFix broken fireassist
Pasi Kallinen [Tue, 15 Feb 2022 18:16:28 +0000 (20:16 +0200)]
Fix broken fireassist

When I recently refactored the rhack loop, I also broke fireassist,
as rhack was clearing the command queue unconditionally.

3 years agoUse grounded macro
Pasi Kallinen [Tue, 15 Feb 2022 16:44:56 +0000 (18:44 +0200)]
Use grounded macro

3 years agoThis is cron-daily v1-Feb-11-2022. 000files updated: Files
nhw_cron [Tue, 15 Feb 2022 13:24:07 +0000 (08:24 -0500)]
This is cron-daily v1-Feb-11-2022.  000files updated: Files

3 years agoanother obsolete function reference
nhmall [Tue, 15 Feb 2022 13:16:21 +0000 (08:16 -0500)]
another obsolete function reference

3 years agoremove obsolete function and references
nhmall [Tue, 15 Feb 2022 13:13:27 +0000 (08:13 -0500)]
remove obsolete function and references

3 years agoUnix argcheck() usage
PatR [Mon, 14 Feb 2022 19:18:08 +0000 (11:18 -0800)]
Unix argcheck() usage

The checking for command line flags --version, --showpath, and one
or two others was inside #if CHDIR.  I don't know whether anyone
ever disables that configuration option, but it shouldn't control
whether those flags are handled.

3 years agoman page update
PatR [Mon, 14 Feb 2022 18:57:49 +0000 (10:57 -0800)]
man page update

For nethack.6, include the recently added 'optmenu' help file among
the list of files.

I didn't do anything about '-windowtype=xyzzy' though; there are some
other command line changes in the pipeline.  The existing '-w' that
the new longer form enhances isn't in there either.

I took my name out for the claim of copyright.  I've barely ever
touched this file.  We see if that breaks the automated processing.

3 years agoMonster or hero placement should avoid wall of water
Pasi Kallinen [Sun, 13 Feb 2022 16:06:45 +0000 (18:06 +0200)]
Monster or hero placement should avoid wall of water