Commit Graph

1326 Commits

Author SHA1 Message Date
cohrs
b5faab3a4a typo in U897 change
in the process of merging my change into the source, the "=" got lost
2004-03-27 05:03:07 +00:00
cohrs
019837d03f U897: kicking while in the air
If you kick something while in the air (i.e. on the Air level or while
in a bubble on the water level), 1) greased objects were treated specially
and 2) messages were given about the object sliding.
- add checks for kicking in the air, and always increased distance a bit
(I didn't add any checks to deal with the transition from air to water or
visa versa)
- don't set the flag that causes the "slides" message in these cases either
2004-03-26 19:26:37 +00:00
cohrs
607f63e5fd score wrapping band-aid
This patch simply keeps the score from wrapping by capping it at LONG_MAX.
If someone wants to change the score to be unsigned, some changes will
need to be made to tweak this code (and use ULONG_MAX instead).
I'm assuming that our platforms all have limits.h.
2004-03-26 18:28:28 +00:00
cohrs
e424ca4ba3 Juiblex' frozen "moat"
<Someone> reported that freezing the swamp on Juiblex' level would result
in message about a frozen moat.  Avoid this by using waterbody_name
to to determine if it's a moat or not.
2004-03-26 18:20:49 +00:00
cohrs
54feb64a0e U944: Tripping over cockatrice corpse does not petrify
added the missing check in slip_or_trip for the case where the hero
is not wearing boots
2004-03-26 18:15:29 +00:00
arromdee
74b4ffe486 blindfold (from r.g.r.n)
Someone suggested that if your vision is only blocked by a blindfold and it's
the blindfold that glows, you should be able to see it.
2004-03-12 03:57:20 +00:00
nethack.allison
42f202f4c0 new context_info struct in compat checks (trunk only)
Add the context_info struct to the version compatibility checks.
This increments EDITLEVEL rendering prior save/bones files useless.
2004-02-02 01:30:31 +00:00
nethack.allison
1e8c99bcc0 thrown potions can sometimes hit saddle 2004-01-31 14:59:36 +00:00
cohrs
5d32958e04 dipping acid in a fountain
<Someone> reported that dipping acid in a fountain did not always destroy
the acid.  It might be best to have get_wet call useup in this case, but
that would require more work.
2004-01-28 17:49:21 +00:00
cohrs
e84bea2009 fleeing mimics
Reported to the list back in November: scaring a mimicing mimic will
produce a "turns to flee" message, but the mimic does not unmimic nor
does it flee.  The latter behavior made sense to me as a defense mechanism,
so I changed monflee to avoid printing the message in this case.
2004-01-27 21:10:14 +00:00
cohrs
b661f86e67 U846 - xorns and pits
Change pit behavior to always mark a non-flying poly'd player as trapped in
a pit, even when Passes_walls is set.  This allows players polymorphed into
xorns to descend into pits and pick things up.  In this case, any attempt
to move out of the pit now takes a turn but always succeeds.  Also fixed
a related bug (w/o ID) that a player could become trapped as if in a pit
when leaving xorn form because u.utrap wasn't checked, and simplified the
code since the extra Passes_walls checks are no longer needed.  Also
updated code in sit.c that duplicated uteetering_at_seen_pit.
2004-01-27 19:35:09 +00:00
cohrs
7ab2bb967a Invisible monsters looking much better
<Someone> reported back in December of an invisible monster using an amulet of
lifesaving and looking much better.  While the comment in the code says the
amulet is visible, this does not mean the monster is.  Add a secondary check.
2004-01-27 17:28:00 +00:00
cohrs
a5e7a67130 U880 - grammar when eating artifacts
Both the reported tombstone message and the initial message could be
grammatically incorrect for eating identified artifacts.  This begs the
question whether artifacts should be so easy to destroy.
2004-01-27 03:37:51 +00:00
cohrs
6f0fb33e9f general musical instrument use while polymorphed
Extend the previous patch to cover all blown instruments.  Also covers
the case of the player strangling.  The test is moved to a new can_blow
function to keep the test in one place.  It supports any monster, although
all current tests are for the player.
2004-01-27 00:23:31 +00:00
cohrs
661f91009b whistle use while polymorphed
Restrict poly'd whistle use to monsters that can blow a whistle.  The
restriction includes those that make no sound (or just buzz, which is a
wing-thing) and are either breathless, tiny (eg ants), headless or water
natives.  Searching monst.c, this appeared to provide a reasonable set of
restrictions.  There are a couple cases one might quibble about if someone
feels like refining this further.
2004-01-26 23:19:36 +00:00
cohrs
89022d94fd using a whistle underwater
A long time ago, a message to the list suggested that whistles should not
work underwater.  I did some google research and this does appear to be
true for most whistles.  However, magic whistles are magical, so I left
them alone (also, I did find one high-tech whistle in my research that
claimed to work underwater).  Since being underwater affects pitch,
adjusted the magic whistle message slightly for that case.
2004-01-22 23:25:15 +00:00
cohrs
0c14e67660 gcc compliation warnings
Since I last tried to compile, a couple gcc warnings slipped into the code.
2004-01-22 23:06:21 +00:00
nethack.allison
f2101638db avoid "It turns into it"
<Someone> drew attention to the silly message in the newsgroup

