From 1fb9844a9f804e6fffb84802ec5fe06ffc2626aa Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Mon, 15 Apr 2019 13:29:29 -0400
Subject: add the old tulim beach to the wormhole

---
 client-data                           |   2 +-
 world/map/data/003-4.wlk              | Bin 0 -> 26224 bytes
 world/map/data/004-1.wlk              | Bin 15565 -> 15565 bytes
 world/map/data/042-1.wlk              | Bin 22564 -> 22564 bytes
 world/map/data/resnametable.txt       |   8 ++++++++
 world/map/npc/001-2/_nodes.txt        |   4 ++--
 world/map/npc/003-4/_import.txt       |   7 +++++++
 world/map/npc/003-4/_mobs.txt         |   9 +++++++++
 world/map/npc/003-4/_nodes.txt        |   4 ++++
 world/map/npc/003-4/_warps.txt        |   6 ++++++
 world/map/npc/003-4/time-traveler.txt |  33 +++++++++++++++++++++++++++++++++
 world/map/npc/004-1/_import.txt       |   6 ++++++
 world/map/npc/004-1/_mobs.txt         |  10 ++++++++++
 world/map/npc/004-1/_nodes.txt        |   4 ++++
 world/map/npc/004-1/_warps.txt        |   5 +++++
 world/map/npc/023-1/_import.txt       |   6 ++++++
 world/map/npc/023-1/_mobs.txt         |  16 ++++++++++++++++
 world/map/npc/023-1/_nodes.txt        |   4 ++++
 world/map/npc/023-1/_warps.txt        |  16 ++++++++++++++++
 world/map/npc/023-2/_import.txt       |   6 ++++++
 world/map/npc/023-2/_mobs.txt         |   3 +++
 world/map/npc/023-2/_nodes.txt        |   4 ++++
 world/map/npc/023-2/_warps.txt        |   5 +++++
 world/map/npc/023-3/_import.txt       |   6 ++++++
 world/map/npc/023-3/_mobs.txt         |   9 +++++++++
 world/map/npc/023-3/_nodes.txt        |   4 ++++
 world/map/npc/023-3/_warps.txt        |  11 +++++++++++
 world/map/npc/041-1/_import.txt       |   6 ++++++
 world/map/npc/041-1/_mobs.txt         |  14 ++++++++++++++
 world/map/npc/041-1/_nodes.txt        |   4 ++++
 world/map/npc/041-1/_warps.txt        |   5 +++++
 world/map/npc/042-1/_import.txt       |   6 ++++++
 world/map/npc/042-1/_mobs.txt         |  13 +++++++++++++
 world/map/npc/042-1/_nodes.txt        |   4 ++++
 world/map/npc/042-1/_warps.txt        |   5 +++++
 world/map/npc/043-1/_import.txt       |   6 ++++++
 world/map/npc/043-1/_mobs.txt         |   6 ++++++
 world/map/npc/043-1/_nodes.txt        |   4 ++++
 world/map/npc/043-1/_warps.txt        |   4 ++++
 world/map/npc/_import.txt             |   8 ++++++++
 40 files changed, 270 insertions(+), 3 deletions(-)
 create mode 100644 world/map/data/003-4.wlk
 create mode 100644 world/map/npc/003-4/_import.txt
 create mode 100644 world/map/npc/003-4/_mobs.txt
 create mode 100644 world/map/npc/003-4/_nodes.txt
 create mode 100644 world/map/npc/003-4/_warps.txt
 create mode 100644 world/map/npc/003-4/time-traveler.txt
 create mode 100644 world/map/npc/004-1/_import.txt
 create mode 100644 world/map/npc/004-1/_mobs.txt
 create mode 100644 world/map/npc/004-1/_nodes.txt
 create mode 100644 world/map/npc/004-1/_warps.txt
 create mode 100644 world/map/npc/023-1/_import.txt
 create mode 100644 world/map/npc/023-1/_mobs.txt
 create mode 100644 world/map/npc/023-1/_nodes.txt
 create mode 100644 world/map/npc/023-1/_warps.txt
 create mode 100644 world/map/npc/023-2/_import.txt
 create mode 100644 world/map/npc/023-2/_mobs.txt
 create mode 100644 world/map/npc/023-2/_nodes.txt
 create mode 100644 world/map/npc/023-2/_warps.txt
 create mode 100644 world/map/npc/023-3/_import.txt
 create mode 100644 world/map/npc/023-3/_mobs.txt
 create mode 100644 world/map/npc/023-3/_nodes.txt
 create mode 100644 world/map/npc/023-3/_warps.txt
 create mode 100644 world/map/npc/041-1/_import.txt
 create mode 100644 world/map/npc/041-1/_mobs.txt
 create mode 100644 world/map/npc/041-1/_nodes.txt
 create mode 100644 world/map/npc/041-1/_warps.txt
 create mode 100644 world/map/npc/042-1/_import.txt
 create mode 100644 world/map/npc/042-1/_mobs.txt
 create mode 100644 world/map/npc/042-1/_nodes.txt
 create mode 100644 world/map/npc/042-1/_warps.txt
 create mode 100644 world/map/npc/043-1/_import.txt
 create mode 100644 world/map/npc/043-1/_mobs.txt
 create mode 100644 world/map/npc/043-1/_nodes.txt
 create mode 100644 world/map/npc/043-1/_warps.txt

