Do the proper fix and the lame fix on Heathin

1 files changed, 29 insertions, 28 deletions

diff --git a/npc/001-2/heathin.txt b/npc/001-2/heathin.txt
index 0ba2f11f..a8c846b0 100644
--- a/npc/001-2/heathin.txt
+++ b/npc/001-2/heathin.txt
@@ -14,12 +14,13 @@
     if (QL_TERRANITE_ARMOR == 7) && (BaseLevel >= 80) goto L_Legs_Ready;
     if (QL_TERRANITE_ARMOR == 6) && (BaseLevel >= 80) goto L_Legs_Forge;
     if (QL_TERRANITE_ARMOR == 5) && (BaseLevel >= 80) goto L_Legs;
-    if (QL_TERRANITE_ARMOR == 4) && (BaseLevel >= 80) goto L_Hood_Ready;
-    if (QL_TERRANITE_ARMOR == 3) && (BaseLevel >= 80) goto L_Hood_Forge;
-    if (QL_TERRANITE_ARMOR == 2) && (BaseLevel >= 80) goto L_Hood;
-    if (QL_TERRANITE_ARMOR == 2) && (BaseLevel >= 60) goto L_Forge_Thanks;
+    if (QL_TERRANITE_ARMOR == 5) goto L_Forge_Thanks;
+    if (QL_TERRANITE_ARMOR == 4) && (BaseLevel >= 70) goto L_Hood_Ready;
+    if (QL_TERRANITE_ARMOR == 3) && (BaseLevel >= 70) goto L_Hood_Forge;
+    if (QL_TERRANITE_ARMOR == 2) && (BaseLevel >= 70) goto L_Hood;
+    if (QL_TERRANITE_ARMOR == 2) goto L_Forge_Thanks;
     if (QL_TERRANITE_ARMOR == 1) && (BaseLevel >= 60) goto L_Forge_Award;
-    if (BaseLevel >= 60) goto L_Start;
+    if (QL_TERRANITE_ARMOR < 1 && BaseLevel >= 60) goto L_Start;
 
     mes "[Heathin]";
     mes "\"Hello, friend. I am Heathin, a smith of exotic metals. \"";
@@ -56,10 +57,10 @@ L_Interested:
         "Can you repeat that again?", L_Interested;
 
 L_Forge_Award:
-    if (countitem ("Coal") < 50) goto L_Forge_Wait;
+    if (countitem (Coal) < 50) goto L_Forge_Wait;
     getinventorylist;
     QL_TERRANITE_ARMOR = 2;
-    delitem "Coal", 50;
+    delitem Coal, 50;
     getexp @heathin_xp_bonus, 0;
     Zeny = Zeny + 20000;
     mes "[Heathin]";
@@ -118,12 +119,12 @@ L_Yes:
 
 L_Hood_Forge:
     if ( (Zeny < 20000)
-        || (countitem("Coal") < 100)
-        || (countitem("TerraniteOre") < 10) )
+        || (countitem(Coal) < 100)
+        || (countitem(TerraniteOre) < 10) )
             goto L_Hood_Wait;
     QL_TERRANITE_ARMOR = 4;
-    delitem "Coal", 100;
-    delitem "TerraniteOre", 10;
+    delitem Coal, 100;
+    delitem TerraniteOre, 10;
     getexp @heathin_xp_bonus, 0;
     Zeny = Zeny - 20000;
     mes "[Heathin]";
@@ -140,7 +141,7 @@ L_Hood_Ready:
     if ((checkweight("TerraniteHelmet", 1) == 0) || (@inventorylist_count == 100))
         goto L_InventoryNoSpace;
     QL_TERRANITE_ARMOR = 5;
-    getitem "TerraniteHelmet", 1;
+    getitem TerraniteHelmet, 1;
     mes "[Heathin]";
     mes "\"I am all done with your terranite hood. I hope you enjoy it!  I have some work to wrap up for the Council, but come back later and I might be able to assist you again.\"";
     close;
@@ -155,12 +156,12 @@ L_Legs:
 
 L_Legs_Forge:
     if ( (Zeny < 40000)
-        || (countitem("Coal") < 200)
-        || (countitem("TerraniteOre") < 30) )
+        || (countitem(Coal) < 200)
+        || (countitem(TerraniteOre) < 30) )
             goto L_Legs_Wait;
     QL_TERRANITE_ARMOR = 7;
-    delitem "Coal", 200;
-    delitem "TerraniteOre", 30;
+    delitem Coal, 200;
+    delitem TerraniteOre, 30;
     getexp @heathin_xp_bonus, 0;
     Zeny = Zeny - 40000;
     mes "[Heathin]";
@@ -192,12 +193,12 @@ L_Chest_Armor:
 
 L_Chest_Armor_Forge:
     if ( (Zeny < 50000)
-        || (countitem("Coal") < 250)
-        || (countitem("TerraniteOre") < 40) )
+        || (countitem(Coal) < 250)
+        || (countitem(TerraniteOre) < 40) )
             goto L_Chest_Armor_Wait;
     QL_TERRANITE_ARMOR = 10;
-    delitem "Coal", 250;
-    delitem "TerraniteOre", 40;
+    delitem Coal, 250;
+    delitem TerraniteOre, 40;
     getexp @heathin_xp_bonus, 0;
     Zeny = Zeny - 50000;
     mes "[Heathin]";
@@ -243,12 +244,12 @@ L_Arrows_Yes:
 
 L_Arrows_Forge:
     if ( (Zeny < @TARROW_REQ_GP)
-        || (countitem("Coal") < @TARROW_REQ_COAL)
-        || (countitem("TerraniteOre") < @TARROW_REQ_TERRA_ORE) )
+        || (countitem(Coal) < @TARROW_REQ_COAL)
+        || (countitem(TerraniteOre) < @TARROW_REQ_TERRA_ORE) )
             goto L_Arrows_Wait;
     QL_TERRANITE_ARMOR = 13;
-    delitem "Coal", @TARROW_REQ_COAL;
-    delitem "TerraniteOre", @TARROW_REQ_TERRA_ORE;
+    delitem Coal, @TARROW_REQ_COAL;
+    delitem TerraniteOre, @TARROW_REQ_TERRA_ORE;
     getexp @heathin_xp_bonus, 0;
     Zeny = Zeny - @TARROW_REQ_GP;
     mes "[Heathin]";
@@ -284,14 +285,14 @@ L_Arrows_Trade_No:
 
 L_Arrows_Trade_Yes:
     if ( (Zeny < @TARROW_REQ_GP)
-        || (countitem("Coal") < @TARROW_REQ_COAL)
-        || (countitem("TerraniteOre") < @TARROW_REQ_TERRA_ORE) )
+        || (countitem(Coal) < @TARROW_REQ_COAL)
+        || (countitem(TerraniteOre) < @TARROW_REQ_TERRA_ORE) )
             goto L_Arrows_Trade_Wait;
     getinventorylist;
     if ((checkweight("TerraniteArrow", 1500) == 0) || (@inventorylist_count == 100))
         goto L_InventoryNoSpace;
-    delitem "Coal", @TARROW_REQ_COAL;
-    delitem "TerraniteOre", @TARROW_REQ_TERRA_ORE;
+    delitem Coal, @TARROW_REQ_COAL;
+    delitem TerraniteOre, @TARROW_REQ_TERRA_ORE;
     Zeny = Zeny - @TARROW_REQ_GP;
     @lucky = 5 * rand(Luk);
     @lucky$ = "";