Since I'm not sure if the act of polymorphing has a sound,
I opted to use a new usmellmon() routine to put out a
message based on the smell of the resulting monster
under those circumstances.

Not every monster has a recognizable smell, so no
message at all is given in that case.

olfactory(youmonst.data) will determine whether
you are capable of detecting smells.

There is lots of room for enhancement, and some of the
existing smell-related messages in the source should perhaps
be checking olfactory(youmonst.data) too, but this patch
doesn't go that far.
2004-01-17 20:42:14 +00:00
nethack.rankin
619f9fccf8 cmdassist enhancement again
>      [...] it also suppresses the message about how to disable
> cmdassist in this case.

     Well it would have done so if I'd used the right diff....
2004-01-10 03:29:30 +00:00
nethack.rankin
8d6f610b37 cmdassist enhancement
Implement the patch sent by <email deleted>
to make responding with '?' at the "what direction?" prompt ask again
after giving the `cmdassist' direction display.  I did it slightly
differently than was done in the submitted patch but the result is the
same except that it also suppresses the message about how to disable
cmdassist in this case.
2004-01-10 03:23:55 +00:00
nethack.rankin
b8991129a8 pit access
Fix the recently reported problem:

" If there is a corpse in a pit, you have to enter the pit in order to pick
" it up, however you are can eat it without being in the pit.

If pit bottoms aren't reachable, then can_reach_floor() needs to know
about it.  I suspect that this change is likely to create some other
bugs though.
2004-01-04 08:54:16 +00:00
nethack.allison
62e46878b1 pat wrote:
> In the development code, two status types have gotten reversed.
> Hallucinating shows up as "Stun" and being stunned shows up as "Hallu".
2003-12-31 20:11:02 +00:00
nethack.rankin
99413fcd04 fix steed-in-trap message grammar when hallucinating
Fix the recently reported bug about the wording of trap messsages
when hero's steed has a name but hallucination prevents that name from
being used, yielding "You lead poor wombat into a pit!" and the like.

     I accidentally deleted the message so can't reply to the sender.

[Before applying this patch, take a look at the POLY_TRAP case of the
switch statement in steedintrap().  A misplaced brace has drawn the
default case into one of its `if' statements.  Evidently it's valid C
syntax, but someone among us must have access to a compiler or lint
checking tool which is capable to diagnosing such things.]
2003-12-27 02:45:47 +00:00
nethack.rankin
4a2dc925bb fix incorrect plural of Nazgul
Incorporate <Someone>'s patch to skip adding of a final "s" to
"Nazgul" when pluralizing.
2003-12-23 02:32:17 +00:00
nethack.allison
57b1e96238 teetering on edge of pit
- when you're teetering on the edge of a pit you can use '>' to enter the pit
- pull the numerious teetering checks into a new function
2003-12-22 19:09:39 +00:00
nethack.rankin
712771f4f7 fix U796 - minor wording 'bug'
"You push the boulder into the pool" should be "Your steed pushes
the boulder into the pool" if done while riding since that's how other
boulder pushing messages are handled.
2003-12-18 05:00:47 +00:00
nethack.allison
28934bc7b6 Re: #U800: possible bug regarding pits
<email deleted> wrote:
> Not sure what exactly should occur, but this seems funny: If
> you escape a pit and there is an object in the pit, you can
> not reach it to pick it up. Nor can you go down into the pit
> to get it, but sitting gives the message "you sit on the
> (object) it's not very comfortable. How can the character sit
> on it if it's in the bottom of the pit?
2003-12-16 02:58:55 +00:00
nethack.rankin
a4a80fdbca back into test mode
Post-release, reset to BETA status to indicate development since
there's no ALPHA.  And use BETA to enable the latent RNG checks.
2003-12-13 15:01:49 +00:00
nethack.rankin
41d3ad8c4e wizard mode ^V crash in endgame
Mentioned in passing in the newsgroup:  level teleporting in the
endgame--which is only possible in wizard mode--can crash if you're
confused.  The change to make confusion sometimes override teleport
control means that sometimes a random destination will be chosen, and
the routine to choose a random level can call rn2() with a value less
than 1 in the endgame, possibly resulting in attempt to divide by 0.

     There's something fishy about the min_/max_depth stuff for the
