Merge branch 'master' of git://gitorious.org/tmw-eathena-data/mainline

4 files changed, 77 insertions, 66 deletions

diff --git a/npc/001-1_Tulimshar/mikhail.txt b/npc/001-1_Tulimshar/mikhail.txt
index 2ec8b50b..6514c07d 100644
--- a/npc/001-1_Tulimshar/mikhail.txt
+++ b/npc/001-1_Tulimshar/mikhail.txt
@@ -1,67 +1,68 @@
 //
 
-001-1.gat,50,46,0	script	Mikhail	120,{
-	if (TMW_Quest == 6) goto L_Done;
-	if (TMW_Quest == 5) goto L_Progress;
-	if (TMW_Quest == 4) goto L_Start;
-	if (TMW_Quest < 4) goto L_Convince_Mikhail_First;
-	
-	// If this happens, something is wrong with the above case handling.
-	mes "Mikhail looks confused.";
-	close;
+001-1.gat,50,46,0	script	Mikhail	120,	{
+    if (TMW_Quest >= 6) goto L_Done;
+    if (TMW_Quest == 5) goto L_Progress;
+    if (TMW_Quest == 4) goto L_Start;
+    if (TMW_Quest < 4) goto L_Convince_Mikhail_First;
+
+    // If this happens, something is wrong with the above case handling.
+    mes "Mikhail looks confused.";
+    close;
 
 L_Convince_Mikhail_First:
-	mes "[Mikhail]";
-	mes "\"Hello...\"";
-	mes "";
-	mes "It seems that the boy would like to say more, but does not dare to open up to you. Maybe you should help someone else first, so that he sees your intentions are good.";
+    mes "[Mikhail]";
+    mes "\"Hello...\"";
+    mes "";
+    mes "It seems that the boy would like to say more, but does not dare to open up to you. Maybe you should help someone else first, so that he sees your intentions are good.";
+    close;
+
+L_Start:
+    mes "[Mikhail]";
+    mes "\"My grandma sent me to get five [Maggot Slime]s from the maggots in the desert, but they scare me so bad!\"";
+    next;
+    mes "\"You look like a nice person.  Would you go get them for me?\"";
+    menu
+        "Of course, I'll go get them for you.", L_accept,
+        "I've got other things to do right now.", L_close;
+    close;
 
-L_Start:	
-	mes "[Mikhail]";
-	mes "\"My grandma sent me to get five [Maggot Slime]s from the maggots in the desert, but they scare me so bad!\"";
-	next;
-	mes "\"You look like a nice person.  Would you go get them for me?\"";	
-	menu
-		"Of course, I'll go get them for you.", L_accept,
-		"I've got other things to do right now.", L_close;
-	close;
-	
 L_close:
-	close;
-	
+    close;
+
 L_accept:
-	mes "[Mikhail]";
-	mes "\"Thank you so much!  I'll wait for you here.\"";
-	set TMW_Quest, 5;
-	close;
-	
+    mes "[Mikhail]";
+    mes "\"Thank you so much!  I'll wait for you here.\"";
+    set TMW_Quest, 5;
+    close;
+
 L_Progress:
-	mes "[Mikhail]";
-	mes "\"Did you bring me the five [Maggot Slime]s i need?\"";
-	next;
-	menu
-		"Yes, here they are, kiddo!", L_try,
-		"Not yet, but I'll be back soon.", L_close;
-	close;
-	
+    mes "[Mikhail]";
+    mes "\"Did you bring me the five [Maggot Slime]s i need?\"";
+    next;
+    menu
+        "Yes, here they are, kiddo!", L_try,
+        "Not yet, but I'll be back soon.", L_close;
+    close;
+
 L_try:
-	if countitem("MaggotSlime") >= 5 goto L_get;
-	mes "[Mikhail]";
-	mes "\"It doesn't look like you have them all...\"";
-	close;
-	
+    if countitem("MaggotSlime") >= 5 goto L_get;
+    mes "[Mikhail]";
+    mes "\"It doesn't look like you have them all...\"";
+    close;
+
 L_get:
-	delitem "MaggotSlime", 5;
-	set TMW_Quest, 6;
-	mes "[Mikhail]";
-	mes "\"Ooh!  Thank you so much!  I can get back to my grandma now!\"";
-	next;
-	getexp 100, 0;
-	mes "You get 100 xp.";
-	close;
-	
+    delitem "MaggotSlime", 5;
+    set TMW_Quest, 6;
+    mes "[Mikhail]";
+    mes "\"Ooh!  Thank you so much!  I can get back to my grandma now!\"";
+    next;
+    getexp 100, 0;
+    mes "You get 100 xp.";
+    close;
+
 L_Done:
-	mes "[Mikhail]";
-	mes "\"Thanks again for helping me get those [Maggot Slime]s!\"";
-	close;
-	
+    mes "[Mikhail]";
+    mes "\"Thanks again for helping me get those [Maggot Slime]s!\"";
+    close;
+}
diff --git a/npc/001-1_Tulimshar/sarah.txt b/npc/001-1_Tulimshar/sarah.txt
index 86ed8db6..7a109fa6 100644
--- a/npc/001-1_Tulimshar/sarah.txt
+++ b/npc/001-1_Tulimshar/sarah.txt
@@ -17,7 +17,8 @@ L_Convince_Sarah_First:
 	mes "\"The girl suddenly looks at you suspiciously.\"";
 	next;
 	mes "\"My mommy says not to talk to strangers!\"";
-	
+	close;
+
 L_Start:
 
 	set @TEMP, rand(2);
diff --git a/npc/009-2_Hurnscald/nicholas.txt b/npc/009-2_Hurnscald/nicholas.txt
index 639b8be3..d0719430 100644
--- a/npc/009-2_Hurnscald/nicholas.txt
+++ b/npc/009-2_Hurnscald/nicholas.txt
@@ -47,9 +47,9 @@ L_Check:
 	mes "[Nicholas]";
 	mes "\"Let me take at look at how much you have...\"";
 	next;
-	if ( (countitem("IngotIron")<3) | (countitem("Coal") < 6) ) goto L_NoItem;
-	if ( (countitem("IngotIron")<6) | (countitem("Coal") < 12) ) goto L_StageA;
-	if ( (countitem("IngotIron")<9) | (countitem("Coal") < 18) ) goto L_StageB;
+	if ( (countitem("IngotIron")<3) || (countitem("Coal") < 6) ) goto L_NoItem;
+	if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) ) goto L_StageA;
+	if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) ) goto L_StageB;
 	goto L_StageC;
 
 L_Info:
