Merge branch 'master' of git://gitorious.org/+dm-developers/tmw/rossy-server

Conflicts:
	db/mob_db.txt

2 files changed, 29 insertions, 19 deletions

diff --git a/db/mob_db.txt b/db/mob_db.txt
index 97923c78..cd8f6d03 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -85,4 +85,5 @@
 1082,	Serqet,			Serqet,			10,	100,	0,	0,	4,	1,	10,	15,	0,	5,	1,	1,	1,	0,	15,	5,	1,	1,	1,	3,	20,	129,	2000,	1872,	672,	480,	0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,		0
 1083,	EarthSpider,		EarthSpider,		90,	1500,	0,	0,	280,	1,	100,	125,	10,	45,	20,	15,	10,	10,	40,	10,	1,	1,	1,	0,	45,	175,	475,	1250,	672,	480,	0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,		0
 1084,	EarthScorpion,		EarthScorpion,		100,	1200,	0,	0,	250,	1,	50,	150,	20,	45,	15,	30,	10,	10,	15,	25,	1,	1,	1,	0,	45,	133,	550,	1350,	672,	480,	0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	0,		0
+1085,	IceSkull,		IceSkull,		180,	5000,	0,	0,	100,	2,	75,	175,	35,	15,	30,	30,	20,	20,	25,	60,	1,	1,	1,	3,	21,	175,	600,	1600,	672,	480,	631,	1000,		4026,	5000,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,		0,	0,	0,	0,	0,	0,	0,	0,	0,	0,	2,		30
 #ID,	Name,			Jname,			LV,	HP,	SP,	EXP,	JEXP,	Range1,	ATK1,	ATK2,	DEF,	MDEF,	STR,	AGI,	VIT,	INT,	DEX,	LUK,	Range2,	Range3,	Scale,	Race,	Element,Mode,	Speed,	Adelay,	Amotion,Dmotion,Drop1id,Drop1per,	Drop2id,Drop2per,	Drop3id,Drop3per,	Drop4id,Drop4per,	Drop5id,Drop5per,	Drop6id,Drop6per,	Drop7id,Drop7per,	Drop8id,Drop8per,	Item1,	Item2,	MEXP,	ExpPer,	MVP1id,	MVP1per,MVP2id,	MVP2per,MVP3id,	MVP3per,mutationcount,	mutationstrength
diff --git a/npc/011-1/alchemist.txt b/npc/011-1/alchemist.txt
index 4031db1e..e38f76ba 100644
--- a/npc/011-1/alchemist.txt
+++ b/npc/011-1/alchemist.txt
@@ -52,9 +52,6 @@ L_post_mana_potion_c:
 	mes "[Rauk the Alchemist]";
 	mes "\"I'm learning the ancient science of the alchemy.";
 	mes "I already know how to create a couple of potions!!\"";
-	next;
-
-	mes "[Rauk the Alchemist]";
 	mes "\"Do you want me to create one for you?\"";
 	next;
 
@@ -285,33 +282,45 @@ L_mana_potion_lacking:
         goto L_main_menu;
 
 L_iron:
-  	if(countitem("SmallMushroom") < 2) goto L_no_iron;
+	set @COST_PER_IRON_POTION, 2;
+
+	mes "\" To make them, I'm going to need " + @COST_PER_IRON_POTION + " Small Mushrooms per Iron Potion.  How many Iron Potions would you like?\"";
+	input @count;
+
+	if (@count == 0) close;
+	set @empty, countitem("SmallMushroom");
+
+	if (@empty < @count * @COST_PER_IRON_POTION) goto L_no_iron;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("SmallMushroom") > 2) goto L_TooMany;
-	mes "[Rauk the Alchemist]";
-	mes "\"Great! You brought me exactly what I need!";
-	mes "Here is your Iron potion.\"";
-	delitem "SmallMushroom", 2;
-	getitem "IronPotion", 1;
+	if (@inventorylist_count == 100 && countitem("SmallMushroom") == 0 && @empty > @count) goto L_TooMany;
+
+	delitem "SmallMushroom", @COST_PER_IRON_POTION * @count;
+	getitem "IronPotion", @count;
 	close;
 
 L_concentration:
-	if(countitem("PinkPetal") < 2) goto L_no_concentration;
+	set @COST_PER_CONCENTRATION_POTION, 2;
+
+	mes "\" To make them, I'm going to need " + @COST_PER_CONCENTRATION_POTION + " Pink Petals per Concentration Potion.  How many Concentration Potions would you like?\"";
+	input @count;
+
+	if (@count == 0) close;
+	set @empty, countitem("PinkPetal");
+
+	if (@empty < @count * @COST_PER_CONCENTRATION_POTION) goto L_no_concentration;
 	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("PinkPetal") > 2) goto L_TooMany;
-	mes "[Rauk the Alchemist]";
-	mes "\"Great! You brought me exactly what I need!";
-	mes "Here is your Concentration potion.\"";
-	delitem "PinkPetal", 2;
-	getitem "ConcentrationPotion", 1;
+	if (@inventorylist_count == 100 && countitem("PinkPetal") == 0 && @empty > @count) goto L_TooMany;
+
+	delitem "PinkPetal", @COST_PER_CONCENTRATION_POTION * @count;
+	getitem "ConcentrationPotion", @count;
 	close;
 
 L_no_iron:
-	mes "\"You have to bring me 2 Small Mushrooms.\"";
+	mes "\"You have to bring me 2 Small Mushrooms for each Iron Potion.\"";
 	close;
 	
 L_no_concentration:
-	mes "\"You have to bring me 2 Pink Petals.\"";
+	mes "\"You have to bring me 2 Pink Petals for each Concentration Potion.\"";
 	close;
 
 L_dyeing_intro: