From 06548c90c8f7d213a683fd22cdaf01b6c99522da Mon Sep 17 00:00:00 2001
From: jesusalva <cpntb1@ymail.com>
Date: Wed, 14 Feb 2018 17:57:22 -0200
Subject: No discount for first travel, fix quest db, update Elmo, fix
 Vincent's typo.

---
 db/quest_db.conf      | 4 ++++
 npc/002-4/elmo.txt    | 5 +++++
 npc/002-4/nard.txt    | 9 +++++----
 npc/005-1/vincent.txt | 4 ++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/db/quest_db.conf b/db/quest_db.conf
index f7cbd5a23..0c1fcd572 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -197,6 +197,10 @@ quest_db: (
     Id: 42
     Name: "TulimsharQuest_WaterForGuard"
 },
+{
+    Id: 43
+    Name: "CandorQuest_Vincent"
+},
 {
 	Id: 1000
 	Name: "Test_testing1"
diff --git a/npc/002-4/elmo.txt b/npc/002-4/elmo.txt
index 0ce832109..18350dd09 100644
--- a/npc/002-4/elmo.txt
+++ b/npc/002-4/elmo.txt
@@ -34,6 +34,11 @@
     if (.@q < 3)
         mes l("- Some of our crew are missing. They're probably wasting their time at beach.");
 
+    // Vincent Quest
+    .@q=getq(CandorQuests_Vincent);
+    if (.@q < 2)
+        mes l("- I overheard rumors about a festival. Maybe someone needs help with their figurine?");
+
     close2;
     goodbye;
     end; // Just for good measure
diff --git a/npc/002-4/nard.txt b/npc/002-4/nard.txt
index 4ff1d1907..4e3c5e3f6 100644
--- a/npc/002-4/nard.txt
+++ b/npc/002-4/nard.txt
@@ -14,10 +14,6 @@
     .@price=2000;
 
 L_Checker:
-    if (getq(CandorQuest_Barrel) == 4 &&
-        getq(CandorQuest_HAS) == 3 &&
-        getq(CandorQuest_Sailors) == 3)
-            .@price-=500;
     if (.@narrator == 1) goto L_Travel;
     if (LOCATION$ != "") goto L_NotYet;
 
@@ -139,6 +135,11 @@ L_NotYet:
     close;
 
 L_Travel:
+    if (getq(CandorQuest_Barrel) == 4 &&
+        getq(CandorQuest_HAS) == 3 &&
+        getq(CandorQuest_Sailors) == 3 &&
+        getq(CandorQuests_Vincent) == 2)
+            .@price-=500;
     mesn;
     mesq l("Hi @@.", strcharinfo(0));
     next;
diff --git a/npc/005-1/vincent.txt b/npc/005-1/vincent.txt
index dceb9ce52..e990757cf 100644
--- a/npc/005-1/vincent.txt
+++ b/npc/005-1/vincent.txt
@@ -47,14 +47,14 @@ L_CheckItems:
 
     delitem .BaitID, .BaitCount;
     Zeny = Zeny + 1000;
-    message strcharinfo(0), l("You receive @@ E!", 1000);
+    message strcharinfo(0), l("You receive @@ GP!", 1000);
     setq CandorQuests_Vincent, 2;
     close;
 
 L_QuestDone:
     speech
         l("Hey, @@!", strcharinfo(0)),
-        l("My figurin is so nice !");
+        l("My figurin is so nice!");
     close;
 
 OnInit:
-- 
cgit v1.2.3-60-g2f50