summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maps/re/010-1-1.mcachebin1585 -> 1596 bytes
-rw-r--r--maps/re/010-2.mcachebin1634 -> 1635 bytes
-rw-r--r--maps/re/014-2.mcachebin1996 -> 1990 bytes
-rw-r--r--maps/re/018-4.mcachebin974 -> 997 bytes
-rw-r--r--npc/010-1-1/_mobs.txt2
-rw-r--r--npc/010-1-1/_warps.txt1
-rw-r--r--npc/010-2/_import.txt2
-rw-r--r--npc/010-2/_warps.txt2
-rw-r--r--npc/014-2/_mobs.txt6
-rw-r--r--npc/018-4/_mobs.txt2
10 files changed, 8 insertions, 7 deletions
diff --git a/maps/re/010-1-1.mcache b/maps/re/010-1-1.mcache
index 4dd57d735..6d6669a77 100644
--- a/maps/re/010-1-1.mcache
+++ b/maps/re/010-1-1.mcache
Binary files differ
diff --git a/maps/re/010-2.mcache b/maps/re/010-2.mcache
index a68c00f11..25ae118b2 100644
--- a/maps/re/010-2.mcache
+++ b/maps/re/010-2.mcache
Binary files differ
diff --git a/maps/re/014-2.mcache b/maps/re/014-2.mcache
index a66047c07..da0c26a86 100644
--- a/maps/re/014-2.mcache
+++ b/maps/re/014-2.mcache
Binary files differ
diff --git a/maps/re/018-4.mcache b/maps/re/018-4.mcache
index 763f1dc6c..9524fb4a7 100644
--- a/maps/re/018-4.mcache
+++ b/maps/re/018-4.mcache
Binary files differ
diff --git a/npc/010-1-1/_mobs.txt b/npc/010-1-1/_mobs.txt
index c56bea4bf..c539ca2be 100644
--- a/npc/010-1-1/_mobs.txt
+++ b/npc/010-1-1/_mobs.txt
@@ -2,7 +2,7 @@
// Map 010-1-1: Canyon Great Caves mobs
010-1-1,55,58,29,22 monster Cave Snake 1035,8,35000,150000
010-1-1,70,40,3,1 monster Small Topaz Bif 1101,1,35000,150000
-010-1-1,54,54,54,54 monster Cave Maggot 1027,35,40000,200000
+010-1-1,79,54,59,54 monster Cave Maggot 1027,55,40000,200000
010-1-1,24,34,4,4 monster Black Scorpion 1071,2,35000,150000
010-1-1,112,34,4,4 monster Black Scorpion 1071,2,35000,150000
010-1-1,147,83,29,22 monster Black Scorpion 1074,12,35000,150000
diff --git a/npc/010-1-1/_warps.txt b/npc/010-1-1/_warps.txt
index 3233cd216..d0929bc71 100644
--- a/npc/010-1-1/_warps.txt
+++ b/npc/010-1-1/_warps.txt
@@ -18,3 +18,4 @@
010-1-1,119,36,0 warp #010-1-1_119_36 0,0,010-2,123,100
010-1-1,112,42,0 warp #010-1-1_112_42 0,0,010-1,105,28
010-1-1,168,23,0 warp #010-1-1_168_23 0,0,010-1,59,192
+010-1-1,176,50,0 warp #010-1-1_176_50 0,0,010-2,136,116
diff --git a/npc/010-2/_import.txt b/npc/010-2/_import.txt
index 7d8484572..53caf284d 100644
--- a/npc/010-2/_import.txt
+++ b/npc/010-2/_import.txt
@@ -2,4 +2,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/010-2/_mobs.txt",
"npc/010-2/_warps.txt",
-"npc/010-2/sawis.txt", \ No newline at end of file
+"npc/010-2/sawis.txt",
diff --git a/npc/010-2/_warps.txt b/npc/010-2/_warps.txt
index 19228bef0..621a3254d 100644
--- a/npc/010-2/_warps.txt
+++ b/npc/010-2/_warps.txt
@@ -8,7 +8,7 @@
010-2,108,129,0 warp #010-2_108_129 0,0,010-1-1,170,50
010-2,88,113,0 warp #010-2_88_113 0,0,010-1-1,41,38
010-2,127,122,0 warp #010-2_127_122 0,0,004-1,33,110
-010-2,136,115,0 warp #010-2_136_115 0,0,004-1,33,110
+010-2,136,115,0 warp #010-2_136_115 0,0,010-1-1,176,49
010-2,133,114,0 warp #010-2_133_114 0,0,004-1,33,110
010-2,114,103,0 warp #010-2_114_103 0,0,010-1-1,112,45
010-2,123,99,0 warp #010-2_123_99 0,0,010-1-1,119,35
diff --git a/npc/014-2/_mobs.txt b/npc/014-2/_mobs.txt
index f1bf4fd58..884f6bc47 100644
--- a/npc/014-2/_mobs.txt
+++ b/npc/014-2/_mobs.txt
@@ -3,10 +3,10 @@
014-2,150,63,86,43 monster Log Head 1066,25,30000,30000
014-2,66,45,58,26 monster Mouboo 1023,6,30000,30000
014-2,108,60,52,58 monster Forest Mushroom 1060,12,60000,45000
-014-2,68,74,69,27 monster Fluffy 1022,7,30000,30000
+014-2,29,74,19,27 monster Fluffy 1022,5,30000,30000
014-2,207,65,40,50 monster Sea Slime 1093,6,42000,30000
-014-2,125,84,157,54 monster Alpha Mouboo 1056,1,120000,180000
-014-2,132,59,90,35 monster Squirrel 1032,26,30000,42000
+014-2,125,84,157,54 monster Alpha Mouboo 1056,2,120000,180000
+014-2,132,59,90,35 monster Squirrel 1032,28,30000,42000
014-2,143,74,137,117 monster Cobalt Plant 1136,3,45000,50000
014-2,148,70,137,117 monster Mauve Plant 1135,3,45000,50000
014-2,154,66,137,117 monster Gamboge Plant 1134,3,45000,50000
diff --git a/npc/018-4/_mobs.txt b/npc/018-4/_mobs.txt
index 684761f6b..8d75fc383 100644
--- a/npc/018-4/_mobs.txt
+++ b/npc/018-4/_mobs.txt
@@ -7,4 +7,4 @@
018-4,91,60,76,47 monster Yellow Slime 1091,15,30000,30000
018-4,91,56,76,43 monster Clover Patch 1028,2,75000,35000
018-4,91,60,76,47 monster Mouboo 1023,3,12000,4000
-018-4,98,66,40,12 monster Fafi Dragon 1179,1,350000,350000,Susanne::OnKillFafi
+018-4,98,66,40,12 monster Wicked Mushroom 1176,2,85000,65000