endgame, but I haven't attempted to figure that out.  This just makes
the random destination always be the current level when in the endgame
so that the problem can't come up.
2003-12-13 14:51:38 +00:00
nethack.allison
86428dc172 U778 wielded silver arrows 2003-12-11 11:43:18 +00:00
kmhugo
a744b6b5bf Mac Carbon updates 2003-12-10 19:36:49 +00:00
nethack.rankin
0dc3c43a8d montraits usage (trunk only)
Move a couple of recently added corpse revival/statue animation
fixups into montraits() so that its callers don't have to worry about
them anymore.
2003-12-10 06:33:25 +00:00
nethack.allison
f935974e02 apply Janet's lint catches to trunk 2003-12-10 01:23:14 +00:00
nethack.allison
e7cb26d898 fix "You hear The food ration tumbles downwards." 2003-12-08 02:25:11 +00:00
nethack.allison
2a91bc6a50 fix message when were_summoning 2003-12-07 09:45:34 +00:00
nethack.rankin
2e28abcd5a fix the "big abuse" reported a few days ago
It was possible to get a shopkeeper to carry the Amulet from the
bottom of the dungeon up to the location of his shop, thereby bypassing
the usual labor of lugging it up yourself.  [Drop the Amulet somewhere;
rob a shop so that the Kops are summoned and the shk comes after you;
when shk is next you, level teleport to the Amulet (probably two hops,
one to the Valley and another deeper into Gehennom); walk to the vicinity
of the Amulet; shk will eventually pick it up (shopkeepers like to pick
up magic items); now, pay him for the stolen goods--he'll be pacified
and migrate back to his shop, taking his inventory with him; lastly,
return to his shop and relieve him of his burder.]  This patch makes
shopkeepers drop the Amulet or invocation tools if/when they set set to
migrate to their normal location.

     Also fix another long standing risk that a monster that is sent
away (nurse when healing, Kops when you pacify a shopkeeper) might be
carrying the Amulet or one of the invocation tools and make the game
unwinnable.  I doubt that that's ever actually happened but I think it'd
be possible if a monster that likes magic items ever got polymorphed
into a Kop.  Such dismissed monsters will now drop the same stuff as
the shk above prior to leaving the game.
2003-12-06 14:08:51 +00:00
nethack.allison
eb65b00eb2 tainted meat did not invoke cannibalism 2003-12-06 05:11:40 +00:00
nethack.allison
40f3251cf4 prevent infinite recursion in impossible 2003-12-05 12:30:18 +00:00
nethack.rankin
4d7a39e563 #U770 part II - lack of "miss" message when throwing gold at monster
There was no feedback when gold was thrown or kicked at monsters
who weren't interested in catching it.  Now it'll give the same "<obj>
misses <monster>" message as other thrown or kicked items objects which
don't hit.
2003-12-05 11:37:37 +00:00
nethack.rankin
9860caf748 fix U770 - grammar bug: The gold pieces hits the [monster]
Report was for scattering gold during a land mine explosion, but the
message was delivered by the widely used hit().  Bug was caused by a typo
in vtense() when handling a subject containing a space.
2003-12-05 08:54:32 +00:00
nethack.rankin
3df53e952c loadstone dropping fix
Fix the reported problem of bad inventory management if the user
specified a count (with traditional menu style) when attempting to drop
part of a stack of cursed loadstones.  After the "you can't drop that"
message, it tried to undo the stack split, but splitobj was changed
sometime back and the undo hack wasn't adjusted to account for the fact
that it needed to merge with the previous object instead of the next one.
The result was that it would incorrectly increment the count of the next
item instead of the original loadstone, or crash in canletgo() if the
split off stone was the last item in the list.

     This prevents cursed loadstones from being split (via getobj()'s
count handling) in the first place, so there's nothing to undo later.
It still uses a similar kludge so that the "can't drop that" message can
be adjusted, but it's now a simpler kludge and I hope a more robust one.
2003-12-03 07:10:24 +00:00
nethack.allison
319bed6ac8 B02005 and B02006
B02006 autopickup_exception documentation