@@ -107,12 +107,12 @@ L_main_menu:
 
 L_main_menu_post_setzer:
 
-	if ( (countitem("IngotIron")<3) | (countitem("Coal") <6) ) goto L_no_more_helmets;
+	if ( (countitem("IngotIron")<3) || (countitem("Coal") <6) ) goto L_no_more_helmets;
         set @choice$[@choices_nr], "Knight's Helmet (3 Iron Ingots & 6 Coal).";
         set @choice_idx[@choices_nr], @CHOICE_KNIGHT;
         set @choices_nr, 1 + @choices_nr;
 
-	if ( (countitem("IngotIron")<6) | (countitem("Coal") < 12) ) goto L_no_more_helmets;
+	if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) ) goto L_no_more_helmets;
 
         set @choice$[@choices_nr], "Crusade Helmet. (6 Iron Ingots & 12 Coal)";
         set @choice_idx[@choices_nr], @CHOICE_CRUSADE;
@@ -122,7 +122,7 @@ L_main_menu_post_setzer:
         set @choice_idx[@choices_nr], @CHOICE_SHIELD;
         set @choices_nr, 1 + @choices_nr;
 
-	if ( (countitem("IngotIron")<9) | (countitem("Coal") < 18) ) goto L_no_more_helmets;
+	if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) ) goto L_no_more_helmets;
 
         set @choice$[@choices_nr], "Warlord Helmet. (9 Iron Ingots & 18 Coal)";
         set @choice_idx[@choices_nr], @CHOICE_WARLORD;
