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/the_sign_quest.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/the_sign_quest.txt')
-rw-r--r-- | npc/quests/the_sign_quest.txt | 19 |
1 files changed, 9 insertions, 10 deletions
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; |