summaryrefslogtreecommitdiff
path: root/world/map/npc/031-2
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/031-2')
-rw-r--r--world/map/npc/031-2/_import.txt4
-rw-r--r--world/map/npc/031-2/_mobs.txt4
-rw-r--r--world/map/npc/031-2/_warps.txt6
-rw-r--r--world/map/npc/031-2/angelaHouse.txt2
-rw-r--r--world/map/npc/031-2/cindyHouse.txt2
-rw-r--r--world/map/npc/031-2/mapflags.txt2
6 files changed, 10 insertions, 10 deletions
diff --git a/world/map/npc/031-2/_import.txt b/world/map/npc/031-2/_import.txt
index 1f2f838a..2e3f4e77 100644
--- a/world/map/npc/031-2/_import.txt
+++ b/world/map/npc/031-2/_import.txt
@@ -1,6 +1,6 @@
// Map 031-2: Angela's House
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 031-2.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 031-2
npc: npc/031-2/_mobs.txt
npc: npc/031-2/_warps.txt
npc: npc/031-2/angelaHouse.txt
diff --git a/world/map/npc/031-2/_mobs.txt b/world/map/npc/031-2/_mobs.txt
index cbae1df2..61d16cc9 100644
--- a/world/map/npc/031-2/_mobs.txt
+++ b/world/map/npc/031-2/_mobs.txt
@@ -1,9 +1,9 @@
-// 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.
// Angela's House mobs
-031-2.gat,0,0,0|script|Mob031-2|-1
+031-2,0,0,0|script|Mob031-2|-1
{
end;
}
diff --git a/world/map/npc/031-2/_warps.txt b/world/map/npc/031-2/_warps.txt
index 5e366a1d..d7c00951 100644
--- a/world/map/npc/031-2/_warps.txt
+++ b/world/map/npc/031-2/_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.
// Angela's House warps
-031-2.gat,23,30|warp|To Outside|-1,-1,031-1.gat,95,81
-031-2.gat,73,30|warp|To Outside|-1,-1,031-1.gat,90,116
+031-2,23,30|warp|To Outside|-1,-1,031-1,95,81
+031-2,73,30|warp|To Outside|-1,-1,031-1,90,116
diff --git a/world/map/npc/031-2/angelaHouse.txt b/world/map/npc/031-2/angelaHouse.txt
index 24759211..3fe6f023 100644
--- a/world/map/npc/031-2/angelaHouse.txt
+++ b/world/map/npc/031-2/angelaHouse.txt
@@ -3,7 +3,7 @@
// state3: it's your first visit, you can choose a reward
// state4: you can do daily quests with white and yellow presents boxes
-031-2.gat,29,28,0|script|Angela#house|196
+031-2,29,28,0|script|Angela#house|196
{
set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
diff --git a/world/map/npc/031-2/cindyHouse.txt b/world/map/npc/031-2/cindyHouse.txt
index 34e84863..5a1c20cc 100644
--- a/world/map/npc/031-2/cindyHouse.txt
+++ b/world/map/npc/031-2/cindyHouse.txt
@@ -2,7 +2,7 @@
// state0,1,2: you shouldn't be able to reach this place
// state3 and greater: Cindy is saved, she says one of some random phrases
-031-2.gat,27,26,0|script|Cindy#house|197
+031-2,27,26,0|script|Cindy#house|197
{
set @Q_Nivalis_state_MASK, NIBBLE_5_MASK;
set @Q_Nivalis_state_SHIFT, NIBBLE_5_SHIFT;
diff --git a/world/map/npc/031-2/mapflags.txt b/world/map/npc/031-2/mapflags.txt
index d625ee96..e188a3e0 100644
--- a/world/map/npc/031-2/mapflags.txt
+++ b/world/map/npc/031-2/mapflags.txt
@@ -1 +1 @@
-031-2.gat|mapflag|resave|020-1,52,118
+031-2|mapflag|resave|020-1,52,118