Npcs remaining script fixes

Npcs changed for travel
Npcs changed for new maps
Npcs changed for basic crypts

5 files changed, 48 insertions, 173 deletions

diff --git a/world/map/npc/027-2/alacrius.txt b/world/map/npc/027-2/alacrius.txt
index d8b2b513..8c4b3802 100644
--- a/world/map/npc/027-2/alacrius.txt
+++ b/world/map/npc/027-2/alacrius.txt
@@ -1,43 +1,13 @@
-//Starts the reaper quest
-//(incomplete, use alacrius2.txt instead)
-//To enable: sed 's_^// __' -i npc/027-2/alacrius.txt
-
-//027-2.gat,107,29,0|script|Alacrius|313,
-//{
-//     // if started, go to started
-//     // if fail go to failed
-//     // if complete go to complete
-//     // if cooldown go to cooldown
-
-// // start quest section
-//     mes "Hi, want to fight the reaper?";
-//     menu
-//     "Let's go!",L_START,
-//     "No, thank you.",-;
-//     close;
-
-// L_START:
-//     monster "027-4.gat",40,55,"Reaper Quest",1067,1,"Reaper::OnDead";
-//     enablenpc "#gatecontrol";
-//     enablenpc "#closedgate";
-//     disablenpc "#opengate";
-// // Open doors to reaper level
-//     warp "027-3.gat",41,70;
-//     initnpctimer;
-//     close;
-
-// // 5 min mark for testing purposes, up it when finished.
-// OnTimer300000:
-//     mapwarp "027-3.gat", "027-2.gat",104,41;
-//     mapwarp "027-4.gat", "027-2.gat",104,41;
-//     killmonsterall "027-4.gat";
-//     end;
-// OnTimer301000:
-//     npctalk "You have failed the mission.";
-//     end;
-
-// // cooldown before the quest can be restarted
-// OnTimer360000:
-//     // set quest var
-//     end;
-// }
+// Author: wushin
+//Starts Crypt Quest
+
+027-2.gat,122,105,0|script|Alacrius|313,
+{
+    mes "[Alacrius]";
+    mes "\"Hello, I'm Alacrius. \"";
+    next;
+    mes "\"A very long time ago, I figured a way to cheat death and the limits of time and space. You may think it is evil, but I did it because of true love... \"";
+    next;
+    mes "\"The reaper kidnapped my beloved wife, and took her to the underworld.  I had to find a way to stop him, and as time went by, I became what you can see now... But if you dare to cheat death, time and space you'll have to pay a high price... \"";
+    close;
+}
diff --git a/world/map/npc/027-2/alacrius2.txt b/world/map/npc/027-2/alacrius2.txt
deleted file mode 100644
index 94607b2d..00000000
--- a/world/map/npc/027-2/alacrius2.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-//Starts the reaper quest
-//To enable: sed 's_^// __' -i npc/027-2/alacrius2.txt
-
-// 027-2.gat,107,29,0|script|Alacrius|313,
-// {
-//     if ($@FIGHT_ALACRIUS_STATUS != 0) goto L_Enjoy;
-
-
-//    mes "[Alacrius]";
-//    mes "\"Hello, I'm Alacrius. \"";
-//    next;
-//    mes "[Alacrius]";
-//    mes "\"A very long time ago, I figured a way to cheat death and the limits of time and space. You may think it is evil, but I did it because of true love... \"";
-//    next;
-//    mes "[Alacrius]";
-//    mes "\"The reaper kidnapped my beloved wife, and took her to the underworld.  I had to find a way to stop him, and as time went by, I became what you can see now... But if you dare to cheat death, time and space you'll have to pay a high price... \"";
-//    next;
-//    mes "[Alacrius]";
-//    mes "\"Being away from time and space doesn't allow me to try to save my beloved wife... I need your help. Do you think you have what it takes to handle the most powerful monsters over the world of Mana? \"";
-//    next;
-//    menu
-//       "Let's go!",L_PLAY_OK,
-//       "No, thank you.",-;
-//    close;
-
-// L_PLAY_OK:
-
-//    if ($@FIGHT_ALACRIUS_STATUS != 0)
-//        goto L_AlreadyStarted;
-//    set $@FIGHT_ALACRIUS_STATUS, 1;
-//    set $@MO_REAPER, 0;
-//    startnpctimer;
-//    set @PRIZE, 1;
-
-//    goto L_Exit;
-
-// L_Enjoy:
-//    if ($@MO_REAPER == 1) goto L_AllDead;
-//    mes "[Alacrius]";
-//    mes "\"...Please hurry up, the time is running...\"";
-//    goto L_Exit;
-
-// L_AlreadyStarted:
-//    mes "[Alacrius]";
-//    mes "\"The Reaper is alive.\"";
-//    goto L_Exit;
-
-// L_Exit:
-//    close;
-//    end;
-
-
-// // Time to fight
-// OnTimer10000:
-
-//    monster "027-2.gat",0,0,"Reaper Quest",1111,1,"Alacrius::OnDeadReaper";
-//    end;
-
-// OnDeadReaper:
-//    set $@MO_REAPER, $@MO_REAPER + 1;
-//    killmonster "027-2.gat","All";
-//    end;
-
-// OnDeadLost:
-//    set $@MO_LOST, $@MO_LOST + 1;
-//    end;
-
-
-// OnTimer120000:
-
-//    set $@MO_REAPER,0;
-//    set $@FIGHT_ALACRIUS_STATUS, 0;
-//    killmonster "027-2.gat","All";
-//    stopnpctimer;
-//    setnpctimer 0;
-//    set @PRIZE, 0;
-//    npctalk "Oh my beloved wife, you could not be rescued! I will have to purge my mistakes again...";
-//    npctalk "Please, help my beloved wife!!";
-
-//    end;
-
-// OnDead:
-//    end;
-
-
-// L_AllDead:
-//    if(@PRIZE == 0)
-//        goto L_NOHERO;
-
-//    getinventorylist;
-//    if (@inventorylist_count == 100)
-//        goto L_TooMany;
-//    getitem "CasinoCoins", 1;
-
-//    mes "[Alacrius]";
-//    mes "Thank you very much, you saved my love!! Here you are, a prize according to the dangers you've been exposed to.";
-//    set @PRIZE , 0;
-//    set $@MO_REAPER,0;
-//    close;
-//    end;
-
-// L_TooMany:
-//    mes "[Alacrius]";
-//    mes "You have no room for the reward.";
-//    close;
-
-// L_NOHERO:
-//    mes "[Alacrius]";
-//    mes "Sorry, but you didn't save my love... Try it again when you're ready...";
-//    close;
-//    end;
-// OnInit:
-//    initnpctimer;
-//    stopnpctimer;
-// }
diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt
index bd28a0a5..05c887cd 100644
--- a/world/map/npc/027-2/caretaker.txt
+++ b/world/map/npc/027-2/caretaker.txt
@@ -55,15 +55,12 @@ L_Favor:
 L_Receive:
     set QUEST_Graveyard_Caretaker, 2;
     mes "You receive the letter and put it in a special place so it doesn't get lost in your inventory.";
