summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/constants.conf1
-rw-r--r--maps/re/003-1.mcachebin1302 -> 1298 bytes
-rw-r--r--npc/003-0-1/_import.txt1
-rw-r--r--npc/003-0-1/hiddenwarp.txt21
-rw-r--r--npc/003-0/recepcionist.txt2
-rw-r--r--npc/003-1/_warps.txt2
6 files changed, 26 insertions, 1 deletions
diff --git a/db/constants.conf b/db/constants.conf
index 16d5c0522..c46df610b 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4269,6 +4269,7 @@ constants_db: {
EE_SAXSO: 1
EE_DEMURE: 2
EE_PRSM: 4
+ EE_MAGICSCHOOL: 8
comment__: "Teleporter enum"
TP_NONE: 0
diff --git a/maps/re/003-1.mcache b/maps/re/003-1.mcache
index e87aff702..81b0759c3 100644
--- a/maps/re/003-1.mcache
+++ b/maps/re/003-1.mcache
Binary files differ
diff --git a/npc/003-0-1/_import.txt b/npc/003-0-1/_import.txt
index 5aa9264e7..0d04be190 100644
--- a/npc/003-0-1/_import.txt
+++ b/npc/003-0-1/_import.txt
@@ -3,6 +3,7 @@
"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
new file mode 100644
index 000000000..d6f339b58
--- /dev/null
+++ b/npc/003-0-1/hiddenwarp.txt
@@ -0,0 +1,21 @@
+// 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;
+ .@q=getq(General_EasterEggs);
+
+ if (!(.@q & EE_MAGICSCHOOL)) {
+ setq General_EasterEggs, .@q|EE_MAGICSCHOOL;
+ dispbottom l("For finding an Easter Egg, you got Strange Coins!");
+ getitem StrangeCoin, 3;
+ }
+
+ end;
+}
diff --git a/npc/003-0/recepcionist.txt b/npc/003-0/recepcionist.txt
index 3cb3e89de..db2ae6d98 100644
--- a/npc/003-0/recepcionist.txt
+++ b/npc/003-0/recepcionist.txt
@@ -2,7 +2,7 @@
// Author:
// Jesusalva
// Description:
-// Magic School recepcionist
+// Magic School recepcionist (TODO: Give S. Badge)
003-0,47,44,4 script Recepcionist#003-0 NPC_FEMALE,{
if (getskilllv(TMW2_SKILLPERMIT) == 2 && MAGIC_LVL >= 3 && ST_TIER >= 1) goto L_T3_S0;
diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt
index 07b38bbfc..e552f7c33 100644
--- a/npc/003-1/_warps.txt
+++ b/npc/003-1/_warps.txt
@@ -20,3 +20,5 @@
003-1,58,54,0 warp #003-1_58_54 0,0,003-1-3,82,82
003-1,25,45,0 warp #003-1_25_45 0,0,003-1-3,37,85
003-1,52,35,0 warp #003-1_52_35 1,0,003-0-1,48,51
+003-1,49,23,0 warp #003-1_49_23 0,0,003-0-1,22,25
+003-1,54,23,0 warp #003-1_54_23 0,0,003-0-1,69,24