summaryrefslogtreecommitdiff
path: root/world/map/npc/012-1
diff options
context:
space:
mode:
authormekolat <mekolat@gmail.com>2015-02-01 14:11:22 -0500
committermekolat <mekolat@gmail.com>2015-02-01 14:11:22 -0500
commit22cfbc011ce19e96767861b60473fa3136177f10 (patch)
tree5a5c78db513146769798d2b9e891f15a52886a77 /world/map/npc/012-1
parentb192aaa6afe5cfaedfe364a2893036348270f5b4 (diff)
downloadserverdata-22cfbc011ce19e96767861b60473fa3136177f10.tar.gz
serverdata-22cfbc011ce19e96767861b60473fa3136177f10.tar.bz2
serverdata-22cfbc011ce19e96767861b60473fa3136177f10.tar.xz
serverdata-22cfbc011ce19e96767861b60473fa3136177f10.zip
remove .gat from npcs
Diffstat (limited to 'world/map/npc/012-1')
-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
5 files changed, 15 insertions, 15 deletions
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?\"";