summaryrefslogtreecommitdiff
path: root/world/map/npc/024-1
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-04-02 22:33:31 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-04-02 22:33:31 -0700
commita00579f57be4f02cd2a60ecd9468277ba6631e78 (patch)
treebc1117ddede14e61b030bfe7a337d323ddea75c2 /world/map/npc/024-1
parentc0ba38cd4b68491e28e467889804ebc09c9c002e (diff)
downloadserverdata-a00579f57be4f02cd2a60ecd9468277ba6631e78.tar.gz
serverdata-a00579f57be4f02cd2a60ecd9468277ba6631e78.tar.bz2
serverdata-a00579f57be4f02cd2a60ecd9468277ba6631e78.tar.xz
serverdata-a00579f57be4f02cd2a60ecd9468277ba6631e78.zip
Fix style (split for more readable diff)
Diffstat (limited to 'world/map/npc/024-1')
-rw-r--r--world/map/npc/024-1/eomie.txt4
-rw-r--r--world/map/npc/024-1/tinris.txt18
2 files changed, 15 insertions, 7 deletions
diff --git a/world/map/npc/024-1/eomie.txt b/world/map/npc/024-1/eomie.txt
index 1f62cdb1..5889e6b5 100644
--- a/world/map/npc/024-1/eomie.txt
+++ b/world/map/npc/024-1/eomie.txt
@@ -63,7 +63,8 @@ L_Continue:
callsub S_Update_Mask;
goto L_GetStuff;
-L_GetStuff: // @state == 8
+L_GetStuff:
+ // @state == 8
mes "[Eomie]";
mes "\"I could try to interrupt my spells to be able to cast the spell on the fertilizer, but then I need to prepare the grass for this.";
mes "Bring me " + @grass_amount + " Grass Seeds, " + @water_amount + " Bottles of Water and " + @ice_amount + " Ice Cubes.\"";
@@ -75,6 +76,7 @@ L_GetStuff: // @state == 8
L_More:
if ((countitem("GrassSeed") < @grass_amount) || (countitem("BottleOfWater") < @water_amount) || (countitem("IceCube") < @ice_amount))
goto L_NoItem;
+
delitem "GrassSeed", @grass_amount;
delitem "BottleOfWater", @water_amount;
delitem "IceCube", @ice_amount;
diff --git a/world/map/npc/024-1/tinris.txt b/world/map/npc/024-1/tinris.txt
index 857ca64c..34352a74 100644
--- a/world/map/npc/024-1/tinris.txt
+++ b/world/map/npc/024-1/tinris.txt
@@ -83,7 +83,8 @@ L_FreshFrom:
next;
goto L_FirstTry;
-L_FirstTry: // @state == 3
+L_FirstTry:
+ // @state == 3
mes "[Tinris]";
mes "\"You need to bring me some ingredients.";
mes "The ingredients are " + @slime_amount1 + " Maggot Slimes, " + @bugleg_amount1 + " Bug Legs, " + @stinger_amount1 + " Scorpion Stingers and " + @ash_amount1 + " Piles of Ash.\"";
@@ -122,7 +123,8 @@ L_More:
callsub S_Update_Mask;
goto L_SecondTry;
-L_SecondTry: // @state == 6
+L_SecondTry:
+ // @state == 6
mes "[Tinris]";
mes "\"Oh no! All right, we need to do another try.";
mes "Bring me " + @slime_amount2 + " Maggot Slimes, " + @bugleg_amount2 + " Bug Legs, " + @stinger_amount2 + " Scorpion Stingers, " + @ash_amount2 + " Piles of Ash and " + @cactusp_amount + " Cactus Potion.\"";
@@ -153,17 +155,20 @@ L_HereItIs:
mes "He gives you the bottle with the magic fertilizer.";
goto L_Close;
-L_Eomie: // @state >= 7 but below 9
+L_Eomie:
+ // @state >= 7 but below 9
mes "[Tinris]";
mes "\"I did the best I could, but it seems I'm not experienced enough to cast the spells correctly. Better ask Professor Eomie for help.\"";
goto L_Close;
-L_FertilizerDone: // @state == 9
+L_FertilizerDone:
+ // @state == 9
mes "[Tinris]";
mes "\"I heard Eomie cast the spell? I really hope it'll work this time. Bring the magic fertilizer to Anwar now.\"";
goto L_Close;
-L_GiveGift: // @state == 11
+L_GiveGift:
+ // @state == 11
mes "[Tinris]";
mes "\"Ah, did Anwar try the new fertilizer?\"";
menu
@@ -181,7 +186,8 @@ L_ItWorksGreat:
mes "\"Hey, that's really nice. Tell him my thanks.\"";
goto L_Close;
-L_Done: // @state >= 12
+L_Done:
+ // @state >= 12
mes "[Tinris]";
mes "\"My girlfriend was delighted with the Chocolate Cake and Professor Eomie was happy with my work on the magic fertilizer.\"";
mes "He twinkles.";