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.

2 files changed, 5 insertions, 145 deletions

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;