summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
Diffstat (limited to 'world')
-rw-r--r--world/map/npc/012-1/flowerpentagram2.txt4
-rw-r--r--world/map/npc/012-1/shops.txt4
-rw-r--r--world/map/npc/013-1/flowerpentagram.txt3
-rw-r--r--world/map/npc/017-1/flowerpentagram1.txt4
-rw-r--r--world/map/npc/017-4/orum.txt4
-rw-r--r--world/map/npc/017-4/waric.txt7
-rw-r--r--world/map/npc/018-1/flowerpentagram3.txt4
-rw-r--r--world/map/npc/055-1/flowerpentagram4.txt4
-rw-r--r--world/map/npc/056-1/flowerpentagram5.txt4
9 files changed, 20 insertions, 18 deletions
diff --git a/world/map/npc/012-1/flowerpentagram2.txt b/world/map/npc/012-1/flowerpentagram2.txt
index 688a7639..440d2571 100644
--- a/world/map/npc/012-1/flowerpentagram2.txt
+++ b/world/map/npc/012-1/flowerpentagram2.txt
@@ -1,7 +1,7 @@
// Author: Jenalya
-012-1.gat,143,70,0|script|#FlowerPentagram2|400,{
-
+012-1.gat,143,70,0|script|#FlowerPentagram2|400,
+{
if (OrumQuest >= 31) goto L_PlacedFifthFlower;
if (OrumQuest > 20) goto L_PlacedSecondFlower;
diff --git a/world/map/npc/012-1/shops.txt b/world/map/npc/012-1/shops.txt
index d82eea64..b15b2c3d 100644
--- a/world/map/npc/012-1/shops.txt
+++ b/world/map/npc/012-1/shops.txt
@@ -2,8 +2,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.gat,36,99,0|script|Blossom|163,{
-
+012-1.gat,36,99,0|script|Blossom|163,
+{
mes "[Blossom]";
mes "\"Hello, would you like to buy some flowers?\"";
menu
diff --git a/world/map/npc/013-1/flowerpentagram.txt b/world/map/npc/013-1/flowerpentagram.txt
index d7ffcada..ccab787c 100644
--- a/world/map/npc/013-1/flowerpentagram.txt
+++ b/world/map/npc/013-1/flowerpentagram.txt
@@ -1,4 +1,5 @@
-013-1.gat,1,1,0|script|#FlowerPentagram|127,{
+013-1.gat,1,1,0|script|#FlowerPentagram|127,
+{
end;
OnSummon:
diff --git a/world/map/npc/017-1/flowerpentagram1.txt b/world/map/npc/017-1/flowerpentagram1.txt
index 3815b179..5b09f346 100644
--- a/world/map/npc/017-1/flowerpentagram1.txt
+++ b/world/map/npc/017-1/flowerpentagram1.txt
@@ -1,7 +1,7 @@
// Author: Jenalya
-017-1.gat,95,42,0|script|#FlowerPentagram1|400,{
-
+017-1.gat,95,42,0|script|#FlowerPentagram1|400,
+{
if (OrumQuest >= 31) goto L_PlacedFifthFlower;
if (OrumQuest > 17) goto L_PlacedFirstFlower;
diff --git a/world/map/npc/017-4/orum.txt b/world/map/npc/017-4/orum.txt
index 014830a5..7adf5b0b 100644
--- a/world/map/npc/017-4/orum.txt
+++ b/world/map/npc/017-4/orum.txt
@@ -20,8 +20,8 @@
// 31: Placed fifth flower
// 32: Got reward
-017-4.gat,211,32,0|script|Orum|158,{
-
+017-4.gat,211,32,0|script|Orum|158,
+{
// first flower
set @AMOUNT_SMALLMUSHROOM, 5;
set @AMOUNT_ASH, 5;
diff --git a/world/map/npc/017-4/waric.txt b/world/map/npc/017-4/waric.txt
index 9f806b87..340f2959 100644
--- a/world/map/npc/017-4/waric.txt
+++ b/world/map/npc/017-4/waric.txt
@@ -6,8 +6,8 @@
// Waric would teach the spells based on the progress in the pentagram
// creation, but save which spells were taught in a different variable.
-017-4.gat,216,36,0|script|Waric|153,{
-
+017-4.gat,216,36,0|script|Waric|153,
+{
set @mouboo_status, ((QUEST_MAGIC & NIBBLE_2_MASK) >> NIBBLE_2_SHIFT) & 3;
set @killed_mouboo, 0;
if ((@mouboo_status == 1) || (@mouboo_status == 2))
@@ -110,7 +110,8 @@ L_Close:
close;
}
-017-1.gat,74,32,0|script|DebugFlowerP|153,{
+017-1.gat,74,32,0|script|DebugFlowerP|153,
+{
mes "Debug options for Orum's quest:";
menu
"Candle Helmet done.", L_CandleHelmet,
diff --git a/world/map/npc/018-1/flowerpentagram3.txt b/world/map/npc/018-1/flowerpentagram3.txt
index 57231479..1e41e555 100644
--- a/world/map/npc/018-1/flowerpentagram3.txt
+++ b/world/map/npc/018-1/flowerpentagram3.txt
@@ -1,7 +1,7 @@
// Author: Jenalya
-018-1.gat,83,29,0|script|#FlowerPentagram3|400,{
-
+018-1.gat,83,29,0|script|#FlowerPentagram3|400,
+{
if (OrumQuest >= 31) goto L_PlacedFifthFlower;
if (OrumQuest > 23) goto L_PlacedThirdFlower;
diff --git a/world/map/npc/055-1/flowerpentagram4.txt b/world/map/npc/055-1/flowerpentagram4.txt
index 31f9800f..364963c1 100644
--- a/world/map/npc/055-1/flowerpentagram4.txt
+++ b/world/map/npc/055-1/flowerpentagram4.txt
@@ -1,7 +1,7 @@
// Author: Jenalya
-055-1.gat,141,89,0|script|#FlowerPentagram4|400,{
-
+055-1.gat,141,89,0|script|#FlowerPentagram4|400,
+{
if (OrumQuest >= 31) goto L_PlacedFifthFlower;
if (OrumQuest > 26) goto L_PlacedFourthFlower;
diff --git a/world/map/npc/056-1/flowerpentagram5.txt b/world/map/npc/056-1/flowerpentagram5.txt
index 1218076c..6562d8e8 100644
--- a/world/map/npc/056-1/flowerpentagram5.txt
+++ b/world/map/npc/056-1/flowerpentagram5.txt
@@ -1,8 +1,8 @@
// Author: Jenalya
// $@Flower_Pentagram_Time saves the time when the last summoning happened
-056-1.gat,62,31,0|script|#FlowerPentagram5|400,{
-
+056-1.gat,62,31,0|script|#FlowerPentagram5|400,
+{
if (OrumQuest >= 31) goto L_PlacedFifthFlower;
if (OrumQuest == 30) goto L_FifthFlower;