>Should the documentation say what priority order is used if two conflict?
>(For example, how ">*orcish" and "<*arrow" handle an orcish arrow; from
>experimentation, > always takes precedent over < , but I could be
>missing something.)

B02005 autopickup_exception option menu

> It'd be nice if you were returned to the menu after adding an exception
> via O so that you can set several with one command.
2003-12-02 05:00:02 +00:00
nethack.allison
db7d800c98 autopickup_exception
use doname() instead of xname()
2003-12-02 03:14:50 +00:00
nethack.rankin
f761b02c8d lint bits
and some reformatting.
2003-12-01 14:42:37 +00:00
nethack.allison
9d458f24ce botl.c followup bits 2003-12-01 03:57:42 +00:00
nethack.allison
7a8fafd150 botl.c followup bits 2003-12-01 03:48:32 +00:00
nethack.rankin
fbfb8e92ab corpse revival and statue animation (trunk only)
Try to address the problem From a bug report:  turning the Wizard
of Yendor to stone preserves monster information with his statue and
presence of that information overrides the statue animation check
intended to prevent players from creating the Wizard (or other unique
monsters).  That's ok for the current game--the monster had to have been
in play in order to be turned to stone--but is a problem if the statue
is found in a bones file.  The report was for placing such a statue at
the location of an untriggered statue trap by a player who leaves bones,
but stone-to-flesh by the player who loads bones is a simpler way to
trigger this.  (Aside from getting unique monsters earlier than usual
under some degree of player control they won't have their starting
inventory so special items like the Candelabrum might not get created.)
Using undead turning to revive corpses found in bones was another way to
get into the same trouble (I thought corpses of special monsters were
already excluded from bones?).

     It looks like it's also possible to get strange quest behavior if
a corpse or statue of the leader or nemesis is brought into the dungeon,
left in bones, then revived by the second player, but I didn't attempt
to reproduce it.  More work is probably needed; this tightens up leader
handling a bit but doesn't do anything about the nemesis.  This patch
has already been spreading tentacles and I've got to cut it off....

     The patch discards saved monster traits for corpses and statues of
unique monsters while saving bones; reviving or reanimating them will
produce doppelgangers instead of the original monsters, same as stone-to-
flesh on wished-for statues behaves.  It also discards saved traits for
shopkeepers (also temple priests and vault guards--their traits weren't
saved in 3.4.2 though).  That info might be useable when the corpse or
statue is on the same level as the monster started (ie, where its special
room is located), but that's a complication I'm going to bypass.  This
patch also adds chameleon handling for statue activation--it wouldn't
have mattered in 3.4.2 since shapechangers didn't get their traits saved;
it does matter now but was omitted when trait-saving was extended to all
statues a while back.  (It adds chameleon handling to corpse revival too,
but they still don't get their traits saved with corpses so that's just
protection in case of future modifications.)

     Other bits:  `cant_create()' is renamed to `cant_revive()' since
the latter is a more signicant use than wizard mode <ctrl/G> handling.
Now save traits with nymph corses so that cancellation can be propagated
if they're revived; that doesn't matter much but matches statue handling
(where it was more important since it dealt with succubi as well as with
nymphs).  Explicitly initialize the shape-changer field of all monsters
instead of relying on implicit initialization to 0 (CHAM_ORDINARY).

     There'll be a *much* shorter patch for 3.4.3 which will have to get
by with most of these obscure problems--fortunately they're unlikely to
impact many (any?) players.
2003-11-30 21:19:01 +00:00
nethack.allison
d6bf777e63 figurine transform message
The trunk patch differs from branch patch.
Both patches get rid of the "it", but the trunk patch addresses
other concerns brought to light today.
2003-11-30 19:20:01 +00:00
nethack.allison
331ecb8b5c patch reversal - figurines (was egg hatching message bug)
The fix was directed at figurines; report was actually for eggs.
2003-11-30 12:33:53 +00:00
nethack.rankin
b56641dc2e status bits
Declare structure before using it in prototypes, and declare atol()
for configurations which don't have or don't use <stdlib.h>.  (Some
#ifdef MICRO code for atoi at the end of system.h might need to be done
for atol too.)
2003-11-30 11:04:54 +00:00