summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/first_class/tu_archer.txt4
-rw-r--r--npc/quests/guildrelay.txt60
-rw-r--r--npc/quests/newgears/2010_headgears.txt2
-rw-r--r--npc/quests/partyrelay.txt6
-rw-r--r--npc/quests/quests_ein.txt4
-rw-r--r--npc/quests/quests_lighthalzen.txt8
-rw-r--r--npc/quests/quests_louyang.txt66
-rw-r--r--npc/quests/quests_moscovia.txt17
-rw-r--r--npc/quests/quests_umbala.txt6
-rw-r--r--npc/quests/the_sign_quest.txt19
10 files changed, 91 insertions, 101 deletions
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index c2b34db1a..2ca63f2f5 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -1400,7 +1400,7 @@ pay_arche,76,135,3 script #Target HIDDEN_NPC,{ end; }
- script ::Acolyte_Tu -1,{
mes "[Acolyte]";
if(tu_archer01 == 14){
- if(gettime(HOUR) >= 18 && gettime(HOUR) < 22){
+ if (gettime(GETTIME_HOUR) >= 18 && gettime(GETTIME_HOUR) < 22) {
mes "H-hello!";
mes "Umm, umm...";
mes "Are you R-Reidin Corse's";
@@ -1500,7 +1500,7 @@ pay_arche,76,135,3 script #Target HIDDEN_NPC,{ end; }
close;
}
} else if(tu_archer01 == 15){
- if((gettime(HOUR) >= 18) && (gettime(HOUR) < 22)){
+ if (gettime(GETTIME_HOUR) >= 18 && gettime(GETTIME_HOUR) < 22) {
mes "^666666Zzzzz...^000000";
mes "Wh-wha...?";
mes "Who are you?";
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index de61abad4..6c12574f0 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -70,7 +70,7 @@
if (strcharinfo(0) == getguildmaster(.@GID)) {
if (guildrelay_q == 100) {
if (guildtime > 22) {
- if ((gettime(HOUR) > 1) && (gettime(HOUR) < guildtime)) {
+ if (gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime) {
mes "[" + .@name$ + "]";
mes "Oh, you're back. So did you";
mes "rest up enough? I'm sure the";
@@ -127,7 +127,7 @@
}
}
else if (guildtime > 22) {
- if ((gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)) {
+ if (gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime) {
mes "[" + .@name$ + "]";
mes "Oh, you're back. So did you";
mes "rest up enough? I'm sure the";
@@ -182,8 +182,7 @@
mes "come back to me later.";
close;
}
- }
- else if ((gettime(HOUR) - guildtime) > 2) {
+ } else if (gettime(GETTIME_HOUR) - guildtime > 2) {
mes "[" + .@name$ + "]";
mes "Oh, you're back. So did you";
mes "rest up enough? I'm sure the";
@@ -240,7 +239,9 @@
}
}
else if (guildrelay_q == 150) {
- if (((guildtime > 22) && (gettime(HOUR) > 1) && (gettime(HOUR) < guildtime)) || ((guildtime > 21) && (gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)) || ((gettime(HOUR) - guildtime) > 2)) {
+ if ((guildtime > 22 && gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime)
+ || (guildtime > 21 && gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime)
+ || (gettime(GETTIME_HOUR) - guildtime > 2)) {
mes "[" + .@name$ + "]";
mes "Ah, you look well rested,";
mes "master. It is now time for";
@@ -304,12 +305,12 @@
}
}
else if (guildrelay_q == 25) {
- if (((guildtime > 22) && ((gettime(HOUR) > 4) && (gettime(HOUR) < guildtime)))
- || ((guildtime > 21) && ((gettime(HOUR) > 3) && (gettime(HOUR) < guildtime)))
- || ((guildtime > 20) && ((gettime(HOUR) > 2) && (gettime(HOUR) < guildtime)))
- || ((guildtime > 19) && ((gettime(HOUR) > 1) && (gettime(HOUR) < guildtime)))
- || ((guildtime > 18) && ((gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)))
- || ((gettime(HOUR) - guildtime) > 5)) {
+ if ((guildtime > 22 && gettime(GETTIME_HOUR) > 4 && gettime(GETTIME_HOUR) < guildtime)
+ || (guildtime > 21 && gettime(GETTIME_HOUR) > 3 && gettime(GETTIME_HOUR) < guildtime)
+ || (guildtime > 20 && gettime(GETTIME_HOUR) > 2 && gettime(GETTIME_HOUR) < guildtime)
+ || (guildtime > 19 && gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime)
+ || (guildtime > 18 && gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime)
+ || gettime(GETTIME_HOUR) - guildtime > 5) {
mes "[" + .@name$ + "]";
mes "Ah, have you rested well,";
mes "master? Please excuse my";
@@ -413,7 +414,7 @@
mes "Hand me the spirit, and allow";
mes "me to give you your guild's reward.";
delitem 7239,1; //Soul_Of_Proceeding
- guildtime = gettime(HOUR);
+ guildtime = gettime(GETTIME_HOUR);
guildrelay_q = 100;
.@incen_item = rand(1,100);
if ((.@incen_item > 0) && (.@incen_item < 25)) {
@@ -481,7 +482,7 @@
mes "challenges that you will all";
mes "face together. Good work!";
delitem 7245,1; //Soul_Of_Friendship
- guildtime = gettime(HOUR);
+ guildtime = gettime(GETTIME_HOUR);
guildrelay_q = 150;
.@incen_item = rand(1,100);
if ((.@incen_item > 0) && (.@incen_item < 16)) {
@@ -574,7 +575,7 @@
mes "Tristan III, and share it with";
mes "guild. Once again, good work.";
delitem 7251,1; //Soul_Of_Victory
- guildtime = gettime(HOUR);
+ guildtime = gettime(GETTIME_HOUR);
guildrelay_q = 25;
.@incen_item = rand(1,100);
if ((.@incen_item > 0) && (.@incen_item < 26)) {
@@ -1409,11 +1410,11 @@
mes "don't you worry about it.";
delitem 7235,1; //Soul_Of_Courage
guildrelay_q = 4;
- guildtime = gettime(HOUR);
+ guildtime = gettime(GETTIME_HOUR);
close;
}
if ((guildtime > 22) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
- if ((gettime(HOUR) > 2) && (gettime(HOUR) < guildtime)) {
+ if (gettime(GETTIME_HOUR) > 2 && gettime(GETTIME_HOUR) < guildtime) {
mes "[" + .@name$ + "]";
mes "I guess enough time";
mes "has passed. You ready";
@@ -1427,7 +1428,7 @@
}
}
if ((guildtime > 21) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
- if ((gettime(HOUR) > 0101) && (gettime(HOUR) < guildtime)) {
+ if (gettime(GETTIME_HOUR) > 0101 && gettime(GETTIME_HOUR) < guildtime) { // FIXME[Haru]: hour is clearly wrong
mes "[" + .@name$ + "]";
mes "I guess enough time";
mes "has passed. You ready";
@@ -1441,7 +1442,7 @@
}
}
if ((guildtime > 20) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
- if ((gettime(HOUR) > 0001) && (gettime(HOUR) < guildtime)) {
+ if (gettime(GETTIME_HOUR) > 0001 && gettime(GETTIME_HOUR) < guildtime) { // FIXME[Haru]: Hour is probably wrong
mes "[" + .@name$ + "]";
mes "I guess enough time";
mes "has passed. You ready";
@@ -1454,7 +1455,7 @@
close;
}
}
- if ((gettime(HOUR) - guildtime > 0300) && (guildrelay_q == 4) && (BaseJob == Job_Blacksmith)) {
+ if (gettime(GETTIME_HOUR) - guildtime > 0300 && guildrelay_q == 4 && BaseJob == Job_Blacksmith) { // FIXME[Haru]: Hour is clearly wrong
mes "[" + .@name$ + "]";
mes "I guess enough time";
mes "has passed. You ready";
@@ -1795,11 +1796,11 @@
mes "in order to be successful.";
delitem 7240,1; //Soul_Of_Confidence
guildrelay_q = 9;
- guildtime = gettime(HOUR);
+ guildtime = gettime(GETTIME_HOUR);
close;
}
if ((guildtime > 22) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
- if ((gettime(HOUR) > 02) && (gettime(HOUR) < guildtime)) {
+ if (gettime(GETTIME_HOUR) > 2 && gettime(GETTIME_HOUR) < guildtime) {
mes "[" + .@name$ + "]";
mes "So did you spend some";
mes "quality time with your";
@@ -1830,7 +1831,7 @@
}
}
else if ((guildtime > 21) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
- if ((gettime(HOUR) > 01) && (gettime(HOUR) < guildtime)) {
+ if (gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime) {
mes "[" + .@name$ + "]";
mes "So did you spend some";
mes "quality time with your";
@@ -1861,7 +1862,7 @@
}
}
else if ((guildtime > 20) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
- if ((gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)) {
+ if (gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime) {
mes "[" + .@name$ + "]";
mes "So did you spend some";
mes "quality time with your";
@@ -1890,8 +1891,7 @@
mes "dreams, passions, and goals!";
close;
}
- }
- else if ((gettime(HOUR) - guildtime > 3) && (guildrelay_q == 9) && (BaseJob == Job_Sage)) {
+ } else if (gettime(GETTIME_HOUR) - guildtime > 3 && guildrelay_q == 9 && BaseJob == Job_Sage) {
mes "[" + .@name$ + "]";
mes "So did you spend some";
mes "quality time with your";
@@ -2765,11 +2765,11 @@
mes "to your feelings this time...";
delitem 7249,1; //Soul_Of_Service
guildrelay_q = 21;
- guildtime = gettime(HOUR);
+ guildtime = gettime(GETTIME_HOUR);
close;
}
if ((guildtime > 22) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
- if ((gettime(HOUR) > 2) && (gettime(HOUR) < guildtime)) {
+ if (gettime(GETTIME_HOUR) > 2 && gettime(GETTIME_HOUR) < guildtime) {
mes "[" + .@name$ + "]";
mes "Yes. You've come at just";
mes "the right time. Remember";
@@ -2791,7 +2791,7 @@
}
}
if ((guildtime > 21) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
- if ((gettime(HOUR) > 1) && (gettime(HOUR) < guildtime)) {
+ if (gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime) {
mes "[" + .@name$ + "]";
mes "Yes. You've come at just";
mes "the right time. Remember";
@@ -2813,7 +2813,7 @@
}
}
if ((guildtime > 20) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
- if ((gettime(HOUR) > 0) && (gettime(HOUR) < guildtime)) {
+ if (gettime(GETTIME_HOUR) > 0 && gettime(GETTIME_HOUR) < guildtime) {
mes "[" + .@name$ + "]";
mes "Yes. You've come at just";
mes "the right time. Remember";
@@ -2834,7 +2834,7 @@
close;
}
}
- if ((gettime(HOUR) - guildtime > 3) && (guildrelay_q == 21) && (BaseJob == Job_Crusader)) {
+ if (gettime(GETTIME_HOUR) - guildtime > 3 && guildrelay_q == 21 && BaseJob == Job_Crusader) {
mes "[" + .@name$ + "]";
mes "Yes. You've come at just";
mes "the right time. Remember";
diff --git a/npc/quests/newgears/2010_headgears.txt b/npc/quests/newgears/2010_headgears.txt
index 3dfa0b754..34d1e8b2b 100644
--- a/npc/quests/newgears/2010_headgears.txt
+++ b/npc/quests/newgears/2010_headgears.txt
@@ -1036,7 +1036,7 @@ alberta,120,206,3 script Alonie#Solo_Play_Box 4_M_UMKID,{
mes "My affection-lacked student!";
mes "This is the end of your training!";
next;
- if (gettime(HOUR) < 12) {
+ if (gettime(GETTIME_HOUR) < 12) {
if (checkweight(Solo_Play_Box1,1) == 0) {
mes "[Alonie]";
mes "Playing outside with this heavy bag?";
diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt
index 0a0c3948c..151e5c193 100644
--- a/npc/quests/partyrelay.txt
+++ b/npc/quests/partyrelay.txt
@@ -401,7 +401,7 @@ payon,83,327,3 script Gatan#payon::RelayGatan 4_M_04,{
mes "instructions, didn't you?";
close;
}
- .@relaytime = gettime(HOUR);
+ .@relaytime = gettime(GETTIME_HOUR);
if (party_relay == 28) {
mes "[Gatan]";
mes "Say, I don't think it's";
@@ -1837,7 +1837,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{
mes "with any of the other guys?";
close;
}
- .@relaytime = gettime(HOUR);
+ .@relaytime = gettime(GETTIME_HOUR);
if (party_relay == 30) {
mes "[Bafhail]";
mes "Did you give that ticket";
@@ -2471,7 +2471,7 @@ payon,168,314,3 script Lospii#payon::RelayLospii 4_M_KID1,{
mes "have to meet either, but...";
close;
}
- .@relaytime = gettime(HOUR);
+ .@relaytime = gettime(GETTIME_HOUR);
getmapxy(.@m$,.@x,.@y,1,strnpcinfo(3));
.@juwi = getareausers(.@m$,.@x-8,.@y-8,.@x+8,.@y+8);
if (party_relay == 32) {
diff --git a/npc/quests/quests_ein.txt b/npc/quests/quests_ein.txt
index c5a470507..d2bf684a0 100644
--- a/npc/quests/quests_ein.txt
+++ b/npc/quests/quests_ein.txt
@@ -5692,7 +5692,7 @@ OnTouch:
mes "Failure to do so will result";
mes "in lockout. Please wait.";
next;
- .@startseconds = gettime(HOUR)*60*60+gettime(MINUTE)*60+gettime(SECOND);
+ .@startseconds = gettime(GETTIME_HOUR)*60*60+gettime(GETTIME_MINUTE)*60+gettime(GETTIME_SECOND);
mes "[Security System]";
switch(rand(1,7)) {
case 1:
@@ -5761,7 +5761,7 @@ OnTouch:
}
next;
input .@input2$;
- .@endtime = gettime(HOUR)*60*60+gettime(MINUTE)*60+gettime(SECOND);
+ .@endtime = gettime(GETTIME_HOUR)*60*60+gettime(GETTIME_MINUTE)*60+gettime(GETTIME_SECOND);
.@time = .@endtime-.@startseconds;
mes "[Security System]";
if ((.@input1$ == .@word1$) && (.@input2$ == .@word2$)) {
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 2636b1f77..d7b184f6c 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -85,7 +85,7 @@ lighthalzen,267,200,3 script Guard#lhz01 4_M_LGTGUARD,{
$@Lhz_Gangster_Alert = 100;
close;
}
- if (gettime(HOUR) >= 22 || gettime(HOUR) < 2) {
+ if (gettime(GETTIME_HOUR) >= 22 || gettime(GETTIME_HOUR) < 2) {
mes "[Guard]";
mes "Zzzz... Zzz...";
mes "ZZZzzzzzzzzzz...";
@@ -152,7 +152,7 @@ lighthalzen,294,223,7 script Guard#lhz02 4_M_LGTGUARD,{
$@Lhz_Gangster_Alert = 100;
close;
}
- if (gettime(HOUR) >= 22 || gettime(HOUR) < 2) {
+ if (gettime(GETTIME_HOUR) >= 22 || gettime(GETTIME_HOUR) < 2) {
mes "[Guard]";
mes "Zzzz... Zzz...";
mes "ZZZzzzzzzzzzz...";
@@ -7378,8 +7378,8 @@ yuno_pre,69,20,4 script Secretary#1 4_F_LGTGIRL,{
mes "Membership Card.^000000";
close;
}
- if(((gettime(HOUR) > 10) && (gettime(HOUR) < 15)) || ((gettime(HOUR) > 19) && (gettime(HOUR) <= 23)))
- {
+ if ((gettime(GETTIME_HOUR) > 10 && gettime(GETTIME_HOUR) < 15)
+ || (gettime(GETTIME_HOUR) > 19 && gettime(GETTIME_HOUR) <= 23)) {
mes "^3355FFYou suavely flash";
mes "your ''Secret Wing''";
mes "Membership Card.^000000";
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index 8d5113cd5..c4658a3aa 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -38,7 +38,7 @@
// Soup Quest :: lou_tre
//============================================================
lou_in02,53,174,7 script Employee#1 4_M_CHNMAN,6,62,{
- if (gettime(HOUR) >= 10 && gettime(HOUR) < 22) {
+ if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 22) {
mes "[Chang Pai]";
mes "Welcome, welcome!";
mes "We are ready to serve you~!";
@@ -51,7 +51,7 @@ lou_in02,53,174,7 script Employee#1 4_M_CHNMAN,6,62,{
OnTouch:
if (ch_tre == 2 || ch_tre == 3) {
- if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+ if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
if (rand(1,10) < 9) {
mes "[Chang Pai]";
mes "Wait, who are you?!";
@@ -63,8 +63,7 @@ OnTouch:
ch_tre = 1;
close;
}
- }
- else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+ } else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
if (rand(1,10) < 10) {
mes "[Chang Pai]";
mes "Wait, who are you?!";
@@ -76,8 +75,7 @@ OnTouch:
ch_tre = 1;
close;
}
- }
- else if (gettime(HOUR) >= 17 && gettime(HOUR) < 21) {
+ } else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 21) {
if (rand(1,10) < 6) {
mes "[Chang Pai]";
mes "Wait, who are you?!";
@@ -113,7 +111,7 @@ OnTouch:
}
lou_in02,76,181,3 script Employee#2 4_M_CHNMAN,2,2,{
- if (gettime(HOUR) >= 10 && gettime(HOUR) < 22) {
+ if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 22) {
mes "[Huang Jia Xian]";
mes "Welcome~";
mes "Sorry for making you wait. If you wish to rest, please go upstairs.";
@@ -138,7 +136,7 @@ lou_in02,76,181,3 script Employee#2 4_M_CHNMAN,2,2,{
OnTouch:
if (ch_tre == 2 || ch_tre == 3) {
- if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+ if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
if (rand(1,10) < 9) {
mes "[Huang Jia Xian]";
mes "What the...?";
@@ -151,8 +149,7 @@ OnTouch:
ch_tre = 1;
close;
}
- }
- else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+ } else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
if (rand(1,10) < 10) {
mes "[Huang Jia Xian]";
mes "What the...?";
@@ -165,8 +162,7 @@ OnTouch:
ch_tre = 1;
close;
}
- }
- else if (gettime(HOUR) >= 17 && gettime(HOUR) < 22) {
+ } else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 22) {
if (rand(1,10) < 6) {
mes "[Huang Jia Xian]";
mes "What the...?";
@@ -203,7 +199,7 @@ OnTouch:
}
lou_in02,61,175,3 script Employee#3 4_F_CHNWOMAN,2,2,{
- if (gettime(HOUR) >= 10 && gettime(HOUR) < 22) {
+ if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 22) {
if (ch_tre == 5) {
mes "[Ya Hua]";
mes "Welcome, welcome!";
@@ -234,7 +230,7 @@ lou_in02,61,175,3 script Employee#3 4_F_CHNWOMAN,2,2,{
OnTouch:
if (ch_tre == 2 || ch_tre == 3) {
- if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+ if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
if (rand(1,10) < 9) {
mes "[Ya Hua]";
mes "What do you think";
@@ -247,8 +243,7 @@ OnTouch:
ch_tre = 1;
close;
}
- }
- else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+ } else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
if (rand(1,10) < 10) {
mes "[Ya Hua]";
mes "What do you think";
@@ -261,8 +256,7 @@ OnTouch:
ch_tre = 1;
close;
}
- }
- else if (gettime(HOUR) >= 17 && gettime(HOUR) < 22) {
+ } else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 22) {
if (rand(1,10) < 6) {
mes "[Ya Hua]";
mes "What do you think";
@@ -367,7 +361,7 @@ lou_in02,62,183,3 script Chef#1-2 4_M_CHNCOOK,2,2,{
OnTouch:
if (ch_tre == 2 || ch_tre == 3) {
- if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+ if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
if (rand(1,10) < 9) {
mes "[Wang Shi Long]";
mes "Hey, what do you";
@@ -381,8 +375,7 @@ OnTouch:
warp "louyang",280,161;
close;
}
- }
- else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+ } else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
if (rand(1,10) < 10) {
mes "[Wang Shi Long]";
mes "Hey, what do you";
@@ -396,8 +389,7 @@ OnTouch:
warp "louyang",280,161;
close;
}
- }
- else if (gettime(HOUR) >= 17 && gettime(HOUR) < 22) {
+ } else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 22) {
if (rand(1,10) < 6) {
mes "[Wang Shi Long]";
mes "Hey, what do you";
@@ -720,16 +712,14 @@ lou_in02,50,185,5 script Pot#1 HIDDEN_NPC,{
mes "^3131FFYou take a careful look around.";
mes "It wouldn't be wise to steal this now if anyone is watching.^000000";
next;
- if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+ if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
mes "^3131FFThe restaurant doesn't seem busy right now, so there's only a few employees and customers.^000000";
- }
- else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+ } else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
mes "^3131FFOnly the restaurant";
mes "employees are around,";
mes "and they busy chatting";
mes "amongst each other.^000000";
- }
- else if (gettime(HOUR) >= 17 && gettime(HOUR) < 22) {
+ } else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 22) {
mes "^3131FFThe restaurant is filled";
mes "with customers, and the";
mes "hustle and bustle of the";
@@ -770,7 +760,7 @@ lou_in02,50,185,5 script Pot#1 HIDDEN_NPC,{
mes "^3131FFHowever, it's empty.^000000";
close;
}
- if (gettime(HOUR) >= 10 && gettime(HOUR) < 22) {
+ if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 22) {
mes "[Chef]";
mes "Ah...!";
mes "Please, do not";
@@ -792,16 +782,14 @@ lou_in02,49,185,5 script Pot#2 HIDDEN_NPC,{
mes "^3131FFYou take a careful look around.";
mes "It wouldn't be wise to steal this now if anyone is watching.^000000";
next;
- if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+ if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
mes "^3131FFThe restaurant doesn't seem busy right now, so there's only a few employees and customers.^000000";
- }
- else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+ } else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
mes "^3131FFOnly the restaurant";
mes "employees are around,";
mes "and they busy chatting";
mes "amongst each other.^000000";
- }
- else if (gettime(HOUR) >= 17 && gettime(HOUR) < 22) {
+ } else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 22) {
mes "^3131FFThe restaurant is filled";
mes "with customers, and the";
mes "hustle and bustle of the";
@@ -842,7 +830,7 @@ lou_in02,49,185,5 script Pot#2 HIDDEN_NPC,{
mes "an empty pot.^000000";
close;
}
- if (gettime(HOUR) >= 10 && gettime(HOUR) < 22) {
+ if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 22) {
mes "[Chef]";
mes "Ah...!";
mes "Please, do not";
@@ -894,7 +882,7 @@ lou_in02,58,183,5 script Chef Assistant#lou1 4_M_CHNMONK,5,5,{
OnTouch:
if (ch_tre == 2 || ch_tre == 3) {
- if (gettime(HOUR) >= 10 && gettime(HOUR) < 14) {
+ if (gettime(GETTIME_HOUR) >= 10 && gettime(GETTIME_HOUR) < 14) {
if (rand(1,10) < 9) {
mes "[Jin Wei Ling]";
mes "Wait! Who are you!";
@@ -907,8 +895,7 @@ OnTouch:
ch_tre = 1;
close;
}
- }
- else if (gettime(HOUR) >= 14 && gettime(HOUR) < 17) {
+ } else if (gettime(GETTIME_HOUR) >= 14 && gettime(GETTIME_HOUR) < 17) {
if (rand(1,10) < 10) {
mes "[Jin Wei Ling]";
mes "Wait! Who are you!";
@@ -921,8 +908,7 @@ OnTouch:
ch_tre = 1;
close;
}
- }
- else if (gettime(HOUR) >= 17 && gettime(HOUR) < 22) {
+ } else if (gettime(GETTIME_HOUR) >= 17 && gettime(GETTIME_HOUR) < 22) {
if (rand(1,10) < 6) {
mes "[Jin Wei Ling]";
mes "Wait! Who are you!";
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index caedd20b6..2ae62a0ae 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -752,7 +752,10 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 4_M_RUSBALD,{
mos_whale_edq = 19;
close;
}
- if ((gettime(HOUR) >= 0 && gettime(HOUR) < 3) || (gettime(HOUR) >= 6 && gettime(HOUR) < 9) || (gettime(HOUR) >= 12 && gettime(HOUR) < 15) || (gettime(HOUR) >= 18 && gettime(HOUR) < 21)) {
+ if ((gettime(GETTIME_HOUR) >= 0 && gettime(GETTIME_HOUR) < 3)
+ || (gettime(GETTIME_HOUR) >= 6 && gettime(GETTIME_HOUR) < 9)
+ || (gettime(GETTIME_HOUR) >= 12 && gettime(GETTIME_HOUR) < 15)
+ || (gettime(GETTIME_HOUR) >= 18 && gettime(GETTIME_HOUR) < 21)) {
mes "[Mr. Ibanoff]";
mes "Hmm. It's not a bad time.";
mes "We should hurry up";
@@ -8676,7 +8679,7 @@ OnTouch:
end;
}
if (rhea_rus_hair == 2) {
- if (gettime(HOUR)>=23 || gettime(HOUR)<=5) {
+ if (gettime(GETTIME_HOUR) >= 23 || gettime(GETTIME_HOUR) <= 5) {
mes "- Splash !! -";
next;
if (countitem(523) > 0) {
@@ -8701,7 +8704,7 @@ OnTouch:
mes "And please, tell him to stop suffering and to be happy. This is my request.";
close;
} else if (rhea_rus_hair == 7) {
- if (gettime(HOUR)>=23 || gettime(HOUR)<=5) {
+ if (gettime(GETTIME_HOUR) >= 23 || gettime(GETTIME_HOUR) <= 5) {
mes "- Splash !! -";
next;
if (countitem(523) > 0) {
@@ -9520,11 +9523,13 @@ mosk_fild02,243,270,0 script Marozka#rus31 4_M_LGTGRAND,{
mes "[Marozka]";
mes "I will begin making it now... let me see... Could you please come back to me in an hour?";
rhea_rus_quiz = 4;
- rus_time01 = gettime(HOUR);
- rus_time02 = gettime(WEEKDAY);
+ rus_time01 = gettime(GETTIME_HOUR);
+ rus_time02 = gettime(GETTIME_WEEKDAY);
close;
} else if (rhea_rus_quiz == 4) {
- if (rus_time01 < gettime(HOUR) || rus_time02 < gettime(WEEKDAY) || (rus_time02 == 6 && gettime(WEEKDAY) == SUNDAY)) {
+ if (rus_time01 < gettime(GETTIME_HOUR)
+ || rus_time02 < gettime(GETTIME_WEEKDAY)
+ || (rus_time02 == SATURDAY && gettime(GETTIME_WEEKDAY) == SUNDAY)) {
mes "[Marozka]";
mes "Ah, just in time.";
mes "I have finally finished making the 'Golden Thread'. Just wait one more second and it'll be ready.";
diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt
index 7010ba494..3bcbb7e1d 100644
--- a/npc/quests/quests_umbala.txt
+++ b/npc/quests/quests_umbala.txt
@@ -1126,7 +1126,7 @@ um_in,101,73,3 script Wainatan 4_F_UMWOMAN,{
close;
}
if (um_wind == 1) {
- if (gettime(HOUR) > 18) {
+ if (gettime(GETTIME_HOUR) > 18) {
um_wind = 2;
emotion e_an;
mes "[Wainatan]";
@@ -1170,7 +1170,7 @@ um_in,94,123,5 script Bertztan 4_F_UMWOMAN,{
close;
}
if (um_wind == 2) {
- if (gettime(HOUR) > 18) {
+ if (gettime(GETTIME_HOUR) > 18) {
um_wind = 3;
emotion e_an;
mes "[Bertztan]";
@@ -1222,7 +1222,7 @@ umbala,145,217,3 script Chabimatan 4_F_UMWOMAN,{
close;
}
if (um_wind == 3) {
- if (gettime(HOUR) > 18) {
+ if (gettime(GETTIME_HOUR) > 18) {
um_wind = 4;
emotion e_an;
mes "[Chabimatan]";
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index 48872392e..5ce92aa0e 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -553,7 +553,7 @@ prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{
mes "this and come back later~";
delitem 7314,1; //The_Sign
sign_q = 138;
- .@stime_s = gettime(HOUR);
+ .@stime_s = gettime(GETTIME_HOUR);
if (.@stime_s < 1) sign_sq = 1;
else if (.@stime_s < 3) sign_sq = 2;
else if (.@stime_s < 5) sign_sq = 3;
@@ -568,7 +568,7 @@ prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{
else sign_sq = 12;
}
else if (sign_q == 138) {
- .@stime_s1 = gettime(HOUR);
+ .@stime_s1 = gettime(GETTIME_HOUR);
if (.@stime_s1 < 1) {
if (sign_sq == 11) {
.@pass_s = 1;
@@ -2567,7 +2567,7 @@ aldeba_in,139,103,5 script Monograph#sign HIDDEN_NPC,{
aldeba_in,155,101,3 script Sir Jore#sign 1_M_SIGNALCHE,7,7,{
callfunc "F_UpdateSignVars";
- if ((gettime(HOUR) > 16) && (gettime(HOUR) < 22)) {
+ if (gettime(GETTIME_HOUR) > 16 && gettime(GETTIME_HOUR) < 22) {
if (sign_q == 15) {
mes "["+ strcharinfo(0) +"]";
mes "Excuse me...";
@@ -2857,8 +2857,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 1_M_SIGNALCHE,7,7,{
mes "What's the answer?!";
close;
}
- }
- else if ((gettime(HOUR) > 6) && (gettime(HOUR) < 17)) {
+ } else if (gettime(GETTIME_HOUR) > 6 && gettime(GETTIME_HOUR) < 17) {
mes "^3355FFYou find a tense man";
mes "holding test tubes between";
mes "his fingers, standing in a pile";
@@ -2938,7 +2937,7 @@ OnTouch:
aldeba_in,156,118,4 script Piru Piru#sign 8_F,{
callfunc "F_UpdateSignVars";
mes "[Piru Piru]";
- if ((gettime(HOUR) >= 12) && (gettime(HOUR) <= 24)) { //235959
+ if (gettime(GETTIME_HOUR) >= 12 && gettime(GETTIME_HOUR) <= 24) { //235959
if (sign_q == 17) {
emotion e_sob;
mes "Oh, I'm sooo tired~";
@@ -3018,7 +3017,7 @@ aldeba_in,156,118,4 script Piru Piru#sign 8_F,{
close;
}
}
- else if ((gettime(HOUR) >= 6) && (gettime(HOUR) < 12)) {
+ else if (gettime(GETTIME_HOUR) >= 6 && gettime(GETTIME_HOUR) < 12) {
mes "Everyday we study and";
mes "take notes and test and";
mes "experiment and record";
@@ -4533,7 +4532,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{
}
}
else if (sign_q == 27) {
- if ((gettime(HOUR) > 18) && (gettime(HOUR) < 23)) {
+ if (gettime(GETTIME_HOUR) > 18 && gettime(GETTIME_HOUR) < 23) {
mes "Nice, you're here";
mes "just in time. Well,";
mes "all that matters is that";
@@ -7550,7 +7549,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 4_M_03,{
mes "But I'll do my best for you.";
delitem 7314,1; //The_Sign
sign_q = 140;
- .@stime_e = gettime(HOUR);
+ .@stime_e = gettime(GETTIME_HOUR);
if (.@stime_e < 2) sign_sq = 1;
else if (.@stime_e < 4) sign_sq = 2;
else if (.@stime_e < 6) sign_sq = 3;
@@ -7566,7 +7565,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 4_M_03,{
close;
}
else if (sign_q == 140) {
- .@stime_e1 = gettime(HOUR);
+ .@stime_e1 = gettime(GETTIME_HOUR);
if (.@stime_e1 < 2) {
if (sign_sq == 11) {
.@pass_s1 = 1;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-10 06:52:54 +0000