Easter Egg update

7 files changed, 2 insertions, 46 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 2d7b3286b..54522d8e9 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -2070,6 +2070,7 @@ constants_db: {
 	EE_MAGICSCHOOL:         8
 	EE_THEATER:            16
 	EE_JAK1:               32
+	EE_MANATAURO:          64
 
 	comment__: "Teleporter enum"
 	TP_NONE:                0
diff --git a/npc/003-0-1/_import.txt b/npc/003-0-1/_import.txt
index 0d04be190..5aa9264e7 100644
--- a/npc/003-0-1/_import.txt
+++ b/npc/003-0-1/_import.txt
@@ -3,7 +3,6 @@
 "npc/003-0-1/_warps.txt",
 "npc/003-0-1/audsbel.txt",
 "npc/003-0-1/guards.txt",
-"npc/003-0-1/hiddenwarp.txt",
 "npc/003-0-1/maxime.txt",
 "npc/003-0-1/professor.txt",
 "npc/003-0-1/researcher.txt",
diff --git a/npc/003-0-1/hiddenwarp.txt b/npc/003-0-1/hiddenwarp.txt
deleted file mode 100644
index 98874a9ac..000000000
--- a/npc/003-0-1/hiddenwarp.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-// TMW2 Script
-// Author:
-//    Jesusalva
-// Easter Egg for Hello World player
-// TODO: In future, check player direction
-
-003-0-1,21,24,0	script	#MSchoolRoof	NPC_HIDDEN,0,0,{
-    end;
-
-OnTouch:
-    warp "003-1", 49, 24;
-    RegEasterEgg(EE_MAGICSCHOOL, 3);
-    end;
-}
diff --git a/npc/005-2-1/_import.txt b/npc/005-2-1/_import.txt
index a3d1d7dde..c9b4ade92 100644
--- a/npc/005-2-1/_import.txt
+++ b/npc/005-2-1/_import.txt
@@ -2,4 +2,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/005-2-1/_mobs.txt",
 "npc/005-2-1/_warps.txt",
-"npc/005-2-1/note.txt",
diff --git a/npc/005-2-1/note.txt b/npc/005-2-1/note.txt
deleted file mode 100644
index c77c50fb6..000000000
--- a/npc/005-2-1/note.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-// TMW-2 Script.
-// Authors:
-//    Saulc
-// Description:
-//    A small note
-
-005-2-1,41,33,0	script	Note#saxsocave	NPC_PAPER_NOTE,{
-    mesc l("I leave this basement that start to be too dangerous!");
-
-    RegEasterEgg(EE_SAXSO, 5);
-    close;
-
-OnInit:
-    .distance = 2;
-    end;
-}
diff --git a/npc/006-4-1/painting.txt b/npc/006-4-1/painting.txt
index 82172d304..81f6375db 100644
--- a/npc/006-4-1/painting.txt
+++ b/npc/006-4-1/painting.txt
@@ -2,20 +2,6 @@
 // Author:
 //    Jesusalva
 
-006-4-1,59,29,0	script	#jakPortrait1	NPC_NO_SPRITE,{
-    RegEasterEgg(EE_JAK1, 1);
-    mesc ".:: " + l("Researcher Jak's Residence") + " ::.";
-    mes "";
-    mesc l("And his sister,");
-    mes "";
-    mesc ".:: " + l("Researcher Alyta's Residence") + " ::.";
-    close;
-
-OnInit:
-    .distance=2;
-    end;
-}
-
 006-4-1,24,53,0	script	#jakWestWind	NPC_HIDDEN,0,0,{
     end;
 
diff --git a/npc/scripts.conf b/npc/scripts.conf
index f0b1854fe..7a037fd3f 100644
--- a/npc/scripts.conf
+++ b/npc/scripts.conf
@@ -142,6 +142,7 @@
 "npc/functions/instances.txt",
 "npc/functions/captcha.txt",
 "npc/functions/dungeon.txt",
+"npc/config/easteregg_blackbox.txt"
 
 // Maps specific scripts
 @include "npc/_import.txt"