summaryrefslogtreecommitdiff
path: root/world/map/npc/013-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/013-1')
-rw-r--r--world/map/npc/013-1/_import.txt4
-rw-r--r--world/map/npc/013-1/_mobs.txt34
-rw-r--r--world/map/npc/013-1/_warps.txt12
-rw-r--r--world/map/npc/013-1/flowerpentagram.txt82
-rw-r--r--world/map/npc/013-1/mapflags.txt2
-rw-r--r--world/map/npc/013-1/sagatha.txt2
-rw-r--r--world/map/npc/013-1/traveler.txt2
7 files changed, 69 insertions, 69 deletions
diff --git a/world/map/npc/013-1/_import.txt b/world/map/npc/013-1/_import.txt
index fa8c682b..3a988151 100644
--- a/world/map/npc/013-1/_import.txt
+++ b/world/map/npc/013-1/_import.txt
@@ -1,6 +1,6 @@
// Map 013-1: Woodland Hills
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 013-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 013-1
npc: npc/013-1/_mobs.txt
npc: npc/013-1/_warps.txt
npc: npc/013-1/flowerpentagram.txt
diff --git a/world/map/npc/013-1/_mobs.txt b/world/map/npc/013-1/_mobs.txt
index 2119ca73..e3492192 100644
--- a/world/map/npc/013-1/_mobs.txt
+++ b/world/map/npc/013-1/_mobs.txt
@@ -1,24 +1,24 @@
-// 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 Hills mobs
-013-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0ms,100ms,Mob013-1::On1014
-013-1.gat,0,0,0,0|monster|SpikyMushroom|1019,12,0ms,100ms,Mob013-1::On1019
-013-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,100ms,Mob013-1::On1028
-013-1.gat,0,0,0,0|monster|MauvePlant|1029,1,270ms,180ms,Mob013-1::On1029
-013-1.gat,0,0,0,0|monster|MauvePlant|1029,4,2700000ms,1800000ms,Mob013-1::On1029
-013-1.gat,0,0,0,0|monster|CobaltPlant|1030,1,270ms,180ms,Mob013-1::On1030
-013-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob013-1::On1030
-013-1.gat,0,0,0,0|monster|GambogePlant|1031,1,270ms,180ms,Mob013-1::On1031
-013-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob013-1::On1031
-013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,1,270ms,180ms,Mob013-1::On1032
-013-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob013-1::On1032
-013-1.gat,0,0,0,0|monster|Silkworm|1035,4,60000ms,30000ms,Mob013-1::On1035
-013-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob013-1::On1037
-013-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob013-1::On1038
-013-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob013-1::On1055
+013-1,0,0,0,0|monster|PinkFlower|1014,13,0ms,100ms,Mob013-1::On1014
+013-1,0,0,0,0|monster|SpikyMushroom|1019,12,0ms,100ms,Mob013-1::On1019
+013-1,0,0,0,0|monster|Mouboo|1028,5,0ms,100ms,Mob013-1::On1028
+013-1,0,0,0,0|monster|MauvePlant|1029,1,270ms,180ms,Mob013-1::On1029
+013-1,0,0,0,0|monster|MauvePlant|1029,4,2700000ms,1800000ms,Mob013-1::On1029
+013-1,0,0,0,0|monster|CobaltPlant|1030,1,270ms,180ms,Mob013-1::On1030
+013-1,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob013-1::On1030
+013-1,0,0,0,0|monster|GambogePlant|1031,1,270ms,180ms,Mob013-1::On1031
+013-1,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob013-1::On1031
+013-1,0,0,0,0|monster|AlizarinPlant|1032,1,270ms,180ms,Mob013-1::On1032
+013-1,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob013-1::On1032
+013-1,0,0,0,0|monster|Silkworm|1035,4,60000ms,30000ms,Mob013-1::On1035
+013-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob013-1::On1037
+013-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob013-1::On1038
+013-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob013-1::On1055
-013-1.gat,0,0,0|script|Mob013-1|-1
+013-1,0,0,0|script|Mob013-1|-1
{
end;
diff --git a/world/map/npc/013-1/_warps.txt b/world/map/npc/013-1/_warps.txt
index 1d057212..ec205807 100644
--- a/world/map/npc/013-1/_warps.txt
+++ b/world/map/npc/013-1/_warps.txt
@@ -1,8 +1,8 @@
-// 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 Hills warps
-013-1.gat,125,104|warp|To Woodland Hills Cave|-1,-1,013-3.gat,34,64
-013-1.gat,20,76|warp|To Woodland Hills|-1,2,012-1.gat,149,60
-013-1.gat,46,20|warp|To Woodland Hills|2,-1,017-1.gat,46,104
-013-1.gat,42,90|warp|To Magic House|-1,-1,013-2.gat,63,41
-013-1.gat,136,52|warp|To Woodland Hills|-1,2,055-1.gat,25,52
+013-1,125,104|warp|To Woodland Hills Cave|-1,-1,013-3,34,64
+013-1,20,76|warp|To Woodland Hills|-1,2,012-1,149,60
+013-1,46,20|warp|To Woodland Hills|2,-1,017-1,46,104
+013-1,42,90|warp|To Magic House|-1,-1,013-2,63,41
+013-1,136,52|warp|To Woodland Hills|-1,2,055-1,25,52
diff --git a/world/map/npc/013-1/flowerpentagram.txt b/world/map/npc/013-1/flowerpentagram.txt
index 59c8e392..5be2c99a 100644
--- a/world/map/npc/013-1/flowerpentagram.txt
+++ b/world/map/npc/013-1/flowerpentagram.txt
@@ -1,4 +1,4 @@
-013-1.gat,1,1,0|script|#FlowerPentagram|127
+013-1,1,1,0|script|#FlowerPentagram|127
{
end;
@@ -8,32 +8,32 @@ OnSummon:
callsub S_CleanUp;
// area closely to sagatha
- areamonster "013-1.gat", 119, 21, 134, 36, "", 1105, 3, "#FlowerPentagram::OnSquirrelDeath";
- areamonster "013-1.gat", 119, 21, 134, 36, "", 1106, 2, "#FlowerPentagram::OnMushroomDeath";
- areamonster "013-1.gat", 119, 21, 134, 36, "", 1107, 3, "#FlowerPentagram::OnBlueparDeath";
- areamonster "013-1.gat", 119, 21, 134, 36, "", 1104, 2, "#FlowerPentagram::OnMoubooDeath";
- areamonster "013-1.gat", 119, 21, 134, 36, "", 1003, 10, "#FlowerPentagram::OnScorpionDeath";
- areamonster "013-1.gat", 119, 21, 134, 36, "", 1004, 7, "#FlowerPentagram::OnRScorpionDeath";
- areamonster "013-1.gat", 119, 21, 134, 36, "", 1057, 5, "#FlowerPentagram::OnAScorpionDeath";
- areamonster "013-1.gat", 119, 21, 134, 36, "", 1009, 3, "#FlowerPentagram::OnBScorpionDeath";
+ areamonster "013-1", 119, 21, 134, 36, "", 1105, 3, "#FlowerPentagram::OnSquirrelDeath";
+ areamonster "013-1", 119, 21, 134, 36, "", 1106, 2, "#FlowerPentagram::OnMushroomDeath";
+ areamonster "013-1", 119, 21, 134, 36, "", 1107, 3, "#FlowerPentagram::OnBlueparDeath";
+ areamonster "013-1", 119, 21, 134, 36, "", 1104, 2, "#FlowerPentagram::OnMoubooDeath";
+ areamonster "013-1", 119, 21, 134, 36, "", 1003, 10, "#FlowerPentagram::OnScorpionDeath";
+ areamonster "013-1", 119, 21, 134, 36, "", 1004, 7, "#FlowerPentagram::OnRScorpionDeath";
+ areamonster "013-1", 119, 21, 134, 36, "", 1057, 5, "#FlowerPentagram::OnAScorpionDeath";
+ areamonster "013-1", 119, 21, 134, 36, "", 1009, 3, "#FlowerPentagram::OnBScorpionDeath";
// wider area around sagatha
- areamonster "013-1.gat", 68, 25, 133, 73, "", 1105, 3, "#FlowerPentagram::OnSquirrelDeath";
- areamonster "013-1.gat", 68, 25, 133, 73, "", 1106, 3, "#FlowerPentagram::OnMushroomDeath";
- areamonster "013-1.gat", 68, 25, 133, 73, "", 1107, 5, "#FlowerPentagram::OnBlueparDeath";
- areamonster "013-1.gat", 68, 25, 133, 73, "", 1104, 2, "#FlowerPentagram::OnMoubooDeath";
- areamonster "013-1.gat", 68, 25, 133, 73, "", 1003, 6, "#FlowerPentagram::OnScorpionDeath";
- areamonster "013-1.gat", 68, 25, 133, 73, "", 1004, 5, "#FlowerPentagram::OnRScorpionDeath";
- areamonster "013-1.gat", 68, 25, 133, 73, "", 1057, 4, "#FlowerPentagram::OnAScorpionDeath";
- areamonster "013-1.gat", 68, 25, 133, 73, "", 1009, 2, "#FlowerPentagram::OnBScorpionDeath";
+ areamonster "013-1", 68, 25, 133, 73, "", 1105, 3, "#FlowerPentagram::OnSquirrelDeath";
+ areamonster "013-1", 68, 25, 133, 73, "", 1106, 3, "#FlowerPentagram::OnMushroomDeath";
+ areamonster "013-1", 68, 25, 133, 73, "", 1107, 5, "#FlowerPentagram::OnBlueparDeath";
+ areamonster "013-1", 68, 25, 133, 73, "", 1104, 2, "#FlowerPentagram::OnMoubooDeath";
+ areamonster "013-1", 68, 25, 133, 73, "", 1003, 6, "#FlowerPentagram::OnScorpionDeath";
+ areamonster "013-1", 68, 25, 133, 73, "", 1004, 5, "#FlowerPentagram::OnRScorpionDeath";
+ areamonster "013-1", 68, 25, 133, 73, "", 1057, 4, "#FlowerPentagram::OnAScorpionDeath";
+ areamonster "013-1", 68, 25, 133, 73, "", 1009, 2, "#FlowerPentagram::OnBScorpionDeath";
// almost the entire map
- areamonster "013-1.gat", 24, 22, 136, 100, "", 1105, 4, "#FlowerPentagram::OnSquirrelDeath";
- areamonster "013-1.gat", 24, 22, 136, 100, "", 1106, 3, "#FlowerPentagram::OnMushroomDeath";
- areamonster "013-1.gat", 24, 22, 136, 100, "", 1107, 5, "#FlowerPentagram::OnBlueparDeath";
- areamonster "013-1.gat", 24, 22, 136, 100, "", 1104, 3, "#FlowerPentagram::OnMoubooDeath";
- areamonster "013-1.gat", 24, 22, 136, 100, "", 1003, 5, "#FlowerPentagram::OnScorpionDeath";
- areamonster "013-1.gat", 24, 22, 136, 100, "", 1004, 4, "#FlowerPentagram::OnRScorpionDeath";
- areamonster "013-1.gat", 24, 22, 136, 100, "", 1057, 3, "#FlowerPentagram::OnAScorpionDeath";
- areamonster "013-1.gat", 24, 22, 136, 100, "", 1009, 1, "#FlowerPentagram::OnBScorpionDeath";
+ areamonster "013-1", 24, 22, 136, 100, "", 1105, 4, "#FlowerPentagram::OnSquirrelDeath";
+ areamonster "013-1", 24, 22, 136, 100, "", 1106, 3, "#FlowerPentagram::OnMushroomDeath";
+ areamonster "013-1", 24, 22, 136, 100, "", 1107, 5, "#FlowerPentagram::OnBlueparDeath";
+ areamonster "013-1", 24, 22, 136, 100, "", 1104, 3, "#FlowerPentagram::OnMoubooDeath";
+ areamonster "013-1", 24, 22, 136, 100, "", 1003, 5, "#FlowerPentagram::OnScorpionDeath";
+ areamonster "013-1", 24, 22, 136, 100, "", 1004, 4, "#FlowerPentagram::OnRScorpionDeath";
+ areamonster "013-1", 24, 22, 136, 100, "", 1057, 3, "#FlowerPentagram::OnAScorpionDeath";
+ areamonster "013-1", 24, 22, 136, 100, "", 1009, 1, "#FlowerPentagram::OnBScorpionDeath";
end;
OnSquirrelDeath:
@@ -77,28 +77,28 @@ OnBScorpionDeath:
end;
S_CleanUp:
- killmonster "013-1.gat", "#FlowerPentagram::OnSquirrelDeath";
- killmonster "013-1.gat", "#FlowerPentagram::OnMushroomDeath";
- killmonster "013-1.gat", "#FlowerPentagram::OnBlueparDeath";
- killmonster "013-1.gat", "#FlowerPentagram::OnMoubooDeath";
- killmonster "013-1.gat", "#FlowerPentagram::OnScorpionDeath";
- killmonster "013-1.gat", "#FlowerPentagram::OnRScorpionDeath";
- killmonster "013-1.gat", "#FlowerPentagram::OnAScorpionDeath";
- killmonster "013-1.gat", "#FlowerPentagram::OnBScorpionDeath";
+ killmonster "013-1", "#FlowerPentagram::OnSquirrelDeath";
+ killmonster "013-1", "#FlowerPentagram::OnMushroomDeath";
+ killmonster "013-1", "#FlowerPentagram::OnBlueparDeath";
+ killmonster "013-1", "#FlowerPentagram::OnMoubooDeath";
+ killmonster "013-1", "#FlowerPentagram::OnScorpionDeath";
+ killmonster "013-1", "#FlowerPentagram::OnRScorpionDeath";
+ killmonster "013-1", "#FlowerPentagram::OnAScorpionDeath";
+ killmonster "013-1", "#FlowerPentagram::OnBScorpionDeath";
return;
}
function|script|FlowerPentagramCount
{
set $@Flower_Pentagram_Mobcount,
- mobcount("013-1.gat", "#FlowerPentagram::OnSquirrelDeath") +
- mobcount("013-1.gat", "#FlowerPentagram::OnMushroomDeath") +
- mobcount("013-1.gat", "#FlowerPentagram::OnBlueparDeath") +
- mobcount("013-1.gat", "#FlowerPentagram::OnMoubooDeath") +
- mobcount("013-1.gat", "#FlowerPentagram::OnScorpionDeath") +
- mobcount("013-1.gat", "#FlowerPentagram::OnRScorpionDeath") +
- mobcount("013-1.gat", "#FlowerPentagram::OnAScorpionDeath") +
- mobcount("013-1.gat", "#FlowerPentagram::OnBScorpionDeath") +
+ mobcount("013-1", "#FlowerPentagram::OnSquirrelDeath") +
+ mobcount("013-1", "#FlowerPentagram::OnMushroomDeath") +
+ mobcount("013-1", "#FlowerPentagram::OnBlueparDeath") +
+ mobcount("013-1", "#FlowerPentagram::OnMoubooDeath") +
+ mobcount("013-1", "#FlowerPentagram::OnScorpionDeath") +
+ mobcount("013-1", "#FlowerPentagram::OnRScorpionDeath") +
+ mobcount("013-1", "#FlowerPentagram::OnAScorpionDeath") +
+ mobcount("013-1", "#FlowerPentagram::OnBScorpionDeath") +
8; // the mobcount function has an offset of -1, so we add 8 to have the actual amount of monsters
return;
}
diff --git a/world/map/npc/013-1/mapflags.txt b/world/map/npc/013-1/mapflags.txt
index 4c296e01..5c043bd9 100644
--- a/world/map/npc/013-1/mapflags.txt
+++ b/world/map/npc/013-1/mapflags.txt
@@ -1 +1 @@
-013-1.gat|mapflag|resave|013-1,126,99
+013-1|mapflag|resave|013-1,126,99
diff --git a/world/map/npc/013-1/sagatha.txt b/world/map/npc/013-1/sagatha.txt
index cf99cd28..1251d025 100644
--- a/world/map/npc/013-1/sagatha.txt
+++ b/world/map/npc/013-1/sagatha.txt
@@ -72,7 +72,7 @@ L_next:
}
//----------------------------------------
-013-1.gat,131,24,0|script|Sagatha#_M|167
+013-1,131,24,0|script|Sagatha#_M|167
{
callfunc "SagathaStatus";
diff --git a/world/map/npc/013-1/traveler.txt b/world/map/npc/013-1/traveler.txt
index ff36ded4..efa6c53a 100644
--- a/world/map/npc/013-1/traveler.txt
+++ b/world/map/npc/013-1/traveler.txt
@@ -1,4 +1,4 @@
-013-1.gat,120,90,0|script|Faris the Traveler|103
+013-1,120,90,0|script|Faris the Traveler|103
{
set @NpcName$, "Faris";
set @NpcTravelBit, $@magic_house_bit;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-08 20:56:21 +0000