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.

1 files changed, 8 insertions, 105 deletions

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);
     }