Commit Graph

8689 Commits

Author SHA1 Message Date
nhmall
4177953ec7 Merge branch 'NetHack-3.6.2' part 3 2019-05-05 23:48:18 -04:00
nhmall
6f6f5586c5 Merge branch 'NetHack-3.6.2' part 2 2019-05-05 23:39:20 -04:00
nhmall
db25fe56a8 Merge branch 'NetHack-3.6.2' 2019-05-05 23:30:50 -04:00
nhmall
cd1d227525 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-05-05 23:20:34 -04:00
PatR
a08c0ed2ab VMS update
Long overdue.  Install.vms ought to be rewritten from scratch but that
will probably never happen.
2019-05-05 16:56:58 -07:00
PatR
6127c10848 comment/formatting tidbits
Some miscellaneous stuff I don't want to discard of lose track of.
No change it actual code.
2019-05-05 15:20:09 -07:00
PatR
e2eeca2ed0 bones bit: crysknife vs green slime
Being turned into green slime never drops hero's inventory so invent
objects shouldn't be subject to obj_not_held() handling.

obj_not_held() does apply to undead.  Arising as a mummy or vampire
doesn't go through the trouble of dropping everything and picking it
back up, but there is a point in the die...arise sequence where the
hero is implicitly a corpse so nobody is holding his/her stuff.
2019-05-05 14:48:43 -07:00
PatR
fcd38bdbef couple of interface comments 2019-05-05 13:38:58 -07:00
PatR
a8550fc0e7 ball&chain sanity checking
Add a bc sanity check.  It seems to work ok--in other words, not
trigger--under normal punishment.  I don't have any test cases to
exercise its warnings.

This dragged in a couple of minor bc changes that were pending.  I
should have cleared those out before tackling the sanity checking.
2019-05-05 13:33:30 -07:00
Pasi Kallinen
bed2c2307e Fix monster trapped state being wrong
When cloning a monster, clear the clone trapped and hiding states.
When splitting a monster (eg. a black pudding), the clone could
be placed on a trap, so do mintrap.
When removing a monster from the map, clear the trapped state.
2019-05-05 22:58:27 +03:00
Pasi Kallinen
f55e9ddd7c Fix impossible if monster cannot be relocated from tele region 2019-05-05 22:30:20 +03:00
nhmall
40e7eb7e2a sync recent wording change in history 2019-05-05 14:16:49 -04:00
nhmall
c2e23bac57 Merge branch 'NetHack-3.6.2' 2019-05-05 13:42:29 -04:00
nhmall
e10a3a8f41 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-05-05 13:36:45 -04:00
nhmall
79cc1aa01a Merge branch 'NetHack-3.6.2-beta01' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2-beta01 2019-05-05 13:34:38 -04:00
nhmall
c74e36a359 some updates for 3.6.2 2019-05-05 13:33:59 -04:00
keni
fe055cd6bc This is cron-daily v1-May-5-2019. guidebook updated: doc/Guidebook.txt
to 948099800b722f9be0e8f9c8d4d96cfda5cea98e
2019-05-05 13:32:53 -04:00
nhmall
aa94be62b2 some updates for 3.6.2 2019-05-05 13:29:40 -04:00
PatR
86195d4ad2 display.c formatting
Miscellaneous cleanup of display.c.
2019-05-02 15:22:29 -07:00
nhmall
50f75e1d80 Merge branch 'NetHack-3.6.2' 2019-05-01 09:10:41 -04:00
nhmall
47e73f1127 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-05-01 09:06:37 -04:00
Pasi Kallinen
f303fd2872 Database fixes
Merge barbed devil entry to already existing one.
Replace spaces in the beginning of lines with tabs.
2019-05-01 13:38:57 +03:00
PatR
0dc85b93b4 fix github issue #188 - #chat to succubus/incubus
Fixes #188

The change to fix setting SEDUCE=0 in sysconf broke chatting with
seductive demons by unintentionally changing the way Null attack
argument was handled.  It's still handled differently than it used
to be, but I think this difference is correct.
2019-04-30 11:35:06 -07:00
nhmall
438cc35624 Merge branch 'NetHack-3.6.2' 2019-04-29 13:52:27 -04:00
nhmall
12b183d221 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-04-29 13:52:06 -04:00
Pasi Kallinen
f17cfc977b Add the missing int param 2019-04-29 20:45:18 +03:00
Pasi Kallinen
1a4223faac Unify code for cure self spell 2019-04-29 18:50:08 +03:00
nhmall
5ddd6d7005 Merge branch 'NetHack-3.6.2' 2019-04-29 07:50:25 -04:00
nhmall
ae5d39b863 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-04-29 07:49:58 -04:00
PatR
c4ae9115cb fix github issue #187 - 'reassess' panic with Qt5
Fixes #187

