Remove lots of old scripts on Gado, Juliet, Elmo and Nard.

I do not want them. Juliet is not deputy, Elmo is. Gado is not evil here.
These quests also would need a major rewrite, so clean codebase a little.

4 files changed, 15 insertions, 436 deletions

diff --git a/npc/002-1/chefgado.txt b/npc/002-1/chefgado.txt
index dd98a91de..ad600782d 100644
--- a/npc/002-1/chefgado.txt
+++ b/npc/002-1/chefgado.txt
@@ -2,30 +2,17 @@
 // Authors:
 //    Hal9000
 //    Qwerty Dragon
+//    Jesusalva
 // Description:
 //    La Johanne Chef.
+//    The cook may need help with something.
 // 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. Chef Gago wins.
-//    5   Quest complete. Julia wins (poison dish returned).
-//    6   Quest complete. Julia wins.
 
 002-1,27,28,0	script	Chef Gado	NPC_CHEF_GADO,{
     .@q = getq(ShipQuests_ChefGado);
     .@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 && countitem(PoisonedDish) > 0) goto L_Aborting;
-    if (.@q > 4) goto L_QuestAborted;
-    if (.@n == 3) goto L_QuestStart;
 
     mesn;
     .@r = rand(3);
@@ -35,177 +22,6 @@
 
     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;
