Chef Gado quest is now part of the main Nard Quest Chain.

Other quests adapted in order to test the complete story line.

5 files changed, 86 insertions, 42 deletions

diff --git a/db/questvars.txt b/db/questvars.txt
index 36a171fb..99022801 100644
--- a/db/questvars.txt
+++ b/db/questvars.txt
@@ -7,21 +7,21 @@
 // JJAA PPPP AAKA DTNN D   
 // uull eeee rrnM oCAA a   
 
-ShipQuests,3,1         // ShipQuests_Julia            0
-ShipQuests,3,256       // ShipQuests_Arpan            1
-ShipQuests,3,4         // ShipQuests_Alige            2
-ShipQuests,15,16       // ShipQuests_Peter            3
-ShipQuests,3,32768     // ShipQuests_Nard             4
-ShipQuests,1,1024      // ShipQuests_Knife            5
-ShipQuests,1,2048      // ShipQuests_ArpanMoney       6
-ShipQuests,1,4096      // ShipQuests_Door             7
-ShipQuests,3,8192      // ShipQuests_Darlin           8
-ShipQuests,3,131072    // ShipQuests_Couwan           9
-ShipQuests,1,262144    // ShipQuests_Ale              10
-ShipQuests,1,524288    // ShipQuests_Astapolos        11
-ShipQuests,1,1048576   // ShipQuests_Gulukan          12
-ShipQuests,1,2097152   // ShipQuests_Jalad            13
-ShipQuests,1,4194304   // ShipQuests_QMuller          14
-ShipQuests,1,8388608   // ShipQuests_Tibbo            15
-ShipQuests,3,16777216  // ShipQuests_Gugli            16
-ShipQuests,15,67108864 // ShipQuests_ChefGado         17
+ShipQuests,3,1          // ShipQuests_Julia            0
+ShipQuests,3,256        // ShipQuests_Arpan            1
+ShipQuests,3,4          // ShipQuests_Alige            2
+ShipQuests,15,16        // ShipQuests_Peter            3
+ShipQuests,15,32768     // ShipQuests_Nard             4
+ShipQuests,1,1024       // ShipQuests_Knife            5
+ShipQuests,1,2048       // ShipQuests_ArpanMoney       6
+ShipQuests,1,4096       // ShipQuests_Door             7
+ShipQuests,3,8192       // ShipQuests_Darlin           8
+ShipQuests,3,524288     // ShipQuests_Couwan           9
+ShipQuests,1,1048576    // ShipQuests_Ale              10
+ShipQuests,1,2097152    // ShipQuests_Astapolos        11
+ShipQuests,1,4194304    // ShipQuests_Gulukan          12
+ShipQuests,1,8388608    // ShipQuests_Jalad            13
+ShipQuests,1,16777216   // ShipQuests_QMuller          14
+ShipQuests,1,33554432   // ShipQuests_Tibbo            15
+ShipQuests,3,67108864   // ShipQuests_Gugli            16
+ShipQuests,15,268435456 // ShipQuests_ChefGado         17
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index d9bb0dd4..d0194bde 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -72,6 +72,7 @@ l_TaskGiven:
 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,
         l("Where can I find your crew?"), l_Location,
         l("See you."), -;
 
@@ -134,12 +135,16 @@ l_Lean:
     close;
 
 l_TaskDone:
+    setq ShipQuests_Gugli, 2;
+    if (countitem("AquadaBox") > 1) delitem "AquadaBox", 2;
+    if (countitem("CroconutBox") > 1) delitem "CroconutBox", 2;
+    if (countitem("PlushroomBox") > 1) delitem "PlushroomBox", 2;
+
     mesq l("Well done! Now the ship is ready to sail again!");
     next;
     mesq l("You should inform Nard about the progress of the load of the merchandise. He will be enthusiastic.");
 
-    setq ShipQuests_Gugli, 2;
-    next;
+    close;
 
 l_TaskCompleted:
     mesq l("You are now part of this crew... At least for us down here!");
@@ -158,4 +163,4 @@ l_TaskCompleted:
     doevent "Gugli::OnTalk";
     close;
 
-}
\ No newline at end of file
+}
diff --git a/npc/000-2-0/doors.txt b/npc/000-2-0/doors.txt
index 3d04526e..871d4751 100644
--- a/npc/000-2-0/doors.txt
+++ b/npc/000-2-0/doors.txt
@@ -9,9 +9,9 @@
 
 OnTouch:
     set @q, getq(ShipQuests_Nard);
-    if (@q == 1) goto l_Warp;
-    if (@q == 2) goto l_GotoNard;
-//    if (@q == 3) goto l_End;
+    if (@q > 0) goto l_Warp;
+//  if (@q == 2) goto l_GotoNard;
+//  if (@q == 3) goto l_End;
     close;
 
     setcamnpc "Julia";
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index f485a93e..1106e127 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -5,24 +5,32 @@
 //    La Johanne Chef.
 // Variable:
 //    ShipQuests_ChefGado
+//    ShipQuests_Nard
 // Values:
 //    0   Default, no quest given.
 //    1   Quest accepted.
 //    2   Ingredients collected, ready to poison Julia.
 //    3   Julia poisoned.
 //    4   Quest complete.
