pull in the recent unconditionals merge from master

This commit is contained in:
Derek S. Ray
2015-02-27 21:25:00 -05:00
parent 7f0ff8f011
commit b1a7bbbbdb
538 changed files with 1715 additions and 5685 deletions

3
dat/.gitattributes vendored Normal file
View File

@@ -0,0 +1,3 @@
*.def filter=NHtext merge=NHsubst
*.des filter=NHtext merge=NHsubst
*.txt filter=NHtext merge=NHsubst

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Arch.des $Date$ $Revision$
# NetHack 3.5 Arch.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Arch.des $Date: 2009/05/06 10:44:15 $ $Revision: 1.6 $
# SCCS Id: @(#)Arch.des 3.5 1997/01/31
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1991 by M. Stephenson

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Barb.des $Date$ $Revision$
# NetHack 3.5 Barb.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Barb.des $Date: 2009/05/06 10:44:15 $ $Revision: 1.4 $
# SCCS Id: @(#)Barb.des 3.5 1991/12/22
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1991 by M. Stephenson

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Caveman.des $Date$ $Revision$
# NetHack 3.5 Caveman.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Caveman.des $Date: 2009/05/06 10:44:15 $ $Revision: 1.4 $
# SCCS Id: @(#)Caveman.des 3.5 1995/10/07
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1991 by M. Stephenson

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Healer.des $Date$ $Revision$
# NetHack 3.5 Healer.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Healer.des $Date: 2009/05/06 10:44:16 $ $Revision: 1.5 $
# SCCS Id: @(#)Healer.des 3.5 1995/04/16
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1991, 1993 by M. Stephenson, P. Winner

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Knight.des $Date$ $Revision$
# NetHack 3.5 Knight.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Knight.des $Date: 2009/05/06 10:44:16 $ $Revision: 1.4 $
# SCCS Id: @(#)Knight.des 3.5 1995/04/16
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1991,92 by M. Stephenson

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Monk.des $Date$ $Revision$
# NetHack 3.5 Monk.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Monk.des $Date: 2009/05/06 10:44:16 $ $Revision: 1.6 $
# SCCS Id: @(#)Monk.des 3.5 2002/04/08
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1991-2 by M. Stephenson

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Priest.des $Date$ $Revision$
# NetHack 3.5 Priest.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Priest.des $Date: 2009/05/06 10:44:17 $ $Revision: 1.5 $
# SCCS Id: @(#)Priest.des 3.5 2002/04/08
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1991-2 by M. Stephenson

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Ranger.des $Date$ $Revision$
# NetHack 3.5 Ranger.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Ranger.des $Date: 2009/05/06 10:44:17 $ $Revision: 1.4 $
# SCCS Id: @(#)Ranger.des 3.5 2001/02/01
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1991 by M. Stephenson

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Rogue.des $Date$ $Revision$
# NetHack 3.5 Rogue.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Rogue.des $Date: 2009/05/06 10:44:17 $ $Revision: 1.6 $
# SCCS Id: @(#)Rogue.des 3.5 2002/02/15
# Copyright (c) 1992 by Dean Luick
# NetHack may be freely redistributed. See license for details.

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Samurai.des $Date$ $Revision$
# NetHack 3.5 Samurai.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Samurai.des $Date: 2009/05/06 10:44:17 $ $Revision: 1.6 $
# SCCS Id: @(#)Samurai.des 3.5 2002/04/08
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1991-92 by M. Stephenson, P. Winner

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Tourist.des $Date$ $Revision$
# NetHack 3.5 Tourist.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Tourist.des $Date: 2009/05/06 10:44:17 $ $Revision: 1.4 $
# SCCS Id: @(#)Tourist.des 3.5 1992/09/26
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1991,92 by M. Stephenson, P. Winner

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Valkyrie.des $Date$ $Revision$
# NetHack 3.5 Valkyrie.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Valkyrie.des $Date: 2009/05/06 10:44:17 $ $Revision: 1.6 $
# SCCS Id: @(#)Valkyrie.des 3.5 2007/08/01
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1991-2 by M. Stephenson

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 Wizard.des $Date$ $Revision$
# NetHack 3.5 Wizard.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 Wizard.des $Date: 2009/05/06 10:44:17 $ $Revision: 1.5 $
# SCCS Id: @(#)Wizard.des 3.5 1992/07/11
# Copyright (c) 1992 by David Cohrs
# NetHack may be freely redistributed. See license for details.

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 bigroom.des $Date$ $Revision$
# NetHack 3.5 bigroom.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 bigroom.des $Date: 2009/05/06 10:44:18 $ $Revision: 1.4 $
# SCCS Id: @(#)bigroom.des 3.5 1990/04/15
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1990 by M. Stephenson

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 castle.des $Date$ $Revision$
# NetHack 3.5 castle.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 castle.des $Date: 2009/05/06 10:44:18 $ $Revision: 1.5 $
# SCCS Id: @(#)castle.des 3.5 2002/05/02
# Copyright (c) 1989 by Jean-Christophe Collet
# NetHack may be freely redistributed. See license for details.

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 data.base $Date$ $Revision$
# NetHack 3.5 data.base $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 data.base $Date: 2014/10/09 02:04:43 $ $Revision: 1.50 $
# Copyright (c) 1994, 1995, 1996 by the NetHack Development Team
# Copyright (c) 1994 by Boudewijn Wayers
# NetHack may be freely redistributed. See license for details.

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 dungeon.def $Date$ $Revision$
# NetHack 3.5 dungeon.def $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 dungeon.def $Date: 2009/05/06 10:44:21 $ $Revision: 1.6 $
# SCCS Id: @(#)dungeon.def 3.5 2006/03/18
# Copyright (c) 1990-95 by M. Stephenson
# NetHack may be freely redistributed. See license for details.
@@ -18,8 +19,8 @@
DUNGEON: "The Dungeons of Doom" "D" (25, 5)
ALIGNMENT: unaligned
BRANCH: "The Gnomish Mines" @ (2, 3)
%REINCARNATION LEVEL: "rogue" "R" @ (15, 4)
%REINCARNATION LEVELDESC: roguelike
LEVEL: "rogue" "R" @ (15, 4)
LEVELDESC: roguelike
LEVEL: "oracle" "O" @ (5, 5)
LEVALIGN: neutral
CHAINBRANCH: "Sokoban" "oracle" + (1, 0) up

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 endgame.des $Date$ $Revision$
# NetHack 3.5 endgame.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 endgame.des $Date: 2009/05/06 10:44:22 $ $Revision: 1.6 $
# SCCS Id: @(#)endgame.des 3.5 2007/03/02
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1992,1993 by Izchak Miller, David Cohrs,

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 gehennom.des $Date$ $Revision$
# NetHack 3.5 gehennom.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 gehennom.des $Date: 2009/05/06 10:44:23 $ $Revision: 1.5 $
# SCCS Id: @(#)gehennom.des 3.5 2005/02/02
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1992 by M. Stephenson and Izchak Miller

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 knox.des $Date$ $Revision$
# NetHack 3.5 knox.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 knox.des $Date: 2009/05/06 10:44:23 $ $Revision: 1.5 $
# SCCS Id: @(#)knox.des 3.5 2006/03/20
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1992 by Izchak Miller

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 medusa.des $Date$ $Revision$
# NetHack 3.5 medusa.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 medusa.des $Date: 2009/05/06 10:44:23 $ $Revision: 1.5 $
# SCCS Id: @(#)medusa.des 3.5 1996/05/11
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1990, 1991 by M. Stephenson

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 mines.des $Date$ $Revision$
# NetHack 3.5 mines.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 mines.des $Date: 2009/05/06 10:44:23 $ $Revision: 1.17 $
# SCCS Id: @(#)mines.des 3.5 2002/05/02
# Copyright (c) 1989-95 by Jean-Christophe Collet
# Copyright (c) 1991-95 by M. Stephenson

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 oracle.des $Date$ $Revision$
# NetHack 3.5 oracle.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 oracle.des $Date: 2009/05/06 10:44:23 $ $Revision: 1.4 $
# SCCS Id: @(#)oracle.des 3.5 1995/10/07
# NetHack may be freely redistributed. See license for details.
#

View File

@@ -48,7 +48,7 @@ It is well known that wily shopkeepers raise their prices whene'er they
espy the garish apparel of the approaching tourist or the countenance of a
disfavored patron. They favor the gentle of manner and the fair of face.
The boor may expect unprofitable transactions.
----- SINKS
-----
The cliche of the kitchen sink swallowing any unfortunate rings that contact
its pernicious surface reflecteth greater truth than many homilies, yet
even so, few have developed the skill to identify enchanted rings by the
@@ -96,7 +96,7 @@ The gods are said to be pleased when offerings are given to the
priests who attend their temples, and they may grant various favors to
those who do so. But beware! To be young and frugal is better than to
be old and miserly.
----- ELBERETH
-----
The name of Elbereth may strike fear into the hearts of thine enemies, if
thou dost write it upon the ground at thy feet. If thou maintainest the
utmost calm, thy safety will be aided greatly, but beware lest thy clumsy

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 quest.txt $Date$ $Revision$
# NetHack 3.5 quest.txt $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 quest.txt $Date: 2009/05/06 10:44:23 $ $Revision: 1.23 $
# SCCS Id: @(#)quest.txt 3.5 2005/12/03
# Copyright (c) 1991 by M. Stephenson
# NetHack may be freely redistributed. See license for details.

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 sokoban.des $Date$ $Revision$
# NetHack 3.5 sokoban.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 sokoban.des $Date: 2009/05/06 10:44:24 $ $Revision: 1.5 $
# SCCS Id: @(#)sokoban.des 3.5 1999/03/15
# Copyright (c) 1998-1999 by Kevin Hugo
# NetHack may be freely redistributed. See license for details.

