summaryrefslogtreecommitdiff
path: root/world/map/npc/017-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/017-1')
-rw-r--r--world/map/npc/017-1/_import.txt4
-rw-r--r--world/map/npc/017-1/_mobs.txt44
-rw-r--r--world/map/npc/017-1/_warps.txt18
-rw-r--r--world/map/npc/017-1/flowerpentagram1.txt12
-rw-r--r--world/map/npc/017-1/flowerpentagram5.txt36
-rw-r--r--world/map/npc/017-1/mapflags.txt2
6 files changed, 58 insertions, 58 deletions
diff --git a/world/map/npc/017-1/_import.txt b/world/map/npc/017-1/_import.txt
index a4038987..ecf2c383 100644
--- a/world/map/npc/017-1/_import.txt
+++ b/world/map/npc/017-1/_import.txt
@@ -1,6 +1,6 @@
// Map 017-1: Woodland Hills
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 017-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 017-1
npc: npc/017-1/_mobs.txt
npc: npc/017-1/_warps.txt
npc: npc/017-1/flowerpentagram1.txt
diff --git a/world/map/npc/017-1/_mobs.txt b/world/map/npc/017-1/_mobs.txt
index 4be9ea91..79693ffa 100644
--- a/world/map/npc/017-1/_mobs.txt
+++ b/world/map/npc/017-1/_mobs.txt
@@ -1,27 +1,27 @@
-// 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
-017-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob017-1::On1037
-017-1.gat,99,30,2,1|monster|CloverPatch|1037,1,150000ms,50000ms,Mob017-1::On1037
-017-1.gat,29,29,19,12|monster|GambogePlant|1031,1,0ms,25000ms,Mob017-1::On1031
-017-1.gat,91,25,76,8|monster|LogHead|1025,3,5000ms,60000ms,Mob017-1::On1025
-017-1.gat,31,48,19,12|monster|LogHead|1025,3,5000ms,60000ms,Mob017-1::On1025
-017-1.gat,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob017-1::On1055
-017-1.gat,0,0,0,0|monster|Bat|1017,5,0ms,0ms,Mob017-1::On1017
-017-1.gat,0,0,0,0|monster|FireGoblin|1011,5,0ms,0ms,Mob017-1::On1011
-017-1.gat,0,0,0,0|monster|Mouboo|1028,5,0ms,0ms,Mob017-1::On1028
-017-1.gat,0,0,0,0|monster|PinkFlower|1014,5,0ms,0ms,Mob017-1::On1014
-017-1.gat,0,0,0,0|monster|SpikyMushroom|1019,5,0ms,0ms,Mob017-1::On1019
-017-1.gat,0,0,0,0|monster|EvilMushroom|1013,10,0ms,0ms,Mob017-1::On1013
-017-1.gat,0,0,0,0|monster|AlizarinPlant|1032,3,0ms,0ms,Mob017-1::On1032
-017-1.gat,0,0,0,0|monster|GambogePlant|1031,3,0ms,0ms,Mob017-1::On1031
-017-1.gat,0,0,0,0|monster|CobaltPlant|1030,3,0ms,0ms,Mob017-1::On1030
-017-1.gat,0,0,0,0|monster|MauvePlant|1029,5,0ms,0ms,Mob017-1::On1029
-017-1.gat,0,0,0,0|monster|Silkworm|1035,10,0ms,0ms,Mob017-1::On1035
-017-1.gat,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob017-1::On1038
-
-
-017-1.gat,0,0,0|script|Mob017-1|-1
+017-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob017-1::On1037
+017-1,99,30,2,1|monster|CloverPatch|1037,1,150000ms,50000ms,Mob017-1::On1037
+017-1,29,29,19,12|monster|GambogePlant|1031,1,0ms,25000ms,Mob017-1::On1031
+017-1,91,25,76,8|monster|LogHead|1025,3,5000ms,60000ms,Mob017-1::On1025
+017-1,31,48,19,12|monster|LogHead|1025,3,5000ms,60000ms,Mob017-1::On1025
+017-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms,Mob017-1::On1055
+017-1,0,0,0,0|monster|Bat|1017,5,0ms,0ms,Mob017-1::On1017
+017-1,0,0,0,0|monster|FireGoblin|1011,5,0ms,0ms,Mob017-1::On1011
+017-1,0,0,0,0|monster|Mouboo|1028,5,0ms,0ms,Mob017-1::On1028
+017-1,0,0,0,0|monster|PinkFlower|1014,5,0ms,0ms,Mob017-1::On1014
+017-1,0,0,0,0|monster|SpikyMushroom|1019,5,0ms,0ms,Mob017-1::On1019
+017-1,0,0,0,0|monster|EvilMushroom|1013,10,0ms,0ms,Mob017-1::On1013
+017-1,0,0,0,0|monster|AlizarinPlant|1032,3,0ms,0ms,Mob017-1::On1032
+017-1,0,0,0,0|monster|GambogePlant|1031,3,0ms,0ms,Mob017-1::On1031
+017-1,0,0,0,0|monster|CobaltPlant|1030,3,0ms,0ms,Mob017-1::On1030
+017-1,0,0,0,0|monster|MauvePlant|1029,5,0ms,0ms,Mob017-1::On1029
+017-1,0,0,0,0|monster|Silkworm|1035,10,0ms,0ms,Mob017-1::On1035
+017-1,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms,Mob017-1::On1038
+
+
+017-1,0,0,0|script|Mob017-1|-1
{
end;
diff --git a/world/map/npc/017-1/_warps.txt b/world/map/npc/017-1/_warps.txt
index f54259a1..bddbb64d 100644
--- a/world/map/npc/017-1/_warps.txt
+++ b/world/map/npc/017-1/_warps.txt
@@ -1,11 +1,11 @@
-// 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
-017-1.gat,46,105|warp|To Woodland Hills|2,-1,013-1.gat,45,21
-017-1.gat,43,32|warp|To Theater|-1,-1,017-2.gat,26,30
-017-1.gat,76,31|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,69,68
-017-1.gat,98,20|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,83,52
-017-1.gat,97,31|warp|To Woodland Hills Labyr|-1,-1,017-3.gat,76,65
-017-1.gat,168,90|warp|To Mirak's House|-1,-1,056-2.gat,34,30
-017-1.gat,188,104|warp|To Woodland Hills|-1,-1,055-1.gat,74,21
-017-1.gat,182,16|warp|To Deep Snow Forest|1,-1,045-1.gat,25,178
+017-1,46,105|warp|To Woodland Hills|2,-1,013-1,45,21
+017-1,43,32|warp|To Theater|-1,-1,017-2,26,30
+017-1,76,31|warp|To Woodland Hills Labyr|-1,-1,017-3,69,68
+017-1,98,20|warp|To Woodland Hills Labyr|-1,-1,017-3,83,52
+017-1,97,31|warp|To Woodland Hills Labyr|-1,-1,017-3,76,65
+017-1,168,90|warp|To Mirak's House|-1,-1,056-2,34,30
+017-1,188,104|warp|To Woodland Hills|-1,-1,055-1,74,21
+017-1,182,16|warp|To Deep Snow Forest|1,-1,045-1,25,178
diff --git a/world/map/npc/017-1/flowerpentagram1.txt b/world/map/npc/017-1/flowerpentagram1.txt
index e925445c..64128b4b 100644
--- a/world/map/npc/017-1/flowerpentagram1.txt
+++ b/world/map/npc/017-1/flowerpentagram1.txt
@@ -1,6 +1,6 @@
// Author: Jenalya
-017-1.gat,95,42,0|script|#FlowerPentagram1|400
+017-1,95,42,0|script|#FlowerPentagram1|400
{
if (OrumQuest >= 31) goto L_PlacedFifthFlower;
@@ -17,7 +17,7 @@ L_FirstFlower:
"Leave.", L_Close;
L_Next:
- if (isin("017-1.gat", 94, 41, 96, 43))
+ if (isin("017-1", 94, 41, 96, 43))
goto L_Place;
mes "You're too far away.";
@@ -25,8 +25,8 @@ L_Next:
L_Place:
set @localMonsterCount,
- mobcount("017-1.gat", "#FlowerPentagram1::OnSquirrelDeath") +
- mobcount("017-1.gat", "#FlowerPentagram1::OnScorpionDeath") +
+ mobcount("017-1", "#FlowerPentagram1::OnSquirrelDeath") +
+ mobcount("017-1", "#FlowerPentagram1::OnScorpionDeath") +
2; // the mobcount function has an offset of -1, so we add 2 to have the actual amount of monsters
if (@localMonsterCount > 2)
goto L_MonstersAlive;
@@ -37,8 +37,8 @@ L_Place:
mes "You carefully place the magic flower on the marked spot. You feel some tension in the air around you.";
set OrumQuest, 18;
close2;
- areamonster "017-1.gat", 91, 37, 101, 46, "", 1105, 2, "#FlowerPentagram1::OnSquirrelDeath";
- areamonster "017-1.gat", 91, 37, 101, 46, "", 1003, 3, "#FlowerPentagram1::OnScorpionDeath";
+ areamonster "017-1", 91, 37, 101, 46, "", 1105, 2, "#FlowerPentagram1::OnSquirrelDeath";
+ areamonster "017-1", 91, 37, 101, 46, "", 1003, 3, "#FlowerPentagram1::OnScorpionDeath";
set @value, 15;
callfunc "QuestSagathaAnnoy";
set @value, 0;
diff --git a/world/map/npc/017-1/flowerpentagram5.txt b/world/map/npc/017-1/flowerpentagram5.txt
index 24b2a9d2..f8947dbd 100644
--- a/world/map/npc/017-1/flowerpentagram5.txt
+++ b/world/map/npc/017-1/flowerpentagram5.txt
@@ -1,7 +1,7 @@
// Author: Jenalya
// $@Flower_Pentagram_Time saves the time when the last summoning happened
-017-1.gat,176,59,0|script|#FlowerPentagram5|400
+017-1,176,59,0|script|#FlowerPentagram5|400
{
if (OrumQuest >= 31) goto L_PlacedFifthFlower;
@@ -17,7 +17,7 @@ L_FifthFlower:
"Leave.", L_Close;
L_PlaceTheFlower:
- if (isin("017-1.gat", 175, 58, 177, 60))
+ if (isin("017-1", 175, 58, 177, 60))
goto L_Place;
mes "This isn't working, you're too far away.";
@@ -25,14 +25,14 @@ L_PlaceTheFlower:
L_Place:
set @localMonsterCount,
- mobcount("013-1.gat", "#FlowerPentagram5::OnSquirrelDeath") +
- mobcount("013-1.gat", "#FlowerPentagram5::OnMushroomDeath") +
- mobcount("013-1.gat", "#FlowerPentagram5::OnBlueparDeath") +
- mobcount("013-1.gat", "#FlowerPentagram5::OnMoubooDeath") +
- mobcount("013-1.gat", "#FlowerPentagram5::OnScorpionDeath") +
- mobcount("013-1.gat", "#FlowerPentagram5::OnRScorpionDeath") +
- mobcount("013-1.gat", "#FlowerPentagram5::OnAScorpionDeath") +
- mobcount("013-1.gat", "#FlowerPentagram5::OnBScorpionDeath") +
+ mobcount("013-1", "#FlowerPentagram5::OnSquirrelDeath") +
+ mobcount("013-1", "#FlowerPentagram5::OnMushroomDeath") +
+ mobcount("013-1", "#FlowerPentagram5::OnBlueparDeath") +
+ mobcount("013-1", "#FlowerPentagram5::OnMoubooDeath") +
+ mobcount("013-1", "#FlowerPentagram5::OnScorpionDeath") +
+ mobcount("013-1", "#FlowerPentagram5::OnRScorpionDeath") +
+ mobcount("013-1", "#FlowerPentagram5::OnAScorpionDeath") +
+ mobcount("013-1", "#FlowerPentagram5::OnBScorpionDeath") +
8; // the mobcount function has an offset of -1, so we add 8 to have the actual amount of monsters
if (@localMonsterCount > 4)
goto L_MonstersAlive;
@@ -53,14 +53,14 @@ L_Place:
mes "The pressure builds to the point where you don't think you can endure it any longer; the fabric that binds your consciousness together seemingly unravels.";
set OrumQuest, 31;
close2;
- areamonster "017-1.gat", 170, 55, 190, 75, "", 1105, 3, "#FlowerPentagram5::OnSquirrelDeath";
- areamonster "017-1.gat", 170, 55, 190, 75, "", 1106, 2, "#FlowerPentagram5::OnMushroomDeath";
- areamonster "017-1.gat", 170, 55, 190, 75, "", 1107, 3, "#FlowerPentagram5::OnBlueparDeath";
- areamonster "017-1.gat", 170, 55, 190, 75, "", 1104, 2, "#FlowerPentagram5::OnMoubooDeath";
- areamonster "017-1.gat", 170, 55, 190, 75, "", 1003, 3, "#FlowerPentagram5::OnScorpionDeath";
- areamonster "017-1.gat", 170, 55, 190, 75, "", 1004, 2, "#FlowerPentagram5::OnRScorpionDeath";
- areamonster "017-1.gat", 170, 55, 190, 75, "", 1057, 2, "#FlowerPentagram5::OnAScorpionDeath";
- areamonster "017-1.gat", 170, 55, 190, 75, "", 1009, 2, "#FlowerPentagram5::OnBScorpionDeath";
+ areamonster "017-1", 170, 55, 190, 75, "", 1105, 3, "#FlowerPentagram5::OnSquirrelDeath";
+ areamonster "017-1", 170, 55, 190, 75, "", 1106, 2, "#FlowerPentagram5::OnMushroomDeath";
+ areamonster "017-1", 170, 55, 190, 75, "", 1107, 3, "#FlowerPentagram5::OnBlueparDeath";
+ areamonster "017-1", 170, 55, 190, 75, "", 1104, 2, "#FlowerPentagram5::OnMoubooDeath";
+ areamonster "017-1", 170, 55, 190, 75, "", 1003, 3, "#FlowerPentagram5::OnScorpionDeath";
+ areamonster "017-1", 170, 55, 190, 75, "", 1004, 2, "#FlowerPentagram5::OnRScorpionDeath";
+ areamonster "017-1", 170, 55, 190, 75, "", 1057, 2, "#FlowerPentagram5::OnAScorpionDeath";
+ areamonster "017-1", 170, 55, 190, 75, "", 1009, 2, "#FlowerPentagram5::OnBScorpionDeath";
set @value, 15;
callfunc "QuestSagathaAnnoy";
set @value, 0;
diff --git a/world/map/npc/017-1/mapflags.txt b/world/map/npc/017-1/mapflags.txt
index 98c67d63..5a7ac704 100644
--- a/world/map/npc/017-1/mapflags.txt
+++ b/world/map/npc/017-1/mapflags.txt
@@ -1 +1 @@
-017-1.gat|mapflag|resave|017-1,107,70
+017-1|mapflag|resave|017-1,107,70
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-08 13:19:59 +0000