diff --git a/client-data b/client-data
index bb962b10..43ea6b40 160000
--- a/client-data
+++ b/client-data
@@ -1 +1 @@
-Subproject commit bb962b10fe9fb828dd014183e3e0b6bea32e6802
+Subproject commit 43ea6b40bb02beddd2e014a18f45264dd6f804f5
diff --git a/world/map/data/003-4.wlk b/world/map/data/003-4.wlk
new file mode 100644
index 00000000..1e98b470
Binary files /dev/null and b/world/map/data/003-4.wlk differ
diff --git a/world/map/data/004-1.wlk b/world/map/data/004-1.wlk
index 22473a0b..d720a514 100644
Binary files a/world/map/data/004-1.wlk and b/world/map/data/004-1.wlk differ
diff --git a/world/map/data/042-1.wlk b/world/map/data/042-1.wlk
index f41ebe48..04037f13 100644
Binary files a/world/map/data/042-1.wlk and b/world/map/data/042-1.wlk differ
diff --git a/world/map/data/resnametable.txt b/world/map/data/resnametable.txt
index c458621a..64e09c0d 100644
--- a/world/map/data/resnametable.txt
+++ b/world/map/data/resnametable.txt
@@ -7,6 +7,8 @@
 002-4#002-4.wlk#
 002-5#002-5.wlk#
 003-1#003-1.wlk#
+003-4#003-4.wlk#
+004-1#004-1.wlk#
 004-3#004-3.wlk#
 004-4#004-4.wlk#
 004-5#004-5.wlk#
@@ -58,6 +60,9 @@
 020-2#020-2.wlk#
 020-3#020-3.wlk#
 021-3#021-3.wlk#
+023-1#023-1.wlk#
+023-2#023-2.wlk#
+023-3#023-3.wlk#
 025-1#025-1.wlk#
 025-3#025-3.wlk#
 025-4#025-4.wlk#
@@ -90,6 +95,9 @@
 034-2#034-2.wlk#
 035-2#035-2.wlk#
 036-2#036-2.wlk#
+041-1#041-1.wlk#
+042-1#042-1.wlk#
+043-1#043-1.wlk#
 043-3#043-3.wlk#
 043-4#043-4.wlk#
 045-1#045-1.wlk#
diff --git a/world/map/npc/001-2/_nodes.txt b/world/map/npc/001-2/_nodes.txt
index 83a8fce0..2bf62e74 100644
--- a/world/map/npc/001-2/_nodes.txt
+++ b/world/map/npc/001-2/_nodes.txt
@@ -6,8 +6,8 @@
     end;
 OnInit:
     setarray .m$, "_N-Alchemy", "001-2", "001-2", "001-2", "001-2";
-    setarray .x1, "_N-Alchemy", 98, 92, 98, 92;
-    setarray .y1, "_N-Alchemy", 89, 89, 76, 76;
+    setarray .x1, "_N-Alchemy", 92, 92, 98, 98;
+    setarray .y1, "_N-Alchemy", 76, 89, 76, 89;
     setarray .x2, "_N-Alchemy", 0, 0, 0, 0;
     setarray .y2, "_N-Alchemy", 0, 0, 0, 0;
     setarray .id, "_N-Alchemy", 0, 0, 0, 0;
