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

1 files changed, 12 insertions, 9 deletions

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: