* Replace rock stair tiles with Eino's cool new escape hatch tiles.

* Don't check milestones in arena mode.


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

12 files changed, 29 insertions, 24 deletions

diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc
index 5132af79e5..9c6a2805e9 100644
--- a/crawl-ref/source/hiscores.cc
+++ b/crawl-ref/source/hiscores.cc
@@ -2076,7 +2076,6 @@ std::string xlog_fields::xlog_line() const
 // Milestones
 
 #ifdef DGL_MILESTONES
-
 void mark_milestone(const std::string &type, const std::string &milestone)
 {
     const std::string milestone_file = Options.save_dir + "milestones.txt";
@@ -2092,7 +2091,6 @@ void mark_milestone(const std::string &type, const std::string &milestone)
         lk_close(fp, "a", milestone_file);
     }
 }
-
 #endif // DGL_MILESTONES
 
 #ifdef DGL_WHEREIS
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index df74fbb252..840ada4c60 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -2137,7 +2137,7 @@ void down_stairs( int old_level, dungeon_feature_type force_stair,
     leaving_level_now();
 
 #ifdef DGL_MILESTONES
-    if (!force_stair)
+    if (!force_stair && !crawl_state.arena)
     {
         // Not entirely accurate - the player could die before
         // reaching the Abyss.
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index ef3c9e90c7..d1ba41caec 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -645,10 +645,21 @@ static monsterentry mondata[] = {
 
 // fungi ('f')
 {
+    MONS_TOADSTOOL, 'f', BROWN, "toadstool",
+    M_NO_EXP_GAIN | M_STATIONARY,
+    MR_RES_POISON,
+    0, 10, MONS_FUNGUS, MONS_TOADSTOOL, MH_PLANT, MAG_IMMUNE,
+    { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+    { 1, 2, 2, 0 },
+    1, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT,
+    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+},
+
+{
     MONS_FUNGUS, 'f', LIGHTGREY, "fungus",
     M_NO_EXP_GAIN | M_STATIONARY,
     MR_RES_POISON,
-    0, 10, MONS_PLANT, MONS_FUNGUS, MH_PLANT, MAG_IMMUNE,
+    0, 10, MONS_FUNGUS, MONS_FUNGUS, MH_PLANT, MAG_IMMUNE,
     { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     1, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT,
@@ -656,27 +667,16 @@ static monsterentry mondata[] = {
 },
 
 {
-    MONS_WANDERING_MUSHROOM, 'f', BROWN, "wandering mushroom",
+    MONS_WANDERING_MUSHROOM, 'f', RED, "wandering mushroom",
     M_NO_FLAGS,
     MR_RES_POISON,
-    0, 10, MONS_PLANT, MONS_WANDERING_MUSHROOM, MH_PLANT, -3,
+    0, 10, MONS_FUNGUS, MONS_WANDERING_MUSHROOM, MH_PLANT, -3,
     { {AT_SPORE, AF_CONFUSE, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
     { 8, 3, 5, 0 },
     5, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT,
     HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
 },
 
-{
-    MONS_TOADSTOOL, 'f', BROWN, "toadstool",
-    M_NO_EXP_GAIN | M_STATIONARY,
-    MR_RES_POISON,
-    0, 10, MONS_PLANT, MONS_TOADSTOOL, MH_PLANT, MAG_IMMUNE,
-    { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
-    { 1, 2,2, 0 },
-    1, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT,
-    HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
-},
-
 // goblins ('g')
 {
     MONS_GOBLIN, 'g', LIGHTGREY, "goblin",
diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc
index d0fee93312..c11167bd17 100644
--- a/crawl-ref/source/monstuff.cc
+++ b/crawl-ref/source/monstuff.cc
@@ -1144,7 +1144,8 @@ int monster_die(monsters *monster, killer_type killer,
     bool in_transit          = false;
 
 #ifdef DGL_MILESTONES
-    _check_kill_milestone(monster, killer, killer_index);
+    if (!crawl_state.arena)
+        _check_kill_milestone(monster, killer, killer_index);
 #endif
 
     // Award experience for suicide if the suicide was caused by the
@@ -2706,7 +2707,9 @@ void behaviour_event(monsters *mon, mon_event_type event, int src,
             // (Plain) plants and fungi cannot fight back.
             if (mon->type == MONS_FUNGUS || mon->type == MONS_PLANT
                 || mon->type == MONS_TOADSTOOL)
+            {
                 return;
+            }
 
             mon->foe = src;
 
diff --git a/crawl-ref/source/notes.cc b/crawl-ref/source/notes.cc
index c30efe3706..bffe947996 100644
--- a/crawl-ref/source/notes.cc
+++ b/crawl-ref/source/notes.cc
@@ -429,6 +429,9 @@ Note::Note( NOTE_TYPES t, int f, int s, const char* n, const char* d ) :
 void Note::check_milestone() const
 {
 #ifdef DGL_MILESTONES
+    if (crawl_state.arena)
+        return;
+
     if (type == NOTE_DUNGEON_LEVEL_CHANGE)
     {
         const int br = place_branch(packed_place),
diff --git a/crawl-ref/source/rltiles/dc-dngn/rock_stairs_down.png b/crawl-ref/source/rltiles/UNUSED/other/rock_stairs_down.png
index 12cf07512d..12cf07512d 100644
--- a/crawl-ref/source/rltiles/dc-dngn/rock_stairs_down.png
+++ b/crawl-ref/source/rltiles/UNUSED/other/rock_stairs_down.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/rock_stairs_up.png b/crawl-ref/source/rltiles/UNUSED/other/rock_stairs_up.png
index 4e4dec8cdd..4e4dec8cdd 100644
--- a/crawl-ref/source/rltiles/dc-dngn/rock_stairs_up.png
+++ b/crawl-ref/source/rltiles/UNUSED/other/rock_stairs_up.png
diff --git a/crawl-ref/source/rltiles/dc-dngn.txt b/crawl-ref/source/rltiles/dc-dngn.txt
index 2ee6b70836..abd2f7153a 100644
--- a/crawl-ref/source/rltiles/dc-dngn.txt
+++ b/crawl-ref/source/rltiles/dc-dngn.txt
@@ -347,9 +347,9 @@ dngn_trap_zot DNGN_TRAP_ZOT
 dngn_trap_needle DNGN_TRAP_NEEDLE
 dngn_trap_shaft DNGN_TRAP_SHAFT
 stone_stairs_down DNGN_STONE_STAIRS_DOWN
-rock_stairs_down DNGN_ROCK_STAIRS_DOWN
+escape_hatch_down DNGN_ESCAPE_HATCH_DOWN
 stone_stairs_up DNGN_STONE_STAIRS_UP
-rock_stairs_up DNGN_ROCK_STAIRS_UP
+escape_hatch_up DNGN_ESCAPE_HATCH_UP
 
 %sdir dc-dngn/shops
 ##dngn_enter_shop DNGN_ENTER_SHOP
diff --git a/crawl-ref/source/rltiles/dc-dngn/escape_hatch_down.png b/crawl-ref/source/rltiles/dc-dngn/escape_hatch_down.png
new file mode 100644
index 0000000000..6a2e4f222e
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/escape_hatch_down.png
diff --git a/crawl-ref/source/rltiles/dc-dngn/escape_hatch_up.png b/crawl-ref/source/rltiles/dc-dngn/escape_hatch_up.png
new file mode 100644
index 0000000000..99095652b1
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-dngn/escape_hatch_up.png
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 3187316566..3309d17c19 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -487,6 +487,7 @@ deep_elf_blademaster MONS_DEEP_ELF_BLADEMASTER
 deep_elf_master_archer MONS_DEEP_ELF_MASTER_ARCHER
 
 ## Fungi ('f')
+fungus MONS_TOADSTOOL
 fungus MONS_FUNGUS
 wandering_mushroom MONS_WANDERING_MUSHROOM
 
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 21b085a08b..798cae7d30 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -194,12 +194,12 @@ int tileidx_monster_base(const monsters *mon, bool detected)
         return TILEP_MONS_DEEP_ELF_MASTER_ARCHER;
 
     // fungi ('f')
+    case MONS_TOADSTOOL:
+        return TILEP_MONS_TOADSTOOL;
     case MONS_FUNGUS:
         return TILEP_MONS_FUNGUS;
     case MONS_WANDERING_MUSHROOM:
         return TILEP_MONS_WANDERING_MUSHROOM;
-    case MONS_TOADSTOOL:
-        return TILEP_MONS_FUNGUS;
 
     // goblins ('g')
     case MONS_GOBLIN:
@@ -2332,13 +2332,13 @@ int tileidx_feature(int object, int gx, int gy)
     case DNGN_STONE_STAIRS_DOWN_III:
         return TILE_DNGN_STONE_STAIRS_DOWN;
     case DNGN_ESCAPE_HATCH_DOWN:
-        return TILE_DNGN_ROCK_STAIRS_DOWN;
+        return TILE_DNGN_ESCAPE_HATCH_DOWN;
     case DNGN_STONE_STAIRS_UP_I:
     case DNGN_STONE_STAIRS_UP_II:
     case DNGN_STONE_STAIRS_UP_III:
         return TILE_DNGN_STONE_STAIRS_UP;
     case DNGN_ESCAPE_HATCH_UP:
-        return TILE_DNGN_ROCK_STAIRS_UP;
+        return TILE_DNGN_ESCAPE_HATCH_UP;
     case DNGN_ENTER_DIS:
         return TILE_DNGN_ENTER_DIS;
     case DNGN_ENTER_GEHENNA: