summaryrefslogtreecommitdiff
path: root/world/map/npc/012-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/012-1')
-rw-r--r--world/map/npc/012-1/_import.txt4
-rw-r--r--world/map/npc/012-1/_mobs.txt26
-rw-r--r--world/map/npc/012-1/_warps.txt24
-rw-r--r--world/map/npc/012-1/amrak.txt2
-rw-r--r--world/map/npc/012-1/flowerpentagram2.txt20
-rw-r--r--world/map/npc/012-1/injured-mouboo.txt2
-rw-r--r--world/map/npc/012-1/mapflags.txt2
-rw-r--r--world/map/npc/012-1/shops.txt4
8 files changed, 42 insertions, 42 deletions
diff --git a/world/map/npc/012-1/_import.txt b/world/map/npc/012-1/_import.txt
index 2cdc7196..0a7ff68b 100644
--- a/world/map/npc/012-1/_import.txt
+++ b/world/map/npc/012-1/_import.txt
@@ -1,6 +1,6 @@
// Map 012-1: Woodland Hills
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 012-1.gat
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+map: 012-1
npc: npc/012-1/_mobs.txt
npc: npc/012-1/_warps.txt
npc: npc/012-1/amrak.txt
diff --git a/world/map/npc/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt
index 38f003d9..c8f1303c 100644
--- a/world/map/npc/012-1/_mobs.txt
+++ b/world/map/npc/012-1/_mobs.txt
@@ -1,20 +1,20 @@
-// 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
-012-1.gat,0,0,0,0|monster|PinkFlower|1014,13,0ms,100ms,Mob012-1::On1014
-012-1.gat,0,0,0,0|monster|SpikyMushroom|1019,25,0ms,10ms,Mob012-1::On1019
-012-1.gat,0,0,0,0|monster|Mouboo|1028,20,0ms,10ms,Mob012-1::On1028
-012-1.gat,0,0,0,0|monster|MauvePlant|1029,5,2700000ms,1800000ms,Mob012-1::On1029
-012-1.gat,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob012-1::On1030
-012-1.gat,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob012-1::On1031
-012-1.gat,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob012-1::On1032
-012-1.gat,0,0,0,0|monster|Silkworm|1035,5,60000ms,30000ms,Mob012-1::On1035
-012-1.gat,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob012-1::On1037
-012-1.gat,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob012-1::On1038
-012-1.gat,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms,Mob012-1::On1055
+012-1,0,0,0,0|monster|PinkFlower|1014,13,0ms,100ms,Mob012-1::On1014
+012-1,0,0,0,0|monster|SpikyMushroom|1019,25,0ms,10ms,Mob012-1::On1019
+012-1,0,0,0,0|monster|Mouboo|1028,20,0ms,10ms,Mob012-1::On1028
+012-1,0,0,0,0|monster|MauvePlant|1029,5,2700000ms,1800000ms,Mob012-1::On1029
+012-1,0,0,0,0|monster|CobaltPlant|1030,2,2700000ms,1800000ms,Mob012-1::On1030
+012-1,0,0,0,0|monster|GambogePlant|1031,2,2700000ms,1800000ms,Mob012-1::On1031
+012-1,0,0,0,0|monster|AlizarinPlant|1032,2,2700000ms,1800000ms,Mob012-1::On1032
+012-1,0,0,0,0|monster|Silkworm|1035,5,60000ms,30000ms,Mob012-1::On1035
+012-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms,Mob012-1::On1037
+012-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms,Mob012-1::On1038
+012-1,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms,Mob012-1::On1055
-012-1.gat,0,0,0|script|Mob012-1|-1
+012-1,0,0,0|script|Mob012-1|-1
{
end;
diff --git a/world/map/npc/012-1/_warps.txt b/world/map/npc/012-1/_warps.txt
index cf81ba5b..c9a05a5f 100644
--- a/world/map/npc/012-1/_warps.txt
+++ b/world/map/npc/012-1/_warps.txt
@@ -1,14 +1,14 @@
-// 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
-012-1.gat,51,39|warp|To Moggun Cave|-1,-1,012-3.gat,370,43
-012-1.gat,147,67|warp|To Moggun Cave|-1,-1,012-3.gat,474,106
-012-1.gat,41,48|warp|To Moggun Cave|-1,-1,012-3.gat,353,78
-012-1.gat,44,88|warp|To Moggun Cave|-1,-1,012-3.gat,355,187
-012-1.gat,92,104|warp|To Moggun Cave|-1,-1,012-3.gat,270,111
-012-1.gat,98,99|warp|To Small Cave|-1,-1,012-3.gat,37,81
-012-1.gat,109,92|warp|To Small Cave|-1,-1,012-3.gat,80,73
-012-1.gat,123,90|warp|To Mana Seed Cave|-1,-1,012-3.gat,38,156
-012-1.gat,150,61|warp|To Woodland Hills|-1,2,013-1.gat,21,75
-012-1.gat,132,176|warp|To Woodland|0,-1,011-1.gat,73,10
-012-1.gat,65,126|warp|To Moggun Cave|-1,-1,012-3.gat,176,140
+012-1,51,39|warp|To Moggun Cave|-1,-1,012-3,370,43
+012-1,147,67|warp|To Moggun Cave|-1,-1,012-3,474,106
+012-1,41,48|warp|To Moggun Cave|-1,-1,012-3,353,78
+012-1,44,88|warp|To Moggun Cave|-1,-1,012-3,355,187
+012-1,92,104|warp|To Moggun Cave|-1,-1,012-3,270,111
+012-1,98,99|warp|To Small Cave|-1,-1,012-3,37,81
+012-1,109,92|warp|To Small Cave|-1,-1,012-3,80,73
+012-1,123,90|warp|To Mana Seed Cave|-1,-1,012-3,38,156
+012-1,150,61|warp|To Woodland Hills|-1,2,013-1,21,75
+012-1,132,176|warp|To Woodland|0,-1,011-1,73,10
+012-1,65,126|warp|To Moggun Cave|-1,-1,012-3,176,140
diff --git a/world/map/npc/012-1/amrak.txt b/world/map/npc/012-1/amrak.txt
index 1305b9dd..59bafd4e 100644
--- a/world/map/npc/012-1/amrak.txt
+++ b/world/map/npc/012-1/amrak.txt
@@ -1,6 +1,6 @@
//
-012-1.gat,137,104,0|script|Amrak|103
+012-1,137,104,0|script|Amrak|103
{
mes "[Amrak]";
mes "\"I'm studying this waterfall. The water seems to flow from it like magic.\"";
diff --git a/world/map/npc/012-1/flowerpentagram2.txt b/world/map/npc/012-1/flowerpentagram2.txt
index 35a9a21e..3ce479e9 100644
--- a/world/map/npc/012-1/flowerpentagram2.txt
+++ b/world/map/npc/012-1/flowerpentagram2.txt
@@ -1,6 +1,6 @@
// Author: Jenalya
-012-1.gat,143,70,0|script|#FlowerPentagram2|400
+012-1,143,70,0|script|#FlowerPentagram2|400
{
if (OrumQuest >= 31) goto L_PlacedFifthFlower;
@@ -17,7 +17,7 @@ L_SecondFlower:
"Leave.", L_Close;
L_Next:
- if (isin("012-1.gat", 142, 69, 144, 71))
+ if (isin("012-1", 142, 69, 144, 71))
goto L_Place;
mes "This isn't working, you're too far away.";
@@ -25,10 +25,10 @@ L_Next:
L_Place:
set @localMonsterCount,
- mobcount("012-1.gat", "#FlowerPentagram2::OnSquirrelDeath") +
- mobcount("012-1.gat", "#FlowerPentagram2::OnMushroomDeath") +
- mobcount("012-1.gat", "#FlowerPentagram2::OnScorpionDeath") +
- mobcount("012-1.gat", "#FlowerPentagram2::OnRScorpionDeath") +
+ mobcount("012-1", "#FlowerPentagram2::OnSquirrelDeath") +
+ mobcount("012-1", "#FlowerPentagram2::OnMushroomDeath") +
+ mobcount("012-1", "#FlowerPentagram2::OnScorpionDeath") +
+ mobcount("012-1", "#FlowerPentagram2::OnRScorpionDeath") +
4; // the mobcount function has an offset of -1, so we add 4 to have the actual amount of monsters
if (@localMonsterCount > 2)
goto L_MonstersAlive;
@@ -40,10 +40,10 @@ L_Place:
mes "Sensing a certain tension build up around you, you can't help but feel alarmed.";
set OrumQuest, 21;
close2;
- areamonster "012-1.gat", 140, 64, 146, 73, "", 1105, 2, "#FlowerPentagram2::OnSquirrelDeath";
- areamonster "012-1.gat", 140, 64, 146, 73, "", 1106, 2, "#FlowerPentagram2::OnMushroomDeath";
- areamonster "012-1.gat", 140, 64, 146, 73, "", 1003, 2, "#FlowerPentagram2::OnScorpionDeath";
- areamonster "012-1.gat", 140, 64, 146, 73, "", 1004, 2, "#FlowerPentagram2::OnRScorpionDeath";
+ areamonster "012-1", 140, 64, 146, 73, "", 1105, 2, "#FlowerPentagram2::OnSquirrelDeath";
+ areamonster "012-1", 140, 64, 146, 73, "", 1106, 2, "#FlowerPentagram2::OnMushroomDeath";
+ areamonster "012-1", 140, 64, 146, 73, "", 1003, 2, "#FlowerPentagram2::OnScorpionDeath";
+ areamonster "012-1", 140, 64, 146, 73, "", 1004, 2, "#FlowerPentagram2::OnRScorpionDeath";
set @value, 15;
callfunc "QuestSagathaAnnoy";
set @value, 0;
diff --git a/world/map/npc/012-1/injured-mouboo.txt b/world/map/npc/012-1/injured-mouboo.txt
index 03a5bb70..58a6af50 100644
--- a/world/map/npc/012-1/injured-mouboo.txt
+++ b/world/map/npc/012-1/injured-mouboo.txt
@@ -43,7 +43,7 @@ S_update_var:
return;
}
-012-1.gat,57,153,0|script|Mouboo|171
+012-1,57,153,0|script|Mouboo|171
{
set @Q_MASK, NIBBLE_2_MASK;
set @Q_SHIFT, NIBBLE_2_SHIFT;
diff --git a/world/map/npc/012-1/mapflags.txt b/world/map/npc/012-1/mapflags.txt
index 19586c27..915346ad 100644
--- a/world/map/npc/012-1/mapflags.txt
+++ b/world/map/npc/012-1/mapflags.txt
@@ -1 +1 @@
-012-1.gat|mapflag|resave|012-1,88,141
+012-1|mapflag|resave|012-1,88,141
diff --git a/world/map/npc/012-1/shops.txt b/world/map/npc/012-1/shops.txt
index fb29a68a..f93ec464 100644
--- a/world/map/npc/012-1/shops.txt
+++ b/world/map/npc/012-1/shops.txt
@@ -1,8 +1,8 @@
//
-012-1.gat,36,99,0|shop|#FlowerShop|127,RedRose:*1,PinkRose:*1,YellowRose:*1,WhiteRose:*1,OrangeRose:*1,DarkRedRose:*1,RedTulip:*1,PinkTulip:*1,YellowTulip:*1,WhiteTulip:*1,OrangeTulip:*1
+012-1,36,99,0|shop|#FlowerShop|127,RedRose:*1,PinkRose:*1,YellowRose:*1,WhiteRose:*1,OrangeRose:*1,DarkRedRose:*1,RedTulip:*1,PinkTulip:*1,YellowTulip:*1,WhiteTulip:*1,OrangeTulip:*1
-012-1.gat,36,99,0|script|Blossom|163
+012-1,36,99,0|script|Blossom|163
{
mes "[Blossom]";
mes "\"Hello, would you like to buy some flowers?\"";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 03:13:33 +0000