-    if (@menu == 2)
-        goto L_Location;
-    close;
-
-L_Location:
     next;
-    goto L_Location_Real;
+    if (@menu != 2)
+        close;
+    goto L_Location;
 
-L_Location_Real:
+L_Location:
     mes "[Caretaker]";
     mes "\"Her name is Airlia. She works at the town hall in Hurnscald. Thank you for your help.\"";
     close;
@@ -75,7 +72,7 @@ L_Has_Letter:
     menu
         "Not yet.", L_Close,
         "I'll get there when I get there.", L_Close,
-        "Where did you say I could find her?", L_Location_Real;
+        "Where did you say I could find her?", L_Location;
 
 L_Delivered_Letter:
     mes "[Caretaker]";
@@ -106,6 +103,9 @@ L_Give_New_Letter_Real:
     mes "\"Thank you.\"";
     close;
 
+L_Close:
+    close;
+
 OnTimer3000:
     monster "027-2.gat", 29, 21, "Caretaker's Wife", 1044, 1, "Caretaker::OnWifeDeath";
     stopnpctimer;
@@ -122,7 +122,4 @@ OnWifeDeath:
     gmcommand "@ban +5mn " + strcharinfo(0);
     initnpctimer;
     end;
-
-L_Close:
-    close;
 }
diff --git a/world/map/npc/027-2/golbenez.txt b/world/map/npc/027-2/golbenez.txt
index 082b7a7d..9d7bdb3a 100644
--- a/world/map/npc/027-2/golbenez.txt
+++ b/world/map/npc/027-2/golbenez.txt
@@ -296,17 +296,17 @@ L_Soul:
     goto L_Soul_Try;
 
 L_Soul_Try:
-    if (countitem("JackOSoul") < 1)
+    if (countitem("Soul") < 1)
         menu
             "I'll go and get one.",L_Close;
     menu
-        "What about this Jack O Soul?",L_TryThisSoul,
+        "What about this Soul?",L_TryThisSoul,
         "I'll go and try to find a soul.",L_Close;
 
 L_TryThisSoul:
-    if (countitem("JackOSoul") < 1)
+    if (countitem("Soul") < 1)
         goto L_Betray;
-    delitem "JackOSoul", 1;
+    delitem "Soul", 1;
     set @soul, rand(50);
     if (@soul == 0)
         goto L_Soul_Success;
diff --git a/world/map/npc/027-2/thurston.txt b/world/map/npc/027-2/thurston.txt
new file mode 100644
index 00000000..0778c7ec
--- /dev/null
+++ b/world/map/npc/027-2/thurston.txt
@@ -0,0 +1,23 @@
+// Vampire Bat Wings Daily
+
+027-2.gat,100,105,0|script|Thurston|302,
+{
+    set @dq_level, 60;
+    set @dq_cost, 45;
+    set @dq_count, 20;
+    set @dq_name$, "VampireBatWing";
+    set @dq_friendly_name$, "Vampire Bat Wing";
+    set @dq_money, 4000;
+    set @dq_exp, 1000;
+
+    callfunc "DailyQuest";
+
+    set @dq_level, 0;
+    set @dq_cost, 0;
+    set @dq_count, 0;
+    set @dq_name$, "";
+    set @dq_friendly_name$, "";
+    set @dq_money, 0;
+    set @dq_exp, 0;
+    close;
+}