Qt5 gave "status 'reassess' before init" panic at start of new game.
Don't call status_initialize(REASSESS) from set_usamon()--used for
hero setup as well as for hero polymorph--unless it was previously
called from display_gamewindows() with !REASSESS [which happens when
windowprocs.wincap2 has WC2_STATUS_HILITES or WC2_FLUSH_STATUS set].
2019-04-28 17:32:16 -07:00
nhmall
6d93eb7cdd Merge branch 'NetHack-3.6.2' 2019-04-26 19:52:16 -04:00
nhmall
e1834d5b5f Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-04-26 19:47:18 -04:00
PatR
75db8e004d fix #H8612 - splashes of venom might stay intact
If a poly'd hero spits venom and it lands at a 'soft' spot such as
water, it would remain as an intact venom object.  (Venom spat by
monsters seems to always be used up regardless of where it lands.)
2019-04-25 07:11:42 -07:00
nhmall
b3c2f920b3 Merge branch 'NetHack-3.6.2' 2019-04-24 21:29:11 -04:00
nhmall
bf16336241 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-04-24 21:16:07 -04:00
PatR
f838967c04 vampshifting Vlad
Vlad keeps his own form when carrying the Candelabrum, but if you
manage to get that away from him he should behave like other vampires.
He wasn't though; a high level wizard casting polymorph on him would
change him into an arbitrary monster rather than into a wolf/bat/cloud
that revives as Vlad when killed.
2019-04-24 16:59:44 -07:00
PatR
f441696908 fix #H8619 - hallucination vs vampire transform
|The seemingly dead vampire bat rises as a vampire.
was overriding hallucination when describing both old and new forms.
In 3.6.0 it only overrode the dying shape (explicitly so, presumeably
because the feature was brand new) and honored hallucination for the
revived shape.  The 3.6.1 fix to prevent non-hallucinating:  'The
seemingly dead Foo rises as Foo.' for a named vampire unintentionally
overrode hallucination for the revived shape.

Change it to honor hallucination for both before and after monsters
|The seemingly dead grid bug rises as a microscopic space fleet.
2019-04-24 14:02:09 -07:00
nhmall
20ca1ab0e4 Merge branch 'NetHack-3.6.2' part 2 2019-04-22 14:42:49 -04:00
nhmall
d15496ba31 Merge branch 'NetHack-3.6.2' 2019-04-22 14:36:58 -04:00
nhmall
b2459229da Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-04-22 14:31:18 -04:00
nhmall
82353f1965 enum bit 2019-04-22 14:27:41 -04:00
nhmall
dcf4da2150 preserve dknown field between fakeobj instances
Preserve temporary fake object's previous dknown value by storing it
as a flag value within the m_ap_type field of the posing monster, and
recalling it when it is needed.

This is intended to help eliminate observable differences in price display
between real objects and mimics posing as objects.

98% of this is just switching the code to utilize macro M_AP_TYPE(mon)
everywhere to ensure that the flag bits are stripped off when needed.
2019-04-22 14:17:18 -04:00
nhmall
e4ac043747 Merge branch 'NetHack-3.6.2' 2019-04-21 04:08:57 -04:00
nhmall
08d0f72dea Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-04-21 04:00:47 -04:00
PatR
cd6b5ef933 mimicking a corpse
Noticed while looking over mimic hiding.  When on an object, a mimic
will hide as that type of object.  But for a corpse, it picked a random
monster type and could choose one that doesn't leave a corpse.  Also as
a tin it would always be an empty one, but there doesn't seem to be any
way for a player to learn that.
2019-04-20 16:00:29 -07:00
PatR
ab4625a6bf quantum mechanic hits
Noticed while trying to find the reason for the wildmiss impossible(),
you could be teleported and then drop dead at the destination.  A QM's
AD_TLPT hit also does 1d4 physical damage which gets applied after the
teleport.  Getting "You die." seemed pretty strange, particularly after
picking the destination with telport control.  This makes sure that the
damage will never be fatal when teleport is attempted.
2019-04-19 17:32:36 -07:00
PatR
edd412e56c VMS config1.h
Some port of yacc was generating '#include <stdlib.h>' before our
'#include "config.h" and needed a specific define from config1.h to
be supplied on the command line to avoid conflicting contents within
that header file, but then config1.h drew complaints about redefining
the macro.  Guard against that.
2019-04-19 12:42:35 -07:00
PatR
6c84ccc241 status 'fieldorder'
DEC C in one of its non-ANSI modes didn't like
 fieldorder = test ? &array1 : &array2;
It first complained that '&' applied to an array has no effect (which
was typically true in pre-ANSI environments) and once those '&'s are
ignored, the attempted assignment didn't match the variable's type.
That code was actually more complicated that it needed to be; slightly
simpler code works as intended.
2019-04-19 12:28:14 -07:00
nhmall
638b6678dc Merge branch 'NetHack-3.6.2' 2019-04-19 08:55:54 -04:00
nhmall
7325d4d3b9 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2019-04-19 08:55:39 -04:00