From f3d4f6907cbcd0f85f132fd6db0b7f9a058e0d33 Mon Sep 17 00:00:00 2001
From: "Edgar A. Bering IV" <trizor@gmail.com>
Date: Sun, 1 Nov 2015 11:50:01 -0600
Subject: [PATCH 1/2] Fedhas forgives confused enemies killing plants (9917)

---
 crawl-ref/source/mon-death.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crawl-ref/source/mon-death.cc b/crawl-ref/source/mon-death.cc
index efbda57..e09704a 100644
--- a/crawl-ref/source/mon-death.cc
+++ b/crawl-ref/source/mon-death.cc
@@ -1656,7 +1656,9 @@ static void _fire_kill_conducts(monster &mons, killer_type killer,
     if (mons.is_holy())
         did_kill_conduct(DID_KILL_HOLY, mons);
 
-    if (fedhas_protects(&mons))
+    // Fedhas shrooms cause confusion which leads to subsequent
+    // confusion kills, sometimes of the player's own plants
+    if (fedhas_protects(&mons) && killer != KILL_YOU_CONF)
         did_kill_conduct(DID_KILL_PLANT, mons);
 
     // Cheibriados hates fast monsters.
-- 
2.3.2 (Apple Git-55)


From 259642bdf9f07358e5a14506c2e27d850443593d Mon Sep 17 00:00:00 2001
From: "Edgar A. Bering IV" <trizor@gmail.com>
Date: Sun, 1 Nov 2015 12:06:55 -0600
Subject: [PATCH 2/2] Don't let Dragon Form Vine Stalkers bite all the time
 (9879)

---
 crawl-ref/source/melee_attack.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc
index 37cd88c..63fccc5 100644
--- a/crawl-ref/source/melee_attack.cc
+++ b/crawl-ref/source/melee_attack.cc
@@ -3600,7 +3600,7 @@ bool melee_attack::_extra_aux_attack(unarmed_attack_type atk)
         return you.has_usable_tentacles() && !one_chance_in(3);
 
     case UNAT_BITE:
-        return you.mutation[MUT_ANTIMAGIC_BITE]
+        return player_mutation_level(MUT_ANTIMAGIC_BITE)
                || (you.has_usable_fangs()
                    || player_mutation_level(MUT_ACIDIC_BITE))
                    && x_chance_in_y(2, 5);
-- 
2.3.2 (Apple Git-55)