Update Elmo with remaining Candor quests and prepare Maya for extension

2 files changed, 20 insertions, 1 deletions

diff --git a/npc/002-4/elmo.txt b/npc/002-4/elmo.txt
index 2068b2880..5d3a1673e 100644
--- a/npc/002-4/elmo.txt
+++ b/npc/002-4/elmo.txt
@@ -55,6 +55,16 @@
     if (.@q < 2)
         mes l("- I overheard rumors about a festival. Maybe someone needs help with their figurine?");
 
+    // Tolchi Quest
+    .@q=getq(CandorQuest_Tolchi);
+    if (.@q < 2)
+        mes l("- The weapon master, Tolchi, could use your help. But she will most likely force you to visit Tulimshar in the end.");
+
+    // Maya Quest
+    .@q=getq(CandorQuest_Maya);
+    if (.@q < 4)
+        mes l("- There is a woman walking on the island, called Maya. Once she realises you're willing to help, she'll start paying well.");
+
     // Ship Quests
     .@q1=getq(ShipQuests_Dan);
     .@q2=getq(ShipQuests_ChefGado);
diff --git a/npc/005-1/maya.txt b/npc/005-1/maya.txt
index 321436628..ed8794396 100644
--- a/npc/005-1/maya.txt
+++ b/npc/005-1/maya.txt
@@ -2,13 +2,16 @@
 // Author:
 //    Saulc
 //    GonzoDark
+//    Jesusalva
 // Variables:
 //    0    CandorQuest_Maya
 // Values:
 //    00   Default, no quest selected.
 //    01   First quest accepted: Need 3 cotton cloth and 3 maggot slime
 //    02   First quest completed: Reward Candor shirt
-//    03   wolvern tooth +20k + 2000monster point ->claw pendant
+//    03   Second quest accepted: Need
+//    04   Second quest completed: Reward
+//    05   wolvern tooth +20k + 2000monster point ->claw pendant
 
 005-1,42,37,0	script	Maya	NPC_RAIJIN_FEMALE_LEGION_ARTIS,{
     .@maya = getq(CandorQuest_Maya);
@@ -19,6 +22,12 @@
         goto L_QuestAccepted;
     if (.@maya == 2)
         goto L_NextQuestPending;
+    if (.@maya == 3)
+        goto L_NextQuestPending;
+    if (.@maya == 4)
+        goto L_NextQuestPending;
+    if (.@maya == 5)
+        goto L_NextQuestPending;
 
 L_QuestNotStarted:
     mesn;