From f2d5a04cb26c08881b5ce69cf0720ba2e616b293 Mon Sep 17 00:00:00 2001
From: Shayne Halvorson <N78291@gmail.com>
Date: Fri, 5 Apr 2013 15:07:17 -0500
Subject: [PATCH] Three new Jiyva mutations: disarming tendrils, item
 detection with a twist and absorbing missiles.

---
 crawl-ref/source/beam.cc         |   11 +++++++++
 crawl-ref/source/enum.h          |    3 +++
 crawl-ref/source/main.cc         |    3 ++-
 crawl-ref/source/melee_attack.cc |   50 ++++++++++++++++++++++++++++++++++++++
 crawl-ref/source/melee_attack.h  |    1 +
 crawl-ref/source/mutation-data.h |   30 +++++++++++++++++++++++
 crawl-ref/source/mutation.cc     |    7 ++++--
 crawl-ref/source/spl-goditem.cc  |   14 ++++++++---
 8 files changed, 112 insertions(+), 7 deletions(-)

diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc
index 00d1bff..4758c87 100644
--- a/crawl-ref/source/beam.cc
+++ b/crawl-ref/source/beam.cc
@@ -3684,6 +3684,17 @@ void bolt::affect_player()
                 was_affected = true;
             }
         }
+        
+        if (you.mutation[MUT_JELLY_MISSILE]
+			&& you.hp < you.hp_max
+			&& !you.duration[DUR_DEATHS_DOOR]
+			&& is_item_jelly_edible(*item)
+			&& coinflip())
+        {
+			mprf("Your attached jelly eats %s!", item->name(DESC_THE).c_str());
+			inc_hp(random2(hurted / 2));
+			mpr("You feel a little better.");
+		}
     }
 
     // Sticky flame.
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 5a1cfe6..b54846c 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -2769,6 +2769,9 @@ enum mutation_type
 
     MUT_EVOLUTION,
     MUT_AUGMENTATION,
+    MUT_TENDRILS,
+    MUT_JELLY_GROWTH,
+    MUT_JELLY_MISSILE,
     NUM_MUTATIONS,
 
     RANDOM_MUTATION,
diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc
index f7d31d6..4740a97 100644
--- a/crawl-ref/source/main.cc
+++ b/crawl-ref/source/main.cc
@@ -3128,7 +3128,8 @@ static void _player_reacts_to_monsters()
     if (player_mutation_level(MUT_ANTENNAE) || you.religion == GOD_ASHENZARI)
         check_antennae_detect();
 
-    if (you.religion == GOD_ASHENZARI && !player_under_penance())
+    if ((you.religion == GOD_ASHENZARI && !player_under_penance())
+        || you.mutation[MUT_JELLY_GROWTH])
         detect_items(-1);
 
     if (you.duration[DUR_TELEPATHY])
diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc
index b0d05b1..d37eb41 100644
--- a/crawl-ref/source/melee_attack.cc
+++ b/crawl-ref/source/melee_attack.cc
@@ -752,6 +752,19 @@ bool melee_attack::handle_phase_damaged()
 
     if (shroud_broken)
         mpr("Your shroud falls apart!", MSGCH_WARN);
+        
+    if (defender->is_player() && you.mutation[MUT_JELLY_GROWTH]
+        && x_chance_in_y(damage_done, you.hp_max))
+    {
+        mgen_data mg(MONS_JELLY, BEH_STRICT_NEUTRAL, 0, 0, 0,
+                     you.pos(), MHITNOT, 0, you.religion);
+        
+        if (create_monster(mg))
+        {
+            mpr("Your attached jelly is knocked off by the blow!");
+            you.mutation[MUT_JELLY_GROWTH] = 0;
+        }
+    }   
 
     return true;
 }
@@ -800,7 +813,10 @@ bool melee_attack::handle_phase_end()
 
     // Check for passive mutation effects.
     if (defender->is_player() && defender->alive() && attacker != defender)
+    {
         mons_do_eyeball_confusion();
+        tendril_disarm();
+    }
 
     // This may invalidate both the attacker and defender.
     fire_final_effects();
@@ -4735,6 +4751,40 @@ void melee_attack::mons_do_eyeball_confusion()
     }
 }
 
