summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/011-3/flood.txt2
-rw-r--r--npc/014-3/_mobs.txt4
-rw-r--r--npc/014-3/_warps.txt2
-rw-r--r--npc/015-3/_warps.txt2
4 files changed, 5 insertions, 5 deletions
diff --git a/npc/011-3/flood.txt b/npc/011-3/flood.txt
index 802b0c9ac..04d7e12fc 100644
--- a/npc/011-3/flood.txt
+++ b/npc/011-3/flood.txt
@@ -36,7 +36,7 @@ OnSkipFlood:
.@fd=!(getmapmask("011-3")&MASK_SPECIAL); // .@fd - is flooded?
if (.@fd) {
- //debugmes "[Flood] UF - Unflooding";
+ debugmes "[Flood] UF - Unflooding";
// If it is flooded, unflood it to prevent players getting struck for too long
killmonster("011-3", "#EternalSwampCore::OnSwampMob");
addmapmask "011-3", MASK_SPECIAL;
diff --git a/npc/014-3/_mobs.txt b/npc/014-3/_mobs.txt
index ff318a430..8c90e4ffc 100644
--- a/npc/014-3/_mobs.txt
+++ b/npc/014-3/_mobs.txt
@@ -1,10 +1,10 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 014-3: Woodlands Central Area mobs
014-3,133,94,91,52 monster Mouboo 1023,28,30000,45000
-014-3,146,131,70,21 monster Forest Mushroom 1060,9,60000,45000
+014-3,114,121,70,21 monster Forest Mushroom 1060,10,60000,45000
014-3,122,121,90,35 monster Squirrel 1032,26,30000,42000
014-3,62,101,37,32 monster Centaur 1139,3,80000,90000
-014-3,192,94,22,15 monster Pinkie 1132,6,30000,50000,Oscar::OnKillPinkie
+014-3,182,94,31,14 monster Pinkie 1132,9,30000,50000,Oscar::OnKillPinkie
014-3,113,84,49,25 monster Poison Spiky Mushroom 1043,11,45000,45000
014-3,146,131,70,21 monster Mauve Plant 1135,4,90000,90000
014-3,62,101,37,32 monster Chagashroom Field 1128,4,90000,90000
diff --git a/npc/014-3/_warps.txt b/npc/014-3/_warps.txt
index 0d0752f12..f90a9fb70 100644
--- a/npc/014-3/_warps.txt
+++ b/npc/014-3/_warps.txt
@@ -1,6 +1,6 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 014-3: Woodlands Central Area warps
-014-3,158,142,0 warp #014-3_158_142 0,0,015-3,172,195
+014-3,138,140,0 warp #014-3_138_140 0,0,015-3,172,195
014-3,149,154,0 warp #014-3_149_154 1,0,014-2,48,25
014-3,224,111,0 warp #014-3_224_111 0,4,012-1,23,61
014-3,173,59,0 warp #014-3_173_59 1,0,014-5,81,228
diff --git a/npc/015-3/_warps.txt b/npc/015-3/_warps.txt
index 33e3d3fa4..3b1a45bb8 100644
--- a/npc/015-3/_warps.txt
+++ b/npc/015-3/_warps.txt
@@ -2,6 +2,6 @@
// Map 015-3: Butterfly Caves warps
015-3,152,162,0 warp #015-3_152_162 0,0,015-3,123,38
015-3,171,161,0 warp #015-3_171_161 0,0,015-3,147,39
-015-3,172,196,0 warp #015-3_172_196 0,0,014-3,158,143
+015-3,172,196,0 warp #015-3_172_196 0,0,014-3,138,141
015-3,123,39,0 warp #015-3_123_39 0,0,015-3,152,163
015-3,147,40,0 warp #015-3_147_40 0,0,015-3,171,162