Commit Graph

646 Commits

Author SHA1 Message Date
nethack.rankin
bc2215268b random level teleport fix
From the newsgroup:  prevent monsters from level teleporting out of
the quest into the main dungeon.  The player can't do that and monsters
weren't supposed to be able to, but from time to time the quest nemesis
has seemingly vanished after reading a cursed scroll of teleportation.
His disappearance was due to ending up on a random level between the
quest entrance and the top of the dungeon.

     This also fixes an obscure bug that I noticed while trying to
reproduce that problem:  uncontrolled level teleports by the player in
the quest had 80% or thereabouts chance of ending up on the quest home
level.  All 12-15 main dungeon levels above quest entrance were included
in the random range of 1 thru current+3, then any choice which tried to
pick one of those was converted to quest level 1.  (Monster destination
wasn't getting that adjustment.)
2003-06-01 14:52:04 +00:00
jwalz
c845548c36 Make enhanced ammo last longer.
Since traps can no longer provide an infinite supply, and people were
complaining that they always ran out of ammo before, make it less likely
to break enchanted and blessed ammo, and more likely to break eroded
ones.
2003-05-28 21:54:37 +00:00
nethack.rankin
ad243c0286 cmdassist bits
If the player gives the 'T' command while not wearing any armor,
don't suggest "use 'R' to remove accessories" unless the character is
actually wearing accessories.  Likewise for 'R' while not wearing any
accessories, don't suggest "use 'T' to take off armor" unless wearing
some.

     Add missing amulet case to the silly_thing() handling for 'W' and
'T'.  Also handle boots, gloves, and lenses as plural in the message
there.  silly_thing() has been simplified a little bit in the process.
2003-05-26 17:34:28 +00:00
nethack.allison
253a9d388b win32gui: prevent male valkyrie (from <Someone>)
>Steps to reproduce problem:
>1) make sure you don't have race, role, gender specified in your
>   defaults.h, then add
>   OPTIONS=role:Valkyrie,race:Human,gender:male,align:lawful
>2) start a new nethackw.exe game
>3) Uncheck "Random" from gender box, now you can select from male
>   or female, not only female.
>4) Select male and click OK.
>5) When game begins press shift+O (Options) and look to gender.
>   Your valkyrie is male.

defaults.nh values were not used the dialog initialization. That's
why both male/female options were available for Valkyries. This is
now fixed.

