summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2011-08-25 20:10:49 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2011-08-25 20:10:49 +0200
commitab9e7f6386eac72d662eb66b1aee0d6e8c98f0d1 (patch)
treea0d4ff9b88e53c36a9e8a9e5606cf9a4517913ad /world/map
parent5e92cd30d0adfb487f64dabbf01e266c267c80af (diff)
downloadserverdata-ab9e7f6386eac72d662eb66b1aee0d6e8c98f0d1.tar.gz
serverdata-ab9e7f6386eac72d662eb66b1aee0d6e8c98f0d1.tar.bz2
serverdata-ab9e7f6386eac72d662eb66b1aee0d6e8c98f0d1.tar.xz
serverdata-ab9e7f6386eac72d662eb66b1aee0d6e8c98f0d1.zip
Converter: new scripting guideline applied, tabs in headlines replaced by pipes
Diffstat (limited to 'world/map')
-rw-r--r--world/map/npc/009-4/_import.txt2
-rw-r--r--world/map/npc/011-3/_mobs.txt4
-rw-r--r--world/map/npc/011-3/_warps.txt2
-rw-r--r--world/map/npc/011-5/_import.txt2
-rw-r--r--world/map/npc/011-6/_import.txt2
-rw-r--r--world/map/npc/011-6/_mobs.txt148
-rw-r--r--world/map/npc/011-6/_warps.txt48
-rw-r--r--world/map/npc/020-1/_mobs.txt4
-rw-r--r--world/map/npc/020-1/_warps.txt18
-rw-r--r--world/map/npc/025-3/_import.txt2
-rw-r--r--world/map/npc/025-3/_mobs.txt38
-rw-r--r--world/map/npc/025-3/_warps.txt6
-rw-r--r--world/map/npc/025-4/_import.txt2
-rw-r--r--world/map/npc/025-4/_mobs.txt16
-rw-r--r--world/map/npc/025-4/_warps.txt4
-rw-r--r--world/map/npc/028-1/_import.txt2
-rw-r--r--world/map/npc/028-3/_import.txt2
-rw-r--r--world/map/npc/030-1/_mobs.txt28
-rw-r--r--world/map/npc/030-1/_warps.txt2
-rw-r--r--world/map/npc/033-1/_mobs.txt4
-rw-r--r--world/map/npc/034-1/_mobs.txt4
-rw-r--r--world/map/npc/041-1/_import.txt2
-rw-r--r--world/map/npc/042-1/_import.txt2
-rw-r--r--world/map/npc/042-2/_import.txt2
-rw-r--r--world/map/npc/botcheck/_import.txt2
25 files changed, 174 insertions, 174 deletions
diff --git a/world/map/npc/009-4/_import.txt b/world/map/npc/009-4/_import.txt
index db91605c..0ecc07a2 100644
--- a/world/map/npc/009-4/_import.txt
+++ b/world/map/npc/009-4/_import.txt
@@ -1,4 +1,4 @@
-// Map 009-4:
+// Map 009-4: unnamed map 009-4
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 009-4.gat
npc: npc/009-4/_mobs.txt
diff --git a/world/map/npc/011-3/_mobs.txt b/world/map/npc/011-3/_mobs.txt
index 2fc7d85b..d17c348d 100644
--- a/world/map/npc/011-3/_mobs.txt
+++ b/world/map/npc/011-3/_mobs.txt
@@ -3,6 +3,6 @@
-011-3.gat,0,0,0 script Mob011-3 -1,{
- end;
+011-3.gat,0,0,0|script|Mob011-3|-1,{
+ end;
}
diff --git a/world/map/npc/011-3/_warps.txt b/world/map/npc/011-3/_warps.txt
index afd248b6..69cc183d 100644
--- a/world/map/npc/011-3/_warps.txt
+++ b/world/map/npc/011-3/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Hermit's cave warps
-011-3.gat,31,14 warp ToLakeCave -1,-1,011-4.gat,72,11
+011-3.gat,31,14|warp|ToLakeCave|-1,-1,011-4.gat,72,11
diff --git a/world/map/npc/011-5/_import.txt b/world/map/npc/011-5/_import.txt
index 0901afa2..24b88f80 100644
--- a/world/map/npc/011-5/_import.txt
+++ b/world/map/npc/011-5/_import.txt
@@ -1,4 +1,4 @@
-// Map 011-5:
+// Map 011-5: unnamed map 011-5
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 011-5.gat
npc: npc/011-5/_mobs.txt
diff --git a/world/map/npc/011-6/_import.txt b/world/map/npc/011-6/_import.txt
index 0afbffa4..fbb68dc9 100644
--- a/world/map/npc/011-6/_import.txt
+++ b/world/map/npc/011-6/_import.txt
@@ -1,4 +1,4 @@
-// Map 011-6:
+// Map 011-6: unnamed map 011-6
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 011-6.gat
npc: npc/011-6/_mobs.txt
diff --git a/world/map/npc/011-6/_mobs.txt b/world/map/npc/011-6/_mobs.txt
index 007e7e86..9c110ff9 100644
--- a/world/map/npc/011-6/_mobs.txt
+++ b/world/map/npc/011-6/_mobs.txt
@@ -1,95 +1,95 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// mobs
+// unnamed map 011-6 mobs
-011-6.gat,152,72,283,127 monster Silk Worm 1035,9,30000,100000,Mob011-6::On1035
-011-6.gat,263,38,30,34 monster Bandit 1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,262,114,38,38 monster Bandit 1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,132,119,17,21 monster Bandit 1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,170,66,17,21 monster Bandit 1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,67,70,17,21 monster Bandit 1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,196,107,17,21 monster Bandit 1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,196,29,17,21 monster Bandit 1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,36,37,17,21 monster Bandit 1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,112,40,45,48 monster Bandit 1064,2,30000,60000,Mob011-6::On1064
-011-6.gat,31,99,17,21 monster Bandit 1064,1,30000,30000,Mob011-6::On1064
-011-6.gat,223,250,123,65 monster Bat 1017,5,30000,100000,Mob011-6::On1017
-011-6.gat,224,175,118,25 monster Bat 1017,3,30000,100000,Mob011-6::On1017
-011-6.gat,257,77,4,126 monster Bat 1017,6,30000,100000,Mob011-6::On1017
-011-6.gat,192,77,4,126 monster Bat 1017,9,30000,100000,Mob011-6::On1017
-011-6.gat,167,110,87,13 monster Bat 1017,9,30000,100000,Mob011-6::On1017
-011-6.gat,75,70,104,96 monster Bat 1017,23,30000,100000,Mob011-6::On1017
-011-6.gat,78,195,129,97 monster Bat 1017,9,30000,100000,Mob011-6::On1017
-011-6.gat,168,109,36,37 monster Spiky Mushroom 1019,5,30000,100000,Mob011-6::On1019
-011-6.gat,199,76,36,37 monster Spiky Mushroom 1019,5,30000,100000,Mob011-6::On1019
-011-6.gat,88,163,29,27 monster Spiky Mushroom 1019,5,30000,100000,Mob011-6::On1019
-011-6.gat,48,113,35,19 monster Spiky Mushroom 1019,5,30000,100000,Mob011-6::On1019
-011-6.gat,177,94,20,28 monster Evil Mushroom 1013,4,30000,100000,Mob011-6::On1013
-011-6.gat,194,49,20,28 monster Evil Mushroom 1013,2,30000,100000,Mob011-6::On1013
-011-6.gat,51,115,47,24 monster Evil Mushroom 1013,2,30000,100000,Mob011-6::On1013
-011-6.gat,63,169,13,17 monster Evil Mushroom 1013,2,30000,100000,Mob011-6::On1013
-011-6.gat,100,226,29,14 monster Spiky Mushroom 1019,3,30000,100000,Mob011-6::On1019
-011-6.gat,260,44,53,16 monster Spiky Mushroom 1019,3,30000,100000,Mob011-6::On1019
-011-6.gat,272,48,21,28 monster Evil Mushroom 1013,2,30000,100000,Mob011-6::On1013
-011-6.gat,95,78,31,25 monster Yellow Slime 1007,5,30000,100000,Mob011-6::On1007
-011-6.gat,59,36,19,25 monster Yellow Slime 1007,5,30000,100000,Mob011-6::On1007
-011-6.gat,26,69,19,25 monster Yellow Slime 1007,5,30000,100000,Mob011-6::On1007
-011-6.gat,61,101,14,10 monster Yellow Slime 1007,3,30000,100000,Mob011-6::On1007
-011-6.gat,50,61,9,12 monster Yellow Slime 1007,3,30000,100000,Mob011-6::On1007
-011-6.gat,128,39,9,12 monster Yellow Slime 1007,3,30000,100000,Mob011-6::On1007
-011-6.gat,41,178,9,12 monster Yellow Slime 1007,1,30000,100000,Mob011-6::On1007
-011-6.gat,70,229,9,12 monster Yellow Slime 1007,1,30000,100000,Mob011-6::On1007
-011-6.gat,20,204,9,12 monster Yellow Slime 1007,1,30000,100000,Mob011-6::On1007
-011-6.gat,114,190,9,12 monster Yellow Slime 1007,4,30000,100000,Mob011-6::On1007
-011-6.gat,137,205,9,12 monster Yellow Slime 1007,2,30000,100000,Mob011-6::On1007
-011-6.gat,79,220,29,14 monster Cave Snake 1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,115,210,29,14 monster Cave Snake 1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,41,193,31,31 monster Cave Snake 1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,70,143,31,31 monster Cave Snake 1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,97,183,29,14 monster Cave Snake 1021,3,30000,100000,Mob011-6::On1021
-011-6.gat,172,252,9,12 monster Cave Maggot 1056,4,30000,100000,Mob011-6::On1056
-011-6.gat,263,236,16,5 monster Cave Maggot 1056,3,30000,100000,Mob011-6::On1056
+011-6.gat,152,72,283,127|monster|Silk Worm|1035,9,30000,100000,Mob011-6::On1035
+011-6.gat,263,38,30,34|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,262,114,38,38|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,132,119,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,170,66,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,67,70,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,196,107,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,196,29,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,36,37,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,112,40,45,48|monster|Bandit|1064,2,30000,60000,Mob011-6::On1064
+011-6.gat,31,99,17,21|monster|Bandit|1064,1,30000,30000,Mob011-6::On1064
+011-6.gat,223,250,123,65|monster|Bat|1017,5,30000,100000,Mob011-6::On1017
+011-6.gat,224,175,118,25|monster|Bat|1017,3,30000,100000,Mob011-6::On1017
+011-6.gat,257,77,4,126|monster|Bat|1017,6,30000,100000,Mob011-6::On1017
+011-6.gat,192,77,4,126|monster|Bat|1017,9,30000,100000,Mob011-6::On1017
+011-6.gat,167,110,87,13|monster|Bat|1017,9,30000,100000,Mob011-6::On1017
+011-6.gat,75,70,104,96|monster|Bat|1017,23,30000,100000,Mob011-6::On1017
+011-6.gat,78,195,129,97|monster|Bat|1017,9,30000,100000,Mob011-6::On1017
+011-6.gat,168,109,36,37|monster|Spiky Mushroom|1019,5,30000,100000,Mob011-6::On1019
+011-6.gat,199,76,36,37|monster|Spiky Mushroom|1019,5,30000,100000,Mob011-6::On1019
+011-6.gat,88,163,29,27|monster|Spiky Mushroom|1019,5,30000,100000,Mob011-6::On1019
+011-6.gat,48,113,35,19|monster|Spiky Mushroom|1019,5,30000,100000,Mob011-6::On1019
+011-6.gat,177,94,20,28|monster|Evil Mushroom|1013,4,30000,100000,Mob011-6::On1013
+011-6.gat,194,49,20,28|monster|Evil Mushroom|1013,2,30000,100000,Mob011-6::On1013
+011-6.gat,51,115,47,24|monster|Evil Mushroom|1013,2,30000,100000,Mob011-6::On1013
+011-6.gat,63,169,13,17|monster|Evil Mushroom|1013,2,30000,100000,Mob011-6::On1013
+011-6.gat,100,226,29,14|monster|Spiky Mushroom|1019,3,30000,100000,Mob011-6::On1019
+011-6.gat,260,44,53,16|monster|Spiky Mushroom|1019,3,30000,100000,Mob011-6::On1019
+011-6.gat,272,48,21,28|monster|Evil Mushroom|1013,2,30000,100000,Mob011-6::On1013
+011-6.gat,95,78,31,25|monster|Yellow Slime|1007,5,30000,100000,Mob011-6::On1007
+011-6.gat,59,36,19,25|monster|Yellow Slime|1007,5,30000,100000,Mob011-6::On1007
+011-6.gat,26,69,19,25|monster|Yellow Slime|1007,5,30000,100000,Mob011-6::On1007
+011-6.gat,61,101,14,10|monster|Yellow Slime|1007,3,30000,100000,Mob011-6::On1007
+011-6.gat,50,61,9,12|monster|Yellow Slime|1007,3,30000,100000,Mob011-6::On1007
+011-6.gat,128,39,9,12|monster|Yellow Slime|1007,3,30000,100000,Mob011-6::On1007
+011-6.gat,41,178,9,12|monster|Yellow Slime|1007,1,30000,100000,Mob011-6::On1007
+011-6.gat,70,229,9,12|monster|Yellow Slime|1007,1,30000,100000,Mob011-6::On1007
+011-6.gat,20,204,9,12|monster|Yellow Slime|1007,1,30000,100000,Mob011-6::On1007
+011-6.gat,114,190,9,12|monster|Yellow Slime|1007,4,30000,100000,Mob011-6::On1007
+011-6.gat,137,205,9,12|monster|Yellow Slime|1007,2,30000,100000,Mob011-6::On1007
+011-6.gat,79,220,29,14|monster|Cave Snake|1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,115,210,29,14|monster|Cave Snake|1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,41,193,31,31|monster|Cave Snake|1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,70,143,31,31|monster|Cave Snake|1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,97,183,29,14|monster|Cave Snake|1021,3,30000,100000,Mob011-6::On1021
+011-6.gat,172,252,9,12|monster|Cave Maggot|1056,4,30000,100000,Mob011-6::On1056
+011-6.gat,263,236,16,5|monster|Cave Maggot|1056,3,30000,100000,Mob011-6::On1056
-011-6.gat,0,0,0 script Mob011-6 -1,{
+011-6.gat,0,0,0|script|Mob011-6|-1,{
On1007:
- set @mobID, 1007;
- callfunc "MobPoints";
- break;
+ set @mobID, 1007;
+ callfunc "MobPoints";
+ end;
On1013:
- set @mobID, 1013;
- callfunc "MobPoints";
- break;
+ set @mobID, 1013;
+ callfunc "MobPoints";
+ end;
On1017:
- set @mobID, 1017;
- callfunc "MobPoints";
- break;
+ set @mobID, 1017;
+ callfunc "MobPoints";
+ end;
On1019:
- set @mobID, 1019;
- callfunc "MobPoints";
- break;
+ set @mobID, 1019;
+ callfunc "MobPoints";
+ end;
On1021:
- set @mobID, 1021;
- callfunc "MobPoints";
- break;
+ set @mobID, 1021;
+ callfunc "MobPoints";
+ end;
On1035:
- set @mobID, 1035;
- callfunc "MobPoints";
- break;
+ set @mobID, 1035;
+ callfunc "MobPoints";
+ end;
On1056:
- set @mobID, 1056;
- callfunc "MobPoints";
- break;
+ set @mobID, 1056;
+ callfunc "MobPoints";
+ end;
On1064:
- set @mobID, 1064;
- callfunc "MobPoints";
- break;
+ set @mobID, 1064;
+ callfunc "MobPoints";
+ end;
- end;
+ end;
}
diff --git a/world/map/npc/011-6/_warps.txt b/world/map/npc/011-6/_warps.txt
index 513c1c51..35ecabe7 100644
--- a/world/map/npc/011-6/_warps.txt
+++ b/world/map/npc/011-6/_warps.txt
@@ -1,26 +1,26 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// warps
+// unnamed map 011-6 warps
-011-6.gat,51,75 warp toMiddleCave1 -1,-1,011-6.gat,260,125
-011-6.gat,61,71 warp toMiddleCave2 -1,-1,011-6.gat,270,122
-011-6.gat,270,125 warp toMainCave -1,-1,011-6.gat,61,73
-011-6.gat,260,128 warp toMiddleCave2 -1,-1,011-6.gat,51,77
-011-6.gat,145,118 warp ToMainCave3 -1,-1,011-6.gat,47,119
-011-6.gat,196,26 warp toSmallCave1 -1,-1,011-6.gat,261,44
-011-6.gat,261,47 warp toPassage1 -1,-1,011-6.gat,196,28
-011-6.gat,271,52 warp toMainCave4 -1,-1,011-6.gat,98,32
-011-6.gat,98,30 warp toSmallCave -1,-1,011-6.gat,271,50
-011-6.gat,47,120 warp toPassage -1,-1,011-6.gat,145,115
-011-6.gat,49,101 warp toOutside -1,-1,011-1.gat,38,37
-011-6.gat,24,206 warp warp -1,-1,011-4.gat,17,59
-011-6.gat,47,185 warp warp -1,-1,011-4.gat,39,38
-011-6.gat,97,169 warp warp -1,-1,011-4.gat,89,21
-011-6.gat,113,182 warp warp -1,-1,011-4.gat,105,34
-011-6.gat,122,211 warp warp -1,-1,011-4.gat,114,63
-011-6.gat,94,225 warp warp -1,-1,011-4.gat,86,77
-011-6.gat,68,235 warp warp -1,-1,011-4.gat,62,87
-011-6.gat,251,278 warp warp -1,-1,011-4.gat,111,123
-011-6.gat,186,182 warp warp -1,-1,011-4.gat,31,7
-011-6.gat,266,182 warp warp -1,-1,011-4.gat,45,120
-011-6.gat,174,256 warp warp -1,-1,011-6.gat,264,238
-011-6.gat,264,236 warp warp -1,-1,011-6.gat,174,252
+011-6.gat,51,75|warp|toMiddleCave1|-1,-1,011-6.gat,260,125
+011-6.gat,61,71|warp|toMiddleCave2|-1,-1,011-6.gat,270,122
+011-6.gat,270,125|warp|toMainCave|-1,-1,011-6.gat,61,73
+011-6.gat,260,128|warp|toMiddleCave2|-1,-1,011-6.gat,51,77
+011-6.gat,145,118|warp|ToMainCave3|-1,-1,011-6.gat,47,119
+011-6.gat,196,26|warp|toSmallCave1|-1,-1,011-6.gat,261,44
+011-6.gat,261,47|warp|toPassage1|-1,-1,011-6.gat,196,28
+011-6.gat,271,52|warp|toMainCave4|-1,-1,011-6.gat,98,32
+011-6.gat,98,30|warp|toSmallCave|-1,-1,011-6.gat,271,50
+011-6.gat,47,120|warp|toPassage|-1,-1,011-6.gat,145,115
+011-6.gat,49,101|warp|toOutside|-1,-1,011-1.gat,38,37
+011-6.gat,24,206|warp|warp|-1,-1,011-4.gat,17,59
+011-6.gat,47,185|warp|warp|-1,-1,011-4.gat,39,38
+011-6.gat,97,169|warp|warp|-1,-1,011-4.gat,89,21
+011-6.gat,113,182|warp|warp|-1,-1,011-4.gat,105,34
+011-6.gat,122,211|warp|warp|-1,-1,011-4.gat,114,63
+011-6.gat,94,225|warp|warp|-1,-1,011-4.gat,86,77
+011-6.gat,68,235|warp|warp|-1,-1,011-4.gat,62,87
+011-6.gat,251,278|warp|warp|-1,-1,011-4.gat,111,123
+011-6.gat,186,182|warp|warp|-1,-1,011-4.gat,31,7
+011-6.gat,266,182|warp|warp|-1,-1,011-4.gat,45,120
+011-6.gat,174,256|warp|warp|-1,-1,011-6.gat,264,238
+011-6.gat,264,236|warp|warp|-1,-1,011-6.gat,174,252
diff --git a/world/map/npc/020-1/_mobs.txt b/world/map/npc/020-1/_mobs.txt
index d236884e..42667e01 100644
--- a/world/map/npc/020-1/_mobs.txt
+++ b/world/map/npc/020-1/_mobs.txt
@@ -3,6 +3,6 @@
-020-1.gat,0,0,0 script Mob020-1 -1,{
- end;
+020-1.gat,0,0,0|script|Mob020-1|-1,{
+ end;
}
diff --git a/world/map/npc/020-1/_warps.txt b/world/map/npc/020-1/_warps.txt
index 5bac9e69..f86e4966 100644
--- a/world/map/npc/020-1/_warps.txt
+++ b/world/map/npc/020-1/_warps.txt
@@ -1,12 +1,12 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Nivalis warps
-020-1.gat,76,38 warp ToIceCave 1,-1,020-3.gat,31,28
-020-1.gat,47,48 warp ToClothesShop -1,-1,020-2.gat,25,33
-020-1.gat,66,52 warp ToHouse -1,-1,020-2.gat,72,68
-020-1.gat,70,127 warp toSnowField 2,-1,019-1.gat,70,22
-020-1.gat,64,82 warp toInn -1,-1,020-2.gat,111,31
-020-1.gat,86,46 warp toWeaponShop -1,-1,020-2.gat,32,72
-020-1.gat,56,90 warp ToPotionsShop -1,-1,020-2.gat,66,25
-020-1.gat,70,127 warp toSnowField 2,-1,019-1.gat,70,22
-020-1.gat,107,55 warp toPort -1,-1,031-1.gat,38,55
+020-1.gat,76,38|warp|ToIceCave|1,-1,020-3.gat,31,28
+020-1.gat,47,48|warp|ToClothesShop|-1,-1,020-2.gat,25,33
+020-1.gat,66,52|warp|ToHouse|-1,-1,020-2.gat,72,68
+020-1.gat,70,127|warp|toSnowField|2,-1,019-1.gat,70,22
+020-1.gat,64,82|warp|toInn|-1,-1,020-2.gat,111,31
+020-1.gat,86,46|warp|toWeaponShop|-1,-1,020-2.gat,32,72
+020-1.gat,56,90|warp|ToPotionsShop|-1,-1,020-2.gat,66,25
+020-1.gat,70,127|warp|toSnowField|2,-1,019-1.gat,70,22
+020-1.gat,107,55|warp|toPort|-1,-1,031-1.gat,38,55
diff --git a/world/map/npc/025-3/_import.txt b/world/map/npc/025-3/_import.txt
index 285e674e..6644999e 100644
--- a/world/map/npc/025-3/_import.txt
+++ b/world/map/npc/025-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 025-3:
+// Map 025-3: Rossy Main Hall
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 025-3.gat
npc: npc/025-3/_mobs.txt
diff --git a/world/map/npc/025-3/_mobs.txt b/world/map/npc/025-3/_mobs.txt
index 236af8c8..3b7e395d 100644
--- a/world/map/npc/025-3/_mobs.txt
+++ b/world/map/npc/025-3/_mobs.txt
@@ -1,32 +1,32 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// mobs
+// Rossy Main Hall mobs
-025-3.gat,0,0,0,0 monster CaveMaggot 1056,100,0,100,Mob025-3::On1056
-025-3.gat,0,0,0,0 monster Archant 1060,20,0,100,Mob025-3::On1060
-025-3.gat,0,0,0,0 monster AngryScorpion 1057,25,0,0,Mob025-3::On1057
-025-3.gat,69,153,13,1 monster Skeleton 1043,1,0,30000,Mob025-3::On1043
+025-3.gat,0,0,0,0|monster|CaveMaggot|1056,100,0,100,Mob025-3::On1056
+025-3.gat,0,0,0,0|monster|Archant|1060,20,0,100,Mob025-3::On1060
+025-3.gat,0,0,0,0|monster|AngryScorpion|1057,25,0,0,Mob025-3::On1057
+025-3.gat,69,153,13,1|monster|Skeleton|1043,1,0,30000,Mob025-3::On1043
-025-3.gat,0,0,0 script Mob025-3 -1,{
+025-3.gat,0,0,0|script|Mob025-3|-1,{
On1043:
- set @mobID, 1043;
- callfunc "MobPoints";
- break;
+ set @mobID, 1043;
+ callfunc "MobPoints";
+ end;
On1056:
- set @mobID, 1056;
- callfunc "MobPoints";
- break;
+ set @mobID, 1056;
+ callfunc "MobPoints";
+ end;
On1057:
- set @mobID, 1057;
- callfunc "MobPoints";
- break;
+ set @mobID, 1057;
+ callfunc "MobPoints";
+ end;
On1060:
- set @mobID, 1060;
- callfunc "MobPoints";
- break;
+ set @mobID, 1060;
+ callfunc "MobPoints";
+ end;
- end;
+ end;
}
diff --git a/world/map/npc/025-3/_warps.txt b/world/map/npc/025-3/_warps.txt
index c64903e0..83648ab3 100644
--- a/world/map/npc/025-3/_warps.txt
+++ b/world/map/npc/025-3/_warps.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// warps
+// Rossy Main Hall warps
-025-3.gat,112,98 warp ToOutside 1,-1,025-1.gat,42,81
-025-3.gat,105,86 warp ToHelper -1,-1,025-4.gat,28,36
+025-3.gat,112,98|warp|ToOutside|1,-1,025-1.gat,42,81
+025-3.gat,105,86|warp|ToHelper|-1,-1,025-4.gat,28,36
diff --git a/world/map/npc/025-4/_import.txt b/world/map/npc/025-4/_import.txt
index a8b01ca1..5d597da9 100644
--- a/world/map/npc/025-4/_import.txt
+++ b/world/map/npc/025-4/_import.txt
@@ -1,4 +1,4 @@
-// Map 025-4:
+// Map 025-4: Rossy Battle Caves
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 025-4.gat
npc: npc/025-4/_mobs.txt
diff --git a/world/map/npc/025-4/_mobs.txt b/world/map/npc/025-4/_mobs.txt
index 6ee5b1d1..16893437 100644
--- a/world/map/npc/025-4/_mobs.txt
+++ b/world/map/npc/025-4/_mobs.txt
@@ -1,15 +1,15 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// mobs
+// Rossy Battle Caves mobs
-025-4.gat,29,31,20,14 monster CaveMaggot 1056,3,0,0,Mob025-4::On1056
-025-4.gat,94,24,20,21 monster CaveMaggot 1056,5,0,0,Mob025-4::On1056
+025-4.gat,29,31,20,14|monster|CaveMaggot|1056,3,0,0,Mob025-4::On1056
+025-4.gat,94,24,20,21|monster|CaveMaggot|1056,5,0,0,Mob025-4::On1056
-025-4.gat,0,0,0 script Mob025-4 -1,{
+025-4.gat,0,0,0|script|Mob025-4|-1,{
On1056:
- set @mobID, 1056;
- callfunc "MobPoints";
- break;
+ set @mobID, 1056;
+ callfunc "MobPoints";
+ end;
- end;
+ end;
}
diff --git a/world/map/npc/025-4/_warps.txt b/world/map/npc/025-4/_warps.txt
index e0b9ae4d..fb9998a1 100644
--- a/world/map/npc/025-4/_warps.txt
+++ b/world/map/npc/025-4/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
-// warps
+// Rossy Battle Caves warps
-025-4.gat,28,37 warp ToMainHall -1,-1,025-3.gat,105,87
+025-4.gat,28,37|warp|ToMainHall|-1,-1,025-3.gat,105,87
diff --git a/world/map/npc/028-1/_import.txt b/world/map/npc/028-1/_import.txt
index 1cfec48c..d71d931d 100644
--- a/world/map/npc/028-1/_import.txt
+++ b/world/map/npc/028-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 028-1:
+// Map 028-1: unnamed map 028-1
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 028-1.gat
npc: npc/028-1/Portal.txt
diff --git a/world/map/npc/028-3/_import.txt b/world/map/npc/028-3/_import.txt
index bb8dd79e..6578d494 100644
--- a/world/map/npc/028-3/_import.txt
+++ b/world/map/npc/028-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 028-3:
+// Map 028-3: unnamed map 028-3
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 028-3.gat
npc: npc/028-3/_mobs.txt
diff --git a/world/map/npc/030-1/_mobs.txt b/world/map/npc/030-1/_mobs.txt
index 830b17e4..daaf7dea 100644
--- a/world/map/npc/030-1/_mobs.txt
+++ b/world/map/npc/030-1/_mobs.txt
@@ -1,26 +1,26 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Snow field mobs
-030-1.gat,78,55,66,70 monster Santa Slime 1015,5,100000,30000,Mob030-1::On1015
-030-1.gat,84,57,66,70 monster Squirrel 1038,10,100000,30000,Mob030-1::On1038
-030-1.gat,84,57,66,70 monster Fluffy 1020,15,100000,30000,Mob030-1::On1020
+030-1.gat,0,0,0,0|monster|Santa Slime|1015,5,100000,30000,Mob030-1::On1015
+030-1.gat,0,0,0,0|monster|Squirrel|1038,10,100000,30000,Mob030-1::On1038
+030-1.gat,0,0,0,0|monster|Fluffy|1020,15,100000,30000,Mob030-1::On1020
-030-1.gat,0,0,0 script Mob030-1 -1,{
+030-1.gat,0,0,0|script|Mob030-1|-1,{
On1015:
- set @mobID, 1015;
- callfunc "MobPoints";
- break;
+ set @mobID, 1015;
+ callfunc "MobPoints";
+ end;
On1020:
- set @mobID, 1020;
- callfunc "MobPoints";
- break;
+ set @mobID, 1020;
+ callfunc "MobPoints";
+ end;
On1038:
- set @mobID, 1038;
- callfunc "MobPoints";
- break;
+ set @mobID, 1038;
+ callfunc "MobPoints";
+ end;
- end;
+ end;
}
diff --git a/world/map/npc/030-1/_warps.txt b/world/map/npc/030-1/_warps.txt
index 1a4e7582..e67e8921 100644
--- a/world/map/npc/030-1/_warps.txt
+++ b/world/map/npc/030-1/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually changes will be removed when running the Converter.
// Snow field warps
-030-1.gat,61,28 warp toSnowfield 0,-1,019-1.gat,61,100
+030-1.gat,61,28|warp|toSnowfield|0,-1,019-1.gat,61,100
diff --git a/world/map/npc/033-1/_mobs.txt b/world/map/npc/033-1/_mobs.txt
index 61a53305..daab38d9 100644
--- a/world/map/npc/033-1/_mobs.txt
+++ b/world/map/npc/033-1/_mobs.txt
@@ -3,6 +3,6 @@
-033-1.gat,0,0,0 script Mob033-1 -1,{
- end;
+033-1.gat,0,0,0|script|Mob033-1|-1,{
+ end;
}
diff --git a/world/map/npc/034-1/_mobs.txt b/world/map/npc/034-1/_mobs.txt
index 50d15f66..847c66d6 100644
--- a/world/map/npc/034-1/_mobs.txt
+++ b/world/map/npc/034-1/_mobs.txt
@@ -3,6 +3,6 @@
-034-1.gat,0,0,0 script Mob034-1 -1,{
- end;
+034-1.gat,0,0,0|script|Mob034-1|-1,{
+ end;
}
diff --git a/world/map/npc/041-1/_import.txt b/world/map/npc/041-1/_import.txt
index 54c7edd1..f3ec6736 100644
--- a/world/map/npc/041-1/_import.txt
+++ b/world/map/npc/041-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 041-1:
+// Map 041-1: unnamed map 041-1
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 041-1.gat
npc: npc/041-1/_mobs.txt
diff --git a/world/map/npc/042-1/_import.txt b/world/map/npc/042-1/_import.txt
index c843ceef..f7900726 100644
--- a/world/map/npc/042-1/_import.txt
+++ b/world/map/npc/042-1/_import.txt
@@ -1,4 +1,4 @@
-// Map 042-1:
+// Map 042-1: unnamed map 042-1
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 042-1.gat
npc: npc/042-1/_mobs.txt
diff --git a/world/map/npc/042-2/_import.txt b/world/map/npc/042-2/_import.txt
index 604c82cd..09ce6d23 100644
--- a/world/map/npc/042-2/_import.txt
+++ b/world/map/npc/042-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 042-2:
+// Map 042-2: unnamed map 042-2
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 042-2.gat
npc: npc/042-2/_mobs.txt
diff --git a/world/map/npc/botcheck/_import.txt b/world/map/npc/botcheck/_import.txt
index 8c1b3663..6d5394ab 100644
--- a/world/map/npc/botcheck/_import.txt
+++ b/world/map/npc/botcheck/_import.txt
@@ -1,4 +1,4 @@
-// Map botcheck:
+// Map botcheck: unnamed map botcheck
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: botcheck.gat
npc: npc/botcheck/_mobs.txt