diff options
| author | Jesusaves <cpntb1@ymail.com> | 2025-01-11 09:40:49 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2025-01-11 09:40:49 -0300 |
| commit | 77bacd3a52735008a507a213eb02230ece8dac96 (patch) | |
| tree | a75b30333941e874e82765dd594057bce52ff52d | |
| parent | d6efedb34b430ee004d9bf400c7eed2a140a4714 (diff) | |
| download | serverdata-77bacd3a52735008a507a213eb02230ece8dac96.tar.gz serverdata-77bacd3a52735008a507a213eb02230ece8dac96.tar.bz2 serverdata-77bacd3a52735008a507a213eb02230ece8dac96.tar.xz serverdata-77bacd3a52735008a507a213eb02230ece8dac96.zip | |
Revert "2025 Christmas Override (Extension)"
This reverts commit 9b3260025ab14da55356a9c22bdeb7cafa8f7e43.
| -rw-r--r-- | npc/019-4-1/ofelia.txt | 6 | ||||
| -rw-r--r-- | npc/functions/event.txt | 12 |
2 files changed, 5 insertions, 13 deletions
diff --git a/npc/019-4-1/ofelia.txt b/npc/019-4-1/ofelia.txt index 1a11930f7..c9933fd16 100644 --- a/npc/019-4-1/ofelia.txt +++ b/npc/019-4-1/ofelia.txt @@ -15,10 +15,6 @@ if ($EVENT$ == "Christmas") goto L_Main; - // 2024 amendment - if (gettime(7) == 2025 && gettime(6) == JANUARY && gettime(5) < 10) - goto L_Skip; - // Last year if (X24_CHALLENGES_DONE) goto L_Reward; @@ -50,8 +46,6 @@ L_Main: mesq l("Hi! Sorry, it's too cold outside, so I'm still catching my breath. Try talking to Christmas Chief first?"); close; } - -L_Skip: mesn; mesq l("Hey %s, did you knew that in 2025 AD (or 425 AT) Moubootaur Legends celebrates its 7th anniversary?", strcharinfo(0)); dnext; diff --git a/npc/functions/event.txt b/npc/functions/event.txt index afaa9de08..4bddb9568 100644 --- a/npc/functions/event.txt +++ b/npc/functions/event.txt @@ -610,13 +610,11 @@ function script X24Event { if (!playerattached()) return; - if (gettime(7) != 2025 || gettime(6) != JANUARY || gettime(5) >= 10) { - // Date check - if ($EVENT$ != "Christmas") - return; - if (!getq(SQuest_Christmas)) - return; - } + // Date check + if ($EVENT$ != "Christmas") + return; + if (!getq(SQuest_Christmas)) + return; // Extract Arguments .@bit = getarg(0); |