summaryrefslogtreecommitdiff
path: root/world/map/npc/015-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/015-1')
-rw-r--r--world/map/npc/015-1/_import.txt4
-rw-r--r--world/map/npc/015-1/_mobs.txt24
-rw-r--r--world/map/npc/015-1/_warps.txt8
-rw-r--r--world/map/npc/015-1/alice.txt2
-rw-r--r--world/map/npc/015-1/barrier.txt2
-rw-r--r--world/map/npc/015-1/mapflags.txt2
-rw-r--r--world/map/npc/015-1/sword.txt2
7 files changed, 22 insertions, 22 deletions
diff --git a/world/map/npc/015-1/_import.txt b/world/map/npc/015-1/_import.txt
index 28390d4b..6085f2a3 100644
--- a/world/map/npc/015-1/_import.txt
+++ b/world/map/npc/015-1/_import.txt
@@ -1,6 +1,6 @@
// Map 015-1: Woodland
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 015-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 015-1
npc: npc/015-1/_mobs.txt
npc: npc/015-1/_warps.txt
npc: npc/015-1/alice.txt
diff --git a/world/map/npc/015-1/_mobs.txt b/world/map/npc/015-1/_mobs.txt
index 2346adc2..810a4bd8 100644
--- a/world/map/npc/015-1/_mobs.txt
+++ b/world/map/npc/015-1/_mobs.txt
@@ -1,19 +1,19 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland mobs
-015-1.gat,0,0,0,0|monster|CloverPatch|1037,2,100000ms,1000ms,Mob015-1::On1037
-015-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob015-1::On1055
-015-1.gat,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob015-1::On1038
-015-1.gat,0,0,0,0|monster|LogHead|1025,40,0ms,0ms,Mob015-1::On1025
-015-1.gat,0,0,0,0|monster|SpikyMushroom|1019,20,0ms,0ms,Mob015-1::On1019
-015-1.gat,0,0,0,0|monster|PinkFlower|1014,20,0ms,0ms,Mob015-1::On1014
-015-1.gat,0,0,0,0|monster|GambogePlant|1031,5,0ms,0ms,Mob015-1::On1031
-015-1.gat,0,0,0,0|monster|AlizarinPlant|1032,5,0ms,0ms,Mob015-1::On1032
-015-1.gat,0,0,0,0|monster|Silkworm|1035,7,15000ms,7000ms,Mob015-1::On1035
-015-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob015-1::On1029
+015-1,0,0,0,0|monster|CloverPatch|1037,2,100000ms,1000ms,Mob015-1::On1037
+015-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob015-1::On1055
+015-1,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob015-1::On1038
+015-1,0,0,0,0|monster|LogHead|1025,40,0ms,0ms,Mob015-1::On1025
+015-1,0,0,0,0|monster|SpikyMushroom|1019,20,0ms,0ms,Mob015-1::On1019
+015-1,0,0,0,0|monster|PinkFlower|1014,20,0ms,0ms,Mob015-1::On1014
+015-1,0,0,0,0|monster|GambogePlant|1031,5,0ms,0ms,Mob015-1::On1031
+015-1,0,0,0,0|monster|AlizarinPlant|1032,5,0ms,0ms,Mob015-1::On1032
+015-1,0,0,0,0|monster|Silkworm|1035,7,15000ms,7000ms,Mob015-1::On1035
+015-1,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob015-1::On1029
-015-1.gat,0,0,0|script|Mob015-1|-1
+015-1,0,0,0|script|Mob015-1|-1
{
end;
diff --git a/world/map/npc/015-1/_warps.txt b/world/map/npc/015-1/_warps.txt
index 56e6166b..679f1883 100644
--- a/world/map/npc/015-1/_warps.txt
+++ b/world/map/npc/015-1/_warps.txt
@@ -1,6 +1,6 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland warps
-015-1.gat,93,55|warp|To Woodland|-1,0,010-1.gat,14,54
-015-1.gat,59,31|warp|To Cat's Cave|-1,-1,015-3.gat,31,42
-015-1.gat,59,101|warp|To Woodland Swamp|2,-1,025-1.gat,89,20
+015-1,93,55|warp|To Woodland|-1,0,010-1,14,54
+015-1,59,31|warp|To Cat's Cave|-1,-1,015-3,31,42
+015-1,59,101|warp|To Woodland Swamp|2,-1,025-1,89,20
diff --git a/world/map/npc/015-1/alice.txt b/world/map/npc/015-1/alice.txt
index 4b1d0a9a..3e1d82de 100644
--- a/world/map/npc/015-1/alice.txt
+++ b/world/map/npc/015-1/alice.txt
@@ -1,7 +1,7 @@
// A herb collector giving the players some hints about finding and brewing
// herbs.
-015-1.gat,52,53,0|script|Alice|106
+015-1,52,53,0|script|Alice|106
{
set @cat, ((Katze & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
set @Hiss, ((Katze & NIBBLE_1_MASK) >> NIBBLE_1_SHIFT);
diff --git a/world/map/npc/015-1/barrier.txt b/world/map/npc/015-1/barrier.txt
index dacad6e7..a87cfd23 100644
--- a/world/map/npc/015-1/barrier.txt
+++ b/world/map/npc/015-1/barrier.txt
@@ -1,7 +1,7 @@
// This barrier is for checking whether the player went outside after
// progressing with the cat quest.
-015-1.gat,59,32,0|script|#CatOutsideBarrier|127,1,1
+015-1,59,32,0|script|#CatOutsideBarrier|127,1,1
{
set @catNeedsAlone, 0;
end;
diff --git a/world/map/npc/015-1/mapflags.txt b/world/map/npc/015-1/mapflags.txt
index a626da24..7e6513cf 100644
--- a/world/map/npc/015-1/mapflags.txt
+++ b/world/map/npc/015-1/mapflags.txt
@@ -1 +1 @@
-015-1.gat|mapflag|resave|010-1,27,97
+015-1|mapflag|resave|010-1,27,97
diff --git a/world/map/npc/015-1/sword.txt b/world/map/npc/015-1/sword.txt
index 199066f2..6e218f9b 100644
--- a/world/map/npc/015-1/sword.txt
+++ b/world/map/npc/015-1/sword.txt
@@ -1,4 +1,4 @@
-015-1.gat,97,97,0|script|#MagicSword#_M|400
+015-1,97,97,0|script|#MagicSword#_M|400
{
if (getskilllv(SKILL_MAGIC))
goto L_message;