summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-01-09 23:42:21 -0200
committerJesusaves <cpntb1@ymail.com>2019-01-09 23:42:21 -0200
commit424aa32c75b85d8291e32780f865e0b5462cfa32 (patch)
treeb12d8584dcbe80fc4b00d4d8cba030c7ca394b93
parentc7c2fda6e8f25e53ff0094a63719e5e2df29c88e (diff)
downloadserverdata-424aa32c75b85d8291e32780f865e0b5462cfa32.tar.gz
serverdata-424aa32c75b85d8291e32780f865e0b5462cfa32.tar.bz2
serverdata-424aa32c75b85d8291e32780f865e0b5462cfa32.tar.xz
serverdata-424aa32c75b85d8291e32780f865e0b5462cfa32.zip
-rw-r--r--npc/019-4-1/chief.txt21
-rw-r--r--npc/functions/clientversion.txt4
2 files changed, 13 insertions, 12 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)) {
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 35eeb9ddb..baef35d1d 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -87,7 +87,7 @@ function script checkclientversion {
.@dg=1;
showavatar NPC_LOF_RICH;
mesn ("TMW2 Staff");
- mesc l("Hello, @@! We just looked up and found out you were active during 2018-12-29!"), 3;
+ mesc l("Hello, @@! We just looked up and found out you were active during 2018-12-29!", strcharinfo(0)), 3;
mesc l("And during that time, item dropped was bugged! We wanted to deliver you a token of apology!"), 3;
mesc l("Sorry, and enjoy the game! Your TMW2 Staff Team."), 3;
mesc l("Token Of Apology: 1x @@, 570 GP", getitemlink(GoldenGift));
@@ -101,7 +101,7 @@ function script checkclientversion {
.@dg=1;
showavatar NPC_LOF_RICH;
mesn ("TMW2 Staff");
- mesc l("Hello, @@! We are proud to announce the @@ RESULTS!", b(l("1° Screenshooting Contest"))), 3;
+ mesc l("Hello, @@! We are proud to announce the @@ RESULTS!", strcharinfo(0) , b(l("1° Screenshooting Contest"))), 3;
mesc l("Participants: Jesusalva * mishana * bObr * demure * LawnCable"), 3;
next;
mesc ("Mishana Entries: Happy"), 3;