diff options
author | Haru <haru@dotalux.com> | 2015-11-15 00:54:33 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2015-11-15 00:57:00 +0100 |
commit | 34037c40d28c9fe179d930949320090448b249e9 (patch) | |
tree | 3fe4d79c6185df4f165beae47cc3e7a286ce5af8 /npc/quests/quests_louyang.txt | |
parent | 8ee5eafc741d581579efd696765fb0646b72a553 (diff) | |
download | hercules-34037c40d28c9fe179d930949320090448b249e9.tar.gz hercules-34037c40d28c9fe179d930949320090448b249e9.tar.bz2 hercules-34037c40d28c9fe179d930949320090448b249e9.tar.xz hercules-34037c40d28c9fe179d930949320090448b249e9.zip |
Fixed too-generic constant names of gettime() types
- Follow-up to 3bd77ffc0daca508352834add828766490075aee
- The names were too generic (not namespaced), and were easily clashing
with custom (and potential future official) constants or variables.
- Constants are now prefixed with a 'GETTIME_' namespace:
- GETTIME_SECOND
- GETTIME_MINUTE
- GETTIME_HOUR
- GETTIME_WEEKDAY
- GETTIME_DAYOFMONTH
- GETTIME_MONTH
- GETTIME_YEAR
- GETTIME_DAYOFYEAR
- Fixed some excessive (and some times incorrect) parentheses in
various scripts using gettime().
- Updated documentation.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/quests/quests_louyang.txt')
-rw-r--r-- | npc/quests/quests_louyang.txt | 66 |
1 files changed, 26 insertions, 40 deletions
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!"; |