Track the repeatable quests in Candor and Tulimshar on the ship (except C. Cave)

Tweak Swezanne and Dracoula daily rewards.

5 files changed, 38 insertions, 7 deletions

diff --git a/npc/002-3/note.txt b/npc/002-3/note.txt
index 32cdf4d15..112833bf9 100644
--- a/npc/002-3/note.txt
+++ b/npc/002-3/note.txt
@@ -10,6 +10,7 @@
 //    A small note presenting the rules and game-world release notes of TMW-2.
 
 002-3,40,25,0	script	Note#johanne	NPC_PAPER_NOTE,{
+    function questTracker;
     narrator S_LAST_NEXT,
             l("The La Johanne always have interesting notes.");
 
@@ -18,6 +19,7 @@
             l("Read the News."),
             l("Read the Rules."),
             rif($EVENT$ != "", l("Event Information")),
+            l("Read the Announcements."),
             l("Leave.");
 
         switch (@menu) {
@@ -30,9 +32,11 @@
             case 3:
                 EventHelp();
                 break;
-
+            case 4:
+                questTracker();
+                break;
         }
-    } while (@menu != 4);
+    } while (@menu != 5);
 
 
     narrator S_NO_NPC_NAME,
@@ -45,6 +49,26 @@
 
     close;
 
+function questTracker {
+    if (LOCATION$ == "Candor") {
+        mesc l("%s is offering %s %s.", l("Ayasha"), l("to rent her"), getitemlink(Judgement));
+        mesc l("%s requests %d %s.", l("Liana"), 10, getitemlink(MaggotSlime));
+    /////////////////////////////////////////////////////////////////////////////
+    } else if (LOCATION$ == "Tulim") {
+        mesc l("%s is offering %s %s.", l("Maxime"), l("to bake"), getitemlink(TonoriDelight));
+        mesc l("%s is offering %s %s.", l("Professor"), l("experience"), l("for listening his class"));
+        mesc l("%s is offering %s %s.", l("Kreist"), l("daily bounties"), l("for adventurers"));
+        mesc l("%s is offering %s %s.", l("Ishi"), l("to exchange monster points"), "");
+        mesc l("%s is offering %s %s.", l("Eleanore"), l("to craft"), getitemlink(Lifestone));
+        mesc l("%s requests %d %s.", l("Guard Devoir"), 7, getitemlink(RedScorpionStinger));
+        mesc l("%s requests %d %s.", l("Eugene"), 1, getitemlink(GrassCarp));
+        mesc l("%s requests %d %s.", l("Sarah"), 5, getitemlink(CherryCake));
+        mesc l("%s requests %d %s.", l("Swezanne"), 5, getitemlink(CactusPotion));
+        mesc l("%s requests %d %s.", l("Dracoula"), 11, getitemlink(BatTeeth));
+    }
+    return;
+}
+
 OnInit:
     .distance = 2;
     end;
diff --git a/npc/003-1/sarah.txt b/npc/003-1/sarah.txt
index 38fd2876b..44f473d57 100644
--- a/npc/003-1/sarah.txt
+++ b/npc/003-1/sarah.txt
@@ -38,7 +38,8 @@
 // Quest completed
 function quest_completed {
     if (getq2(TulimsharQuest_Sarah) != gettimeparam(GETTIME_DAYOFMONTH)) {
-        .@price = getiteminfo(CherryCake, ITEMINFO_SELLPRICE) * 4;
+        // Reward base is the same as Eugene: 1× + 500%
+        .@price = getiteminfo(CherryCake, ITEMINFO_SELLPRICE) * 6;
         mesn;
         mesq l("Hey, I remember you! You brought me cake the other day!");
         next;
diff --git a/npc/003-1/swezanne.txt b/npc/003-1/swezanne.txt
index 8e40d6393..ea3257b63 100644
--- a/npc/003-1/swezanne.txt
+++ b/npc/003-1/swezanne.txt
@@ -66,13 +66,15 @@ L_Repeat:
 L_Finish2:
     delitem CactusPotion, 5;
     getexp 37, 0;
-    Zeny = (Zeny + 350); // 5*35 = 175 base (+100%)
+    // Bonus: +400%
+    .@price = getiteminfo(CactusPotion, ITEMINFO_SELLPRICE) * 5 * 4;
+    Zeny += .@price;
     .@q3=getq3(TulimsharQuest_Swezanne)+1;
     setq2 TulimsharQuest_Swezanne, gettimetick(2)+60*60*24;
     setq3 TulimsharQuest_Swezanne, .@q3;
     if (!(.@q3 % 30)) {
         //inventoryplace MercCard_Swezanne, 1;
-        getitem MercCard_Swezanne, 1;
+        getitem MercCard_Swezanne, 10;
         mesn;
         mesq l("Thanks for helping me this month. Here is my card, just call me if you need.");
     }
diff --git a/npc/007-1/dracoula.txt b/npc/007-1/dracoula.txt
index 323fd7887..be6d2aa6e 100644
--- a/npc/007-1/dracoula.txt
+++ b/npc/007-1/dracoula.txt
@@ -83,7 +83,7 @@ L_Repeat:
 // First Time Only
 L_Finish:
     delitem BatTeeth, 20;
-    getexp 666, 5; // 20 / 18% = 111 kills * 15 xp = 1665 xp gained from killing. (40% bonus)
+    getexp 667, 5; // 20 / 18% = 111 kills * 15 xp = 1665 xp gained from killing. (40% bonus)
     Zeny = (Zeny + 600); // 10*20 = 200 base (300% bonus)
     setq MineQuest_Dracoula, 1, santime();
     mes "";
@@ -95,7 +95,9 @@ L_Finish:
 L_Finish2:
     delitem BatTeeth, 11;
     getexp 275, 1; // 11 / 18% = 61 kills * 15 xp = 915 xp gained from killing. (30% bonus)
-    Zeny = (Zeny + 220); // 10*11 = 110 base (200% bonus)
+    // Bonus: +300%
+    .@price = getiteminfo(BatTeeth, ITEMINFO_SELLPRICE) * 11 * 3;
+    Zeny += .@price;
     setq MineQuest_Dracoula, 1, santime();
     mes "";
     mesn;
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 398553459..48f5ca398 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -1084,6 +1084,8 @@ function	script	clientupdater	{
         }
         if (getq(HurnscaldQuest_ForestBow))
             getitem TrainingArrow, 220;
+        if (getq3(TulimsharQuest_Swezanne) > 30)
+            getitem MercCard_Swezanne, 9 * (getq3(TulimsharQuest_Swezanne)/30);
     }
 
     // :// End of Regular Update System