Move stuff around. lg() bug.

1 files changed, 56 insertions, 49 deletions

diff --git a/npc/012-2/helena.txt b/npc/012-2/helena.txt
index a1547414d..64bb7004e 100644
--- a/npc/012-2/helena.txt
+++ b/npc/012-2/helena.txt
@@ -55,6 +55,61 @@ L_Busy:
     mesq l("Ah, @@! I'm busy now, can we talk again later?", strcharinfo(0));
     close;
 
+
+///////////////////////// Stage 1
+L_Start:
+    mesn;
+    mesq l("Ah, hello.");
+    next;
+    mesn;
+    mesq l("We actually have a problem. Bandits ransacked this tavern, and took a huge loot.");
+    next;
+    mesn;
+    mesq l("We pursued them until the mines, slayed them, and took the chests where they locked our stuff into.");
+    next;
+    mesn;
+    mesq l("The problem is... The slimes ate the keys for the chests. This is not the first time such thing happens.");
+    next;
+    // 5 ÷ 4.5% = 112 Copper Slimes. You can kill Yellow Slimes too
+    mesn;
+    mesq l("If you bring us 5 @@, we'll be forever grateful.", getitemlink(TreasureKey));
+    select
+        l("Don't worry ma'm, I'll recover the Treasure Keys at once."),
+        l("Ah... Slimes... Sorry, not my cup of tea...");
+    mes "";
+    if (@menu == 2)
+        close;
+    setq HurnscaldQuest_Bandits, 1;
+    mesn;
+    mesq l("Wonderful! I'll be expecting you back.");
+    close;
+
+L_Return:
+    mesn;
+    mesq lg("Adventurer, did you brought me what I asked? I see you have @@/5 @@.","Adventurer, did you brought me what I asked? I see you have @@/5 @@.", countitem(TreasureKey), getitemlink(TreasureKey));
+    mes "";
+    select
+        rif(countitem(TreasureKey) >= 5, l("Yes, take it.")),
+        rif(countitem(TreasureKey) < 5, l("No, I'll be back with them.")),
+        l("Hm, can we talk again later?");
+    mes "";
+    if (@menu != 1)
+        close;
+    delitem TreasureKey, 5;
+    Zeny=Zeny+1000;
+    setq HurnscaldQuest_Bandits, 2;
+    mesn;
+    mesq l("Hey hey... Good job! We can now use again the stuff we recovered from the bandits.");
+    next;
+    mesn;
+    mesq l("Here is 1000 GP for your efforts. Thanks for making Hurnscald a better place to live.");
+    next;
+    mesn;
+    mesq l("This happens quite often, too. My friends and I are always collecting keys to reduce beer price on Hurnscald. %%2");
+    close;
+
+
+///////////////////////// Stage 2
 L_Quest:
     mesn;
     mesq l("Ah, @@, good thing you are here.", strcharinfo(0));
@@ -113,56 +168,8 @@ L_Hood:
     mesq l("Here is 2000 GP for your efforts. Thanks for making Hurnscald a better place to live.");
     close;
 
-L_Start:
-    mesn;
-    mesq l("Ah, hello.");
-    next;
-    mesn;
-    mesq l("We actually have a problem. Bandits ransacked this tavern, and took a huge loot.");
-    next;
-    mesn;
-    mesq l("We pursued them until the mines, slayed them, and took the chests where they locked our stuff into.");
-    next;
-    mesn;
-    mesq l("The problem is... The slimes ate the keys for the chests. This is not the first time such thing happens.");
-    next;
-    // 5 ÷ 4.5% = 112 Copper Slimes. You can kill Yellow Slimes too
-    mesn;
-    mesq l("If you bring us 5 @@, we'll be forever grateful.", getitemlink(TreasureKey));
-    select
-        l("Don't worry ma'm, I'll recover the Treasure Keys at once."),
-        l("Ah... Slimes... Sorry, not my cup of tea...");
-    mes "";
-    if (@menu == 2)
-        close;
-    setq HurnscaldQuest_Bandits, 1;
-    mesn;
-    mesq l("Wonderful! I'll be expecting you back.");
-    close;
 
-L_Return:
-    mesn;
-    mesq lg("Adventurer, did you brought me what I asked? I see you have @@/5 @@.", countitem(TreasureKey), getitemlink(TreasureKey));
-    mes "";
-    select
-        rif(countitem(TreasureKey) >= 5, l("Yes, take it.")),
-        rif(countitem(TreasureKey) < 5, l("No, I'll be back with them.")),
-        l("Hm, can we talk again later?");
-    mes "";
-    if (@menu != 1)
-        close;
-    delitem TreasureKey, 5;
-    Zeny=Zeny+1000;
-    setq HurnscaldQuest_Bandits, 2;
-    mesn;
-    mesq l("Hey hey... Good job! We can now use again the stuff we recovered from the bandits.");
-    next;
-    mesn;
-    mesq l("Here is 1000 GP for your efforts. Thanks for making Hurnscald a better place to live.");
-    next;
-    mesn;
-    mesq l("This happens quite often, too. My friends and I are always collecting keys to reduce beer price on Hurnscald. %%2");
-    close;
+///////////////////////// Stage 3
 
 OnInit:
     .@npcId = getnpcid(0, .name$);