@@ -173,6 +173,7 @@ L_NoMoney:
 
 L_YesKnight:
 	if (zeny < 10000) goto L_NoMoney;
+	if ( (countitem("IngotIron")<3) || (countitem("Coal") < 6) ) goto L_NoItem;
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_TooMany;
 	set zeny, zeny - 10000;
@@ -183,6 +184,7 @@ L_YesKnight:
 
 L_YesCrusade:
 	if (zeny < 10000) goto L_NoMoney;
+	if ( (countitem("IngotIron")<6) || (countitem("Coal") < 12) ) goto L_NoItem;
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_TooMany;
 	set zeny, zeny-10000;
@@ -193,6 +195,7 @@ L_YesCrusade:
 
 L_YesWarlord:
 	if (zeny < 10000) goto L_NoMoney;
+	if ( (countitem("IngotIron")<9) || (countitem("Coal") < 18) ) goto L_NoItem;
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_TooMany;
 	set zeny, zeny-10000;
@@ -305,7 +308,7 @@ L_SetzerQuest:
         if (@Q_SETZER_status & @SETZER_FLAG_MADE_SETZER)
         	mes "\"Another one?  Sure, why not.\"";
 	mes "Nicholas examines your [Short Sword], then nods.";
-        mes "\"This is good quality.  I can make something special out of it, with three ingot bars of iron and 50,000 GP -- but I will also need a potion of monster oil.\"";
+        mes "\"This is good quality.  I can make something special out of it, with three ingot bars of iron, six lumps of coal and 50,000 GP -- but I will also need a potion of monster oil.\"";
         if (@Q_SETZER_status < @SETZER_KNOWS_OIL)
         	set @Q_SETZER_status, @SETZER_KNOWS_OIL;
         callsub L_Update_Var;
@@ -316,7 +319,7 @@ L_SetzerQuest:
              "HOW much?  Nevermind then!", L_Pass;
 
 	if (zeny < 50000) goto L_SetzerNoZeny;
-	if ( (countitem("IngotIron") < 3) | (countitem("Coal") < 6) ) goto L_SetzerNoIngot;
+	if ( (countitem("IngotIron") < 3) || (countitem("Coal") < 6) ) goto L_SetzerNoIngot;
 	if (countitem("MonsterOilPotion") < 1) goto L_SetzerNoMonsterOil;
 	if (countitem("ShortSword") < 1) goto L_SetzerNoSword;
 	// No inventory check needed, as the short sword is removed, opening a slot
@@ -360,7 +363,7 @@ L_SetzerNoZeny:
 
 L_SetzerNoIngot:
         mes "[Nicholas]";
-        mes "\"Without 3 ingots of iron, I can't improve your sword.\"";
+        mes "\"Without 3 ingots of iron, and six lumps of coal, I can't improve your sword.\"";
         close;
 
 L_SetzerNoMonsterOil:
diff --git a/npc/010-2_Dimonds_Cove/loratay.txt b/npc/010-2_Dimonds_Cove/loratay.txt
index 47d5ea1d..c336de32 100644
--- a/npc/010-2_Dimonds_Cove/loratay.txt
+++ b/npc/010-2_Dimonds_Cove/loratay.txt
@@ -315,6 +315,9 @@ L_trim:
 	if (@item >= 2100 && @item <= 2109) set @genitem, @item + 70;
         if (@genitem == 0) goto L_trim_impossible;
         if (zeny < 100) goto L_trim_nozeny;
+        
+        if (countitem(@delitem) < 1)
+                goto L_main_menu;
 
         delitem @delitem, 1;
         getitem @genitem, 1;
@@ -368,6 +371,9 @@ L_lengthen:
         if (@genitem == 0) goto L_lengthen_impossible;
         if (zeny < 500) goto L_lengthen_nozeny;
         if (countitem ("CottonCloth") < 1) goto L_lengthen_nocotton;
+        
+        if (countitem(@delitem) < 1)
+        	goto L_main_menu;
 
         delitem @delitem, 1;
         delitem "CottonCloth", 1;