Merge git://gitorious.org/~wombat/tmw-eathena-data/cache-serverdata

1 files changed, 13 insertions, 10 deletions

diff --git a/npc/021-2_Tulimshar/furquest.txt b/npc/021-2_Tulimshar/furquest.txt
index 6727ea7d..c4e0c805 100644
--- a/npc/021-2_Tulimshar/furquest.txt
+++ b/npc/021-2_Tulimshar/furquest.txt
@@ -1,7 +1,7 @@
 //#################################################################################
 // Script by Shaili and QOAL
 //#################################################################################
- 
+
 // Tulimshar Crafting Workshop - Agostine, The Legendary Tailor
 021-2.gat,32,63,0	script	Agostine	137,{
 	if (QUEST_WG_state == 1) goto L_State_0_3;
@@ -13,7 +13,7 @@
 	if (QUEST_WG_state == 7) goto L_State_11;
 	if (QUEST_WG_state == 8) goto L_State_12;
 	if (QUEST_WG_state >= 9) goto L_State_13;
- 
+
 	mes "\"This goes up, this goes left...\"";
 	next;
 	mes "\"Mmmm...?\"";
@@ -66,7 +66,7 @@ L_State_0_3:
 		"A Cactus Potion.", L_State_0_5,
 		"Some milk.", L_State_0_6,
 		"A pint of beer.", L_State_0_7,
-		"A Iron potion.", L_State_0_9,
+		"An Iron potion.", L_State_0_9,
 		"A Concentration Potion.", L_State_0_8,
 		"Nothing, at the moment.", -;
 	close;
@@ -75,7 +75,6 @@ L_State_0_4:
 	mes "[Agostine, The Legendary Tailor]";
 	mes "\"So, a Cactus Drink?\"";
 	if (countitem("CactusDrink") < 1) goto L_State_neg;
-	next;
 	delitem "CactusDrink", 1;
 	goto L_State_bad;
 	close;
@@ -84,7 +83,6 @@ L_State_0_5:
 	mes "[Agostine, The Legendary Tailor]";
 	mes "\"So, a Cactus Potion?\"";
 	if (countitem("CactusPotion") < 1) goto L_State_neg;
-	next;
 	delitem "CactusPotion", 1;
 	goto L_State_bad;
 	close;
@@ -101,7 +99,6 @@ L_State_0_7:
 	mes "[Agostine, The Legendary Tailor]";
 	mes "\"So, a beer?\"";
 	if (countitem("Beer") < 1) goto L_State_neg;
-	next;
 	delitem "Beer", 1;
 	goto L_State_bad;
 	close;
@@ -110,7 +107,6 @@ L_State_0_8:
 	mes "[Agostine, The Legendary Tailor]";
 	mes "\"So, a Concentration Potion?\"";
 	if (countitem("ConcentrationPotion") < 1) goto L_State_neg;
-	next;
 	delitem "ConcentrationPotion", 1;
 	goto L_State_bad;
 	close;
@@ -119,8 +115,8 @@ L_State_0_9:
 	mes "[Agostine, The Legendary Tailor]";
 	mes "\"So, an Iron Potion?\"";
 	if (countitem("IronPotion") < 1) goto L_State_neg;
-	next;
 	delitem "IronPotion", 1;
+	next;
 	mes "Agostine looks pleased as he drinks the potion.";
 	next;
 	mes "[Agostine, The Legendary Tailor]";
@@ -133,12 +129,12 @@ L_State_0_9:
 	close;
 
 L_State_neg:
-	mes "[Agostine, The Legendary Tailor]";
+	next;
 	mes "\"Seems that you lied. You don't have the drink you told me.\"";
 	close;
 
 L_State_bad:
-	mes "[Agostine, The Legendary Tailor]";
+	next;
 	mes "\"Well, I don't like it so much. Bring me something else.\"";
 	close;
 
@@ -187,6 +183,7 @@ L_State_4_try:
 	mes "\"Let me see, my friend! It needs to be perfect for my gloves!\"";
 	mes "Agostine examines the patch of fur.";
 	next;
+	if (countitem("WhiteFur") < 1) goto L_No_Fur;
 	delitem "WhiteFur", 1;
 	set @Temp1,rand(30);
 	if (@Temp1 == 0) goto L_State_4_success;
@@ -272,6 +269,7 @@ L_State_11_try:
 	next;
 	mes "Agostine examines the patch of fur.";
 	next;
+	if (countitem("WhiteFur") < 1) goto L_No_Fur;
 	delitem "WhiteFur", 1;
 	set @Temp2,rand(30);
 	if (@Temp2 == 0) goto L_State_11_success;
@@ -332,4 +330,9 @@ L_TooMany:
 	mes "[Agostine, The Legendary Tailor]";
 	mes "\"You don't have anywhere to put them. Come back when you do.";
 	close;
+
+L_No_Fur:
+	mes "[Agostine, The Legendary Tailor]";
+	mes "\"You don't have any white fur! Stop talking nonsense.";
+	close;
 }