View File

@@ -201,10 +201,6 @@ start: RogueEpyx
S_food: \x05 # club (as in cards)
S_potion: \xad # upside down '!'
S_scroll: \x0e # musical note
# S_armor: \x5b
# S_ring: \x3d
# S_amulet: \x0c
# S_tool: \x28
S_wand: \xe7 # greek tau
S_coin: \x0f # yes it's the same as gems
S_gem: \x0f # fancy '*'
@@ -397,131 +393,3 @@ start: NHAccess
S_explode9: \047
finish
start: Unicode_US
Description: Unicode symbols similar to code page 437
Restrictions: Unicode
S_vwall: U+2502 # box drawings light vertical
S_hwall: U+2500 # box drawings light horizontal
S_tlcorn: U+250C # box drawings light down and right
S_trcorn: U+2510 # box drawings light down and left
S_blcorn: U+2514 # box drawings light up and right
S_brcorn: U+2518 # box drawings light up and left
S_crwall: U+253C # box drawings light up and left
S_tuwall: U+2534 # box drawings light up and horizontal
S_tdwall: U+252C # box drawings light down and horizontal
S_tlwall: U+2524 # box drawings light vertical and left
S_trwall: U+251C # box drawings light vertical and right
S_ndoor: U+2556 # box drawings down double and left single
S_vodoor: U+25A0 # black square
S_hodoor: U+25A0 # black square
S_bars: U+2261 # identical to
S_tree: U+00B1 # plus-minus sign
S_room: U+00B7 # middle dot
S_corr: U+2591 # light shade
S_litcorr: U+2592 # medium shade
S_fountain: U+2320 # top half integral
S_pool: U+2248 # almost equal to
S_ice: U+00B7 # middle dot
S_lava: U+2248 # almost equal to
S_vodbridge: U+00B7 # middle dot
S_hodbridge: U+00B7 # middle dot
S_water: U+2248 # almost equal to
S_vbeam: U+2502 # box drawings light vertical
S_hbeam: U+2500 # box drawings light horizontal
S_sw_ml: U+2502 # box drawings light vertical
S_sw_mr: U+2502 # box drawings light vertical
S_explode4: U+2502 # box drawings light vertical
S_explode6: U+2502 # box drawings light vertical
finish
start: Unicode_non_US
Description: If default OEM CP for non-Unicode programs is not 437 or 850
Restrictions: Unicode
S_vwall: U+2502 # box drawings light vertical
S_hwall: U+2500 # box drawings light horizontal
S_tlcorn: U+250C # box drawings light down and right
S_trcorn: U+2510 # box drawings light down and left
S_blcorn: U+2514 # box drawings light up and right
S_brcorn: U+2518 # box drawings light up and left
S_crwall: U+253C # box drawings light up and left
S_tuwall: U+2534 # box drawings light up and horizontal
S_tdwall: U+252C # box drawings light down and horizontal
S_tlwall: U+2524 # box drawings light vertical and left
S_trwall: U+251C # box drawings light vertical and right
S_vodoor: U+25A0 # black square
S_hodoor: U+25A0 # black square
S_corr: U+2591 # light shade
S_litcorr: U+2592 # medium shade
S_vbeam: U+2502 # box drawings light vertical
S_hbeam: U+2500 # box drawings light horizontal
S_sw_ml: U+2502 # box drawings light vertical
S_sw_mr: U+2502 # box drawings light vertical
S_explode4: U+2502 # box drawings light vertical
S_explode6: U+2502 # box drawings light vertical
S_coin: U+20AC # euro
finish
start: UnicodeRogueEpyx
Description: Unicode Rogue level symbols
Restrictions: Unicode
Restrictions: Rogue
Color: Yes
S_weapon: U+2191 # up arrow
S_armor: U+25d9 # Vert rect with o
S_ring: U+2642 # circle with arrow
S_amulet: U+2640 # "female" symbol
S_food: U+2663 # club (as in cards)
S_potion: U+00a1 # upside down '!'
S_scroll: U+266a # musical note
S_wand: U+03c4 # greek tau
S_coin: U+263c # yes it's the same as gems
S_gem: U+263c # fancy '*'
S_rock: U+0060 # grave accent
S_ball: U+0030 # digit 0
S_chain: U+005f # low line
S_venom: U+002e # full stop
S_book: U+002b # + sign
S_vwall: U+2551 # all walls now use
S_hwall: U+2550 # double line graphics
S_tlcorn: U+2554 # box drawing double down and right
S_trcorn: U+2557 # box drawing double down and left
S_blcorn: U+255a # box drawing double up and right
S_brcorn: U+255d # box drawing double up and left
S_crwall: U+256c # box drawing double vertical and horizontal
S_tuwall: U+2569 # box drawing double up and horizontal
S_tdwall: U+2566 # box drawing double down and horizontal
S_tlwall: U+2563 # box drawing double vertical and left
S_trwall: U+2560 # box drawing double vertical and right
S_ndoor: U+256c # box drawing double vertical and horizontal
S_vodoor: U+256c # box drawing double vertical and horizontal
S_hodoor: U+256c # box drawing double vertical and horizontal
S_room: U+00b7 # centered dot
S_corr: U+2592 # medium shade
S_litcorr: U+2593 # dark shade
S_upstair: U+001e # Greek Xi
S_dnstair: U+001f
S_arrow_trap: U+2666 # diamond (cards)
S_dart_trap: U+2666
S_falling_rock_trap: U+2666
S_squeaky_board: U+2666
S_bear_trap: U+2666
S_land_mine: U+2666
S_rolling_boulder_trap: U+2666
S_sleeping_gas_trap: U+2666
S_rust_trap: U+2666
S_fire_trap: U+2666
S_pit: U+2666
S_spiked_pit: U+2666
S_hole: U+2666
S_trap_door: U+2666
S_teleportation_trap: U+2666
S_level_teleporter: U+2666
S_magic_portal: U+2666
S_web: U+2666
S_statue_trap: U+2666
S_magic_trap: U+2666
S_anti_magic_trap: U+2666
S_polymorph_trap: U+2666
S_human: U+263a # face
finish

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 tower.des $Date$ $Revision$
# NetHack 3.5 tower.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 tower.des $Date: 2009/05/06 10:44:25 $ $Revision: 1.4 $
# SCCS Id: @(#)tower.des 3.5 1990/02/26
# Copyright (c) 1989 by Jean-Christophe Collet
# NetHack may be freely redistributed. See license for details.

View File

@@ -1,4 +1,5 @@
# NetHack 3.5 yendor.des $Date$ $Revision$
# NetHack 3.5 yendor.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.5 yendor.des $Date: 2009/05/06 10:44:25 $ $Revision: 1.5 $
# SCCS Id: @(#)yendor.des 3.5 1996/10/20
# Copyright (c) 1989 by Jean-Christophe Collet
# Copyright (c) 1992 by M. Stephenson and Izchak Miller