-
-    menu
-        l("How rude! What is the reason behind your malice?"), L_Rude,
-        l("I swear, I do not eat so much."), -;
-
-    mes "";
-    mesn;
-    mesq l("Yeah, yeah, of course you don't...");
-
-    close;
-
-L_Rude:
-    mes "";
-    mesn;
-    mesq l("UAHAHAHAAH! I am the cook of that bunch of donkeys, and I can be rude with everyone from this bossy captain to that harpy-lady!");
-    next;
-
-    select
-        l("Harpy-lady?");
-
-    mes "";
-    mesn;
-    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 lieutenant of this crew. Then one day one of those damn sailors brought that 'nice' lady here.");
-    next;
-    mesq l("I will not tell you all the details, but after a 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... Oh... My tasty revenge! Hhm, actually I wonder if... Maybe...");
-    next;
-
-    select
-        l("M... Maybe?");
-
-    mes "";
-    mesn;
-    mesq lg("Well, eh-heh... Welcome aboard, cutie!", "Well, eh-heh... Welcome aboard, son!");
-    next;
-    mesq l("I just realized I am lacking some common things, and one key ingredient, to prepare a... A special recipe.");
-    next;
-    mesq l("I only need 2 @@, 2 @@s, 1 @@...", getitemlink(PiouLegs), getitemlink(HalfCroconut), getitemlink(Aquada));
-    next;
-    mesq l("... and 1 @@.", getitemlink(SeaDrops));
-    next;
-
-    menu
-        l("Sea water?! I will not help you with your evil plan!"), L_Quit,
-        l("Sure, why not?"), -;
-
-    setq ShipQuests_ChefGado, 1;
-    mes "";
-    mesn;
-    mesq lg("Well done! Collect all the ingredients and then come back here. You will be rewarded once I am satisfied that they understand who rules this ship!");
-    next;
-    mesq l("Before you go, let me tell you how to get @@s, because you don't look very smart.", getitemlink(HalfCroconut));
-
-    goto L_OpenCroconut;
-
-L_QuestAccepted:
-    mesn;
-    mesq l("Have you collected all the ingredients for my recipe? The special one too?");
-    next;
-
-    menu
-        rif(countitem(PiouLegs) > 1 && countitem(HalfCroconut) > 1 && countitem(Aquada) > 0 && countitem(SeaDrops) > 0, l("All your... Fresh ingredients are ready to be cooked.")), L_GotAll,
-        l("What are your needs?"), L_Need,
-        l("Where can I find a half croconut?"), L_OpenCroconut,
-        l("Not yet. I will be back soon."), L_Quit;
-
-L_OpenCroconut:
-    mes "";
-    mesn;
-    mesq lg("Take a @@ and try opening it using something like a sharp knife. I doubt you'll succeed, you're being so weak in everything.",
-            "Take a @@ and try opening it using something like a sharp knife. I doubt you'll succeed, you're being so weak in everything.", getitemlink(Croconut));
-    next;
-    mesq l("Now move!");
-
-    close;
-
-L_GotAll:
-    mes "";
-
-    inventoryplace PoisonedDish, 1;
-
-    delitem PiouLegs, 2;
-    delitem HalfCroconut, 1;
-    delitem Aquada, 1;
-    delitem SeaDrops, 1;
-
-    mesn;
-    mesq l("Let me see... Crispy legs, disgusting liquids... Let's start!");
-    next;
-    mesq l("Water, salt, spicy herbs and meat stuffed with my special surprise!");
-    next;
-    mesq l("Done. Here, take it! Now, here is the plan. Go talk to her and offer our beautiful lady a bite of her arrogance!");
-
-    setq ShipQuests_ChefGado, 2;
-    getitem PoisonedDish, 1;
-    close;
-
-L_Need:
-    mes "";
-    mesn;
-    mesq l("Shhht, don't say it that loud...");
-    next;
-    mesq l("I only need 2 @@, 2 @@s, 1 @@...", getitemlink(PiouLegs), getitemlink(HalfCroconut), getitemlink(Aquada));
-    next;
-    mesq l("... and 1 @@.", getitemlink(SeaDrops));
-
-    close;
-
-L_PoisonAccepted:
-    mesn;
-    mesq l("Fool! Just come back here when you'll be done with our little... 'Secret mission'.");
-
-    close;
-
-L_PoisonJulia:
-    mesn;
-    mesq l("The usurper has been punished! This is a great day! Take this reward as a prize for your loyalty to the old commander!");
-
-    setq ShipQuests_ChefGado, 4;
-    Zeny = Zeny + 200;
-    message strcharinfo(0), l("You receive @@ E!", 200);
-    inventoryplace Bread, 1;
-    getitem Bread, 1;
-    getexp 15, 0;
-
-    close;
-
-L_QuestComplete:
-    mesn;
-    mesq l("Oh, it's you. I think it's better we do not talk for a while. They suspect something.");
-
-    close;
-
-L_Aborting:
-    mesn;
-    mesq l("Wait, why do you still have the dish with you?!");
-    next;
-
-    select
-        l("I informed Julia about your monstrous plan.");
-
-    mes "";
-    mesn;
-    mesq l("Are you mad?!");
-    next;
-    mesq lg("Give me back this dish, you dirty liar!");
-
-    if (countitem(PoisonedDish) > 0) delitem PoisonedDish, 1;
-
-    next;
-    mesq l("You're like the rest of this filthy crew, I can't trust you!");
-
-    close;
-
-L_QuestAborted:
-    mesn;
-    mesq lg("You're like the rest of this filthy crew. Your name is now on the traitors list!");
-
-    close;
-
-L_Quit:
-    closedialog;
-    close;
-
 OnInit:
     .sex = G_MALE;
     .distance = 2;
diff --git a/npc/002-3/juliet.txt b/npc/002-3/juliet.txt
index 24b6a0e21..c773f8755 100644
--- a/npc/002-3/juliet.txt
+++ b/npc/002-3/juliet.txt
@@ -1,3 +1,4 @@
+// TMW2 scripts.
 // Evol scripts.
 // Authors:
 //    4144
@@ -6,33 +7,14 @@
 //    Jesusalva
 // Description:
 //    Allows to change language and talks about what happened to him.
-//    Modified by Jesusalva for TMW2
-//    2 Bits Array:
-//    ShipQuests
+//    Modified by Jesusalva for TMW2. She is the nurse and also does other minor tasks.
 // Variables:
 //    0 ShipQuests_Julia
-//    1 ShipQuests_ChefGado
-//    2 ShipQuests_Nard
 // Values:
 //    Julia:
 //    10   Default, no quest given.
 //    01   Need to see Julia.
 //    02   Has been registered by Julia.