+void melee_attack::tendril_disarm()
+{
+    monster *mon = attacker->as_monster();
+    item_def *mons_wpn = mon->mslot_item(MSLOT_WEAPON);
+    
+    if (!mons_wpn)
+        return;
+    
+    // assume the player would not pull weapons into terrain that would destroy them
+    if (!((feat_has_solid_floor(grd(you.pos()))
+        && feat_has_solid_floor(grd(mon->pos())))
+        || (feat_is_watery(grd(you.pos())) && species_likes_water(you.species)
+        && grd(mon->pos()) != DNGN_LAVA)))
+    {
+        return;
+    }
+    
+    if (you.mutation[MUT_TENDRILS]
+        && attacker->alive()
+        && adjacent(you.pos(), mon->pos())
+        && you.can_see(mon)
+        && one_chance_in(5)
+        && (random2(you.dex()) > (mons_class_flag(mon->type, M_FIGHTER)) ? mon->hit_dice * 1.5 : mon->hit_dice
+        || random2(you.strength()) > (mons_class_flag(mon->type, M_FIGHTER)) ? mon->hit_dice * 1.5 : mon->hit_dice)
+        && !mons_wpn->cursed())
+    {
+        mprf("Your tendrils lash around %s %s and pull it to the ground!", 
+            apostrophise(mon->name(DESC_THE)).c_str(), mons_wpn->name(DESC_PLAIN).c_str());
+        
+        mon->drop_item(MSLOT_WEAPON, false);
+        move_top_item(mon->pos(), you.pos());
+    }
+}
+
 void melee_attack::do_spines()
 {
     if (defender->is_player())
diff --git a/crawl-ref/source/melee_attack.h b/crawl-ref/source/melee_attack.h
index 99cbffb..36402ae 100644
--- a/crawl-ref/source/melee_attack.h
+++ b/crawl-ref/source/melee_attack.h
@@ -111,6 +111,7 @@ private:
     void do_spines();
     void do_passive_freeze();
     void emit_foul_stench();
+    void tendril_disarm();
     /* Race Effects */
     void do_minotaur_retaliation();
 
diff --git a/crawl-ref/source/mutation-data.h b/crawl-ref/source/mutation-data.h
index 461bd95..ac20bd6 100644
--- a/crawl-ref/source/mutation-data.h
+++ b/crawl-ref/source/mutation-data.h
@@ -1432,4 +1432,34 @@
   "foul stench"
 },
 
+{ MUT_TENDRILS,                       0,  1, false,  true, true,
+  "tendrils",
+
+  {"Thin tendrils of slime have grown from your body.", "", ""},
+  {"Thin, slimy tendrils emerge from your body.", "", ""},
+  {"Your tendrils retract into your body.", "", ""},
+
+  "tendrils"
+},
+
+{ MUT_JELLY_GROWTH,                       0,  1, false,  true, true,
+  "a jelly is attached to you",
+
+  {"You have a small jelly attached to you that senses nearby items.", "", ""},
+  {"Your body partially splits into a small jelly.", "", ""},
+  {"The jelly growth is reabsorbed into your body.", "", ""},
+
+  "jelly growth"
+},
+
+{ MUT_JELLY_MISSILE,                       0,  1, false,  true, true,
+  "absorbing missiles",
+
+  {"You have a small jelly attached to you that may absorb incoming projectiles.", "", ""},
+  {"Your body partially splits into a small jelly.", "", ""},
+  {"The jelly growth is reabsorbed into your body.", "", ""},
+
+  "jelly missile"
+},
+
 #endif
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index 4297ad3..ca0401e 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -874,7 +874,8 @@ static mutation_type _get_random_slime_mutation()
 {
     const mutation_type slime_muts[] = {
         MUT_GELATINOUS_BODY, MUT_EYEBALLS, MUT_TRANSLUCENT_SKIN,
-        MUT_PSEUDOPODS, MUT_FOOD_JELLY, MUT_ACIDIC_BITE
+        MUT_PSEUDOPODS, MUT_FOOD_JELLY, MUT_ACIDIC_BITE, MUT_TENDRILS,
+        MUT_JELLY_GROWTH, MUT_JELLY_MISSILE
     };
 
     return RANDOM_ELEMENT(slime_muts);
@@ -905,7 +906,9 @@ static bool _is_slime_mutation(mutation_type m)
 {
     return (m == MUT_GELATINOUS_BODY || m == MUT_EYEBALLS
             || m == MUT_TRANSLUCENT_SKIN || m == MUT_PSEUDOPODS
-            || m == MUT_FOOD_JELLY || m == MUT_ACIDIC_BITE);
+            || m == MUT_FOOD_JELLY || m == MUT_ACIDIC_BITE
+            || m == MUT_TENDRILS || m == MUT_JELLY_GROWTH
+            || m == MUT_JELLY_MISSILE);
 }
 
 static mutation_type _get_random_xom_mutation()
diff --git a/crawl-ref/source/spl-goditem.cc b/crawl-ref/source/spl-goditem.cc
index ba487e8..f336fe3 100644
--- a/crawl-ref/source/spl-goditem.cc
+++ b/crawl-ref/source/spl-goditem.cc
@@ -483,10 +483,16 @@ int detect_items(int pow)
         map_radius = 8 + random2(8) + pow;
     else
     {
-        ASSERT(you.religion == GOD_ASHENZARI);
-        map_radius = min(you.piety / 20, LOS_RADIUS);
-        if (map_radius <= 0)
-            return 0;
+        if (you.religion == GOD_ASHENZARI)
+        {
+			map_radius = min(you.piety / 20, LOS_RADIUS);
+			if (map_radius <= 0)
+				return 0;
+		}
+		else // MUT_JELLY_GROWTH
+		{
+			map_radius = 6;
+		}
     }
 
     for (radius_iterator ri(you.pos(), map_radius, C_ROUND); ri; ++ri)
-- 
1.7.9.5