Maintenance quest-related

6 files changed, 21 insertions, 21 deletions

diff --git a/db/quest_db.conf b/db/quest_db.conf
index b51cfe8d2..517cd2539 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -96,7 +96,7 @@ quest_db: (
 },
 {
     Id: 35
-    Name: "CandorQuest_Apana"
+    Name: "CandorQuest_Rosen"
 },
 {
     Id: 36
@@ -108,7 +108,11 @@ quest_db: (
 },
 {
     Id: 38
-    Name: "CandorQuests_Vincent"
+    Name: "CandorQuest_Vincent"
+},
+{
+    Id: 39
+    Name: "CandorQuest_Trainer"
 },
 
 // ID 51 to 70: Tulimshar quests
diff --git a/npc/002-4/elmo.txt b/npc/002-4/elmo.txt
index d95f3e8b0..57310866d 100644
--- a/npc/002-4/elmo.txt
+++ b/npc/002-4/elmo.txt
@@ -38,7 +38,7 @@
         mes l("- Some of our crew are missing. They're probably wasting their time at beach.");
 
     // Vincent Quest
-    .@q=getq(CandorQuests_Vincent);
+    .@q=getq(CandorQuest_Vincent);
     if (.@q < 2)
         mes l("- I overheard rumors about a festival. Maybe someone needs help with their figurine?");
 
diff --git a/npc/002-4/nard.txt b/npc/002-4/nard.txt
index 47a5e54ae..657363ed4 100644
--- a/npc/002-4/nard.txt
+++ b/npc/002-4/nard.txt
@@ -145,7 +145,7 @@ L_Travel:
     if (getq(CandorQuest_Barrel) == 4 &&
         getq(CandorQuest_HAS) == 3 &&
         getq(CandorQuest_Sailors) == 3 &&
-        getq(CandorQuests_Vincent) == 2)
+        getq(CandorQuest_Vincent) == 2)
             .@price-=500;
     mesn;
     mesq l("Hi @@.", strcharinfo(0));
diff --git a/npc/005-1/vincent.txt b/npc/005-1/vincent.txt
index cf1b83251..013d553bc 100644
--- a/npc/005-1/vincent.txt
+++ b/npc/005-1/vincent.txt
@@ -2,7 +2,7 @@
 // Authors:
 //    Saulc
 // Variables:
-//    CandorQuests_Vincent  - quest var
+//    CandorQuest_Vincent  - quest var
 
 
 005-1,92,95,0	script	Vincent	NPC_PLAYER,{
@@ -11,7 +11,7 @@
     .LegsID = BugLeg;
     .LegsCount = 12;
 
-    .@q = getq(CandorQuests_Vincent);
+    .@q = getq(CandorQuest_Vincent);
     if (.@q == 1) goto L_CheckItems;
     if (.@q == 2) goto L_QuestDone;
 
@@ -23,7 +23,7 @@
                    l("Sorry, I'm doing other things at the moment.")))
     {
         case 1:
-            setq CandorQuests_Vincent, 1;
+            setq CandorQuest_Vincent, 1;
             speech S_FIRST_BLANK_LINE,
                 l("Thank you. I'll wait here.");
             close;
@@ -49,7 +49,7 @@ L_CheckItems:
     delitem .LegsID, .LegsCount;
     Zeny = Zeny + 1000;
     message strcharinfo(0), l("You receive @@ GP!", 1000);
-    setq CandorQuests_Vincent, 2;
+    setq CandorQuest_Vincent, 2;
     close;
 
 L_QuestDone:
diff --git a/npc/005-4/rosen.txt b/npc/005-4/rosen.txt
index e42e30bd2..8c682c3a6 100644
--- a/npc/005-4/rosen.txt
+++ b/npc/005-4/rosen.txt
@@ -2,24 +2,20 @@
 // Author:
 //    Saulc
 // Description:
-//    Light Armor shop keeper.
+//    Candor Armor&Weapon shop keeper. The quest is currently broken.
 // Variables:
-//    CandorQuests_Rosen
+//    CandorQuest_Rosen
 // Values:
-//    0    Default.
-//    1    BlackSmith quest delivered.
-//    2    Chelios Quest given.
-//    3    Chelios Quest done.
-//    4    BlackSmith gave the sword.
-//    5    Light Armor Shop quest delivered.
-//    6    Light Armor Shop gave the cloths.
+//    0    Default
+//    5    Broken dialog node
+//    6    Broken dialog node
 
 005-4,29,36,0	script	Rosen	NPC_GUARD1,{
 
     function explain_ironingot {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("Did you see Jhedia the blacksmith in Tulimshar? He might know how you could get this."),
-            l("Nevertheless, you can sap it on Bif, if you are lucky.");
+            l("Nevertheless, you probably need some base materials from Bif. Who knows what it will drop if you are lucky?");
 
         return;
     }
@@ -30,7 +26,7 @@
 
         narrator S_LAST_NEXT, l("You pick up the package.");
 
-        setq CandorQuests_Rosen, 6;
+        setq CandorQuest_Rosen, 6;
 
         return;
     }
@@ -41,7 +37,7 @@
 
     do
     {
-        .@rosen = getq(CandorQuests_Rosen);
+        .@rosen = getq(CandorQuest_Rosen);
         select
             rif(.@rosen == 5, lg("I came to retrieve a package for Rosen.")),
             menuaction(l("Trade")),
diff --git a/npc/005-4/tolchi.txt b/npc/005-4/tolchi.txt
index 4e45e1fe9..1ceb84e02 100644
--- a/npc/005-4/tolchi.txt
+++ b/npc/005-4/tolchi.txt
@@ -3,7 +3,7 @@
 //    Saulc
 //    Jesusalva
 // Variables:
-//    CandorQuests_Tolchi
+//    CandorQuest_Tolchi
 // Description:
 //   Tolchi crafts weapons at Rosen & Tolchi shop
 // Values: