summaryrefslogtreecommitdiff
path: root/world/map/npc/016-1
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-02-01 13:20:36 -0600
committerWushin <pasekei@gmail.com>2015-02-01 13:20:36 -0600
commit7a2d45e2bf1886d60d4fb0d30814ff91c1e548d7 (patch)
treed8bc376f768085d422dc523fabe7823b878ee3d3 /world/map/npc/016-1
parent44d34c2835e8f6601bbb0e320c82240c19cdbea3 (diff)
parent06d909765be760521b8379cda26167e2e7804cff (diff)
downloadserverdata-7a2d45e2bf1886d60d4fb0d30814ff91c1e548d7.tar.gz
serverdata-7a2d45e2bf1886d60d4fb0d30814ff91c1e548d7.tar.bz2
serverdata-7a2d45e2bf1886d60d4fb0d30814ff91c1e548d7.tar.xz
serverdata-7a2d45e2bf1886d60d4fb0d30814ff91c1e548d7.zip
Merge pull request #267 from mekolat/gat
remove .gat
Diffstat (limited to 'world/map/npc/016-1')
-rw-r--r--world/map/npc/016-1/_import.txt4
-rw-r--r--world/map/npc/016-1/_mobs.txt24
-rw-r--r--world/map/npc/016-1/_warps.txt6
-rw-r--r--world/map/npc/016-1/gwendolyn.txt2
-rw-r--r--world/map/npc/016-1/mapflags.txt2
5 files changed, 19 insertions, 19 deletions
diff --git a/world/map/npc/016-1/_import.txt b/world/map/npc/016-1/_import.txt
index 16e79693..e67bcb01 100644
--- a/world/map/npc/016-1/_import.txt
+++ b/world/map/npc/016-1/_import.txt
@@ -1,6 +1,6 @@
// Map 016-1: Woodland
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 016-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 016-1
npc: npc/016-1/_mobs.txt
npc: npc/016-1/_warps.txt
npc: npc/016-1/gwendolyn.txt
diff --git a/world/map/npc/016-1/_mobs.txt b/world/map/npc/016-1/_mobs.txt
index 781e2392..8777b2a4 100644
--- a/world/map/npc/016-1/_mobs.txt
+++ b/world/map/npc/016-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
-016-1.gat,0,0,0,0|monster|CloverPatch|1037,2,100000ms,30000ms,Mob016-1::On1037
-016-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob016-1::On1055
-016-1.gat,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob016-1::On1038
-016-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,0ms,Mob016-1::On1028
-016-1.gat,0,0,0,0|monster|Scorpion|1003,15,0ms,0ms,Mob016-1::On1003
-016-1.gat,0,0,0,0|monster|MauvePlant|1029,3,0ms,0ms,Mob016-1::On1029
-016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob016-1::On1029
-016-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,0ms,0ms,Mob016-1::On1030
-016-1.gat,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob016-1::On1029
-016-1.gat,0,0,0,0|monster|Silkworm|1035,7,150000ms,7000ms,Mob016-1::On1035
+016-1,0,0,0,0|monster|CloverPatch|1037,2,100000ms,30000ms,Mob016-1::On1037
+016-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob016-1::On1055
+016-1,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob016-1::On1038
+016-1,0,0,0,0|monster|Mouboo|1028,5,0ms,0ms,Mob016-1::On1028
+016-1,0,0,0,0|monster|Scorpion|1003,15,0ms,0ms,Mob016-1::On1003
+016-1,0,0,0,0|monster|MauvePlant|1029,3,0ms,0ms,Mob016-1::On1029
+016-1,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob016-1::On1029
+016-1,0,0,0,0|monster|CobaltPlant|1030,3,0ms,0ms,Mob016-1::On1030
+016-1,0,0,0,0|monster|MauvePlant|1029,4,270000ms,180000ms,Mob016-1::On1029
+016-1,0,0,0,0|monster|Silkworm|1035,7,150000ms,7000ms,Mob016-1::On1035
-016-1.gat,0,0,0|script|Mob016-1|-1
+016-1,0,0,0|script|Mob016-1|-1
{
end;
diff --git a/world/map/npc/016-1/_warps.txt b/world/map/npc/016-1/_warps.txt
index 6587c824..7437c416 100644
--- a/world/map/npc/016-1/_warps.txt
+++ b/world/map/npc/016-1/_warps.txt
@@ -1,5 +1,5 @@
-// 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
-016-1.gat,56,18|warp|To Woodland|1,-1,010-1.gat,56,104
-016-1.gat,20,53|warp|To Woodland Swamp|-1,1,025-1.gat,129,58
+016-1,56,18|warp|To Woodland|1,-1,010-1,56,104
+016-1,20,53|warp|To Woodland Swamp|-1,1,025-1,129,58
diff --git a/world/map/npc/016-1/gwendolyn.txt b/world/map/npc/016-1/gwendolyn.txt
index e27b61db..f95336e9 100644
--- a/world/map/npc/016-1/gwendolyn.txt
+++ b/world/map/npc/016-1/gwendolyn.txt
@@ -21,7 +21,7 @@
// 5, state5: you are ready to do the targeting minigame
// 6, state6: you did the minigame
-016-1.gat,33,45,0|script|Gwendolyn|182
+016-1,33,45,0|script|Gwendolyn|182
{
// schoolfee in gp
set @SCHOOLFEE, 25000;
diff --git a/world/map/npc/016-1/mapflags.txt b/world/map/npc/016-1/mapflags.txt
index 407d15b5..4c31651b 100644
--- a/world/map/npc/016-1/mapflags.txt
+++ b/world/map/npc/016-1/mapflags.txt
@@ -1 +1 @@
-016-1.gat|mapflag|resave|010-1,27,97
+016-1|mapflag|resave|010-1,27,97