diff options
| -rw-r--r-- | npc/003-10/guarddevoir.txt | 3 | ||||
| -rw-r--r-- | npc/003-4/sorfina.txt | 3 | ||||
| -rw-r--r-- | npc/007-1/dracoula.txt | 3 | ||||
| -rw-r--r-- | npc/012-2/helena.txt | 4 | ||||
| -rw-r--r-- | npc/015-3/arkim.txt | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/npc/003-10/guarddevoir.txt b/npc/003-10/guarddevoir.txt index 8935c637d..67fd3e18c 100644 --- a/npc/003-10/guarddevoir.txt +++ b/npc/003-10/guarddevoir.txt @@ -29,7 +29,8 @@ L_Quest: mesq l("Nice! I want you to kill some red scorpions, as I said!"); next; if (.@q == 0) goto L_Continue; - if (santime() >= getq2(TulimsharQuest_Devoir) + 60 * 60 * 36 || gcsantime()) goto L_Repeat; // Repats every 36 hours + .@q2=getq2(TulimsharQuest_Devoir) + 60 * 60 * 36; + if (santime() >= .@q2 || gcsantime(.@q2)) goto L_Repeat; // Repats every 36 hours mesn; mesq l("But, it wouldn't look nice if I let you do all the killing! The other guards are working right now!"); next; diff --git a/npc/003-4/sorfina.txt b/npc/003-4/sorfina.txt index 9133baca3..e5d8d07e4 100644 --- a/npc/003-4/sorfina.txt +++ b/npc/003-4/sorfina.txt @@ -48,7 +48,8 @@ L_Trouble: L_Basement: if (BaseLevel < 13) goto L_TooWeak; - if (getq3(TulimsharQuest_Hasan) > santime() || gcsantime()) goto L_Wait; + .@q3=getq3(TulimsharQuest_Hasan); + if (.@q3 > santime() || gcsantime(.@q3)) goto L_Wait; mesn; mesq l("There's one on the basement of this house. If you kill it, Hasan will think on you as a hero and won't steal you anymore."); next; diff --git a/npc/007-1/dracoula.txt b/npc/007-1/dracoula.txt index a40959df9..7dec2bee4 100644 --- a/npc/007-1/dracoula.txt +++ b/npc/007-1/dracoula.txt @@ -40,7 +40,8 @@ L_Quest: next; } if (.@q == 0) goto L_Continue; - if (santime() >= getq2(MineQuest_Dracoula) + 60 * 60 * 23 || gcsantime()) goto L_Repeat; + .@q2=getq2(MineQuest_Dracoula) + 60 * 60 * 23; + if (santime() >= .@q2 || gcsantime(.@q2)) goto L_Repeat; mesn; mesq l("But come back in a few hours, I didn't lost all @@!", getitemlink(BatTeeth)); close; diff --git a/npc/012-2/helena.txt b/npc/012-2/helena.txt index 5d1d7cd29..290e5e6b6 100644 --- a/npc/012-2/helena.txt +++ b/npc/012-2/helena.txt @@ -41,8 +41,8 @@ L_Daily: mesq l("Ah, @@, my friend! Are you here to help us with 5 @@? Or perhaps you have 5 more @@ to show that Hurnscald is getting safer?", strcharinfo(0), getitemlink(TreasureKey), getitemlink(BanditHood)); mes ""; select - rif((.@k < santime() || gcsantime()) && countitem(TreasureKey) >= 5, l("I have 5 Treasure keys with me.")), - rif((.@h < santime() || gcsantime()) && countitem(BanditHood) >= 5, l("I have 5 Bandit Hoods with me.")), + rif((.@k < santime() || gcsantime(.@k)) && countitem(TreasureKey) >= 5, l("I have 5 Treasure keys with me.")), + rif((.@h < santime() || gcsantime(.@h)) && countitem(BanditHood) >= 5, l("I have 5 Bandit Hoods with me.")), l("Nothing at the moment."); mes ""; switch (@menu) { diff --git a/npc/015-3/arkim.txt b/npc/015-3/arkim.txt index 5ae702ff2..2f5602cc8 100644 --- a/npc/015-3/arkim.txt +++ b/npc/015-3/arkim.txt @@ -25,7 +25,7 @@ L_Loop: mesq l("I am doing a great research with Bats, and thus far I collected @@ Bat Wings and Teeths.", $ARKIM_ST); next; // It was yesterday - if (.@q3 < $@ARKIM_QTIMER || gcsantime()) { + if (.@q3 < $@ARKIM_QTIMER || gcsantime(.@q3)) { setq2 HurnscaldQuest_Arkim, 0; setq3 HurnscaldQuest_Arkim, $@ARKIM_QTIMER; } |