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/flowerpentagram1.txt12
-rw-r--r--world/map/npc/017-1/flowerpentagram5.txt36
-rw-r--r--world/map/npc/017-1/mapflags.txt2
3 files changed, 25 insertions, 25 deletions
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