Fixing some deleting of items without a check for the items right before in Alan and Agostine

2 files changed, 26 insertions, 17 deletions

diff --git a/npc/009-2_Hurnscald/alan.txt b/npc/009-2_Hurnscald/alan.txt
index 28ca7d47..ea00fe31 100644
--- a/npc/009-2_Hurnscald/alan.txt
+++ b/npc/009-2_Hurnscald/alan.txt
@@ -19,7 +19,7 @@
 	if (@Q_status == 3) goto L_State_3;
 	if (@Q_status == 4) goto L_State_4;
 	if (@Q_status == 5) goto L_State_5;
-	
+
 	mes "[Alan]";
 	mes "\"When you want to buy something then please speak to my apprentice. I am only doing special requests.\"";
 	next;
@@ -33,7 +33,7 @@
 			"OK, thanks", -,
 			"Can you make me a really good bow?", L_State_0_1;
 	close;
-	
+
 L_State_0_1:
 	mes "[Alan]";
 	mes "\"You mean like one of my legendary forest bows?\"";
@@ -91,7 +91,7 @@ L_State_1_1:
 	mes "[Alan]";
 	mes "\"When you leave my shop just go southwest over the village plaza. You can't miss it.\"";
 	close;
-	
+
 L_State_2:
 	mes "[Alan]";
 	mes "\"Did you already ask Jack why he won't deliver me any more living wood?\"";
@@ -112,7 +112,7 @@ L_State_2:
         callsub S_Update_Var;
 
 	close;
-	
+
 L_State_3:
 	mes "[Alan]";
 	mes "\"How is the hunt going? Did you bring me any wood?\"";
@@ -130,11 +130,12 @@ L_State_3:
 	close;
 
 L_State_3_try:
+	if (countitem(569) < 1) goto L_No_Log;
+	delitem "RawLog", 1;
 	mes "[Alan]";
 	mes "\"Hmmm... looks ok, but is it strong enough?\"";
 	mes "Alan bends the log over his knee.";
 	next;
-	delitem "RawLog", 1;
 	set @Temp1, rand(20);
 	if (@Temp1 == 0) goto L_State_3_success;
 	mes "The log breaks with a loud crack";
@@ -147,7 +148,7 @@ L_State_3_try:
 		"Sure, here you go.", L_State_3_try,
 		"Hey! Stop breaking my stuff!", -;
 	close;
-	
+
 L_State_3_success:
 	mes "Alan tries as hard as he can but the log won't bend.";
 	next;
@@ -156,7 +157,7 @@ L_State_3_success:
 	next;
 	set @Q_status, 4;
         callsub S_Update_Var;
-	
+
 L_State_4:
 	mes "[Alan]";
 	mes "\"I can make you a really nice forest bow out of this. I just need 10,000 GP for material and work time.\"";
@@ -210,6 +211,11 @@ L_NohMask_Answer:
 	mes "\"No.\"";
 	close;
 
+L_No_Log:
+	mes "[Alan]";
+	mes "\"Where should I look at? You don't have a raw log.\"";
+	close;
+
 S_Update_Var:
         set QUEST_Forestbow_state,
         	(QUEST_Forestbow_state & ~(@Q_MASK)
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;
 }