* Fix 2744875 (mutation screen assert).

* Rename KeymapContext KC_* -> KMC_* to avoid overlap with
  kill_category KC_*.
* Increase odds for chaos brands mimicking brands that hurt the defender.
* Tweak chaos_affects_attacker().


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

1 files changed, 8 insertions, 4 deletions

diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 84cd21750d..c8bceea2f8 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -7169,6 +7169,11 @@ bool player::is_icy() const
     return (attribute[ATTR_TRANSFORMATION] == TRAN_ICE_BEAST);
 }
 
+bool player::is_fiery() const
+{
+    return (false);
+}
+
 void player::base_moveto(const coord_def &c)
 {
     ASSERT(!crawl_state.arena);
@@ -7509,12 +7514,11 @@ bool player::do_shaft()
             return (false);
         }
 
+        mpr("A shaft briefly opens up underneath you!");
+        handle_items_on_shaft(you.pos(), false);
+
         if (airborne() || total_weight() == 0)
-        {
-            mpr("A shaft briefly opens up underneath you!");
-            handle_items_on_shaft(you.pos(), false);
             return (true);
-        }
 
         force_stair = DNGN_TRAP_NATURAL;
     }