diff --git a/world/map/npc/003-4/_import.txt b/world/map/npc/003-4/_import.txt
new file mode 100644
index 00000000..12b32eae
--- /dev/null
+++ b/world/map/npc/003-4/_import.txt
@@ -0,0 +1,7 @@
+// Map 003-4: Beach
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 003-4
+npc: npc/003-4/_mobs.txt
+npc: npc/003-4/_nodes.txt
+npc: npc/003-4/_warps.txt
+npc: npc/003-4/time-traveler.txt
diff --git a/world/map/npc/003-4/_mobs.txt b/world/map/npc/003-4/_mobs.txt
new file mode 100644
index 00000000..608c9c53
--- /dev/null
+++ b/world/map/npc/003-4/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Beach mobs
+
+003-4,158,68,28,96|monster|GiantMaggot|1006,10,100000ms,30000ms
+003-4,0,0,0,0|monster|SeaSlime|1033,15,100000ms,30000ms
+003-4,120,31,22,22|monster|SeaSlime|1033,5,100000ms,30000ms
+003-4,119,68,105,101|monster|GreenSlime|1005,35,100000ms,30000ms
+003-4,134,69,76,71|monster|RedScorpion|1004,20,100000ms,30000ms
+003-4,35,25,10,3|monster|MountainSnake|1026,1,700000ms,600000ms
diff --git a/world/map/npc/003-4/_nodes.txt b/world/map/npc/003-4/_nodes.txt
new file mode 100644
index 00000000..8c36389e
--- /dev/null
+++ b/world/map/npc/003-4/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Beach nodes
+
+// (no nodes)
diff --git a/world/map/npc/003-4/_warps.txt b/world/map/npc/003-4/_warps.txt
new file mode 100644
index 00000000..a27ebb4d
--- /dev/null
+++ b/world/map/npc/003-4/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Beach warps
+
+003-4,172,77|warp|-1,3,002-1,32,66
+003-4,141,19|warp|1,-1,004-1,37,110
+003-4,114,117|warp|2,-1,043-1,44,20
diff --git a/world/map/npc/003-4/time-traveler.txt b/world/map/npc/003-4/time-traveler.txt
new file mode 100644
index 00000000..cf078fcb
--- /dev/null
+++ b/world/map/npc/003-4/time-traveler.txt
@@ -0,0 +1,33 @@
+// time traveler that warps from old nivalis to new nivalis
+
+002-1,30,67,0|script|Time Traveler#21|184
+{
+    mes "Would you like to time travel?";
+    menu
+        "Yes!", L_Warp;
+
+L_Warp:
+    mes "Hang tight!";
+    close2;
+    warp "003-4", 171, 76;
+    close;
+}
+
+003-4,165,73,0|script|Time Traveler#34|184
+{
+    mes "Welcome back!";
+    menu
+        "What is this place?", L_What,
+        "How do I leave?", L_Leave;
+
+L_What:
+    mes "This place used to be part of Tonori a few years back.";
+    mes "Unfortunately, it almost vanished completely due to illegal dredging of the coast.";
+    next;
+    mes "The culprits were never caught.";
+    close;
+
+L_Leave:
+    mes "Walk East from here to escape the time dilation bubble.";
+    close;
+}
diff --git a/world/map/npc/004-1/_import.txt b/world/map/npc/004-1/_import.txt
new file mode 100644
index 00000000..be7b0851
--- /dev/null
+++ b/world/map/npc/004-1/_import.txt
@@ -0,0 +1,6 @@
+// Map 004-1: Beach
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 004-1
+npc: npc/004-1/_mobs.txt
+npc: npc/004-1/_nodes.txt
+npc: npc/004-1/_warps.txt
diff --git a/world/map/npc/004-1/_mobs.txt b/world/map/npc/004-1/_mobs.txt
new file mode 100644
index 00000000..c643668a
--- /dev/null
+++ b/world/map/npc/004-1/_mobs.txt
@@ -0,0 +1,10 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Beach mobs
+
+004-1,39,57,8,29|monster|SeaSlime|1033,5,100000ms,30000ms
+004-1,33,83,9,40|monster|SeaSlime|1033,11,100000ms,30000ms
+004-1,28,103,11,14|monster|SeaSlime|1033,7,100000ms,30000ms
+004-1,71,104,27,20|monster|GiantMaggot|1006,5,100000ms,30000ms
+004-1,76,68,21,49|monster|RedScorpion|1004,13,100000ms,30000ms
+004-1,68,25,19,10|monster|GiantMaggot|1006,2,100000ms,30000ms
+004-1,93,27,2,3|monster|BlackScorpion|1009,1,120000ms,60000ms
diff --git a/world/map/npc/004-1/_nodes.txt b/world/map/npc/004-1/_nodes.txt
new file mode 100644
index 00000000..8c36389e
--- /dev/null
+++ b/world/map/npc/004-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Beach nodes
+
+// (no nodes)
diff --git a/world/map/npc/004-1/_warps.txt b/world/map/npc/004-1/_warps.txt
new file mode 100644
index 00000000..78c4ec8b
--- /dev/null
+++ b/world/map/npc/004-1/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Beach warps
+
+004-1,68,19|warp|1,-1,041-1,101,94
+004-1,37,111|warp|1,-1,003-1,141,20
diff --git a/world/map/npc/023-1/_import.txt b/world/map/npc/023-1/_import.txt
new file mode 100644
index 00000000..a13517df
--- /dev/null
+++ b/world/map/npc/023-1/_import.txt
@@ -0,0 +1,6 @@
+// Map 023-1: Tulimshar Lighthouse Beach
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 023-1
+npc: npc/023-1/_mobs.txt
+npc: npc/023-1/_nodes.txt
+npc: npc/023-1/_warps.txt
diff --git a/world/map/npc/023-1/_mobs.txt b/world/map/npc/023-1/_mobs.txt
new file mode 100644
index 00000000..61f7a828
--- /dev/null
+++ b/world/map/npc/023-1/_mobs.txt
@@ -0,0 +1,16 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Tulimshar Lighthouse Beach mobs
+
+023-1,70,41,7,7|monster|Thug|1119,1,100000ms,30000ms
+023-1,84,33,11,7|monster|Swashbuckler|1120,1,100000ms,30000ms
+023-1,58,28,6,6|monster|Grenadier|1121,1,100000ms,30000ms
+023-1,80,99,11,7|monster|Swashbuckler|1120,1,100000ms,30000ms
+023-1,86,117,19,2|monster|Grenadier|1121,1,100000ms,30000ms
+023-1,55,126,7,7|monster|Thug|1119,1,100000ms,30000ms
+023-1,47,86,7,7|monster|Thug|1119,1,100000ms,30000ms
+023-1,102,67,11,7|monster|Swashbuckler|1120,1,100000ms,30000ms
+023-1,105,90,7,7|monster|Thug|1119,1,100000ms,30000ms
+023-1,62,60,7,7|monster|Thug|1119,1,100000ms,30000ms
+023-1,93,49,13,11|monster|Grenadier|1121,1,100000ms,30000ms
+023-1,64,95,1,46|monster|AngrySeaSlime|1109,3,150000ms,100000ms
+023-1,45,54,5,38|monster|AngrySeaSlime|1109,3,150000ms,100000ms
diff --git a/world/map/npc/023-1/_nodes.txt b/world/map/npc/023-1/_nodes.txt
new file mode 100644
index 00000000..d629af24
--- /dev/null
+++ b/world/map/npc/023-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Tulimshar Lighthouse Beach nodes
+
+// (no nodes)
diff --git a/world/map/npc/023-1/_warps.txt b/world/map/npc/023-1/_warps.txt
new file mode 100644
index 00000000..b9ede113
--- /dev/null
+++ b/world/map/npc/023-1/_warps.txt
@@ -0,0 +1,16 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Tulimshar Lighthouse Beach warps
+
+023-1,65,146|warp|0,-1,042-1,65,24
+023-1,75,134|warp|-1,-1,023-3,75,132
+023-1,71,117|warp|-1,-1,023-3,71,114
+023-1,83,114|warp|-1,-1,023-3,83,112
+023-1,107,120|warp|-1,-1,023-3,106,118
+023-1,105,114|warp|-1,-1,023-3,106,115
+023-1,70,95|warp|-1,-1,023-3,70,93
+023-1,48,80|warp|-1,-1,023-3,48,78
+023-1,61,36|warp|-1,-1,023-3,61,39
+023-1,36,34|warp|-1,-1,023-2,31,38
+023-1,37,23|warp|-1,-1,023-2,31,33
+023-1,66,101|warp|-1,2,023-1,61,100
+023-1,62,101|warp|-1,2,023-1,67,100
diff --git a/world/map/npc/023-2/_import.txt b/world/map/npc/023-2/_import.txt
new file mode 100644
index 00000000..0aab30cd
--- /dev/null
+++ b/world/map/npc/023-2/_import.txt
@@ -0,0 +1,6 @@
+// Map 023-2: Lighthouse
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 023-2
+npc: npc/023-2/_mobs.txt
+npc: npc/023-2/_nodes.txt
+npc: npc/023-2/_warps.txt
diff --git a/world/map/npc/023-2/_mobs.txt b/world/map/npc/023-2/_mobs.txt
new file mode 100644
index 00000000..438ad3e2
--- /dev/null
+++ b/world/map/npc/023-2/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Lighthouse mobs
+
diff --git a/world/map/npc/023-2/_nodes.txt b/world/map/npc/023-2/_nodes.txt
new file mode 100644
index 00000000..fd72112d
--- /dev/null
+++ b/world/map/npc/023-2/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Lighthouse nodes
+
+// (no nodes)
diff --git a/world/map/npc/023-2/_warps.txt b/world/map/npc/023-2/_warps.txt
new file mode 100644
index 00000000..f61b4052
--- /dev/null
+++ b/world/map/npc/023-2/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Lighthouse warps
+
+023-2,31,40|warp|-1,-1,023-1,36,35
+023-2,31,31|warp|-1,-1,023-1,36,23
diff --git a/world/map/npc/023-3/_import.txt b/world/map/npc/023-3/_import.txt
new file mode 100644
index 00000000..9cc92d99
--- /dev/null
+++ b/world/map/npc/023-3/_import.txt
@@ -0,0 +1,6 @@
+// Map 023-3: Tulimshar Beach Caves
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 023-3
+npc: npc/023-3/_mobs.txt
+npc: npc/023-3/_nodes.txt
+npc: npc/023-3/_warps.txt
diff --git a/world/map/npc/023-3/_mobs.txt b/world/map/npc/023-3/_mobs.txt
new file mode 100644
index 00000000..406ae2ba
--- /dev/null
+++ b/world/map/npc/023-3/_mobs.txt
@@ -0,0 +1,9 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Tulimshar Beach Caves mobs
+
+023-3,91,77,7,7|monster|Thug|1119,1,100000ms,30000ms
+023-3,127,85,7,7|monster|Swashbuckler|1120,1,100000ms,30000ms
+023-3,98,28,7,7|monster|Swashbuckler|1120,1,100000ms,30000ms
+023-3,120,45,7,7|monster|Thug|1119,1,100000ms,30000ms
+023-3,51,107,12,5|monster|Swashbuckler|1120,1,100000ms,30000ms
+023-3,69,52,66,8|monster|Thug|1119,1,100000ms,30000ms
diff --git a/world/map/npc/023-3/_nodes.txt b/world/map/npc/023-3/_nodes.txt
new file mode 100644
index 00000000..2481bf66
--- /dev/null
+++ b/world/map/npc/023-3/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Tulimshar Beach Caves nodes
+
+// (no nodes)
diff --git a/world/map/npc/023-3/_warps.txt b/world/map/npc/023-3/_warps.txt
new file mode 100644
index 00000000..bb7af5ad
--- /dev/null
+++ b/world/map/npc/023-3/_warps.txt
@@ -0,0 +1,11 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Tulimshar Beach Caves warps
+
+023-3,75,134|warp|-1,-1,023-1,75,136
+023-3,71,117|warp|-1,-1,023-1,71,119
+023-3,83,114|warp|-1,-1,023-1,83,116
+023-3,106,120|warp|-1,-1,023-1,107,122
+023-3,106,112|warp|-1,-1,023-1,105,112
+023-3,70,95|warp|-1,-1,023-1,70,97
+023-3,48,80|warp|-1,-1,023-1,48,82
+023-3,61,36|warp|-1,-1,023-1,61,34
diff --git a/world/map/npc/041-1/_import.txt b/world/map/npc/041-1/_import.txt
new file mode 100644
index 00000000..6fb25a4c
--- /dev/null
+++ b/world/map/npc/041-1/_import.txt
@@ -0,0 +1,6 @@
+// Map 041-1: Beach
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 041-1
+npc: npc/041-1/_mobs.txt
+npc: npc/041-1/_nodes.txt
+npc: npc/041-1/_warps.txt
diff --git a/world/map/npc/041-1/_mobs.txt b/world/map/npc/041-1/_mobs.txt
new file mode 100644
index 00000000..b766519b
--- /dev/null
+++ b/world/map/npc/041-1/_mobs.txt
@@ -0,0 +1,14 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Beach mobs
+
+041-1,81,55,18,9|monster|Scorpion|1003,3,100000ms,30000ms
+041-1,101,67,18,9|monster|Scorpion|1003,3,100000ms,30000ms
+041-1,100,84,18,9|monster|Scorpion|1003,3,100000ms,30000ms
+041-1,61,34,13,20|monster|Scorpion|1003,3,100000ms,30000ms
+041-1,55,30,10,48|monster|SeaSlime|1033,3,100000ms,30000ms
+041-1,59,13,10,9|monster|Scorpion|1003,3,100000ms,30000ms
+041-1,60,7,3,2|monster|TameScorpion|1046,1,100000ms,30000ms
+041-1,66,49,3,2|monster|TameScorpion|1046,1,100000ms,30000ms
+041-1,95,75,21,9|monster|TameScorpion|1046,1,100000ms,30000ms
+041-1,100,57,18,9|monster|RedScorpion|1004,3,100000ms,30000ms
+041-1,83,64,18,9|monster|RedScorpion|1004,3,100000ms,30000ms
diff --git a/world/map/npc/041-1/_nodes.txt b/world/map/npc/041-1/_nodes.txt
new file mode 100644
index 00000000..8c36389e
--- /dev/null
+++ b/world/map/npc/041-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Beach nodes
+
+// (no nodes)
diff --git a/world/map/npc/041-1/_warps.txt b/world/map/npc/041-1/_warps.txt
new file mode 100644
index 00000000..7f4ff77e
--- /dev/null
+++ b/world/map/npc/041-1/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Beach warps
+
+041-1,101,95|warp|1,-1,004-1,68,20
+041-1,58,4|warp|1,-1,042-1,44,113
diff --git a/world/map/npc/042-1/_import.txt b/world/map/npc/042-1/_import.txt
new file mode 100644
index 00000000..307d1e7a
--- /dev/null
+++ b/world/map/npc/042-1/_import.txt
@@ -0,0 +1,6 @@
+// Map 042-1: Tulimshar Suburbs
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 042-1
+npc: npc/042-1/_mobs.txt
+npc: npc/042-1/_nodes.txt
+npc: npc/042-1/_warps.txt
diff --git a/world/map/npc/042-1/_mobs.txt b/world/map/npc/042-1/_mobs.txt
new file mode 100644
index 00000000..fdb0e4ec
--- /dev/null
+++ b/world/map/npc/042-1/_mobs.txt
@@ -0,0 +1,13 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Tulimshar Suburbs mobs
+
+042-1,101,69,31,15|monster|Maggot|1002,5,100000ms,30000ms
+042-1,65,59,27,15|monster|Maggot|1002,7,100000ms,30000ms
+042-1,68,102,7,8|monster|BlackScorpion|1009,5,100000ms,30000ms
+042-1,98,88,5,8|monster|Scorpion|1003,4,100000ms,30000ms
+042-1,63,63,37,30|monster|TameScorpion|1046,6,100000ms,30000ms
+042-1,85,102,5,8|monster|Scorpion|1003,5,100000ms,30000ms
+042-1,98,99,5,5|monster|Scorpion|1003,3,100000ms,30000ms
+042-1,82,87,6,3|monster|Scorpion|1003,2,100000ms,30000ms
+042-1,70,88,5,8|monster|BlackScorpion|1009,5,100000ms,30000ms
+042-1,80,35,11,5|monster|BlackScorpion|1009,5,100000ms,30000ms
diff --git a/world/map/npc/042-1/_nodes.txt b/world/map/npc/042-1/_nodes.txt
new file mode 100644
index 00000000..2bb4d903
--- /dev/null
+++ b/world/map/npc/042-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Tulimshar Suburbs nodes
+
+// (no nodes)
diff --git a/world/map/npc/042-1/_warps.txt b/world/map/npc/042-1/_warps.txt
new file mode 100644
index 00000000..61aa0b87
--- /dev/null
+++ b/world/map/npc/042-1/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Tulimshar Suburbs warps
+
+042-1,65,20|warp|0,-1,023-1,64,143
+042-1,44,115|warp|1,-1,041-1,58,6
diff --git a/world/map/npc/043-1/_import.txt b/world/map/npc/043-1/_import.txt
new file mode 100644
index 00000000..51426ec7
--- /dev/null
+++ b/world/map/npc/043-1/_import.txt
@@ -0,0 +1,6 @@
+// Map 043-1: Beach
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 043-1
+npc: npc/043-1/_mobs.txt
+npc: npc/043-1/_nodes.txt
+npc: npc/043-1/_warps.txt
diff --git a/world/map/npc/043-1/_mobs.txt b/world/map/npc/043-1/_mobs.txt
new file mode 100644
index 00000000..3dccd6e2
--- /dev/null
+++ b/world/map/npc/043-1/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Beach mobs
+
+043-1,0,0,0,0|monster|SeaSlime|1033,17,40000ms,30000ms
+043-1,0,0,0,0|monster|YellowSlime|1007,15,60000ms,60000ms
+043-1,0,0,0,0|monster|GreenSlime|1005,20,60000ms,60000ms
diff --git a/world/map/npc/043-1/_nodes.txt b/world/map/npc/043-1/_nodes.txt
new file mode 100644
index 00000000..8c36389e
--- /dev/null
+++ b/world/map/npc/043-1/_nodes.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Beach nodes
+
+// (no nodes)
diff --git a/world/map/npc/043-1/_warps.txt b/world/map/npc/043-1/_warps.txt
new file mode 100644
index 00000000..05b4cdc8
--- /dev/null
+++ b/world/map/npc/043-1/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Beach warps
+
+043-1,43,19|warp|4,-1,003-4,114,116
diff --git a/world/map/npc/_import.txt b/world/map/npc/_import.txt
index 17df3b2b..1fafe813 100644
--- a/world/map/npc/_import.txt
+++ b/world/map/npc/_import.txt
@@ -9,6 +9,8 @@ import: npc/002-3/_import.txt
 import: npc/002-4/_import.txt
 import: npc/002-5/_import.txt
 import: npc/003-1/_import.txt
+import: npc/003-4/_import.txt
+import: npc/004-1/_import.txt
 import: npc/004-3/_import.txt
 import: npc/004-4/_import.txt
 import: npc/004-5/_import.txt
@@ -60,6 +62,9 @@ import: npc/020-1/_import.txt
 import: npc/020-2/_import.txt
 import: npc/020-3/_import.txt
 import: npc/021-3/_import.txt
+import: npc/023-1/_import.txt
+import: npc/023-2/_import.txt
+import: npc/023-3/_import.txt
 import: npc/025-1/_import.txt
 import: npc/025-3/_import.txt
 import: npc/025-4/_import.txt
@@ -92,6 +97,9 @@ import: npc/034-1/_import.txt
 import: npc/034-2/_import.txt
 import: npc/035-2/_import.txt
 import: npc/036-2/_import.txt
+import: npc/041-1/_import.txt
+import: npc/042-1/_import.txt
+import: npc/043-1/_import.txt
 import: npc/043-3/_import.txt
 import: npc/043-4/_import.txt
 import: npc/045-1/_import.txt
-- 
cgit v1.2.3-60-g2f50