diff -urd --exclude-from=diff_ign.txt nh343off/dat/help nh343ger/dat/help
--- nh343off/dat/help Mon Dec 8 01:39:14 2003
+++ nh343ger/dat/help Sat Dec 13 14:40:16 2003
@@ -62,6 +62,8 @@
case means the Control key, not a caret)
> down m
: move without picking up objects
F: fight even if you don't sense a monster
+ If the game was compiled with the GERMANKB patch enabled,
+ z will be used for Northwest movement instead of y.
If the number_pad option is set, the number keys move instead.
Depending on the platform, Shift number (on the numberpad),
Meta number, or Alt number will invoke the YUHJKLBN commands.
@@ -146,6 +148,8 @@
z Zap a wand.
Z Cast a spell.
^Z Suspend the game.
+ If the game was compiled with the GERMANKB patch enabled,
+ y zaps a wand, Y casts a spell and ^Y suspends the game.
: Look at what is here.
; Look at what is somewhere else.
, Pick up some things.
diff -urd --exclude-from=diff_ign.txt nh343off/dat/hh nh343ger/dat/hh
--- nh343off/dat/hh Mon Dec 8 01:39:14 2003
+++ nh343ger/dat/hh Sat Dec 13 14:40:16 2003
@@ -9,6 +9,8 @@
case means the Control key, not a caret)
> down m: move without picking up objects/fighting
F: fight even if you don't sense a monster
+ If the game was compiled with the GERMANKB patch enabled,
+ z will be used for Northwest movement instead of y.
If the number_pad option is set, the number keys move instead.
Depending on the platform, Shift number (on the numberpad),
Meta number, or Alt number will invoke the YUHJKLBN commands.
@@ -21,6 +23,8 @@
S save save the game (to be continued later) and exit
! sh escape to some SHELL (if allowed)
^Z suspend suspend the game (independent of your current suspend char)
+If the game was compiled with the GERMANKB patch enabled, ^Y will be used
+as the suspend command instead of ^Z.
O options set options
/ whatis tell what a map symbol represents
\ known display list of what's been discovered
@@ -66,6 +70,8 @@
x xchange swap wielded and secondary weapons
z zap zap a wand
Z Zap cast a spell
+If the game was compiled with the GERMANKB patch enabled,
+y zaps a wand and Y casts a spell.
< up go up the stairs
> down go down the stairs
^ trap_id identify a previously found trap
diff -urd --exclude-from=diff_ign.txt nh343off/doc/Guidebook.mn nh343ger/doc/Guidebook.mn
--- nh343off/doc/Guidebook.mn Mon Dec 8 01:39:14 2003
+++ nh343ger/doc/Guidebook.mn Sat Dec 13 14:40:16 2003
@@ -441,12 +441,15 @@
Go up to the previous level (if you are on a staircase or ladder).
.lp >
Go down to the next level (if you are on a staircase or ladder).
-.lp [yuhjklbn]
+.lp [yuhjklbn] (or [zuhjklbn] if the game was compiled with GERMANKB patch enabled)
Go one step in the direction indicated (see Figure 2). If you sense
or remember
a monster there, you will fight the monster instead. Only these
one-step movement commands cause you to fight monsters; the others
(below) are ``safe.''
+If the game was compiled with the GERMANKB patch enabled,
+z will be used instead of y for all kinds of movement,
+including all the modified movements described below.
.sd
.TS S
center;
@@ -621,11 +624,11 @@
.lp ^X
Display your name, role, race, gender, and alignment as well as
the various deities in your game.
-.lp z
+.lp z (y if the game was compiled with GERMANKB patch enabled)
Zap a wand. To aim at yourself, use `.' for the direction.
-.lp Z
+.lp Z (Y if the game was compiled with GERMANKB patch enabled)
Zap (cast) a spell. To cast at yourself, use `.' for the direction.
-.lp ^Z
+.lp ^Z (^Y if the game was compiled with GERMANKB patch enabled)
Suspend the game
.ux " versions with job control only)." (
.lp :
diff -urd --exclude-from=diff_ign.txt nh343off/doc/Guidebook.tex nh343ger/doc/Guidebook.tex
--- nh343off/doc/Guidebook.tex Mon Dec 8 01:39:14 2003
+++ nh343ger/doc/Guidebook.tex Sat Dec 13 14:40:16 2003
@@ -601,6 +601,9 @@
a monster there, you will fight the monster instead. Only these
one-step movement commands cause you to fight monsters; the others
(below) are ``safe.''
+If the game was compiled with the GERMANKB patch enabled,
+z will be used instead of y for all kinds of movement,
+including all the modified movements described below.
%.sd
\begin{center}
\begin{tabular}{cc}
@@ -825,12 +828,15 @@
the various deities in your game.
%.lp
\item[\tb{z}]
+(y if the game was compiled with GERMANKB patch enabled)
Zap a wand. To aim at yourself, use `{\tt .}' for the direction.
%.lp
\item[\tb{Z}]
+(Y if the game was compiled with GERMANKB patch enabled)
Zap (cast) a spell. To cast at yourself, use `{\tt .}' for the direction.
%.lp
\item[\tb{\^{}Z}]
+(^Z if the game was compiled with GERMANKB patch enabled)
Suspend the game (UNIX versions with job control only).
%.lp
\item[\tb{:}]
diff -urd --exclude-from=diff_ign.txt nh343off/doc/Guidebook.txt nh343ger/doc/Guidebook.txt
--- nh343off/doc/Guidebook.txt Mon Dec 8 01:39:14 2003
+++ nh343ger/doc/Guidebook.txt Sat Dec 13 14:40:16 2003
@@ -577,16 +577,16 @@
> Go down to the next level (if you are on a staircase or lad-
der).
- [yuhjklbn]
+ [yuhjklbn] ([zuhjklbn] if the game was compiled with GERMANKB
+ patch enabled)
Go one step in the direction indicated (see Figure 2). If
you sense or remember a monster there, you will fight the
monster instead. Only these one-step movement commands
cause you to fight monsters; the others (below) are
``safe.''
-
-
-
-
+ If the game was compiled with the GERMANKB patch enabled,
+ z will be used instead of y for all kinds of movement,
+ including all the modified movements described below.
NetHack 3.4 December 2, 2003
@@ -802,12 +802,15 @@
^X Display your name, role, race, gender, and alignment as well
as the various deities in your game.
- z Zap a wand. To aim at yourself, use `.' for the direction.
+ z (y if the game was compiled with GERMANKB patch enabled)
+ Zap a wand. To aim at yourself, use `.' for the direction.
- Z Zap (cast) a spell. To cast at yourself, use `.' for the
+ Z (Y if the game was compiled with GERMANKB patch enabled)
+ Zap (cast) a spell. To cast at yourself, use `.' for the
direction.
- ^Z Suspend the game (UNIX(R) versions with job control only).
+ ^Z (^Y if the game was compiled with GERMANKB patch enabled)
+ Suspend the game (UNIX(R) versions with job control only).
: Look at what is here.
diff -urd --exclude-from=diff_ign.txt nh343off/src/cmd.c nh343ger/src/cmd.c
--- nh343off/src/cmd.c Mon Dec 8 01:39:14 2003
+++ nh343ger/src/cmd.c Sat Dec 13 14:40:16 2003
@@ -1376,8 +1376,12 @@
#endif
{C('x'), TRUE, doattributes},
#ifdef SUSPEND
+#ifdef GERMANKB
+ {C('y'), TRUE, dosuspend},
+#else
{C('z'), TRUE, dosuspend},
#endif
+#endif
{'a', FALSE, doapply},
{'A', FALSE, doddoremarm},
{M('a'), TRUE, doorganize},
@@ -1441,8 +1445,13 @@
{'x', FALSE, doswapweapon},
{'X', TRUE, enter_explore_mode},
/* 'y', 'Y' : go nw */
+#ifdef GERMANKB
+ {'y', FALSE, dozap},
+ {'Y', TRUE, docast},
+#else
{'z', FALSE, dozap},
{'Z', TRUE, docast},
+#endif
{'<', FALSE, doup},
{'>', FALSE, dodown},
{'/', TRUE, dowhatis},
diff -urd --exclude-from=diff_ign.txt nh343off/src/decl.c nh343ger/src/decl.c
--- nh343off/src/decl.c Mon Dec 8 01:39:14 2003
+++ nh343ger/src/decl.c Sat Dec 13 14:40:16 2003
@@ -98,7 +98,11 @@
NEARDATA struct sinfo program_state;
/* 'rogue'-like direction commands (cmd.c) */
+#ifdef GERMANKB
+const char sdir[] = "hzkulnjb><";
+#else
const char sdir[] = "hykulnjb><";
+#endif
const char ndir[] = "47896321><"; /* number pad mode */
const schar xdir[10] = { -1,-1, 0, 1, 1, 1, 0,-1, 0, 0 };
const schar ydir[10] = { 0,-1,-1,-1, 0, 1, 1, 1, 0, 0 };