Merge branch 'master' of gitorious.org:evol/serverdata-beta

Conflicts:
	npc/000-1/ale.txt

1 files changed, 36 insertions, 11 deletions

diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt
index c28b7889..15a789ee 100644
--- a/npc/000-1/ale.txt
+++ b/npc/000-1/ale.txt
@@ -10,21 +10,42 @@
     set @q, getq(ShipQuests_Ale);
     if (@q == 1) goto l_CallFunc;
 
-    mes "";

-    mesn;

-    mesq l("Ouch...");
+    mesn;
+    mesq l("Can't you see I'm working?!");
     next;
-    mesq l("These eavy boxs are killing me, I don't feel my arms anymore!");
+
+    menu
+        l("Well I'm working too! Don't you want me to carry one of those boxes back to Gugli?"), -;
+
+    mes "";
+    mesn;
+    mesq l("Ooh... It seems sailors are not able to do their job anymore?!");
     next;
+    
+    menu
+        l("Fine! Goodbye."), l_Close;
+        l("Yes, it is true! You are not able at all. Nard has been waiting for the food for too long already. Hurry up, you lazy sailors!"), -;
 
-    menu

-        l(""), l_Aquada,

-        l(""), l_Aquada,
-        l(""), Close;
+    mes "";
+    mesn;
+    mesq l("Are you blind? Do you think these boxes are light and soft as a Piou's feather?!");
+    next;
+
+    menu
+        l("I am sure I can run with one of them on my shoulder."), -;
+
+    mes "";
+    mesn;
+    mesq l("Well then... Take this one!");
+    next;
 
     setq ShipQuests_Ale, 1;
     getitem "AquadaBox", 1;
-// And here too.
+
+    mes "";
+    mesn;
+    mesq l("And now I want to see you run!");
+    close;
 
 l_CallFunc:
     callfunc "SailorFood";
@@ -35,7 +56,7 @@ l_CallFunc:
 

     mes "";

     mesn;

-    mesq l("Who are you searching?");
+    mesq l("Who are you looking for?");
     next;
 
     menu
@@ -51,7 +72,7 @@ l_CallFunc:
 l_Bottom:
     mes "";

     mesn;

-    mesq l("I've seen him on the bottom of the island, ask Jalad for more info.");

+    mesq l("I've seen him on the bottom of the island, ask Jalad for more information.");

 
     close;
 
@@ -75,6 +96,10 @@ l_Aquada:
     next;

     mesq l("Orelse, if you really wish one, and if you feel capable, you can try killing tortugas or crocs if you're strong enough. I'm sure they could drop one or two @@s.", getitemlink("Aquada"));

 

+    close;
+    
+l_Close:
+
     close;

 
 }