add the old candor to the wormholev2019.6.4

10 files changed, 59 insertions, 0 deletions

diff --git a/client-data b/client-data
-Subproject 54964d8886479fcbf4e6ac10586a1bc7f2b96e1
+Subproject d06a5166e52e83a7b81e2261d4cb4fe01addd53
diff --git a/world/map/data/029-4.wlk b/world/map/data/029-4.wlk
new file mode 100644
index 00000000..9dbbe403
--- /dev/null
+++ b/world/map/data/029-4.wlk
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index 64e09c0d..b09a82d7 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -81,6 +81,7 @@
 029-1#029-1.wlk#
 029-2#029-2.wlk#
 029-3#029-3.wlk#
+029-4#029-4.wlk#
 030-1#030-1.wlk#
 030-2#030-2.wlk#
 030-3#030-3.wlk#
diff --git a/world/map/npc/029-4/_import.txt b/world/map/npc/029-4/_import.txt
new file mode 100644
index 00000000..10833d5c
--- /dev/null
+++ b/world/map/npc/029-4/_import.txt
@@ -0,0 +1,8 @@
+// Map 029-4: 2014 Candor
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 029-4
+npc: npc/029-4/_mobs.txt
+npc: npc/029-4/_nodes.txt
+npc: npc/029-4/_warps.txt
+npc: npc/029-4/mapflags.txt
+npc: npc/029-4/time-traveler.txt
diff --git a/world/map/npc/029-4/_mobs.txt b/world/map/npc/029-4/_mobs.txt
new file mode 100644
index 00000000..1b1f2252
--- /dev/null
+++ b/world/map/npc/029-4/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// 2014 Candor mobs
+
+029-4,69,65,12,13|monster|EvilMushroom|1013,4,20000ms,60000ms
+029-4,32,33,12,13|monster|Squirrel|1038,3,30000ms,60000ms
+029-4,46,48,4,1|monster|CloverPatch|1037,1,10000ms,120000ms
+029-4,37,60,22,20|monster|SpikyMushroom|1019,5,10000ms,30000ms
+029-4,54,36,17,18|monster|Bat|1017,4,25000ms,30000ms
+029-4,59,51,13,9|monster|LogHead|1025,2,25000ms,30000ms
diff --git a/world/map/npc/029-4/_nodes.txt b/world/map/npc/029-4/_nodes.txt
new file mode 100644
index 00000000..5eae3c8a
--- /dev/null
+++ b/world/map/npc/029-4/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// 2014 Candor nodes
+
+// (no nodes)
diff --git a/world/map/npc/029-4/_warps.txt b/world/map/npc/029-4/_warps.txt
new file mode 100644
index 00000000..588ef957
--- /dev/null
+++ b/world/map/npc/029-4/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// 2014 Candor warps
+
+029-4,22,38|warp|-1,0,029-1,25,38
diff --git a/world/map/npc/029-4/mapflags.txt b/world/map/npc/029-4/mapflags.txt
new file mode 100644
index 00000000..8e181716
--- /dev/null
+++ b/world/map/npc/029-4/mapflags.txt
@@ -0,0 +1 @@
+029-4|mapflag|resave|029-4,69,69
diff --git a/world/map/npc/029-4/time-traveler.txt b/world/map/npc/029-4/time-traveler.txt
new file mode 100644
index 00000000..1242e7c4
--- /dev/null
+++ b/world/map/npc/029-4/time-traveler.txt
@@ -0,0 +1,31 @@
+// time traveler that warps from old tonori to new tonori
+
+029-1,25,40,0|script|Time Traveler#291|184
+{
+    mes "Would you like to time travel?";
+    menu
+        "Yes!", L_Warp;
+
+L_Warp:
+    mes "Hang tight!";
+    close2;
+    warp "029-4", 24, 38;
+    close;
+}
+
+029-4,26,36,0|script|Time Traveler#294|184
+{
+    mes "Welcome back!";
+    menu
+        "What year are we in?", L_What,
+        "How do I leave?", L_Leave;
+
+L_What:
+    mes "This is what Candor used to look like back in 2014.";
+    // TODO: we need an explaination
+    close;
+
+L_Leave:
+    mes "Walk West from here to escape the time dilation bubble.";
+    close;
+}
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 1fafe813..b92ea7e1 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -83,6 +83,7 @@ import: npc/028-3/_import.txt
 import: npc/029-1/_import.txt
 import: npc/029-2/_import.txt
 import: npc/029-3/_import.txt
+import: npc/029-4/_import.txt
 import: npc/030-1/_import.txt
 import: npc/030-2/_import.txt
 import: npc/030-3/_import.txt