Also added: checking for consistency of the initial settings and
resetting all incompatible values to ROLE_NONE.
2003-05-26 09:58:15 +00:00
nethack.allison
01120453f2 Fix B03001
"You can't loot or pick up containers on the floor if you're not
skilled enough to reach them from your saddle, but you can check
for and disarm traps on them; this seems a little odd. (Likewise,
being able to set land mines and beartraps while riding.)"
2003-05-25 22:47:12 +00:00
cohrs
1f712ac626 U303 - starting the game as a male valkyrie
A core fixup if the the port startup code sets an invalid flags.female when
starting a new game.  The old comment regarding being unable to change
flags.female was not completely correct.  The flags.pantheon can be used to
differenciate new games from a restored game.
2003-05-25 20:28:41 +00:00
cohrs
702c373619 untested FreeBSD compilation fix
this particular fix has been sitting around my inbox for a while although
we've had reports of FreeBSD build problems for a long time.  While it's
untested, it certainly looks like the unfixed system.h had a case that
could not be reached.  bsdi seems like it needs to be handled the same way.
2003-05-25 19:03:55 +00:00
cohrs
8fcb235336 golem statue vs stone-to-flesh
move the fixes entry for this from 35.0 to 34.2 since the fix got
inserted into the 3.4.2 source and is not detrimental to the branch.
2003-05-25 17:40:51 +00:00
cohrs
b115b536c1 B03005 - canceling monster redux
Revert the code, but add a comment. The behavior is not obvious to everyone.
2003-05-25 17:21:21 +00:00
cohrs
dde1a1ceec B03006 - Searching trapped chests
When attempting to disarm a trapped chest, wisdom should only be exercised
when not confused.  It stands to reason that even if you manage to find a
trap in a confused/hallucinating state, wisdom shouldn't be exercised.
2003-05-25 05:04:11 +00:00
cohrs
1d2b62de95 B03005 - Canceling monsters
Since monster cancellation sticks, it doesn't makes sense for Magicbane to
cancel a monster more than once.  Tweaked the messages to deal with this fact.
I decided to not make Magicbane's random effect "intelligent", which is what
changing it to use some other attack against a canceled monster would be.
2003-05-25 03:47:31 +00:00
cohrs
dce0e0cb33 use Is_box
While inspecting some code, I noticed that detect.c wasn't using Is_box in
some places it should have been.
2003-05-25 02:35:16 +00:00
cohrs
aace75a34d B03004 - candelabrum in bones file
curse the candelabrum, like other similar artifacts
2003-05-24 01:59:11 +00:00
cohrs
4b22aa7bff sitting in lava and other utraptype sit messages
Several cases in the trap block of code in dosit() were caused by utraptype
being set to values not corresponding to an actual trap.  <Someone>
reported back in 12/02 that the "sitting in lava" killer message could not
occur, but the special-case sit messages for TT_INFLOOR and TT_BURIEDBALL
couldn't occur either.
2003-05-23 02:47:45 +00:00
cohrs
82cef26512 sitting in lava and other utraptype sit messages
Several cases in the trap block of code in dosit() were caused by utraptype
being set to values not corresponding to an actual trap.  <Someone>
reported back in 12/02 that the "sitting in lava" killer message could not
occur, but the special-case sit messages for TT_INFLOOR and TT_BURIEDBALL
couldn't occur either.
2003-05-22 01:43:21 +00:00
cohrs
ac3746d055 B03003 - throwing short swords
<Someone> pointed out a disagreement between the comment and code in
throwing_weapon(): comment says daggers & knife can be thrown, but
code also allowed short swords.  Assuming the comment was correct, changed
the code to match.
2003-05-21 22:08:22 +00:00
cohrs
3862424fa7 choking on non-food
<Someone> (also later forwarded by <Someone>) reported that choking
while eating non-food always resulted in calling it a "quick snack".
lesshungry() depends on an occupation to tell if you are actually eatig or
not, but since non-food is eaten in one turn, no occupation was set.  Took
his suggestion of setting the occupation temporarily to cause lesshungry()
call choke() appropriately in this case.
2003-05-21 18:32:40 +00:00
cohrs
e6ed77f634 U464 - picking up items while swallowed in a shop
The bug report referred to greased hands, but that doesn't affect the
behavior.  If you drop an object while swallowed or engulfed in a shop, and
that object had previously been picked up from the shop floor, the object
was treated as costly.  In some cases, this could result in impossible
errors later on.  Perhaps object ox & oy should be modified when in
player/monster inventory, but this fix addresses the specific problem by
not doing the costly check while swallowed.
2003-05-21 17:12:47 +00:00
cohrs
bbaa40993b U472 - untrapping squeaky board with a can of grease
If using a permanent inventory window, the charges weren't updated immediately.
2003-05-21 15:15:27 +00:00
nethack.rankin
1b512c4a49 more "disclose" handling
Even though the in game help now lists the actual disclosure values
instead of "all" as the default value, implement support for "all" (also
for "none") since doing so is trivial.
2003-05-20 08:25:45 +00:00
nethack.rankin
cf4c262178 vms playground setup
Create an empty paniclog file during playground creation, so that it
starts with the same permissions as other writeable files.  Without this,
it's liable to end up being owned by the first random user who triggers
a panic or impossibility rather than by the playground owner and probably
wouldn't be writable by any other user.
2003-05-20 06:04:04 +00:00
cohrs
b13c70597d U468 - disclose default
clarify the "disclose" default value in opthelp
2003-05-20 03:39:02 +00:00
cohrs
14c12765a0 U433 - infinite loop with place_branch
This solution is mostly a band-aid.  Make sure information set by join_map
that is overlaid by the MAP is cleared out.  This ensures that place_branch
will never consider invalid data.  A new function, remove_rooms(), with a
helper, remove_room(), takes care of this, but only for rooms created by
join_map, which addresses the only known case that causes this problem.
There's a possibility that some other strange behavior, especially in
minetn-6, will be fixed by this as well.  The problem of disconnected caves
on minetn-6 is not yet addressed.