-//    Gado:
-//    10   Default, no quest given.
-//    11   Quest accepted.
-//    12   Ingredients collected, ready to poison Julia.
-//    13   Julia poisoned.
-//    14   Quest complete. Chef Gago wins.
-//    15   Quest complete. Julia wins (poison dish returned).
-//    16   Quest complete. Julia wins.
-//    Nard:
-//    20   Introduction of the boxes and Nard. This is displayed when the player never spoke to Nard or his box.
-//    21   Nard spoke and gave access to the outdoor of the ship.
-//    22   Completed the Gugli quest.
-//    23   ChefGado Quest accepted.
-//    24   ChefGado Quest completed and "Introduction" chapter finalized.
-//    25   Reward taken from the box.
 
 002-3,27,24,0	script	Juliet#TMW2	NPC_JULIA,2,10,{
 
@@ -43,17 +25,6 @@
         closedialog;
     }
 
-    function poisonJulia {
-        mes "";
-        mesn;
-        mesq l("Seems yummy! Let me taste it!");
-        next;
-        mesq l("Hmmm, hm... *cough*, *cough*, *burp*, *cough*. What... What is that?!... *cough*, *burp*... Damn Gado... *cough*");
-        if (countitem(PoisonedDish) > 0) delitem PoisonedDish, 1;
-        setq ShipQuests_ChefGado, 3;
-        close;
-    }
-
     function gotoSleep {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("You already did enough for us, follow Nard's advice and get some rest."),
@@ -63,68 +34,7 @@
         return;
     }
 
