diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-01-01 11:24:09 -0200 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-01-01 11:24:09 -0200 |
| commit | 14231b3ba4e0b7540ff671d9114ff8a10aa59f22 (patch) | |
| tree | 82d9faa74ccc1804c3673fe764a227da963bef08 /npc/019-4-1 | |
| parent | 5cfb33e05ccc4f5b907965755125b80c4a5c2aa6 (diff) | |
| download | serverdata-14231b3ba4e0b7540ff671d9114ff8a10aa59f22.tar.gz serverdata-14231b3ba4e0b7540ff671d9114ff8a10aa59f22.tar.bz2 serverdata-14231b3ba4e0b7540ff671d9114ff8a10aa59f22.tar.xz serverdata-14231b3ba4e0b7540ff671d9114ff8a10aa59f22.zip | |
[XMAS 18] Urgent fixes
Diffstat (limited to 'npc/019-4-1')
| -rw-r--r-- | npc/019-4-1/chief.txt | 18 | ||||
| -rw-r--r-- | npc/019-4-1/golbarez.txt | 3 |
2 files changed, 12 insertions, 9 deletions
diff --git a/npc/019-4-1/chief.txt b/npc/019-4-1/chief.txt index a8beecd45..58136e529 100644 --- a/npc/019-4-1/chief.txt +++ b/npc/019-4-1/chief.txt @@ -42,17 +42,19 @@ next; } + // Start Event for the first time + if (gettime(GETTIME_MONTH) != JANUARY && getq(SQuest_Christmas) < gettime(GETTIME_YEAR)) + setq SQuest_Christmas, gettime(GETTIME_YEAR), 0, 0; + if (gettime(GETTIME_MONTH) == JANUARY && getq(SQuest_Christmas) != gettime(GETTIME_YEAR)-1) + setq SQuest_Christmas, gettime(GETTIME_YEAR), 0, 0; + // Christmas still running + if ($EVENT$ == "Christmas") + goto L_Main; // Last year if (getq(SQuest_Christmas) == gettime(GETTIME_YEAR)-1) goto L_Reward; - // Not on season - if ($EVENT$ != "Christmas") - goto L_OutOfSeason; - // Start Event for the first time - if (getq(SQuest_Christmas) < gettime(GETTIME_YEAR)) - setq SQuest_Christmas, gettime(GETTIME_YEAR), 0, 0; - // Main Loop - goto L_Main; + // Not in season + goto L_OutOfSeason; L_OutOfSeason: mesn; diff --git a/npc/019-4-1/golbarez.txt b/npc/019-4-1/golbarez.txt index c64079503..7e5e9da8f 100644 --- a/npc/019-4-1/golbarez.txt +++ b/npc/019-4-1/golbarez.txt @@ -21,7 +21,8 @@ L_OutOfSeason: close; L_Main: - if (getq(SQuest_Christmas) != gettime(GETTIME_YEAR)) { + if (getq(SQuest_Christmas) != gettime(GETTIME_YEAR) && + !(gettime(GETTIME_MONTH) == JANUARY && getq(SQuest_Christmas) == gettime(GETTIME_YEAR)-1)) { mesn; mesq l("Please talk with this workshop's Chief before talking to me."); close; |