Also, add a check to lev_comp.y to make sure the required fg semantics of
joined levels (fg must be ROOM or CORR) are actually met.  Doesn't affect
any levels currently included in the distro, but might address levels
others are trying to make.
2003-05-20 02:05:45 +00:00
cohrs
462858bd31 B02005 - Boulder and vision
add another bit to the flags passed to launch_obj so it can print
the initial "rumbling" message at the appropriate time rather than
having the caller print the message, possibly out of order.
2003-05-18 21:04:49 +00:00
cohrs
252460c70a starvation killer message
Write "died of starvation" on the tombstone, not just "starvation".
Suggested by <Someone> a couple weeks ago, although his suggested
prefix was different and didn't work as well for the "exhaustion" case.
2003-05-17 22:03:27 +00:00
cohrs
07a3dabab1 more U429 - tile bits
> While looking at the tiles.bmp file, I've found some more mistakes like
> this : the Wizard of Yendor's shadow is touching Croesus' tile, and one
> of Orcus' wing is touching Yeenoghu's tile.
2003-05-17 21:46:45 +00:00
cohrs
775e4e0345 U442 - scroll of charging
<Someone> suggested a scroll to counteract an unknown scroll of charging
that had negative effects.  Scroll of punishment already costs the same,
so that unknown behavior is already covered.  Plus, a cursed scroll of
charging already has negative effects, except in the case where the player
was confused where no negative effect from reading a cursed scroll of
charging occured.  Added such an effect (since the curse should still cause
something bad, even though the reader is confused), to drain the player's
energy.
2003-05-17 21:12:16 +00:00
cohrs
ddb2f60171 message when eating a stalking
As suggested by <Someone> to the mailing list, display a message
when you eat a stalker and notice that you became invisible.
2003-05-17 20:51:11 +00:00
nethack.rankin
c4c1b064f7 fix B02004 and other projectile related killer reasons
1) killer reason for scattered land mine shrapnel used "a" or "an" prefix
   even when multiple projectiles hit as a group -- one of various things
   From a bug report.oextra field) --
   noticed while investigating #1 and later From a bug report.4.0 due to an unintentional side-effect of missile killer reason
   handling in 3.4.1 (removal of redundant "poisoned" prefix by m_throw()
   confused the poison handling routine) -- noticed while investigating #3.
2003-05-14 10:25:26 +00:00
nethack.allison
792b684dcc Add <Someone> to dungeoneers list
Proposed by Michael Allison.
Seconded by Pat Rankin.
(it can always be withdrawn if there is a later objection)

