summaryrefslogtreecommitdiff
path: root/npc/019-4-1
diff options
context:
space:
mode:
Diffstat (limited to 'npc/019-4-1')
-rw-r--r--npc/019-4-1/chief.txt21
1 files changed, 11 insertions, 10 deletions
diff --git a/npc/019-4-1/chief.txt b/npc/019-4-1/chief.txt
index 5d267b951..746346147 100644
--- a/npc/019-4-1/chief.txt
+++ b/npc/019-4-1/chief.txt
@@ -42,22 +42,14 @@
next;
}
- // Start Event for the first time
- if (gettime(GETTIME_MONTH) != JANUARY && getq(SQuest_Christmas) < gettime(GETTIME_YEAR)) {
- npctalk3 l("Bug, please report: Merry Christmas I am undefined");
- setq SQuest_Christmas, gettime(GETTIME_YEAR), 0, 0;
- }
- if (gettime(GETTIME_MONTH) == JANUARY && getq(SQuest_Christmas) != gettime(GETTIME_YEAR)-1) {
- npctalk3 l("Bug, please report: Merry Christmas, I am @@. I got @@/@@ on exams last week!", getq(SQuest_Christmas), getq2(SQuest_Christmas), getq3(SQuest_Christmas));
- setq SQuest_Christmas, gettime(GETTIME_YEAR)-1, 0, 0;
- }
// Christmas still running
if ($EVENT$ == "Christmas")
goto L_Main;
- npctalk3 l("Bug, please report: Merry Christmas I am no one");
+
// Last year
if (getq(SQuest_Christmas) == gettime(GETTIME_YEAR)-1)
goto L_Reward;
+
// Not in season
goto L_OutOfSeason;
@@ -162,6 +154,15 @@ L_Reward:
close;
L_Main:
+ // Start Event for the first time if needed
+ 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)-1, 0, 0;
+ }
+
+ // Begin Christmas
.@q=getq2(SQuest_Christmas);
//
if (!getq(General_Narrator)) {