From 2cd832ea08834f56c81b18e664a8d58b36679fc2 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Fri, 22 Jun 2018 02:41:10 -0300
Subject: Adapting Swezanne to a smarter logic was more difficult.

---
 npc/003-1/silvia.txt   |  2 +-
 npc/003-1/swezanne.txt | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/npc/003-1/silvia.txt b/npc/003-1/silvia.txt
index 7d9056b50..b6b62f414 100644
--- a/npc/003-1/silvia.txt
+++ b/npc/003-1/silvia.txt
@@ -8,7 +8,7 @@
 if (strcharinfo(0) == $MOST_HEROIC$) npctalk l("Oh my, the great @@ has come to talk to me!", $MOST_HEROIC$);
 if (getq(TulimsharQuest_Swezanne) == 4) goto L_Message;
 if (getq(TulimsharQuest_Swezanne) == 1 && getq(TulimsharQuest_Lifestone) < 2) goto L_Lifestone;
-if (getq(TulimsharQuest_Swezanne) == 2) goto L_Unallowed;
+if (getq2(TulimsharQuest_Swezanne) < gettimetick(2)) goto L_Unallowed;
 if (strcharinfo(0) != $MOST_HEROIC$) hello;
 end;
 
diff --git a/npc/003-1/swezanne.txt b/npc/003-1/swezanne.txt
index 54b09ed0f..2b6393afd 100644
--- a/npc/003-1/swezanne.txt
+++ b/npc/003-1/swezanne.txt
@@ -1,6 +1,8 @@
 // TMW-2 Script
 // Author:
 //    Jesusalva
+// Note:
+//    DO NOT USE QUEST STATUS 2. Thing from past.
 
 003-1,70,100,0	script	Swezanne	NPC_FEMALE,{
     .@q=getq(TulimsharQuest_Swezanne);
@@ -8,10 +10,8 @@
     mesq l("Hi.");
     next;
     if (.@q == 0) goto L_Quest;
-    if (.@q == 1 && gettimetick(2) >= SWEZANNE_TIMER + 60 * 60 * 24) setq TulimsharQuest_Swezanne, 2;
-    .@q=getq(TulimsharQuest_Swezanne);
-    if (.@q == 2) goto L_Repeat;
     else if (.@q == 3) goto L_Silvia;
+    else if (getq2(TulimsharQuest_Swezanne) >= gettimetick(2)) goto L_Repeat;
     mesq l("I fight every day in hopes to meet Andrei, the famous hero who prevented Hurnscald from total destruction against a horde of monsters alone.");
     if ($MOST_HEROIC$ != "") goto L_Heroics;
     close;
@@ -55,7 +55,7 @@ L_Finish2:
     getexp 37, 0;
     Zeny = (Zeny + 220); // 5*35 = 175 base
     setq TulimsharQuest_Swezanne, 1;
-    set SWEZANNE_TIMER, gettimetick(2);
+    setq2 TulimsharQuest_Swezanne, gettimetick(2)+60*60*24;
     close;
 
 L_Finish:
@@ -63,7 +63,7 @@ L_Finish:
     getexp 63, 4; // 4 Job points! A great reward.
     Zeny = (Zeny + 150); // 5*25 = 125 base
     setq TulimsharQuest_Swezanne, 3;
-    set SWEZANNE_TIMER, gettimetick(2);
+    setq2 TulimsharQuest_Swezanne, gettimetick(2)+60*60*24;
     close;
 
 L_Silvia:
-- 
cgit v1.2.3-60-g2f50