Commit Graph

5782 Commits

Author SHA1 Message Date
PatR
f2dc48086f acid explosion messages from water_damage()
Restore the variant phrasing used when more than one stack of potions of
acid explode while being inflicted with water damage.  First message:
"a potion explodes" or "some potions explode"; second and subsequent
messages: "another potion explodes" or "more potions explode".  This
trivial feature stopped working when erosion handling was overhauled and
old water_damage was split into current water_damage_chain+water_damage.

Augment the message so that vague "potion" is only used when the object's
dknown flag isn't set (ie, object hasn't been seen yet).  Use "<color>
potion" or "potion of acid" otherwise, depending upon whether such potions
have been fully discovered.
2015-03-19 15:54:17 -07:00
Pasi Kallinen
384f519cc8 Add lots of new random epitaphs 2015-03-19 22:01:16 +02:00
Pasi Kallinen
1fd371600d Add some new random engravings 2015-03-19 21:13:24 +02:00
Pasi Kallinen
f5ea4e0d1f Add lots of new hallu monsters 2015-03-19 18:43:35 +02:00
Pasi Kallinen
3cc3709d95 Save xlogfile time_t fields correctly 2015-03-19 17:41:14 +02:00
nhmall
02cdaf5a09 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-03-18 23:01:34 -04:00
nhmall
d182920655 update cmdline Makefile 2015-03-18 23:00:46 -04:00
PatR
357115ae80 add bogusmon,engrave,epitaph to dat/.gitignore 2015-03-18 19:24:43 -07:00
PatR
4b0a1af482 xlogfile tweak to avoid forcing ANSI C
Avoid the C89/C90 feature of implicit concatentation of string literals.
XLOG_SEP handling becomes clumsier but will work with pre-ANSI compilers.
2015-03-18 19:21:29 -07:00
nhmall
d01bec9fae rare books store tribute 2015-03-18 21:47:18 -04:00
Pasi Kallinen
debdf7ca48 Move some hard-coded string arrays into data files.
Random epitaphs, engravings and hallucinatory monsters now
live in text data files.
2015-03-18 22:05:10 +02:00
Pasi Kallinen
e93add8cb8 Prevent segfault, water_damage may get a NULL obj 2015-03-18 21:40:54 +02:00
Pasi Kallinen
27add21e7e Merge branch 'paxed-xlogfile' 2015-03-18 18:57:52 +02:00
nhmall
c80828fe7a Start to prepare dat/history for release
This gets the history started. Please review/correct/improve and
fill in the various <FIXME> items I've flagged.
2015-03-17 22:40:57 -04:00
Pasi Kallinen
379c23096a More getpos improvements
Look up remembered dungeon features, not user-visible glyphs,
and ignore uninteresting features (room, corridor and wall tiles).

Original patch by Patric Mueller, from UnNetHack
2015-03-17 21:29:54 +02:00
Pasi Kallinen
56699486a0 Catch up with post-343 lev_comp changes
- Iced pools vs. iced moats
- allow making map outer edges nonpasswall & nondiggable,
  so eg. xorns cannot be teleported there