-    function heardRumors {
-        mes "";
-        mesn;
-        mesq l("You shouldn't believe every tale drunken sailors tell you.");
-        next;
-
-        select
-            l("Let's say the person who told me about that is well respected on this ship and never drunk.");
-
-        mes "";
-        mesn;
-        mesq l("Hahaha! All sailors aboard this ship are always drunk... Well... Except... Wait, what?! Nard told you?!");
-        next;
-        mesq l("Doesn't he like the way I'm taking care of his ship? Everything is clean and tidy with me, rightful lieutenant of La Johanne.");
-        next;
-        mesq l("I give tasks to every single sailor, all day long. That should make him happy!");
-        next;
-
-        select
-            l("Well... I don't think it is the best way to rule a ship. Think about it."),
-            l("In fact, everything seems to work perfectly under your guidance. Nard has made the right choice.");
-
-        if (@menu == 1)
-        {
-            closedialog;
-            end;
-        }
-
-        mes "";
-        mesn;
-        mesq l("I'm glad you're on my side.");
-        next;
-        mesq l("Take this money as a reward for your nice words.");
-
-        setq ShipQuests_ChefGado, 6;
-        Zeny += 100;
-        message strcharinfo(0), l("You receive @@ GP!", 100);
-        getexp 8, 0;
-        close;
-    }
-
-    function gotRegrets {
-        mes "";
-        mesn;
-        mesq l("Why? And who should you bring it back to?");
-        next;
 
-        select
-            l("Ehm... He was really upset because of some past stories.");
-
-        mes "";
-        mesn;
-        mesq l("Gado! That coward lives in the past, I will ask Nard to punish him, again!");
-        next;
-        mesq l("Take this money for your wise choice. But do not try it again. The open sea has been merciful with you once... Do not further tempt the fates!");
-
-        setq ShipQuests_ChefGado, 5;
-        Zeny += 200;
-        message strcharinfo(0), l("You receive @@ GP!", 200);
-        getexp 15, 0;
-        close;
-    }
 
     function basicSkill {
         mes "";
@@ -234,15 +144,11 @@
     function mainMenu {
         do
         {
-            .@q2 = getq(ShipQuests_ChefGado);
             .@q3 = getq(ShipQuests_Nard);
             .@q4 = getq(General_Narrator);
 
             selectd
                 rif(.@q3 == 5 && .@q4 < 1, l("What can I do now?")),
-                rif(.@q3 == 3 && .@q2 == 0, l("I heard rumors about some old hostilities between you and Gado. Are they true?")),
-                rif(.@q2 == 2 && countitem(PoisonedDish), l("Well... No wait, I have something for you but you shouldn't eat it... I'm taking it back to the kitchen.")),
-                rif(.@q2 == 2 && countitem(PoisonedDish), l("I have brought you a tasty present for your delicate mouth.")),
                 rif(getskilllv(NV_BASIC) < 6, l("Something is wrong with me, I can't smile nor sit.")),
                 lg("I made a mistake, I would like to change my language."),
                 l("Could you explain to me where I am?"),
@@ -253,15 +159,12 @@
             switch (@menu)
             {
                 case 1: gotoSleep; break;
-                case 2: heardRumors; break;
-                case 3: gotRegrets; break;
-                case 4: poisonJulia; break;
-                case 5: basicSkill; break;
-                case 6: chooseLang .@s$; break;
-                case 7: whereAmI; break;
-                case 8: whatHappened; break;
-                case 9: readRules; break;
-                case 10: closedialog; end;
+                case 2: basicSkill; break;
+                case 3: chooseLang .@s$; break;
+                case 4: whereAmI; break;
+                case 5: whatHappened; break;
+                case 6: readRules; break;
+                case 7: closedialog; end;
             }
         } while (1);
     }
diff --git a/npc/002-4/elmo.txt b/npc/002-4/elmo.txt
index 06f1f5ddd..2b03b9ad8 100644
--- a/npc/002-4/elmo.txt
+++ b/npc/002-4/elmo.txt
@@ -2,7 +2,7 @@
 // Authors:
 //    Jesusalva
 // Description:
-//    Elmo's second dialog.
+//    Elmo's second dialog. He is Nard's deputy and second-in-command.
 //    Elmo was created in Evol by Qwerty Dragon and Reid
 
 002-4,27,27,0	script	Elmo	NPC_ELMO,{
diff --git a/npc/002-4/nard.txt b/npc/002-4/nard.txt
index 08fe8357c..98cf5afcf 100644
--- a/npc/002-4/nard.txt
+++ b/npc/002-4/nard.txt
@@ -1,46 +1,20 @@
-// Evol scripts.
+// TMW2 scripts.
 // Authors:
 //    Qwerty Dragon
 //    Reid
+//    Jesusalva
 // Description:
 //    Captain Nard dialogs.
 //    Nard is a fair merchant ship's captain.
-//    This quest is meant to teach the player how to use a weapon.
-//    4 bits array:
-//    ShipQuests
-// Variable:
-//    0    ShipQuests_Nard
-//    1    ShipQuests_Gugli
-//    2    ShipQuests_ChefGado
-// Values:
-//    00   Introduction of the boxes 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.
-//    02   Completed the Gugli quest.
-//    03   ChefGado Quest accepted.
-//    04   ChefGado Quest completed and "Introduction" chapter finalized.
-//    05   Reward taken from the box.
-//    06   Intro finished
-//    10   Never talked with Gugli.
-//    11   Gugli gives you the task.
-//    12   Gave all of the boxes to Gugli.
+//    Original Nard's from Evol by Qwerty Dragon and Reid
 
 002-4,25,26,0	script	Nard	NPC_NARD,{
-    .@nard = getq(ShipQuests_Nard);
-    .@gugli = getq(ShipQuests_Gugli);
-    .@gado = getq(ShipQuests_ChefGado);
+    .@nard = getq(ShipQuests_Nard); // TODO
     .@narrator = getq(General_Narrator);
     .@price=2000;
 
 L_Checker:
     if (getq(CandorQuest_Barrel) == 4 && getq(CandorQuest_HAS) == 3) .@price-=500; // Check Elmo's script. You can do quests later... FOR NOW.
-    if (.@gado > 3 && .@nard == 3) goto L_ChefQuestComplete;
-    if (.@nard == 2) goto L_ChefQuestStart;
-    if (.@nard == 3) goto L_ChefQuestGiven;
-    if (.@nard == 4) goto L_Reward;
-    if (.@nard > 5) goto L_GoBackArtis;
-    if (.@nard > 4) goto L_Already;
-    if (.@gugli == 2) goto L_Done;
-    if (.@nard == 1) goto L_NotYet;
     if (.@narrator == 1) goto L_Travel;
     if (LOCATION$ != "") goto L_NotYet;
 
@@ -82,10 +56,6 @@ L_MenuQuest:
         l("Wait, you never came here before?"), L_CandorIsland;
 
     mes "";
-    //mesn;
-    //mesq l("Oh! I like that sort of answer!");
-    //next;
-    //mesq lg("We need manpower on the island... Oh forgive me, women are also welcome, of course.", "We need manpower on the island.");
     mesn;
     mesq l("Ship travels are not free. See if you can gather some money, and I'll bring you to Tulimshar!");
     next;
@@ -206,116 +176,6 @@ L_TTulim:
     mesq l("I was planning to go there soon, anyway. All aboard!");
     close;
 
-
-// Deprecated, will be removed later
-L_Done:
-    mesn;
-    mesq l("Hi @@.", strcharinfo(0));
-    next;
-    mesq l("Elmo and Gugli told me that you did all of the tasks outside, congrats!");
-
-    setq ShipQuests_Nard, 2;
-    next;
-    goto L_ChefQuestRedir;
-
-L_ChefQuestStart:
-    mesn;
-    mesq lg("Elmo told me you are now considered family and are numbered among us in our activities on the island. I do so very much appreciate the efforts you did down there.");
-    next;
-
-L_ChefQuestRedir:
-    mesq l("Unfortunately, we still need help from you. This time it will be a delicate task, here onboard.");
-    next;
-    mesq l("Elmo brought reports to me about some frictions between my old and new lieutenants. You probably already met Juliet and Chef Gado.");
-    next;
-    mesq l("They are each valued individuals and I need them both. In the past, I probably made my share of mistakes. I regret good management is so difficult. I was wondering if you could investigate and... Sort out this situation.");
-    next;
-
-    select
-        l("Of the two of them, who has 'good' on their side?");
-
-    mes "";
-    mesq l("I do not want to go pointing my finger at someone. I want to be honorable and fair, and I sense the same quality in you, so I put my trust in you. I am sure you will be able to judge and solve this troubling situation.");
-
-    setq ShipQuests_Nard, 3;
-
-    close;
-
-L_ChefQuestGiven:
-    mesn;
-    mesq l("It seems you still have some work to do.");
-
-    close;
-
-L_ChefQuestComplete:
-    mesn;
-    mesq l("Congratulations!");
-    next;
-    mesq l("You are now officially part of my crew! Thanks again for your help.");
-    next;
-    mesq l("Take your reward from the box next to my desk!");
-    next;
-
-    select
-        l("I will take it! Thank you captain!");
-
-    setq ShipQuests_Nard, 4;
-    getexp 50, 0;
-
-//  Need to add a skill for the crew at this line.
-    mes "";
-
-L_Already:
-    speech
-        l("I recommend you to take a nap on the inferior level, we will soon leave this place.");
-
-    close;
-
-L_GoBackArtis:
-    checkclientversion;
-    speech S_LAST_NEXT,
-        l("Enough of this island?"),
-        l("Where would you like to go now?");
-    switch (select(l("Let's go to Artis."),
-                   l("Tell me, where are we right now?"),
-                   l("I would like to stay here a bit more.")))
-    {
-        case 1:
-            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                l("Let's set sail then!");
-
-            savepoint "001-2-22", 50, 38;
-            if (!getmapxy(.@map$, .@x, .@y, 0))
-            {
-                warp "001-2-24", .@x, .@y;
-            }
-            else
-            {
-                warp "001-2-24", 22, 27;
-            }
-
-            closedialog;
-            close;
-
-        case 2:
-            closedialog;
-            npctalk3 l("This is Drasil Island, I named it after an ancient mythical tree.");
-            close;
-
-        case 3:
-            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                l("Ok I stay here with my paperwork if you need my help.");
-
-            closedialog;
-            close;
-    }
-
-L_Reward:
-    mesn;
-    mesq l("You may already claim your reward.");
-
-    close;
-
 OnInit:
     .sex = G_MALE;
     .distance = 5;