summaryrefslogtreecommitdiff
path: root/world/map/npc/025-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/025-1')
-rw-r--r--world/map/npc/025-1/_import.txt4
-rw-r--r--world/map/npc/025-1/_mobs.txt24
-rw-r--r--world/map/npc/025-1/_warps.txt8
-rw-r--r--world/map/npc/025-1/barrier.txt4
-rw-r--r--world/map/npc/025-1/mapflags.txt2
-rw-r--r--world/map/npc/025-1/reset.txt2
-rw-r--r--world/map/npc/025-1/rossy.txt2
7 files changed, 23 insertions, 23 deletions
diff --git a/world/map/npc/025-1/_import.txt b/world/map/npc/025-1/_import.txt
index a8778d2f..a5530f31 100644
--- a/world/map/npc/025-1/_import.txt
+++ b/world/map/npc/025-1/_import.txt
@@ -1,6 +1,6 @@
// Map 025-1: Woodland Swamp
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 025-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 025-1
npc: npc/025-1/_mobs.txt
npc: npc/025-1/_warps.txt
npc: npc/025-1/barrier.txt
diff --git a/world/map/npc/025-1/_mobs.txt b/world/map/npc/025-1/_mobs.txt
index fa66668a..cddb2696 100644
--- a/world/map/npc/025-1/_mobs.txt
+++ b/world/map/npc/025-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 Swamp mobs
-025-1.gat,100,60,56,79|monster|CloverPatch|1037,3,30000ms,10000ms,Mob025-1::On1037
-025-1.gat,56,96,13,5|monster|CloverPatch|1037,1,1200000ms,10000ms,Mob025-1::On1037
-025-1.gat,56,35,77,33|monster|AlizarinPlant|1032,2,240000ms,12000ms,Mob025-1::On1032
-025-1.gat,55,62,24,13|monster|Snail|1041,7,30000ms,12000ms,Mob025-1::On1041
-025-1.gat,38,84,37,31|monster|Silkworm|1035,18,40000ms,300ms,Mob025-1::On1035
-025-1.gat,96,47,63,55|monster|LogHead|1025,14,18000ms,3000ms,Mob025-1::On1025
-025-1.gat,0,0,0,0|monster|PinkFlower|1014,34,20000ms,5000ms,Mob025-1::On1014
-025-1.gat,0,0,0,0|monster|SpikyMushroom|1019,40,90000ms,500ms,Mob025-1::On1019
-025-1.gat,101,53,55,65|monster|Squirrel|1038,18,60000ms,9000ms,Mob025-1::On1038
-025-1.gat,26,61,15,85|monster|Scorpion|1003,12,100000ms,50000ms,Mob025-1::On1003
+025-1,100,60,56,79|monster|CloverPatch|1037,3,30000ms,10000ms,Mob025-1::On1037
+025-1,56,96,13,5|monster|CloverPatch|1037,1,1200000ms,10000ms,Mob025-1::On1037
+025-1,56,35,77,33|monster|AlizarinPlant|1032,2,240000ms,12000ms,Mob025-1::On1032
+025-1,55,62,24,13|monster|Snail|1041,7,30000ms,12000ms,Mob025-1::On1041
+025-1,38,84,37,31|monster|Silkworm|1035,18,40000ms,300ms,Mob025-1::On1035
+025-1,96,47,63,55|monster|LogHead|1025,14,18000ms,3000ms,Mob025-1::On1025
+025-1,0,0,0,0|monster|PinkFlower|1014,34,20000ms,5000ms,Mob025-1::On1014
+025-1,0,0,0,0|monster|SpikyMushroom|1019,40,90000ms,500ms,Mob025-1::On1019
+025-1,101,53,55,65|monster|Squirrel|1038,18,60000ms,9000ms,Mob025-1::On1038
+025-1,26,61,15,85|monster|Scorpion|1003,12,100000ms,50000ms,Mob025-1::On1003
-025-1.gat,0,0,0|script|Mob025-1|-1
+025-1,0,0,0|script|Mob025-1|-1
{
end;
diff --git a/world/map/npc/025-1/_warps.txt b/world/map/npc/025-1/_warps.txt
index 63c30e13..eaa15fe5 100644
--- a/world/map/npc/025-1/_warps.txt
+++ b/world/map/npc/025-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 Swamp warps
-025-1.gat,19,66|warp|To Swamp|-1,-1,026-1.gat,128,66
-025-1.gat,90,19|warp|To Woodland|2,-1,015-1.gat,59,100
-025-1.gat,130,58|warp|To Woodland|-1,1,016-1.gat,21,53
+025-1,19,66|warp|To Swamp|-1,-1,026-1,128,66
+025-1,90,19|warp|To Woodland|2,-1,015-1,59,100
+025-1,130,58|warp|To Woodland|-1,1,016-1,21,53
diff --git a/world/map/npc/025-1/barrier.txt b/world/map/npc/025-1/barrier.txt
index 8259c2ff..0b434ee4 100644
--- a/world/map/npc/025-1/barrier.txt
+++ b/world/map/npc/025-1/barrier.txt
@@ -1,6 +1,6 @@
// Authors: alastrim, Ali-g, Dark Mage
-025-1.gat,42,79,0|script|#JuliaBarrier|45,1,1
+025-1,42,79,0|script|#JuliaBarrier|45,1,1
{
if (Rossy_Quest > 14 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_Warp;
if (Rossy_Quest <= 13) goto L_Block;
@@ -8,7 +8,7 @@
goto L_Warp;
L_Warp:
- warp "025-3.gat", 112, 97;
+ warp "025-3", 112, 97;
end;
L_Block:
diff --git a/world/map/npc/025-1/mapflags.txt b/world/map/npc/025-1/mapflags.txt
index 779331b6..ec0bef1a 100644
--- a/world/map/npc/025-1/mapflags.txt
+++ b/world/map/npc/025-1/mapflags.txt
@@ -1 +1 @@
-025-1.gat|mapflag|resave|025-1,33,50
+025-1|mapflag|resave|025-1,33,50
diff --git a/world/map/npc/025-1/reset.txt b/world/map/npc/025-1/reset.txt
index c1b38021..36e422b6 100644
--- a/world/map/npc/025-1/reset.txt
+++ b/world/map/npc/025-1/reset.txt
@@ -1,6 +1,6 @@
//To enable: sed 's_^// __' -i npc/025-1/reset.txt
-// 025-1.gat,47,84,0|script|reset|145
+// 025-1,47,84,0|script|reset|145
// {
// mes "Do you want to reset Rossy Quest?";
// menu
diff --git a/world/map/npc/025-1/rossy.txt b/world/map/npc/025-1/rossy.txt
index 412f3f48..bc51559e 100644
--- a/world/map/npc/025-1/rossy.txt
+++ b/world/map/npc/025-1/rossy.txt
@@ -1,6 +1,6 @@
// Authors: alastrim, Ali-g, Dark Mage
-025-1.gat,80,88,0|script|Rossy|114
+025-1,80,88,0|script|Rossy|114
{
set @child_number, 6;
callfunc "XmasList";