test

4 files changed, 17 insertions, 26 deletions

diff --git a/db/quest_db.conf b/db/quest_db.conf
index f7cbd5a23..0fe65493f 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -196,6 +196,9 @@ quest_db: (
 {
     Id: 42
     Name: "TulimsharQuest_WaterForGuard"
+{
+    Id: 43
+    Name: "CandorQuest_Sailors"
 },
 {
 	Id: 1000
diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index 886b2a814..d86cf6a3a 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -2,7 +2,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/001-1/_mobs.txt",
 "npc/001-1/_warps.txt",
-"npc/001-1/apana.txt",
 "npc/001-1/artaxe.txt",
 "npc/001-1/beuss.txt",
 "npc/001-1/calypsan.txt",
diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt
index 730921ac0..179a9d67d 100644
--- a/npc/005-1/_import.txt
+++ b/npc/005-1/_import.txt
@@ -11,3 +11,4 @@
 "npc/005-1/soul-menhir.txt",
 "npc/005-1/warpcandorbattle.txt",
 "npc/005-1/zegas.txt",
+"npc/005-1/vincent.txt",
diff --git a/npc/001-1/apana.txt b/npc/005-1/vincent.txt
index 812ddfbea..dceb9ce52 100644
--- a/npc/001-1/apana.txt
+++ b/npc/005-1/vincent.txt
@@ -1,21 +1,17 @@
-// Evol scripts.
+// TMW2 scripts.
 // Authors:
 //    Saulc
-// Description:
-//   NPC test fork from moon
 // Variables:
-//    ArtisQuests_Apana  - quest var
-// Quest stages:
-//    0  - not started
-//    1  - started, searching for Bug Leg
-//    2  - quest finished
+//    CandorQuests_Vincent  - quest var
+
+
+005-1,92,95,0	script	Vincent	NPC_MONA,{
 
-001-1,86,110,0	script	apana	NPC_PLAYER,{
 
     .BaitID = BugLeg;
     .BaitCount = 12;
 
-    .@q = getq(ArtisQuests_Apana);
+    .@q = getq(CandorQuests_Vincent);
     if (.@q == 1) goto L_CheckItems;
     if (.@q == 2) goto L_QuestDone;
 
@@ -23,11 +19,11 @@
         l("I made a figurin with Bug legs."),
         lg("Be a friend and bring me @@ @@.", "Be a friend and bring me @@ @@.", .BaitCount, getitemlink(.BaitID));
 
-    switch (select(l("I'll be back in no time."),
+    switch (select(l("Ok, I'll be back in no time."),
                    l("Sorry, I'm doing other things at the moment.")))
     {
         case 1:
-            setq ArtisQuests_Apana, 1;
+            setq CandorQuests_Vincent, 1;
             speech S_FIRST_BLANK_LINE,
                 l("Thank you. I'll wait here.");
             close;
@@ -47,30 +43,22 @@ L_CheckItems:
     }
 
     speech
-        l("That's exactly what I needed!"),
-        l("To thank you, accept my old fishing rod."),
-        l("It's not as good as my new one, but still very useful."),
-        l("Just look at that water! There's a whole bunch of fish down there."),
-        l("Oh, and you will need this book too, it will help you learn the basics of fishing."),
-        lg("You might even get lucky, and get a @@.",
-           "You might even get lucky, and get a @@.", getitemlink(GrassCarp)),
-        l("Have a good time fishing!");
+        l("That's exactly what I needed!");
 
     delitem .BaitID, .BaitCount;
     Zeny = Zeny + 1000;
     message strcharinfo(0), l("You receive @@ E!", 1000);
-    setq ArtisQuests_Apana, 2;
+    setq CandorQuests_Vincent, 2;
     close;
 
 L_QuestDone:
-    // Idea for future: Eugene telling fishman jokes.
     speech
-        l("Ahoy, @@!", strcharinfo(0)),
-        l("Are the fish biting today?");
+        l("Hey, @@!", strcharinfo(0)),
+        l("My figurin is so nice !");
     close;
 
 OnInit:
     .sex = G_MALE;
     .distance = 3;
     end;
-}
\ No newline at end of file
+}