Add 2021 Hall of Events

3 files changed, 69 insertions, 4 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 404b8f62d..b5236cef2 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1743,7 +1743,7 @@ constants_db: {
 	NPC_STATUE_2018:        172
 	NPC_STATUE_2019:        173
 	NPC_STATUE_2020:        174
-	NPC_STATUE_R175:        175
+	NPC_STATUE_2021:        175
 	NPC_STATUE_R176:        176
 	NPC_STATUE_R177:        177
 	NPC_STATUE_R178:        178
diff --git a/npc/003-0-1/statues.txt b/npc/003-0-1/statues.txt
index a09699bd8..e127e2cd4 100644
--- a/npc/003-0-1/statues.txt
+++ b/npc/003-0-1/statues.txt
@@ -81,7 +81,7 @@ OnInit:
 }
 
 
-003-0-1,67,27,0	script	#Statue2018	NPC_STATUE_2018,{
+003-0-1,68,28,0	script	#Statue2018	NPC_STATUE_2018,{
 
     HallOf2018();
     close;
@@ -92,7 +92,7 @@ OnInit:
     end;
 }
 
-003-0-1,68,26,0	script	#Statue2019	NPC_STATUE_2019,{
+003-0-1,67,27,0	script	#Statue2019	NPC_STATUE_2019,{
 
     HallOf2019();
     close;
@@ -103,7 +103,7 @@ OnInit:
     end;
 }
 
-003-0-1,67,25,0	script	#Statue2020	NPC_STATUE_2020,{
+003-0-1,68,26,0	script	#Statue2020	NPC_STATUE_2020,{
 
     HallOf2020();
     close;
@@ -114,3 +114,14 @@ OnInit:
     end;
 }
 
+003-0-1,67,25,0	script	#Statue2021	NPC_STATUE_2021,{
+
+    HallOf2021();
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 4;
+    end;
+}
+
diff --git a/npc/functions/scoreboards.txt b/npc/functions/scoreboards.txt
index 959ce184d..8622d16e7 100644
--- a/npc/functions/scoreboards.txt
+++ b/npc/functions/scoreboards.txt
@@ -625,6 +625,55 @@ function	script	HallOf2020	{
     return;
 }
 
+function	script	HallOf2021	{
+    mes "";
+    mes l(".:: TMW-2 Anniversary ::.");
+    mesc l("Scheduled: January 13rd");
+    //mes l("No victor appliable.");
+    mesc l("Anniversary marks the project birthdate. Do not mistake with TMW2 Day.");
+    mes "";
+    mes l(".:: Valentine Day ::.");
+    mesc l("Scheduled: February 13th - 16th");
+    next;
+    mes l(".:: TMW2 Day ::.");
+    mesc l("Scheduled: March 2nd");
+    //mes l("No victor appliable.");
+    mesc l("TMW2 Day marks the server birthdate. Do not mistake with TMW2 Anniversary.");
+    mes "";
+    mes l(".:: Easter 2021 ::.");
+    mesc l("Scheduled: April 17th - 24th");
+    mes "";
+    mes l(".:: Worker Day ::.");
+    mesc l("Scheduled: April 27th - May 3rd");
+    //mes l("No victor appliable.");
+    next;
+    mes l(".:: Ched's Summer 2021 ::.");
+    mesc l("June 21st - September 21st");
+    mes "";
+    mes l(".:: Chocolate Day ::.");
+    //mesc l("Event Canceled"), 1;
+    mesc l("Scheduled: July 7th");
+    mes "";
+    mes l(".:: Free Software Day ::.");
+    //mesc l("Event Canceled"), 1;
+    mesc l("Scheduled: September 9th");
+    mes "";
+    mes l(".:: International Coffee Day ::.");
+    mesc l("Scheduled: October 1st");
+    //mes l("No victor appliable.");
+    mes "";
+    mes l(".:: Hasan Scorpion Killing Challenge 2021 ::.");
+    mesc l("September 22nd - December 20th");
+    mes "";
+    mes l(".:: Thanksgiving 2021 ::.");
+    mesc l("November 1st - November 30th");
+    //mes l("No victor appliable.");
+    mes "";
+    mes l(".:: Christmas 2021 ::.");
+    mesc l("Scheduled: December 19th - January 2nd");
+    return;
+}
+
 -	script	@scoreboard	NPC_HIDDEN,{
     end;
 
@@ -650,6 +699,7 @@ OnCall:
             l("2018 Event Winners"),
             l("2019 Event Winners"),
             l("2020 Event Winners"),
+            l("2021 Event Winners"),
             l("Game Statistics"),
             l("Quit");
         mes "";
@@ -731,6 +781,10 @@ OnCall:
             next;
             break;
         case 17:
+            HallOf2021();
+            next;
+            break;
+        case 18:
             HallOfGame();
             next;
             break;