Move Juliet & Billy Bons to 002-1

3 files changed, 0 insertions, 328 deletions

diff --git a/npc/002-3/_import.txt b/npc/002-3/_import.txt
index 0fae87c7e..3421a5c5e 100644
--- a/npc/002-3/_import.txt
+++ b/npc/002-3/_import.txt
@@ -1,8 +1,6 @@
 // Map 002-3: First Deck
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/002-3/_mobs.txt",
-"npc/002-3/billybons.txt",
 "npc/002-3/doors.txt",
-"npc/002-3/juliet.txt",
 "npc/002-3/mapflags.txt",
 "npc/002-3/note.txt",
diff --git a/npc/002-3/billybons.txt b/npc/002-3/billybons.txt
deleted file mode 100644
index 6e1c77300..000000000
--- a/npc/002-3/billybons.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-// TMW2 Script
-// Evol scripts.
-// Author:
-//    Reid
-// Description:
-//    Drunk easteregg telling about the player's past.
-//    For TMW2 it is just to provide a bottle
-
-002-3,31,23,0	script	Billy Bons#TMW2	NPC_BILLY_BONS,{
-    if (rand(5) == 2) goto L_Hic;
-    .@q = getq(ShipQuests_Bottle);
-    if (.@q == 1) goto L_Hic;
-
-    mesn;
-    mesq l("You? Here?");
-    mesq l("How is *hic* it possible?");
-    next;
-
-    mesn "Narrator";
-    mesc l("The sailor chugs his beer.");
-    next;
-
-    select
-        lg("Excuse me? Do you know who I am?");
-
-    mes "";
-    mesn;
-    mesq l("Don't do theee... *hic* with me eh!");
-    next;
-
-    menu
-        l("Are you ok?"), L_Quit,
-         ("Take the bottle?"), L_Give,
-        l("Alright... Bye."), -;
-
-    mes "";
-    mesn;
-    mesq lg("No and *hic*... No, you and you and your... *burp* stup*hic* guild!");
-    next;
-    mesq l("You tried to get rid of me, eeh? But surprise! I'm still here... *hic* Or there...");
-    next;
-    mesq l("But you won't *hic* me this time...");
-    next;
-
-    menu
-        l("What are you talking about? What guild?"), L_Quit,
-        l("You are full of wine, my friend..."), -,
-        l("You should go and get some sleep."), L_Quit;
-
-    mes "";
-    mesn;
-    mesq l("If I saw *hic* who you were... *hic* Would not have helped you! ");
-    next;
-
-    menu
-        l("But who am I?"), -,
-        l("What am I supposed to say?"), L_Quit,
-        l("You should go and get some sleep."), L_Secret;
-
-    mes "";
-    mesn;
-    mesq l("The giant boogeyman!");
-
-    close;
-
-L_Secret:
-    mes "";
-    mesn;
-    mesq l("Hear me *hic* well, what ever, whatididever you will *hic* said ab... uhm... out what?! You saw there, the Guild won't let it get public.");
-    next;
-    mesq l("Nobody can know! *burp*");
-    next;
-
-    close;
-
-L_Hic:
-    npctalk3 l("*Hic*");
-
-    close;
-
-L_Quit:
-    mes "";
-    mesn;
-    mesq l("Yeah you're all like *hic* that, but you won't get me! *burp*");
-    next;
-    mesq l("I'm not that numb eeh *hic* what did ever yous disco... ...vered there, the Guild won't get me!");
-    mesq l("*burp*");
-    next;
-
-    mesn "Narrator";
-    mesc l("The sailor turns his back to you.");
-
-    close;
-
-L_Give:
-    mes "";
-    inventoryplace EmptyBottle, 1;
-
-    setq ShipQuests_Bottle, 1;
-    getitem EmptyBottle, 1;
-
-    close;
-
-OnInit:
-    .sex = G_MALE;
-    .distance = 3;
-    end;
-}
diff --git a/npc/002-3/juliet.txt b/npc/002-3/juliet.txt
deleted file mode 100644
index c4aac8108..000000000
--- a/npc/002-3/juliet.txt
+++ /dev/null
@@ -1,218 +0,0 @@
-// TMW2 scripts.
-// Authors:
-//    4144
-//    Qwerty Dragon
-//    Vasily_Makarov
-//    Jesusalva
-// Description:
-//    Allows to change language and talks about what happened to him.
-//    Modified by Jesusalva for TMW2. She is the nurse and also does other minor tasks.
-// Variables:
-//    0 ShipQuests_Julia
-// Values:
-//    Julia:
-//    10   Default, no quest given.
-//    01   Need to see Julia.
-//    02   Has been registered by Julia.
-
-002-3,38,24,0	script	Juliet	NPC_JULIA,2,10,{
-
-    function ynMenu {
-        if (select(l("Yes, I do."), l("No, none.")) == 1) {
-            return;
-        }
-        closedialog;
-    }
-
-    function sellFood {
-        closeclientdialog;
-        openshop;
-        close;
-        return;
-    }
-
-
-
-    function basicSkill {
-        mes "";
-        mesn;
-        mesq l("Let me check into it...");
-        next;
-        adddefaultskills;
-        mesq l("Here you go, everything is fixed.");
-        emotion E_HAPPY;
-        next;
-        mesq l("Do you have any other questions for me?");
-        next;
-        ynMenu;
-        return;
-    }
-
-    function chooseLang {
-        mes "";
-        mesn;
-        mesq l("Of course! But beware that [@@https://www.transifex.com/akaras/saulc-tmw-fork|Translators@@] are always in demand!");
-        next;
-        mesq l("Tell me which language you speak and I will change the note on the ship passenger list.");
-        next;
-
-        asklanguage(LANG_IN_SHIP);
-
-        mes "";
-        mesn;
-        mesq l("Ok, done.");
-
-        if (getq(ShipQuests_Julia) == 2) {
-            next;
-            mesq l("Do you have any other questions for me?");
-            next;
-            ynMenu;
-            return;
-        }
-
-        next;
-        mesq l("I'm sure that you've got some questions for me, feel free to ask them, but first I need to tell you the rules of proper social conduct on board.");
-
-        mesq l("Here they are.");
-        next;
-
-        narrator S_LAST_NEXT,
-            l("There is a paper with some rules written on it.");
-
-        GameRules 8 | 4;
-
-        mesn;
-        mesq l("Oh, and I almost forgot! Do not give the password of your room to anybody! I am the only one who has the other key and I won't ask for yours so keep it secret and try not to use the same password for any other room in the future.");
-        next;
-        mesq l("If you want to read this page again, there is a copy up on the left wall.");
-        next;
-        mesq l("You can also read The Book of Laws at any time to see the rules.");
-        next;
-        mesq l("I think I'm done with that now. Do you have any questions?");
-        next;
-
-        setq ShipQuests_Julia, 2;
-        return;
-    }
-
-    function whereAmI {
-        mes "";
-        mesn;
-        mesq l("You're on a ship, we're on our way to the oldest human city, Tulishmar.");
-        next;
-        mesq l("We should be there in a few days. For now, you can relax on the ship, or visit the island we're docked at! Its a small island, but a good place to get some exercise and stretch your legs.");
-        next;
-        mesq l("Do you have any other questions for me?");
-        next;
-        ynMenu;
-        return;
-    }
-
-    function whatHappened {
-        mes "";
-        mesn;
-        mesq l("We thought that you could help us understand this, all we know is that we found you cast in the sea, adrift on your raft.");
-        next;
-        mesq lg("You were in bad shape, you should be happy we found you before the sea killed you.");
-        next;
-
-        //select
-        //    l("Sorry, but I can't tell you anything about that."),
-        //    l("Nothing, sorry.");
-
-        mes "";
-        mesn;
-        mesq l("Did you have any other questions for me?");
-        next;
-        ynMenu;
-        return;
-    }
-
-    function readRules {
-        mes "";
-        mesn;
-        mesq l("Of course, they are on the left wall, go have a look at them.");
-        next;
-        mesq l("Do you have any other questions for me?");
-        next;
-        ynMenu;
-        return;
-    }
-
-    function mainMenu {
-        do
-        {
-            .@q4 = getq(General_Narrator);
-
-            select
-                l("I am hungry. Can I buy some food here?"),
-                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."),
-                rif(!.@q4, l("Could you explain to me where I am?")),
-                rif(!.@q4, l("What happened to me?")),
-                l("Can I read these rules again?"),
-                l("Nothing, sorry.");
-
-            switch (@menu) {
-                case 1: sellFood; break;
-                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);
-    }
-
-    mesn;
-    mesq lg("Hello dear!");
-    next;
-    mesq l("What do you want today?");
-    next;
-
-    mainMenu;
-
-OnTouch:
-    .@q = getq(ShipQuests_Julia);
-    if (.@q > 1) end;
-
-    checkclientversion;
-
-    mesn;
-    mesq l("Hi, nice to see you!");
-    next;
-    mesq l("My name is Juliet, it is me who took care of you after we found you in the sea. I'm glad to see you're okay.");
-    next;
-    if (getq(ShipQuests_Julia) < 2) {
-        mesq l("I'm sure that you've got some questions for me, feel free to ask them, but first I need to tell you the rules all adventurers must respect on this world.");
-        next;
-
-        GameRules 8 | 4;
-
-        mesn;
-        mesq l("Oh, and I almost forgot! Do not share passwords or pincodes, not even with staff! And do not use the same password somewhere else, they can be stolen!");
-        next;
-        mesn;
-        mesq l("If you want to read this page again, there is a copy up on the left wall.");
-        next;
-        mesn;
-        mesq l("Also, take this book so you don't forget the rules. You can always read it, or type ##B@rules##b on the chat.");
-        // No inventoryplace here.
-        getitem BookOfLaws, 1;
-        setq ShipQuests_Julia, 2;
-        next;
-        mesq l("I think I'm done with that now. Do you have any questions?");
-        next;
-    }
-    mainMenu;
-    end;
-
-OnInit:
-    .sex = G_FEMALE;
-    .distance = 10;
-	sellitem Cheese;
-	sellitem Aquada;
-	sellitem Piberries;
-
-}