Complete Gugli quest.

1 files changed, 40 insertions, 6 deletions

diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index 5c9fee79..d58ecddc 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -36,7 +36,7 @@ OnTalk:
     next;
     mesq l("An unexpected help is always welcome!");
     next;
-    mesq l("As you may know, we are long distance travelers and our whole crew needs to store enough food to survive. You don't know how dangerous the sea life can be.");
+    mesq l("As you may know, we are long distance travellers and our whole crew needs to store enough food to survive. You don't know how dangerous the sea life can be.");
     next;
 
     menu
@@ -75,12 +75,43 @@ l_TaskGiven:
     mesq l("Great to see you! What can I do for you today?");
     next;
 
+    if (getq(ShipQuests_Ale) == 1 && getq(ShipQuests_Astapolos) == 1 && getq(ShipQuests_Gulukan) == 1 && getq(ShipQuests_Jalad) == 1 && getq(ShipQuests_QMuller) == 1 && getq(ShipQuests_Tibbo) == 1) goto l_MenuDone;
+
 l_Menu:
     menu
         rif(getq(ShipQuests_Couwan) == 1, l("Couwan gave me this box, it is for you.")), l_Couwan,
-        rif(countitem("AquadaBox") > 1 && countitem("CroconutBox") > 1 && countitem("PlushroomBox") > 1, l("I have collected all the boxes you needed.")), l_TaskDone,
+        rif(countitem("AquadaBox") > 0 || countitem("CroconutBox") > 0 || countitem("PlushroomBox") > 0, l("I have some boxes for you.")), l_CollectSmthing,
         l("Where can I find your crew?"), l_Location,
-        l("See you!"), -;
+        l("See you!"), close;
+
+l_MenuDone:
+    menu
+        rif(getq(ShipQuests_Couwan) == 1, l("Couwan gave me this box, it is for you.")), l_Couwan,
+        l("I have collected all the boxes you needed."), l_TaskDone,
+        l("See you!"), close;
+
+l_CollectSmthing:
+    mes "";
+    mesn;
+    mesq l("Good job!");
+    next;
+    mesq l("I'll take all of these boxes.");
+    next;
+
+    if (countitem("AquadaBox") == 2) delitem "AquadaBox", 2;
+    if (countitem("CroconutBox") == 2) delitem "AquadaBox", 2;
+    if (countitem("PlushroomBox") == 2) delitem "AquadaBox", 2;
+    if (countitem("AquadaBox") == 1) delitem "AquadaBox", 1;
+    if (countitem("CroconutBox") == 1) delitem "AquadaBox", 1;
+    if (countitem("PlushroomBox") == 1) delitem "AquadaBox", 1;
+
+    mesq l("You still need to give me boxes from: ");
+    if (getq(ShipQuests_Astapolos) == 0), l("- Astapolos");
+    if (getq(ShipQuests_Ale) == 0), l("- Ale");
+    if (getq(ShipQuests_Gulukan) == 0), l("- Gulukan");
+    if (getq(ShipQuests_Jalad) == 0), l("- Jalad");
+    if (getq(ShipQuests_QMuller) == 0), l("- QMuller");
+    if (getq(ShipQuests_Tibbo) == 0), l("- Tibbo");
 
     close;
 
@@ -141,9 +172,12 @@ l_Lean:
     close;
 
 l_TaskDone:
-    if (countitem("AquadaBox") > 1) delitem "AquadaBox", 2;
-    if (countitem("CroconutBox") > 1) delitem "CroconutBox", 2;
-    if (countitem("PlushroomBox") > 1) delitem "PlushroomBox", 2;
+    if (countitem("AquadaBox") == 2) delitem "AquadaBox", 2;
+    if (countitem("CroconutBox") == 2) delitem "AquadaBox", 2;
+    if (countitem("PlushroomBox") == 2) delitem "AquadaBox", 2;
+    if (countitem("AquadaBox") == 1) delitem "AquadaBox", 1;
+    if (countitem("CroconutBox") == 1) delitem "AquadaBox", 1;
+    if (countitem("PlushroomBox") == 1) delitem "AquadaBox", 1;
     setq ShipQuests_Gugli, 2;
 
     mesq l("Well done! The ship is now ready to sail again!");