Commit Graph
4245 Commits
Author SHA1 Message Date
Pasi Kallinen 6fcc030f37 Make HoOA alignment change depend on object ID
The same Helm of opposite alignment will always make
the same alignment change for neutrals.
2015-03-21 13:40:19 +02:00
Pasi Kallinen 3434a157f8 More C343-108: Handle "rub on the stone" 2015-03-21 11:03:54 +02:00
nhmall 66d642fad9 more mswin cmdline Makefile tweaks 2015-03-20 22:06:28 -04:00
Pasi Kallinen 2ec4ff0b8c Fix C343-108 (e- leaves prompt on screen)
You'll get "You mime eating something."
2015-03-20 19:25:24 +02:00
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
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
PatR ad03a7fb7a some lint cleanup 2015-03-16 19:22:49 -07:00
PatR 562fa952ce 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-16 15:54:10 -07:00
Derek S. Ray 4914e256bf finally remember to add the 'nh-' versions 2015-03-16 17:26:31 -04:00
nhmall c24dcf76b2 dungeoneers update March 16, 2015 2015-03-16 06:04:43 -04:00
PatR 0d0711fe17 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-16 02:29:10 -07:00
PatR a983a58b6a free 'sysopt' strings upon termination 2015-03-16 02:03:40 -07:00
PatR 14525ed0c6 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-15 18:02:26 -07:00
Derek S. Ray de8e1a5a9d Some few updates/additions; clean up formatting 2015-03-15 14:28:01 -04:00
nhmall 5fa4a1c82f 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-15 12:59:34 -04:00
nhmall 6e0a3dda2e 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-15 12:36:45 -04:00
Pasi Kallinen 3bbbb01c53 Death talks in CAPITAL LETTERS 2015-03-15 09:53:34 +02:00
nhmall f799bffbb2 Additional obstruction messaging fixup 2015-03-14 09:43:07 -04:00
nhmall ece3385900 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-13 22:27:09 -04:00
nhmall da83545660 "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-13 07:33:32 -04:00
nhmall 75e6fc27db 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-13 01:02:09 -04:00
Derek S. Ray 1e76ed28ae Initial version of simple recipes file 2015-03-12 22:47:44 -04:00
Pasi Kallinen f8aced5480 Add Extended Logfile 2015-03-12 21:35:04 +02:00
Pasi Kallinen 400d842a8f Fix warnings 2015-03-12 17:57:13 +02:00
nhmall a46ad54b1d 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-11 23:04:02 -04:00
nhmall b889a4b938 from ais523 list: charge for boulder filling pit 2015-03-11 21:57:36 -04:00
Pasi Kallinen a46b7a3cf3 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-11 21:56:12 +02:00
Pasi Kallinen a335f8306f Add MAX_STATUENAME_RANK sysconf setting
MAX_STATUENAME_RANK tells how many score file entries to use
for random statue names.
2015-03-11 19:59:52 +02:00
Pasi Kallinen 3243b332a3 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-11 17:16:05 +02:00
nhmall 64b3c6460a catch up on some fixes entries 2015-03-10 18:34:01 -04:00
nhmall 547ad18c7e Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-03-10 18:02:29 -04:00
nhmall 1287999b1c do_look() in post-3.4.3 code fixes entry 2015-03-10 18:00:49 -04:00
nhmall 7c65f47dfd One VS Makefile for Nethack that works with VS2010-VS2015 2015-03-10 14:25:54 -04:00
Pasi Kallinen d5abd07dad Add boolean option "bones"
Setting bones off prevents saving and loading bones files.
2015-03-10 19:50:29 +02:00
Pasi Kallinen f0a335da2a Fix GENERIC_USERNAMES thinko 2015-03-10 17:30:24 +02:00
nhmall 67aab26a83 typo in format string on previous commit 2015-03-09 22:11:49 -04:00
nhmall 7113829de0 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-09 22:05:48 -04:00
nhmall 941c3378ad Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-03-09 21:19:37 -04:00