2015-03-17 18:57:39 +02:00
Pasi Kallinen
b5dd0c1894 Make sokoban prize not depend on the map layout 2015-03-17 18:52:53 +02:00
Pasi Kallinen
c9d5bb9d68 Fix some level flags, sokoban premapping 2015-03-17 18:52:53 +02:00
Pasi Kallinen
79eb17a0a7 New level compiler: des-file changes 2015-03-17 18:52:49 +02:00
Pasi Kallinen
47bb9abace New level compiler: code changes 2015-03-17 18:52:42 +02:00
PatR
7912a566e5 some lint cleanup 2015-03-17 18:47:39 +02:00
PatR
d4467fc594 allow DEBUGFILES to be overridden via getenv()
If getenv("DEBUGFILES") yields a value then it takes precedence over
sysconf.DEBUGFILES or sys.c's #define DEBUGFILES.  (It probably should
only be controlled via environment since it is not a system-wide
attribute, but I haven't taken out the SYSCF handling for it.)
2015-03-17 18:47:38 +02:00
Derek S. Ray
b6ec0f066e finally remember to add the 'nh-' versions 2015-03-17 18:47:38 +02:00
nhmall
ae974e7a6d dungeoneers update March 16, 2015 2015-03-17 18:47:37 +02:00
PatR
105545172f fix #H3724 - gold pile stacking bug
Bug report included a pointer to a fix; this patch is a superset.
Gold pieces dropped on an altar by the player got their bknown flag set,
which is incorrect since bless/curse doesn't apply to coins.  If a
monster (in reported case, a slain temple priest) dropped gold there too
then the two stacks wouldn't merge.  For the normal !GOLDOBJ config, the
problem goes away as soon as the gold gets picked up.  I didn't test for
GOLDOBJ but think two inventory slots containing gold can result.

     The superset part is to not break agnostic conduct by dropping gold
on an altar since no information is revealed when doing that.

