nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'derek-elbereth'

Browse Source 
* derek-elbereth:
  ensure that the 'safe' objects remain safe
  finish up the changes to trigger erosion on use
  initial pass for toning down Elbereth

Conflicts:
	dat/castle.des
	dat/sokoban.des
	include/extern.h
	src/engrave.c
	src/mklev.c
	src/monmove.c
	src/zap.c
This commit is contained in:
Derek S. Ray
2015-05-09 11:58:36 -04:00
parent 222b4c0023 9c8f4d1fad
commit d0fb68795d
7 changed files with 88 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dat/castle.des
View File

@@ -1,5 +1,4 @@
# NetHack 3.6 castle.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 castle.des $Date: 2009/05/06 10:44:18 $ $Revision: 1.5 $
# NetHack 3.6 castle.des $NHDT-Date: 1430348677 2015/04/29 23:04:37 $ $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.8 $
# 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.
@@ -143,6 +142,7 @@ OBJECT:('/',"wishing")
}
# Prevent monsters from eating it. (@'s never eat objects)
ENGRAVING:$place[0],burn,"Elbereth"
OBJECT:('?',"scare monster"),$place[0],cursed
# The treasure of the lord
OBJECT:('(',"chest"),(37,08)
# Traps

5
dat/sokoban.des
View File

@@ -1,5 +1,4 @@
# NetHack 3.6 sokoban.des $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$
# NetHack 3.6 sokoban.des $Date: 2009/05/06 10:44:24 $ $Revision: 1.5 $
# NetHack 3.6 sokoban.des $NHDT-Date: 1430348694 2015/04/29 23:04:54 $ $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.11 $
# 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.
@@ -535,6 +534,7 @@ IF [50%] {
OBJECT:('"',"amulet of reflection"),$place[0]
}
ENGRAVING:$place[0],burn,"Elbereth"
OBJECT:('?', "scare monster"),$place[0],cursed
MAZE:"soko1-2",' '
@@ -635,3 +635,4 @@ IF [50%] {
OBJECT:('"',"amulet of reflection"),$place[0]
}
ENGRAVING:$place[0],burn,"Elbereth"
OBJECT:('?', "scare monster"),$place[0],cursed