Monsters get multilevel resists (incomplete). Monster data needs to be

adjusted per monster to hand out the right resists. The current
MR_RES_FIRE gives one level of resistance only.

Added a real ghost structure, discarded the old ghost values array.
Adjusted bones file format so bones will work out-of-the-box with
Hearse. Breaks bones format, older bones will be rejected.

Fixed some maps with bad DEPTHs.

Added more safe answers in Y/N prompts, added a check to make it less
likely that Crawl will spin in a tight loop reading input from a
closed tty.

(Experimental) !a will override existing foe of friendlies in LOS.

Blademasters no longer pick up stuff to throw (Erik).

Zombies of swimming things are also swimming things. Currently applies
only to zombies explicitly placed in .des files, since fish zombies
cannot be generated otherwise (can of worms).

Morgue is now saved before showing the inventory and other boring
end-of-game stuff.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3231 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 30 insertions, 22 deletions

diff --git a/crawl-ref/source/dat/altar.des b/crawl-ref/source/dat/altar.des
index 2fb39ee218..440960e7b6 100644
--- a/crawl-ref/source/dat/altar.des
+++ b/crawl-ref/source/dat/altar.des
@@ -20,7 +20,6 @@ TAGS: allow_dup
 CHANCE: 20
 MAP
 cccccccccc
-cccccccccc
 cBcBcBcBcc
 G.c.c.c.Bc
 @.......Bc
@@ -28,7 +27,6 @@ G.c.c.c.Bc
 G.c.c.c.Bc
 cBcBcBcBcc
 cccccccccc
-cccccccccc
 ENDMAP
 
 NAME: jmf_multi_god_temple
@@ -124,15 +122,15 @@ TAGS: no_monster_gen
 TAGS: no_monster_gen no_pool_fixup
 : end
 MAP
-  .........   
- ...wwwww...  
-..wwwwwwwww.. 
-.wwwwwwwwwww..
-wwwwwwwwwwwww.
-wwwwwwCwwwwww.
-wwwwwwwwwwwww.
-.wwwwwwwwwww..
-..wwwwwwwww..
+   .........   
+  ...wwwww...  
+ ..wwwwwwwww.. 
+..wwwwwwwwwww..
+.wwwwwwwwwwwww.
+.wwwwwwCwwwwww.
+.wwwwwwwwwwwww.
+..wwwwwwwwwww..
+ .wwwwwwwww..
  ...wwwww... 
    ........  
 ENDMAP
@@ -228,14 +226,19 @@ MAP
 ENDMAP
 
 NAME: lemuel_statue_altar
-DEPTH: 2-18, !Lair, !Hive, !Slime
+
+# Increased depth from 2-18 because getting a hostile statue can
+# instakill a low-level character.
+
+DEPTH: 10-18, !Lair, !Hive, !Slime
+
 MAP
 .....
 .cFc.
 .c.c.
 .c.c.
 .c.c.
-.c.c.
+.c>c.
 .cCc.
 .ccc.
 .....
@@ -249,7 +252,7 @@ MAP
 xxxxxxxxxxxxxxxxxxxx
 ...................x
 c...c...c...c...c..x
-..................Cx
+@.................Cx
 c...c...c...c...c..x
 ...................x
 xxxxxxxxxxxxxxxxxxxx
@@ -281,20 +284,25 @@ ENDMAP
 ######################################
 
 NAME: lemuel_angel_altar
-DEPTH: 2-18, !Lair, !Orc, !Hive, !Slime
+
+# Moved deeper since being teleported next to the Angel will be a
+# quick death at shallow levels.
+
+DEPTH: 9-18, !Lair, !Orc, !Hive, !Slime
 MONS: angel
 KFEAT: C = altar_elyvilon / altar_zin / altar_shining_one
 MAP
    .....
   ..xmx..  
- ..xx.xx.. 
+ ..xx>xx.. 
 ..xxx.xxx..
 .xxxx1xxxx.
-.m...C...m.
+.m>..C..>m.
 .xxxx.xxxx.
 ..xxx.xxx..
- ..xx.xx.. 
-  ..xmx..  
+ ..xx>xx.. 
+  ..xmx..
+   .....
 ENDMAP
 
 NAME: lemuel_hellish_altar
@@ -340,13 +348,13 @@ ENDMAP
 
 NAME: lemuel_blue_sif_altar
 DEPTH: 2-18, !Lair, !Hive, !Slime, !Orc
-TAGS: no_monster_gen
+TAGS: no_monster_gen mini_float
 COLOUR: . = blue
 KFEAT: C = altar_sif_muna
 MAP
 xxxxxxxxxxxxxx
 ...........xxx
-...........+Cx
+@..........+Cx
 ...........xxx
 xxxxxxxxxxxxxx
 ENDMAP
@@ -361,7 +369,7 @@ MAP
 xxxxxxxxxxxxxxxx
 xxxx11111111xxxx
 xxxxwwwwwwwwxxxx
-..............Cx
+@.............Cx
 xxxxwwwwwwwwxxxx
 xxxx11111111xxxx
 xxxxxxxxxxxxxxxx