[This was one of the very last patches checked into the old cvs repository,
where the somewhat out of date message above was accidentally omitted.]
2015-03-17 18:47:37 +02:00
PatR
77dbb1080d free 'sysopt' strings upon termination 2015-03-17 18:47:36 +02:00
PatR
058299aa3a DEBUG/debugpline() fixup
* Replace variadic debugpline() with fixed argument debugpline0(str),
   debugpline1(fmt,arg), and so on so that C99 support isn't required;
 * showdebug() becomes a function rather than a macro and handles a
   bit more;
 * two debugpline() calls in light.c have been changed to impossible();
 * DEBUGFILES macro (in sys.c) can substitute for SYSCF's DEBUGFILES
   setting in !SYSCF configuration (I hope that's temporary).
2015-03-17 18:47:31 +02:00
Derek S. Ray
4c28a96b92 Some few updates/additions; clean up formatting 2015-03-17 18:47:29 +02:00
nhmall
a873129caf withdraw fixes35.0 part of prior commit
There was actually a fixes35.0 entry further down that covered off
that particular entry already which I missed first time around.

> many instances of physical damage were not taking Half_physical_damage
>	into account when reducing your hitpoints
2015-03-17 18:47:29 +02:00
nhmall
3e5d6bf68f catch up on half-physical damage docs
This is catching up on some things that were changed
in development years ago that Dave C. suggested be
documented.

For the record:
-The things that were evaluated and ruled out
are now documented in include/youprop.h so they don't
come up again.

- The things that were evaluated and deemed to be susceptible
to the intrinsic and thus led to a modification in the code
are listed below in this commit message.

Modifications:
- A crystal ball exploding on being applied
- Artifacts' blasting
- Being a fish out of water
- Being hit by Mjollnir on the return
- Being thwacked by an iron ball chained to you
- Boiling/freezing potions
- Broken wands
- Bumping head on ceiling by cursed levitation
- Burning (un)holy water
- Chest/door/tin traps
- Dipping a lit lamp into a potion of oil
- Exploding rings and wands (under all circumstances)
- Exploding spellbooks
- Falling downstairs
- Falling into a (spiked) pit
- Falling off or failing to mount a steed
- Falling on a sink while levitating
- Getting squished in a pit under a boulder
- Hitting your foot with a bullwhip
- Hitting yourself with your pick-axe
- Hooking yourself with a grappling hook
- iron-ball-pulling yourself out of a bear trap
- Jumping/Newton's-Thirding into something solid
- Kicking something that makes you go "Ouch!"
- Land mine explosion
- Sitting in a spiked pit
- Stinking cloud damage
- Thrown potion (bottle)
- Zapping yourself with a wand, horn or spell
- Jumping yourself out of a bear trap
2015-03-17 18:47:29 +02:00
Pasi Kallinen
232d4e69bb Death talks in CAPITAL LETTERS 2015-03-17 18:47:29 +02:00
nhmall
2904297cc0 Additional obstruction messaging fixup 2015-03-17 18:47:28 +02:00
nhmall
995ba09363 fix messaging in obstructed() in lock.c
From ais523's recent list of bugs:
If a long worm tail is blocking the door, and you're blind and not
telepathic, attempting to close the door marks the position of its head.

From an email received in late September 2014 before the git conversion:
> I was trying to close a door, not noticing that there was a garter
> snake there, and this message resulted:
> The garter snake stands in the way!
> I haven't tried it with any other monsters without feet, but
> "stands in the way" appears to be the wrong way to describe
> this situation...

Both of the above were found in the same function in lock.c
2015-03-17 18:47:28 +02:00
nhmall
c2ed47803a "swallowed whole" was preceded by "You bite into"
Another reported by ais523:
The death message "swallowed %s whole" is preceded by
"You bite into %s."; these contradict.
2015-03-17 18:47:27 +02:00
nhmall
f2d9494d95 abuse wisdom in keeping with Rider eating msg
The death message for eating a Rider is "unwisely tried to eat...", but
it doesn't abuse Wisdom (potentially relevant if you lifesave)
2015-03-17 18:47:27 +02:00
Derek S. Ray
3b89c474ab Initial version of simple recipes file 2015-03-17 18:47:27 +02:00
Pasi Kallinen
73b944037a Fix warnings 2015-03-17 18:47:26 +02:00
nhmall
631005ed03 charge for a boulder that fills a pit in shop
Changes to be committed:
	modified:   src/do.c

From the email sent by ais523 earlier:
> You aren't charged for digging a pit below an unpaid boulder
> (causing the boulder to fill the pit).
2015-03-17 18:47:26 +02:00
nhmall
ad1d682751 from ais523 list: charge for boulder filling pit 2015-03-17 18:47:26 +02:00
Pasi Kallinen
9e0d8deaed TTY: Implement the menu_search command
When in a menu that allows selecting entries, press ':'
to enter any text. Entries that match the text (via pmatch)
will be toggled.
2015-03-17 18:47:25 +02:00
Pasi Kallinen
36995448fb Add MAX_STATUENAME_RANK sysconf setting
MAX_STATUENAME_RANK tells how many score file entries to use
for random statue names.
2015-03-17 18:47:24 +02:00
Pasi Kallinen
21cce7fbe6 getpos improvements: automatic description
Pressing '@' will move the cursor on top of the hero.
Pressing '#' will toggle automatic description mode, where
the feature under the cursor is automatically described
when the cursor is moved.
2015-03-17 18:47:23 +02:00
nhmall
d594f9fe01 catch up on some fixes entries 2015-03-17 18:47:23 +02:00
Pasi Kallinen
770a92d259 Add boolean option "bones"
Setting bones off prevents saving and loading bones files.
2015-03-17 18:47:22 +02:00
Pasi Kallinen
ee7e9f563b Fix GENERIC_USERNAMES thinko 2015-03-17 18:47:22 +02:00
nhmall
074fb69be0 do_look() in post-3.4.3 code fixes entry 2015-03-17 18:47:22 +02:00
nhmall
5174eb157f One VS Makefile for Nethack that works with VS2010-VS2015 2015-03-17 18:47:21 +02:00
nhmall
2b83895fd4 typo in format string on previous commit 2015-03-17 18:47:21 +02:00
nhmall
20b16455ef more do_look() glyph usage without it being set properly
Changes to be committed:
	modified:   src/pager.c

When the previous occurrence that triggered a segfault
was fixed, I didn't check for more of them. It turns out there
were more instances.

This also removes some dead code.
2015-03-17 18:47:21 +02:00
Pasi Kallinen
63e7d97148 Change command X to twoweapon toggle
Explore mode is now an extended command #exploremode.
There's no sense that a command used max. once per game, and
in normal games not at all, takes up a key. So, analogous to
the 'x' command (swap weapons), 'X' now toggles two-weapon
combat.
2015-03-17 18:47:20 +02:00