Gugli Var Check in sailors' dialogues.

6 files changed, 80 insertions, 26 deletions

diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt
index 0e5b2e66e..74bcb390c 100644
--- a/npc/000-1/ale.txt
+++ b/npc/000-1/ale.txt
@@ -7,22 +7,25 @@
 
 000-1.gat,55,23,0,1	script	Ale	105;2,{
 
+    set @g, getq(ShipQuests_Gugli);
+    if (@g == 1) goto l_NoTask;
+
     set @q, getq(ShipQuests_Ale);
     if (@q == 1) goto l_CallFunc;
 
-    mesn;

+    mesn;
     mesq l("Ouch...");
     next;
     mesq l("These heavy boxes are killing me, I don't feel my arms anymore!");
     next;
 
-    menu

-        l("Gugli sent me down here to help you."), -,

+    menu
+        l("Gugli sent me down here to help you."), -,
         l("What's that?"), l_Plushroom,
         l("See you aboard."), close;
 
-    mes "";

-    mesn;

+    mes "";
+    mesn;
     mesq l("Really? That's kind of you, I accept your help!");
     next;
     mesq l("Hmm... Let's see, take this one.");
@@ -32,19 +35,19 @@
     getitem "AquadaBox", 1;
 
     mes "";
-    mesn;

+    mesn;
     mesq l("I will care of the other ones don't worry.");
     next;
 
 l_CallFunc:
     callfunc "SailorFood";
 
-    menu

-        rif(getq(ShipQuests_Ale) == 1, l("I'm still busy, I need to find the other sailors.")), -,

-        l("What's that?"), l_Plushroom;

-

-    mes "";

-    mesn;

+    menu
+        rif(getq(ShipQuests_Ale) == 1, l("I'm still busy, I need to find the other sailors.")), -,
+        l("What's that?"), l_Plushroom;
+
+    mes "";
+    mesn;
     mesq l("Who are you looking for?");
     next;
 
@@ -59,9 +62,9 @@ l_CallFunc:
     close;
 
 l_Bottom:
-    mes "";

-    mesn;

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

+    mes "";
+    mesn;
+    mesq l("I've seen him on the bottom of the island, ask Jalad for more information.");
 
     close;
 
@@ -69,22 +72,28 @@ l_Jalad:
     setcamnpc "Jalad";
 
     next;
-    mesn;

+    mesn;
     mesq l("Look, here he is!");
     next;
 
     restorecam;
     close;
 
-l_Plushroom:

-    mes "";

-    mesn;

-    mesq l("'That', as you call it, is a @@. There're plenty on this island!", getitemlink("Plushroom"));

-    next;

-    mesq l("It's a kind of mushroom. We call it like that because of it's taste, just like a marshmallow. It also has this name because of it's appearance, it looks like a plush!.");

-    next;

-    mesq l("There are few groups of these @@s all around this island. Just pick some and have a try.", getitemlink("Plushroom"));

-

-    close;

+l_Plushroom:
+    mes "";
+    mesn;
+    mesq l("'That', as you call it, is a @@. There're plenty on this island!", getitemlink("Plushroom"));
+    next;
+    mesq l("It's a kind of mushroom. We call it like that because of it's taste, just like a marshmallow. It also has this name because of it's appearance, it looks like a plush!.");
+    next;
+    mesq l("There are few groups of these @@s all around this island. Just pick some and have a try.", getitemlink("Plushroom"));
+
+    close;
+
+l_NoTask:
+    mes "";
+    mesn;
+    mesq l("Ouch... These boxes are so heavy!");
+    close;
 
 }
diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt
index 8df78396c..f208d0d1a 100644
--- a/npc/000-1/astapolos.txt
+++ b/npc/000-1/astapolos.txt
@@ -7,6 +7,9 @@
 

 000-1.gat,22,50,0,1	script	Astapolos	107;2,{

 

+    set @g, getq(ShipQuests_Gugli);

+    if (@g == 1) goto l_NoTask;

+

     set @q, getq(ShipQuests_Astapolos);

     if (@q == 1) goto l_CallFunc;

 

@@ -134,4 +137,10 @@ l_Top:
 

     close;

 

+l_NoTask:

+    mes "";

+    mesn;

+    mesq l("Just leave me alone.");

+    close;

+

 }

diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt
index 5007eb776..ec5066d39 100644
--- a/npc/000-1/gulukan.txt
+++ b/npc/000-1/gulukan.txt
@@ -7,6 +7,9 @@
 
 000-1.gat,54,90,0,1	script	Gulukan	111;2,{
 
+    set @g, getq(ShipQuests_Gugli);
+    if (@g == 1) goto l_NoTask;
+
     set @q, getq(ShipQuests_Gulukan);
     if (@q == 1) l_Func;
 
@@ -136,4 +139,10 @@ l_Top:
 
     close;
 
+l_NoTask:
+    mes "";
+    mesn;
+    mesq l("*uff*... And another box of Croconuts for our starving colleagues, is ready.");
+    close;
+
 }
diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt
index ee8bfcb2c..1b91fb781 100644
--- a/npc/000-1/jalad.txt
+++ b/npc/000-1/jalad.txt
@@ -7,6 +7,9 @@
 
 000-1.gat,46,35,0,1	script	Jalad	110;2,{
 
+    set @g, getq(ShipQuests_Gugli);
+    if (@g == 1) goto l_NoTask;
+
     set @q, getq(ShipQuests_Jalad);
     if (@q == 1) goto l_CallFunc;
 
@@ -98,4 +101,10 @@ l_Plushroom:
 
     close;
 
+l_NoTask:
+    mes "";
+    mesn;
+    mesq l("Sometime I hope someone will be sent here to help us.");
+    close;
+
 }
diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt
index 635c10d12..242223ab7 100644
--- a/npc/000-1/muller.txt
+++ b/npc/000-1/muller.txt
@@ -7,6 +7,9 @@
 
 000-1.gat,35,69,0,1	script	Q'Muller	104;2,{
 
+    set @g, getq(ShipQuests_Gugli);
+    if (@g == 1) goto l_NoTask;
+
     set @q, getq(ShipQuests_QMuller);
     if (@q == 1) goto l_CallFunc;
 
@@ -95,4 +98,10 @@ l_Plushroom:
 
     close;
 
+l_NoTask:
+    mes "";
+    mesn;
+    mesq l("You see? I'm working here!");
+    close;
+
 }
diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt
index 3aa9de8a1..74b03bfd3 100644
--- a/npc/000-1/tibbo.txt
+++ b/npc/000-1/tibbo.txt
@@ -7,6 +7,9 @@
 
 000-1.gat,34,111,0,1	script	Tibbo	110;2,{
 
+    set @g, getq(ShipQuests_Gugli);
+    if (@g == 1) goto l_NoTask;
+
     set @q, getq(ShipQuests_Tibbo);
     if (@q == 1) goto l_CallFunc;
 
@@ -85,4 +88,10 @@ l_Aquada:
 
     close;
 
+l_NoTask:
+    mes "";
+    mesn;
+    mesq l("I'm sorry. No time to chat with you.");
+    close;
+
 }