Replace Paxel :3

2 files changed, 18 insertions, 86 deletions

diff --git a/npc/00000SAVE/016-1_NewPaxel.forum.deserthelmet.txt b/npc/00000SAVE/016-1_NewPaxel.forum.txt
index a5ee35f70..b0408fcd9 100644
--- a/npc/00000SAVE/016-1_NewPaxel.forum.deserthelmet.txt
+++ b/npc/00000SAVE/016-1_NewPaxel.forum.txt
@@ -1,10 +1,14 @@
-// This is to replace Paxel
+// This is from LoF, to replace LoF Paxel
 //----------------------------------------------------
-// Desert Helmet quest
+// PRSM Helmet quest
 // Create Quest: Darlord (Depredador) 
 //----------------------------------------------------
 
-012-1.gat,122,115,0 script Paxel 126,{
+// Old Paxel turned Raw Coal in Coal... But we don't have Raw Coal.
+// He probably used the nice furnace NPC too... We will need another NPC to use that...
+
+//012-1.gat,122,115,0 script Paxel 126,{
+016-1,40,39,0	script	Paxel	NPC141,{
     if(QUEST_Warrior1 == 2) goto L_Done1;
     if(QUEST_Warrior1 == 1) goto L_Ask2; 
 
@@ -61,7 +65,7 @@ L_Rude:
 
 L_Check1:
     if (countitem(IronIngot) > 11)
-    goto L_Progress1;
+        goto L_Progress1;
     goto L_More_Needed1;
 
 L_More_Needed1:
@@ -81,7 +85,7 @@ L_Progress1:
 
 L_Ask2:
 	mesn;
-	mes "\"I need a two Infantry Helmet to enchant them, one Warlord Helmet to make them full of vitality and a lot of Terranite Ore to make it more magical.\"";
+	mes "\"I need a two Infantry Helmet to enchant them, one Warlord Helmet to make them full of vitality and a lot of Terranite Ore to make it more magical. And 10000 GP.\"";
 
     menu
     "Please have a look, i have what you asked", L_Check2,
@@ -90,9 +94,14 @@ L_Ask2:
 
 
 L_Check2:
-    if (countitem(InfantryHelmet) > 0 && countitem(WarlordHelmet) > 0 && countitem(TerraniteOre) > 0)
+    if (countitem(InfantryHelmet) < 2 || countitem(WarlordHelmet) < 1 || countitem(TerraniteOre) < 6)
+        goto L_More_Needed2;
+    if (Zeny < 10000) {
+        mesn;
+        mes "\"You can't afford that much work! Do some odd jobs and come back.\"";
+        close;
+    }
     goto L_Progress2;
-    goto L_More_Needed2;
 
 
 L_More_Needed2:
@@ -107,8 +116,8 @@ L_More_Needed2:
 // Got Desert
 // ----------------------------------------------------
 L_Progress2:
-    if (@inventorylist_count == 100) goto L_noRoom;
-    delitem InfantryHelmet, 1;
+    inventoryplace PrsmHelmet, 1;
+    delitem InfantryHelmet, 2;
     delitem WarlordHelmet, 1;
     delitem TerraniteOre, 20;
     getexp 60000, 0;
@@ -117,10 +126,6 @@ L_Progress2:
 	mesn;
 	mes "\"There you go a special Desert Helmet!.\"";
 	close;
-L_noRoom:
-	mesn;
-	mes "\"You don't have enough room left for helmet... Please do spring cleaning in your inventory.\"";
-	close;
 
 L_Done1:
 	mesn;
diff --git a/npc/00000SAVE/016-1_paxel.txt b/npc/00000SAVE/016-1_paxel.txt
deleted file mode 100644
index e3675fc09..000000000
--- a/npc/00000SAVE/016-1_paxel.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-// TODO IMPORTANT: We don't use raw coal, so this NPC need to change a bit
-
-016-1,40,39,0	script	Paxel	NPC141,{
-    @Cost_With_Logs = 2000;
-    @Cost_Without_Logs = 3000;
-    @Logs_Needed = 5;
-    @Coal_Per = 5;
-
-    mes "[Paxel]";
-    mes "\"Hello traveler! I've been studying how to refine raw coal with pressure and heat from a wood firepit.";
-    mes "\"For " + @Cost_With_Logs + " gold, I can refine " + @Coal_Per + " Coal from a lump of Raw Coal and " + @Logs_Needed + " Raw Logs.";
-    mes "If you don't have any logs to spare, I can use my logs; but that will cost you " + @Cost_Without_Logs + " gold.\"";
-
-    menu
-        "I'd like you to use my logs.", L_Logs_Provided,
-        "Use your logs, please.", L_No_Logs_Provided,
-        "I don't want to refine any coal today.", L_close;
-
-L_Logs_Provided:
-    @Log_Mult = @Logs_Needed;
-    @Cost_Mult = @Cost_With_Logs;
-    goto L_Check_Items;
-
-L_No_Logs_Provided:
-    @Log_Mult = 0;
-    @Cost_Mult = @Cost_Without_Logs;
-    goto L_Check_Items;
-
-L_Check_Items:
-    mes "[Paxel]";
-    mes "\"How many lumps of Raw Coal do you want refined?\"";
-
-    input @refine_count;
-
-    if (@refine_count == 0) goto L_Bye;
-    if (@refine_count > countitem("RawCoal") || @refine_count * @Log_Mult > countitem("RawLog")) goto L_MissingItems;
-    if (@refine_count * @Cost_Mult > Zeny) goto L_NoMoney;
-    getinventorylist;
-    if (@inventorylist_count == 100 && countitem("Coal") == 0) goto L_NoSpace;
-
-    delitem "RawCoal", @refine_count;
-    delitem "RawLog", @refine_count * @Log_Mult;
-    Zeny = Zeny - (@refine_count * @Cost_Mult);
-
-    getitem "Coal", @refine_count * @Coal_Per;
-    goto L_Bye;
-
-
-L_MissingItems:
-    mes "[Paxel]";
-    mes "\"You are missing some of the raw materials.\"";
-    goto L_close;
-
-L_NoMoney:
-    mes "[Paxel]";
-    mes "\"You can't afford that much work! Do some odd jobs and come back.\"";
-    goto L_close;
-
-
-L_NoSpace:
-    mes "[Paxel]";
-    mes "\"You won't have enough space for the refined Coal. Better come back later.\"";
-    goto L_close;
-
-
-L_Bye:
-    mes "[Paxel]";
-    mes "\"Have a good day and come again soon!\"";
-    goto L_close;
-
-L_close:
-    close;
-}