-//    5   Quest aborted.
+//    5   Quest aborted. Julia wins.
 
 000-2-1.gat,17,28,0,1	script	Chef Gado	318;2,{
 
     set @q, getq(ShipQuests_ChefGado);
+    set @n, getq(ShipQuests_Nard);
     if (@q == 1) goto l_QuestAccepted;
     if (@q == 2) goto l_PoisonAccepted;
     if (@q == 3) goto l_PoisonJulia;
     if (@q == 4) goto l_QuestComplete;
     if (@q == 5) goto l_QuestAborted;
+    if (@n == 3) goto l_QuestStart;
 
     mesn;
+    mesq l("Where is the damn salt!? Give me the salt. I know you have it!");
+    close;
+
+l_QuestStart:
+    mesn;
     mesq l("So it seems I have another stomach to fill. Those bastards have no respect for who feeds them every damn day!");
     next;
 
@@ -43,9 +51,9 @@ l_Rude:
     mes "";
     mesq l("I am sure you know her. Nice dress, large smile and a constant flux of orders and rules. Julia they call her!");
     next;
-    mesq l("You have to know that there was a time during which I was the unopposed captain of this crew. Then one day one of the damn sailor brought here that nice lady and Nard, her partner in crime.");
+    mesq l("You have to know that there was a time during which I was the unopposed lieutenant of this crew. Then one day one of the damn sailor brought here that nice lady.");
     next;
-    mesq l("I will not describe you all the details but after 1 month they were ruling the ship and I was sent down here cooking for those traitors!");
+    mesq l("I will not describe you all the details but after one month she was ruling the ship and I was sent down here cooking for those traitors!");
     next;
     mesq l("But I swear that one day..ooh my tasty revenge. Hhmm, actually I wonder if...maybe...");
     next;
diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt
index 064a6527..b0976d1a 100644
--- a/npc/000-2-3/nard.txt
+++ b/npc/000-2-3/nard.txt
@@ -10,6 +10,7 @@
 // Variable:
 //    ShipQuests_Nard
 //    ShipQuests_Gugli
+//    ShipQuests_ChefGado
 // Values: 
 //    00   Introduction of the box and Nard. This is displayed when the player never spoke to Nard or his box.
 //    01   Nard spoke and gave access to the outdoor of the ship.
@@ -23,12 +24,16 @@
 
     set @q, getq(ShipQuests_Nard);
     set @a, getq(ShipQuests_Gugli);
+    set @c, getq(ShipQuests_ChefGado);
 
 l_Checker:
-    if (@q == 1) goto l_NotYet;
-    if (@q == 2) goto l_Give;
-    if (@q > 2) goto l_Already;
+    if (@c > 3 && @q == 3) goto l_ChefQuestComplete;
+    if (@q == 2) goto l_ChefQuestStart;
+    if (@q == 3) goto l_ChefQuestGiven;
+    if (@q == 4) goto l_Already;
     if (@a == 2) goto l_Done;
+    if (@q == 1) goto l_NotYet;
+    //if (@q == 2) goto l_Give;
 
     mesn;
     mesq l("Hello."); 
@@ -127,34 +132,60 @@ l_NotYet:
     mesq l("You still haven't completed your task.");  
     close;
 
-l_Give:
+l_Done:
+    mesn;
+    mesq l("Hi @@.", strcharinfo(0));
+    next;
+    mesq l("Elmo and Gugli reported me that you done the ccccccccccccccccccccccccccccccccccccccccccccc IIIIIIIIIIICCCCCCCCCCCCCCCCIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII.");
+    next;
+
+    setq ShipQuests_Nard, 2;
+
+    close;
+
+l_ChefQuestStart:
     mesn;
-    mesq l("Congrats!"); 
+    mesq l("Elmo told me you are now considered as one of us on the island. And I do appreciate efforts you did down there.");
     next;
-    mesq l("You are now part of the crew! Thanks again for your help.");
+    mesq l("Unfortunately we still need help from you. This time it will be a delicate task, here onboard.");
+    next;
+    mesq l("Elmo reported me about some frictions between my old and new lieutenants. You probably have already met Julia and Gado the Chef.");
+    next;
+    mesq l("They are both valid and I need them. Probably in the past I did some mistakes I now regret of. I was wondering if you could investigate and...sort out the situation.");
+    next;
+
+    menu
+        l("Who of the two has the right on his side?"), -;
+
+    mes "";
+    mesq l("I do not want to point my finger on someone. I just put my trust in you. I am sure you will be able to judge and solve this annoying problem.");
 
     setq ShipQuests_Nard, 3;
-    getitem "Bandana", 1;
-//  Need to add a skill for the crew at this line.
 
     close;
 
-l_Already:
+l_ChefQuestGiven:
     mesn;
-    mesq l("I don't need any help right now, come back later.");
+    mesq l("It seems you still have some work to do.");
 
     close;
 
-l_Done:
+l_ChefQuestComplete:
     mesn;
-    mesq l("Hi @@.", strcharinfo(0));
-    next;
-    mesq l("Elmo and Gugli reported me that you done the ccccccccccccccccccccccccccccccccccccccccccccc IIIIIIIIIIICCCCCCCCCCCCCCCCIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII ");
+    mesq l("Congratulations!"); 
     next;
+    mesq l("You are now officially part of my crew! Thanks again for your help.");
+
+    setq ShipQuests_Nard, 4;
+    getitem "Bandana", 1;
+//  Need to add a skill for the crew at this line.
 
+    close;
 
+l_Already:
+    mesn;
+    mesq l("Sorry, I don't need any help right now. Come back later.");
 
-    setq ShipQuests_Nard, 2;
     close;
 
 }