summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/mob_db.conf1
-rw-r--r--maps/re/014-4.mcachebin833 -> 1094 bytes
-rw-r--r--maps/re/017-1.mcachebin4290 -> 4295 bytes
-rw-r--r--npc/014-3/_warps.txt1
-rw-r--r--npc/014-4/_import.txt2
-rw-r--r--npc/014-4/_mobs.txt7
-rw-r--r--npc/014-4/_warps.txt4
-rw-r--r--npc/017-1/_warps.txt1
8 files changed, 16 insertions, 0 deletions
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 2b46377d6..19f7323b1 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -6465,6 +6465,7 @@ mob_db: (
Attack: [207, 257]
Def: 0
Mdef: 5
+ WalkMask: "WALK_WATER"
Stats: {
Str: 1
Agi: 15
diff --git a/maps/re/014-4.mcache b/maps/re/014-4.mcache
index d78821319..0f27dceb2 100644
--- a/maps/re/014-4.mcache
+++ b/maps/re/014-4.mcache
Binary files differ
diff --git a/maps/re/017-1.mcache b/maps/re/017-1.mcache
index a773b924d..2f5356a6c 100644
--- a/maps/re/017-1.mcache
+++ b/maps/re/017-1.mcache
Binary files differ
diff --git a/npc/014-3/_warps.txt b/npc/014-3/_warps.txt
index b5132537e..8d4dd156a 100644
--- a/npc/014-3/_warps.txt
+++ b/npc/014-3/_warps.txt
@@ -6,3 +6,4 @@
014-3,138,86,0 warp #014-3_138_86 0,0,015-2,49,100
014-3,73,61,0 warp #014-3_73_61 0,0,014-3,95,59
014-3,95,58,0 warp #014-3_95_58 0,0,014-3,73,62
+014-3,47,89,0 warp #014-3_47_89 0,3,014-4,158,68
diff --git a/npc/014-4/_import.txt b/npc/014-4/_import.txt
index 45a61f509..82a798273 100644
--- a/npc/014-4/_import.txt
+++ b/npc/014-4/_import.txt
@@ -1,3 +1,5 @@
// Map 014-4: Thunderhill
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/014-4/_mobs.txt",
+"npc/014-4/_warps.txt",
"npc/014-4/mapflags.txt",
diff --git a/npc/014-4/_mobs.txt b/npc/014-4/_mobs.txt
new file mode 100644
index 000000000..0c3c4ee57
--- /dev/null
+++ b/npc/014-4/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 014-4: Thunderhill mobs
+014-4,134,85,26,22 monster Centaur 1139,1,60000,60000
+014-4,61,38,43,23 monster Mana Piou 1155,6,30000,30000
+014-4,130,68,24,52 monster Forest Mushroom 1060,9,60000,45000
+014-4,70,77,53,13 monster Living Potato 1181,4,60000,45000
+014-4,20,26,4,20 monster Bluepar 1177,4,30000,30000
diff --git a/npc/014-4/_warps.txt b/npc/014-4/_warps.txt
new file mode 100644
index 000000000..e503630e7
--- /dev/null
+++ b/npc/014-4/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 014-4: Thunderhill warps
+014-4,95,32,0 warp #014-4_95_32 0,0,017-1,219,90
+014-4,159,69,0 warp #014-4_159_69 0,3,014-3,48,88
diff --git a/npc/017-1/_warps.txt b/npc/017-1/_warps.txt
index 5810d4b17..efdd898e9 100644
--- a/npc/017-1/_warps.txt
+++ b/npc/017-1/_warps.txt
@@ -5,3 +5,4 @@
017-1,179,197,0 warp #017-1_179_197 0,0,018-1,32,66
017-1,182,197,0 warp #017-1_182_197 0,0,018-4,164,104
017-1,119,60,0 warp #017-1_119_60 0,0,017-2,31,30
+017-1,219,91,0 warp #017-1_219_91 0,0,014-4,95,33