Clean up enora's script.

1 files changed, 26 insertions, 30 deletions

diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index ba2f2cee..70731ba6 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -90,21 +90,6 @@
     }
 
     function enora_second_quest {
-        speech 4,
-            l("After this small overview of Artis, what do you think of our city?"),
-            l("The Legion of Aemil is in charge of the security of the intramural part of most city throughout the archipelagos."),
-            l("But we are quite lucky here, outside of some tipsy travelers there are no big problem around here, it's not like capital, Esperia."),
-            l("Now that I think about it, I have another task for you. I asked Resa from the light armor shop some new clothes, she is a bit far from here, I can't go there as I need to watch the dock."),
-            l("Her shop is on the west part of the city, between the legion building and the library.");
-
-        setq ArtisQuests_Enora, 5;
-
-        closedialog;
-        npctalk3 l("Thank you very much!");
-        close;
-    }
-
-    function enora_first_quest_ret {
         speech 5,
             l("Thank you for this commission, Chelios is as good as Don when it comes to forging metal."),
             l("By the way, did you ever talk with Don?"),
@@ -131,18 +116,30 @@
 
                 break;
         }
-        enora_second_quest;
 
-        return;
+        speech 4,
+            l("After this small overview of Artis, what do you think of our city?"),
+            l("The Legion of Aemil is in charge of the security of the intramural part of most city throughout the archipelagos."),
+            l("But we are quite lucky here, outside of some tipsy travelers there are no big problem around here, it's not like capital, Esperia."),
+            l("Now that I think about it, I have another task for you. I asked Resa from the light armor shop some new clothes, she is a bit far from here, I can't go there as I need to watch the dock."),
+            l("Her shop is on the west part of the city, between the legion building and the library.");
+
+        setq ArtisQuests_Enora, 5;
+
+        closedialog;
+        npctalk3 l("Thank you very much!");
+        close;
     }
 
     function enora_third_quest {
-        return;
-    }
+        speech 5,
+            l("");
 
-    function enora_second_quest_ret {
-        enora_third_quest;
-        return;
+//      setq ArtisQuests_Enora, 7;
+
+        closedialog;
+        npctalk3 l("Thank you very much!");
+        close;
     }
 
     function enora_fourth_quest {
@@ -178,12 +175,11 @@
                 break;
         }
 
-        return;
-    }
+//      setq ArtisQuests_Enora, 10;
 
-    function enora_third_quest_ret {
-        enora_fourth_quest;
-        return;
+        closedialog;
+        npctalk3 l("Thank you very much!");
+        close;
     }
 
     function enora_hill_cleaned {
@@ -217,13 +213,13 @@
         switch (getq(ArtisQuests_Enora))
         {
             case 4:
-                enora_first_quest_ret;
+                enora_second_quest;
                 break;
             case 6:
-                enora_second_quest_ret;
+                enora_third_quest;
                 break;
             case 9:
-                enora_third_quest_ret;
+                enora_fourth_quest;
                 break;
             default:
                 break;