summaryrefslogtreecommitdiff
path: root/npc/re
diff options
context:
space:
mode:
authorEmistry <Equinox1991@gmail.com>2015-10-27 18:31:29 +0800
committerEmistry <Equinox1991@gmail.com>2015-10-27 18:31:29 +0800
commit3bd77ffc0daca508352834add828766490075aee (patch)
treeb6d2b9f8e02c2c993985908a9406ae9f72685f75 /npc/re
parent415114467ab6bcac45e66031993e33f1a68a3255 (diff)
downloadhercules-3bd77ffc0daca508352834add828766490075aee.tar.gz
hercules-3bd77ffc0daca508352834add828766490075aee.tar.bz2
hercules-3bd77ffc0daca508352834add828766490075aee.tar.xz
hercules-3bd77ffc0daca508352834add828766490075aee.zip
Replaced parameter type with constant.
constant for gettime( <type> ) constant for Weekday and Month.
Diffstat (limited to 'npc/re')
-rw-r--r--npc/re/quests/quests_mora.txt2
-rw-r--r--npc/re/woe-fe/invest_main.txt14
2 files changed, 8 insertions, 8 deletions
diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt
index 55a60de98..6bfb908d1 100644
--- a/npc/re/quests/quests_mora.txt
+++ b/npc/re/quests/quests_mora.txt
@@ -2519,7 +2519,7 @@ mora,31,138,6 script Raffle Researcher#ep14 4_M_RAFLE_OR,{
close;
}
// NPC disabled from 12am ~ 5am.
- if (gettime(3) >= 0 && gettime(3) < 5) {
+ if (gettime(HOUR) >= 0 && gettime(HOUR) < 5) {
if (ep14_1_muk > 0) {
mes "[Raffle Researcher]";
mes "Don't humans sleep?";
diff --git a/npc/re/woe-fe/invest_main.txt b/npc/re/woe-fe/invest_main.txt
index 9ed49ce7a..88e88d385 100644
--- a/npc/re/woe-fe/invest_main.txt
+++ b/npc/re/woe-fe/invest_main.txt
@@ -62,31 +62,31 @@ $@vfund_*_extra
- script #invest_timer -1,{
OnClock0000: // Open investments on Wed (1 hour after WoE)
- if (gettime(4) == 3 && !agitcheck()) {
+ if (gettime(WEEKDAY) == WEDNESDAY && !agitcheck()) {
$2011_agit_invest = 1;
donpcevent "#fund_master::OnInvest_start";
}
end;
OnClock1200: // Close investments on Fri (60 hours after investments open)
- if (gettime(4) == 5 && !agitcheck()) {
+ if (gettime(WEEKDAY) == FRIDAY && !agitcheck()) {
$2011_agit_invest = 2;
donpcevent "#fund_master::OnInvest_stop";
}
end;
OnClock1235: // Open dungeons on Fri (at least 31 minutes after investments close)
- if (gettime(4) == 5 && !agitcheck())
+ if (gettime(WEEKDAY) == FRIDAY && !agitcheck())
donpcevent "#fund_master::OnResult";
end;
OnClock2000: // Close dungeons on Tues (1 hour before WoE)
- if (gettime(4) == 2)
+ if (gettime(WEEKDAY) == TUESDAY)
donpcevent "#fund_master::OnReset";
end;
}
function script F_Invest_Status {
- .@day = gettime(4);
- .@hour = gettime(3);
- .@minute = gettime(2);
+ .@day = gettime(WEEKDAY);
+ .@hour = gettime(HOUR);
+ .@minute = gettime(MINUTE);
// Inactive.
if (agitcheck())