summaryrefslogtreecommitdiff
path: root/npc/003-1
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-07-15 01:07:15 -0300
committerJesusaves <cpntb1@ymail.com>2018-07-15 01:07:15 -0300
commit364e629ec881f2d702fac2173988499df7b62cbf (patch)
treec175f613693b915faa96ac5ef84b5413b136c7b3 /npc/003-1
parent20400fdbf1cd09300e7a6dc9ab444420c980bbb0 (diff)
downloadserverdata-364e629ec881f2d702fac2173988499df7b62cbf.tar.gz
serverdata-364e629ec881f2d702fac2173988499df7b62cbf.tar.bz2
serverdata-364e629ec881f2d702fac2173988499df7b62cbf.tar.xz
serverdata-364e629ec881f2d702fac2173988499df7b62cbf.zip
Fix Swezanne and Silvia. Found a bug at Silvia, and fixed it.
Diffstat (limited to 'npc/003-1')
-rw-r--r--npc/003-1/silvia.txt13
-rw-r--r--npc/003-1/swezanne.txt3
2 files changed, 9 insertions, 7 deletions
diff --git a/npc/003-1/silvia.txt b/npc/003-1/silvia.txt
index b6b62f414..8352c3aa0 100644
--- a/npc/003-1/silvia.txt
+++ b/npc/003-1/silvia.txt
@@ -5,12 +5,13 @@
003-1,109,150,0 script Silvia NPC_FEMALE,{
-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 (getq2(TulimsharQuest_Swezanne) < gettimetick(2)) goto L_Unallowed;
-if (strcharinfo(0) != $MOST_HEROIC$) hello;
-end;
+ 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 (.@q2 < santime() || gcsantime(.@q2)) goto L_Unallowed;
+ if (getq(TulimsharQuest_Swezanne) == 1 && getq(TulimsharQuest_Lifestone) < 2) goto L_Lifestone;
+ .@q2=getq2(TulimsharQuest_Swezanne);
+ if (strcharinfo(0) != $MOST_HEROIC$) hello;
+ end;
L_Message:
mesn strcharinfo(0);
diff --git a/npc/003-1/swezanne.txt b/npc/003-1/swezanne.txt
index 366682514..2b7d5ef3a 100644
--- a/npc/003-1/swezanne.txt
+++ b/npc/003-1/swezanne.txt
@@ -11,7 +11,8 @@
next;
if (.@q == 0) goto L_Quest;
else if (.@q == 3) goto L_Silvia;
- else if (getq2(TulimsharQuest_Swezanne) < gettimetick(2)) goto L_Repeat;
+ .@q2=getq2(TulimsharQuest_Swezanne);
+ else if (.@q2 < santime() || gcsantime(.@q2)) 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;