-Author of Spanish NetHack
-Author of some NT keyboard internationalization fixes
-Author of "Hell patch"
2003-05-12 03:05:00 +00:00
nethack.allison
6406ef5f93 Add <Someone>'s key handling as loadable handler 2003-05-11 23:25:08 +00:00
nethack.allison
0226b0f20d typo (mine not Ken's) 2003-05-11 15:09:24 +00:00
nethack.allison
9042e11f31 fixes30.0
On January 20, 2002 Ken Arromdee wrote:
>I dug this out of my files. (Well, it didn't take a lot of
>digging; I already copied the disk in question to my PC long ago.)
[...]
>I may or may not have another one of these but I'd actually
>have to go install a 5 1/4 inch drive to check.
2003-05-11 14:52:59 +00:00
nethack.allison
4d191334fc add some old fixes entries
some old patches from the same week that never got fixes34.0 entries
(fixes33.2 at the time)
2003-05-11 13:40:01 +00:00
cohrs
669c48dd04 polearms and infravision
Allow hero to apply a polearm against a monster seen only by infravision.
Reported to the mailing list.
2003-05-11 05:08:58 +00:00
cohrs
b8e61b8c47 B02003 - choking on unique monster corpse
Try harder to use the pronoun "the" when refering to a unique monster's corpse
2003-05-11 04:18:25 +00:00
cohrs
3f1f8c0b91 U455 - attacking disenchanter
When polymorphed, only attacks involving hands/feet/weapons should result
in damage to object.  Theoretically, hug and butt attacks should affect
objects too, but no forms with such attacks currently allow wearing armor.
2003-05-11 03:18:02 +00:00
nethack.allison
b32a445a2c final qbuf patch
This is my final src mod to ensure that a qbuf does not overflow due to
a lengthy named object.  These recent patches, coupled with the core yn_function() patch earlier, should make it much rarer for a QBUFSZ
buffer overflow to occur in a window port routine (unless the window
port routine has its own bugs, but that isn't the core's fault).
2003-05-10 21:16:39 +00:00
nethack.allison
9746d9404e next qbuf overflow
By naming the candelabrum as long a name as the game will allow, and by naming a candle the longest name also, a qbuf overflow and crash is
triggered when you attach the candle to the candelabrum.
2003-05-09 04:03:16 +00:00
nethack.rankin
33d3c2581e bones fix
From the newsgroup:  leash found inside a bones level shop was flagged
as "in use".  3.4.0 had a fix for that which works for most cases, but not
when the shopkeeper has taken the dead character's inventory just before
saving the bones file.

     This also adds an entry to the branch copy of fixes34.2 to synchronize
it with the trunk copy.
2003-05-08 07:23:11 +00:00
nethack.allison
f38ebb5a21 back out accidental fixes35.0 update 2003-05-08 02:27:10 +00:00
nethack.allison
24f9f56006 fix prompt string overflow in lift_object()
<email deleted> wrote:
> The game crashed badly when I made some experiments with items
> with very long names:
>
> You have much trouble lifting a blessed greased thoroughly rusty  >thoroughly corroded +3 plate mail named terribly long killer longer than my
>ong long-worm called long.  Continue? [ynq] (q)

  tty_yn_function(const char * 0x0012fa50,
      const char * 0x00572ddc _ynqchars, char 113) line 379 + 6 bytes
  lift_object(obj * 0x009e8970, obj * 0x00000000,
      long * 0x0012fcd0, char 0) line 1131 + 20 bytes
  pickup_object(obj * 0x009e8970, long 1, char 0) line 1258 + 19 bytes
  pickup(int 0) line 474 + 28 bytes
  dopickup() line 1853 + 11 bytes
  rhack(char * 0x005c0d50 in_line) line 1908 + 3 bytes
  moveloop() line 406 + 7 bytes
  main(int 3, char * * 0x009e2ac0) line 102
2003-05-08 02:25:19 +00:00
nethack.rankin
25d6335de9 two land mine bits
Noticed when investigating one of the killer reason bugs recently
reported:  a land mine explosion shouldn't create a concealed pit trap;
make a revealed pit instead.  And while testing that, I noticed that the
"Kaboom" message given when pushing a boulder onto a land mine was given
while the map still showed the boulder at its original location even
though it had actually been moved already.  It's a little odd that you
get hit by shrapnel at your original position--as if you're shoving the
boulder ahead of you and then pausing a moment before stepping into its
former location--but that's trickier to fix; sometimes you won't advance
due to there being multiple boulders present (in that case you evidently
do shove the boulder instead of performing a steady push, so maybe the
current behavior is fine as it is).
2003-05-03 02:08:34 +00:00
nethack.rankin
9672d39e13 fix U438 - text formatting
"List of game options" from `? f' misaligns the entries for runmode
and scroll_amount (at least for tty display).  Shorten their descriptions
so that they fit without squeezing out spaces.
2003-04-30 23:27:31 +00:00
nethack.rankin
a16ba92a01 magic bag explosion
Make exploding bags of holding be less mysterious, and perhaps cut
done on the number of claims that they've vanished for no reason.  There
wasn't any feedback other than the explosion message itself; in particular,
the message about putting something into the bag didn't occur since that's
handled by the didn't-explode case.
2003-04-27 11:05:22 +00:00
nethack.rankin
de2c772a11 Castle trap doors fix
Recently discussed in the newsgroup, and it sounded familiar so may
have been reported directly earlier:

  You fly through the trap door.  You fly down along the stairs.

when polymorphed into a flying creature or riding a flying steed.  It
only happens at the castle, and only happens because the go-down code is
explicitly setting the arrival point to be the Valley stairs.  That's how
the castle trap doors used to work as traps too, but they were changed to
dump you randomly near the stairs quite some time ago.  Fix it by making
intentional triggering work the same now; this also prevents the false
feedback (even if you happen to arrive on the stairs by coincidence).
2003-04-27 10:32:55 +00:00
cohrs
8cb8d6cf54 U429 - high priest tile
Fix a couple bad pixels in the high priest tile that are actually shadows
from the previous tile that spilled over.
2003-04-22 23:51:30 +00:00
cohrs
a2a8c0f86c gauntlets of power removal encumbrance feedback
<Someone> reported that encumbrance feedback when removing GoP
was delayed until the next turn.  Several other places call encumber_msg()
to provide immediate feedback.  Call it in Gloves_off() too.
2003-04-20 22:29:25 +00:00
cohrs
cb56f6fd2d B02002 - Monster werechange messages
Change the monster constants to match the current position of the switch
statement.  Also test canseemon(), since the message isn't needed if you
see the change.  I didn't make any other change to the message frequency.
If it's too frequent, then perhaps the changes themselves are too frequent.
2003-04-20 18:00:12 +00:00
cohrs
3d7d2f569e U423 - uninitialized memory access in dolookup
fix a case where "cc", which is only set when looking from_screen,
in a case where from_screen is not set.
2003-04-17 03:44:02 +00:00