Commit Graph

6270 Commits

Author SHA1 Message Date
keni
c08c73c738 fix nested comment warning 2016-11-09 20:10:42 -05:00
keni
9cdbf3bcce Merge remote-tracking branch 'origin/NetHack-3.6.0' 2016-11-04 16:46:19 -04:00
keni
c5133e4f99 Explicit verbiage for BREAK_360_SAVE_COMPAT. 2016-10-29 11:50:58 -04:00
Pasi Kallinen
f4acfd7995 Make older corpses not taste okay
Post-3.6.0 change made practically all corpses taste okay.
Change it so there's always a 10% chance for the corpse
to taste terrible, and increase the chance if the corpse
is slightly old.
2016-10-27 21:44:44 +03:00
keni
355bc8e601 Explain (via preprocessor defines) why CONWAY is off at the moment. 2016-10-26 09:42:19 -04:00
keni
0724fe98cf Merge remote-tracking branch 'origin/NetHack-3.6.0' 2016-10-23 15:21:59 -04:00
Alex Smith
f715224b9c Merge branch 'ais523-elbereth' into NetHack-3.6.0 2016-10-21 23:30:09 +01:00
Pasi Kallinen
bf1c81c0b4 Accept custom level annotations at the level teleport prompt
via UnNetHack, original implementation by aaxelb
2016-10-18 23:19:16 +03:00
Pasi Kallinen
1506572ea0 With fragile wands, use snap instead of break 2016-10-18 19:42:20 +03:00
Alex Smith
9c5cfc4153 Changelog for the Elbereth changes 2016-10-18 16:52:30 +01:00
Pasi Kallinen
f106b578a2 Wielding Demonbane prevents demons summoning friends 2016-10-18 18:07:53 +03:00
Alex Smith
d01c0364f1 Ugh, why does NH3's commit process have to differ from NH4's? 2016-10-17 18:29:09 +01:00
Alex Smith
348e54aa32 Change the rules for Elbereth erosion
If you attack a monster under Elbereth protection, and it wasn't
scuffed by the attack itself, then it'll be automatically removed
with an alignment penalty. It no longer fades from scaring monsters;
only from being abused to attack monsters while protected.
2016-10-17 18:26:44 +01:00
Alex Smith
ee5b488514 Differentiate between monster anger from attacks and from other causes
setmangry() and wakeup() were being used for multiple purposes. Add an
extra parameter to track which. This fixes several minor bugs (e.g.
whether monsters with no eyes were angered by (useless) gaze attacks
against them previously depended on the state of a UI option, and
the Minetown guards would be annoyed if you used a cursed scroll of
tame monster on a shopkeeper). It's also a prerequisite for the
Elbereth changes I'm working on.
2016-10-17 18:19:22 +01:00
Alex Smith
5c12362a98 Fix engrave.c; I used the wrong commit command 2016-10-17 17:34:08 +01:00
Alex Smith
8d32f37588 Make the Elbereth restrictions more flavour-consistent
Elbereth now has to be on a square by itself; it's hard to justify
why text before it would prevent it working if text after it fails
to prevent it working.
2016-10-17 17:31:00 +01:00
Pasi Kallinen
14bd550481 Wielding Trollsbane prevents trolls from reviving 2016-10-15 19:47:04 +03:00
Pasi Kallinen
35f46a0149 Put throne room gold in the chest 2016-10-15 10:26:20 +03:00
Pasi Kallinen
17e13f1e53 X11: Handle define-lines in NetHack.ad
xrdb can load a X recource file with #define-lines, but NetHack
cannot. Substitute the defines in Makefile during compile.

