From 6aafb97b701bc50fdcdc82f38b79c777ff3b9a1f Mon Sep 17 00:00:00 2001
From: moxian <aleftmail@inbox.ru>
Date: Sat, 17 Dec 2011 08:23:16 +0400
Subject: [PATCH] Sticks-to-snakes now can transmute sticks on the ground

---
 crawl-ref/source/spl-summoning.cc |   59 ++++++++++++++++++++++++++++++++-----
 1 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/crawl-ref/source/spl-summoning.cc b/crawl-ref/source/spl-summoning.cc
index 376778a..ee3d2d7 100644
--- a/crawl-ref/source/spl-summoning.cc
+++ b/crawl-ref/source/spl-summoning.cc
@@ -196,13 +196,48 @@ bool item_is_snakable(const item_def& item)
 
 spret_type cast_sticks_to_snakes(int pow, god_type god, bool fail)
 {
-    if (!you.weapon())
-    {
-        mprf("Your %s feel slithery!", you.hand_name(true).c_str());
-        return SPRET_ABORT;
-    }
-
-    const item_def& wpn = *you.weapon();
+	item_def *wpn_pointer=NULL;
+	bool wpn_on_ground = false;
+	
+	if (you.weapon() && item_is_snakable(*you.weapon()))
+	{
+		if(_snakable_missile(*you.weapon())){
+			wpn_pointer = you.weapon();
+		}
+		else
+		{
+			//Assuming that converting non-missiles to snakes is an action rare
+			//and dangerous enough to be prompted
+			std::string prompt = "Attempt converting " + you.weapon()->name(DESC_YOUR)
+				+ " you are wielding to snake(s)?";
+			if(yesno(prompt.c_str()))
+				wpn_pointer = you.weapon();
+		}
+	}
+	
+	if(!wpn_pointer)
+	{
+		for (stack_iterator si(you.pos(), true); si; ++si)
+		{
+			if (item_is_snakable(*si))
+			{	
+				std::string prompt = "Attempt converting " + si->name(DESC_THE) 
+					+ " to snake(s)?";
+				if(!yesno(prompt.c_str())) continue;
+				wpn_on_ground=true;
+				wpn_pointer = &(*si);
+				break;
+			}
+		}
+	}
+	
+	if (!wpn_pointer)
+	{
+		mprf("Your %s feel slithery!", you.hand_name(true).c_str());
+		return SPRET_ABORT;
+	}
+
+    const item_def& wpn = *wpn_pointer;
     const std::string abort_msg =
             make_stringf("%s feel%s slithery for a moment!",
                          wpn.name(DESC_YOUR).c_str(),
@@ -294,7 +329,15 @@ spret_type cast_sticks_to_snakes(int pow, god_type god, bool fail)
         return SPRET_SUCCESS;
     }
 
-    dec_inv_item_quantity(you.equip[EQ_WEAPON], count);
+	if (!wpn_on_ground)
+	{
+		dec_inv_item_quantity(you.equip[EQ_WEAPON], count);
+	}
+	else
+	{
+		int link = item_on_floor(wpn, you.pos());
+		dec_mitm_item_quantity(link, count);
+	}
     mpr((count > 1) ? "You create some snakes!" : "You create a snake!");
     return SPRET_SUCCESS;
 }
-- 
1.7.8