Requires grep
2016-10-14 16:50:25 +03:00
PatR
9f8f22ea4a more lint and formatting
Fix a C89/C90 complaint about a declaration following executable code.
The rest is formatting (of stuff I saw rather than systematic fixups).
2016-10-13 12:08:06 -07:00
Pasi Kallinen
abb4f0fab2 Allow toggling menu for any travel target list 2016-10-13 20:16:21 +03:00
Pasi Kallinen
4af4fc1143 Occasionally remove maze dead ends, creating loops 2016-10-12 18:39:24 +03:00
PatR
90ca75d0d9 lint fix 2016-10-11 16:03:45 -07:00
Pasi Kallinen
9858e46f64 Show correct keybind in ext cmd list 2016-10-11 23:03:36 +03:00
Pasi Kallinen
23157c4830 Free allocated memory 2016-10-11 18:34:41 +03:00
Pasi Kallinen
09c517e830 Fix valgrind complaint 2016-10-11 17:59:35 +03:00
Pasi Kallinen
56e51b9b6b Add wizmode command to recreate current level 2016-10-11 17:26:32 +03:00
Pasi Kallinen
63487e8dbd Sometimes create mazes with wide corridors
...and/or thick walls.
2016-10-11 15:06:39 +03:00
Pasi Kallinen
ecf1500b6c Use even more enums 2016-10-10 21:55:23 +03:00
Pasi Kallinen
552647fb36 Use more enums
We're already using enums, so convert some already existing defines.
2016-10-10 16:18:20 +03:00
keni
5c6da25c56 Merge remote-tracking branch 'origin/NetHack-3.6.0' 2016-10-09 15:56:50 -04:00
Pasi Kallinen
856252702f Don't clobber up and down ext cmd binds 2016-10-09 18:10:28 +03:00
Pasi Kallinen
710f5ed235 Give quest guardians some equipment 2016-10-08 21:17:58 +03:00
Pasi Kallinen
8d3cc7bc34 Typofix 2016-10-08 14:11:20 +03:00
Pasi Kallinen
5772af5bea Hero polyed into ghoul can eat only non-veggy corpses or eggs
Change via dNetHack.  Restrict heroes polymorphed into ghouls
so they can only eat non-vegan corpses and eggs.  This matches
more closely what pet ghouls prefer.
2016-10-08 13:57:43 +03:00
Pasi Kallinen
96df8ce580 Add couple hallu monsters 2016-10-08 13:16:46 +03:00
Pasi Kallinen
dbe1da0bec Make kicking activate statue trap
Change via dNetHack
2016-10-08 12:47:32 +03:00
Pasi Kallinen
e8e7d969c3 Pet starting apport equals your current charisma 2016-10-08 11:55:28 +03:00
PatR
e81c58aa1d keybinding lint and formatting 2016-10-07 13:14:54 -07:00
Pasi Kallinen
2c9aac4f13 Use symbolic name STONE for levl typ 0 2016-10-07 15:43:27 +03:00
Pasi Kallinen
f95747e3ef win32: Save and load map colors from registry 2016-10-06 21:00:15 +03:00
Pasi Kallinen
580c18bb7e Fixes entry for cursor positioning via menu 2016-10-06 13:38:09 +03:00
Pasi Kallinen
fb148c0d44 Iron bars, water and lava are not interesting for travel 2016-10-06 13:33:54 +03:00
Pasi Kallinen
efd7526194 Accessibility: Pick travel/cursor targets from a menu
Adds two new configurable keys to the cursor targeting: 'A' (getpos.menu)
and 'a' (getpos.menu.cansee). First one shows a menu of all interesting
glyphs on the map, second one shows only those in sight.

Travel command also now obeys the "request menu" -prefix, showing
the menu with interesting targets in sight, and then traveling there.

Idea via the NetHack accessibility research by Alexei Pepers.
2016-10-06 13:10:13 +03:00
Pasi Kallinen
53cd30c54c Show menu control keys in help menu 2016-10-06 08:53:38 +03:00
Pasi Kallinen
680c8a542c Add key rebinding
This is a modified version of Jason Dorje Short's key rebinding
patch, and allows also binding special keys, such as the ones
used in getloc and getpos.

One of the ways to play NetHack on nethack.alt.org is via a HTML
terminal in browser. Unfortunately this means several ctrl-key
combinations cannot be entered, because the browser intercepts
those. Similar thing applies to some international keyboard layouts
on Windows. With this patch, the user can just rebind the command
to a key that works best for them.

I've tested this on Linux TTY, X11, and Windows TTY and GUI.
2016-10-05 20:04:56 +03:00
PatR
d0783facdc tribute: The Shepherd's Crown 2016-10-04 17:08:16 -07:00
Pasi Kallinen
f07c5570ca Add configurable symbol entry for strange object 2016-10-03 09:36:28 +03:00
keni
1e443c5ddf Merge remote-tracking branch 'origin/NetHack-3.6.0' 2016-10-02 15:26:11 -04:00
Pasi Kallinen
a562cc88a7 Fix Blank symset 2016-10-02 00:03:37 +03:00