Merge branch 'master' into jesusalva/GuidedTourjesusalva/GuidedTour

8 files changed, 380 insertions, 0 deletions

diff --git a/npc/008-2-2/_import.txt b/npc/008-2-2/_import.txt
index 5a896da0..34d628f7 100644
--- a/npc/008-2-2/_import.txt
+++ b/npc/008-2-2/_import.txt
@@ -1,4 +1,11 @@
 // Map 008-2-2: The Rusty Pick
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/008-2-2/_warps.txt",
+"npc/008-2-2/barron.txt",
+"npc/008-2-2/kfahr.txt",
+"npc/008-2-2/ledmitz.txt",
 "npc/008-2-2/mapflags.txt",
+"npc/008-2-2/melania.txt",
+"npc/008-2-2/melinda.txt",
+"npc/008-2-2/note.txt",
+"npc/008-2-2/shop.txt",
diff --git a/npc/008-2-2/barron.txt b/npc/008-2-2/barron.txt
new file mode 100644
index 00000000..c64efa40
--- /dev/null
+++ b/npc/008-2-2/barron.txt
@@ -0,0 +1,32 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Barron, the bartender of the Rusty Pick.
+
+008-2-2,43,28,0	script	Barron#008-2-2	NPC_GENERAL_STORE,{
+speech S_LAST_NEXT, 
+    l("Hi!"),
+    l("I am the bartender here, can I provide you with some delicious beverage?"),
+    l("Or you can take seat and ask Melinda if you need something.");
+    
+    switch (select(l("What beverages do you have?"),
+                   l("I'll ask Melinda later")))
+    {
+        case 1:
+        closeclientdialog;
+        shop "#Invisible008-2-2";
+        close;
+    case 2:
+        speech S_FIRST_BLANK_LINE,
+        l("Make sure to tip her, it will brighten up her day.");
+        close;
+    }
+        
+
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 3;
+    end;
+}
diff --git a/npc/008-2-2/kfahr.txt b/npc/008-2-2/kfahr.txt
new file mode 100644
index 00000000..0ffae5df
--- /dev/null
+++ b/npc/008-2-2/kfahr.txt
@@ -0,0 +1,20 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Kfahr the hero.
+// THIS IS A PLACEHOLDER!
+
+008-2-2,44,36,0	script	Kfahr#008-2-2	NPC_YOUNG_MAN_KFAHR,{
+    speech
+        l("Oh hey *hicks*"),
+        l("This waitress *hicks* is great, she never stops to bring beer *hicks.");
+        lg("When I am less busy *hicks*, I can tell you stories of my heroism.");
+
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 2;
+    end;
+}
diff --git a/npc/008-2-2/ledmitz.txt b/npc/008-2-2/ledmitz.txt
new file mode 100644
index 00000000..5939428e
--- /dev/null
+++ b/npc/008-2-2/ledmitz.txt
@@ -0,0 +1,55 @@
+// Evol scripts.
+// Author:
+//    gumi
+
+008-2-2,43,34,0	script	Ledd	NPC_DRINKER_ROAMINGO,{
+                // XXX: ^ I know it should be Led and Mitz but 4144 made names
+                //        shorter than 4 characters illegal
+
+    deltimer("Mitz::OnTalk");
+    addtimer(rand(500, 900), "Mitz::OnTalk");
+OnTalk:
+    npctalk3(l("Ha! I'll drink muuuch mo.. more than you! Im not ooone biiit dr...dr..unk!"));
+    // TODO: add more sentences
+    // XXX: maybe instead of making them respond to a click they should just
+    //      shout at each other at regular intervals?
+    end;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 3;
+
+////////// UNFINISHED //////////
+////////////////////////////////
+// REMOVE THIS CODE WHEN THIS //
+// NPC IS NO LONGER A WIP //////
+////////////////////////////////
+//if (!debug) disablenpc(.name$);
+///////// UNFINISHED ///////////
+
+    end;
+}
+
+008-2-2,46,34,0	script	Mitz	NPC_DRINKER_MICKSHA,{
+
+    deltimer("Ledd::OnTalk");
+    addtimer(rand(500, 900), "Ledd::OnTalk");
+OnTalk:
+    npctalk3(l("I can still drink more! Better give up you... you... teelotaler! MORE BEER MELINDA!"));
+    // TODO: add more sentences
+    end;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 3;
+
+////////// UNFINISHED //////////
+////////////////////////////////
+// REMOVE THIS CODE WHEN THIS //
+// NPC IS NO LONGER A WIP //////
+////////////////////////////////
+//if (!debug) disablenpc(.name$);
+///////// UNFINISHED ///////////
+
+    end;
+}
diff --git a/npc/008-2-2/melania.txt b/npc/008-2-2/melania.txt
new file mode 100644
index 00000000..52efda05
--- /dev/null
+++ b/npc/008-2-2/melania.txt
@@ -0,0 +1,21 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Receptionist of Rusty Pick.
+// THIS IS A PLACEHOLDER!
+
+008-2-2,28,27,0	script	Melania	NPC_AIRLIA,{
+    speech
+        l("Hello Sir."),
+        l("Welcome to the Rusty Pick. Sorry, we have no room left today."),
+        l("One advice: Don't take the things those drinkers say too serious. They are sitting here and drinking all day."),
+        l("I wish you a beautiful day.");
+
+    close;
+
+OnInit:
+    .sex = G_FEMALE;
+    .distance = 2;
+    end;
+}
diff --git a/npc/008-2-2/melinda.txt b/npc/008-2-2/melinda.txt
new file mode 100644
index 00000000..a418b4e2
--- /dev/null
+++ b/npc/008-2-2/melinda.txt
@@ -0,0 +1,172 @@
+
+// Evol scripts.
+// Authors:
+//    Toams
+// Description:
+//    Melinda, Rusty Pick's waitress
+
+008-2-2,40,29,0	script	Melinda#008-2-2	NPC_MELINDA,1,1,{
+
+function StartConversation {
+ 
+        .@tick = gettimetick(1);
+        if (.@tick > @Hurns_Rusty_Pick_WaitressTick + 10)
+        {
+            setarray .messages$[0], l("Welcome to our inn!"),
+                                    l("Welcome to the Rusty Pick."),
+                                    l("Please, have a seat."),
+                                    l("Lovely day, isn't it?");
+ 
+            .@r = rand(getarraysize(.messages$));
+            .@msg$ = .messages$[.@r];
+            npctalk3 .@msg$;
+            @Hurns_Rusty_Pick_WaitressTick = .@tick;
+        }
+    }
+ 
+mes "";
+mesn;
+mesq l("Hi, sweetie! Want a fresh beer for 90 Florin?");
+switch (select(l("Sure! [Don't tip]"),
+               l("Sure! [Tip 5 Florin]"),
+               l("Sure! [Tip 10 Florin]"),
+               l("Nah, maybe later.")))
+{
+    case 1:
+        if (Zeny < 90)
+            goto L_NoMoney;
+        getinventorylist;
+        if (@inventorylist_count == 100 && countitem("Beer") == 0)
+            goto L_TooMany;
+        set Zeny, Zeny - 90;
+        getitem Beer, 1;
+        mes "";
+        mesn;
+        mesq l("Pff... Nickel nurser!");
+        goto L_Close;
+    case 2:
+        if (Zeny < 95)
+            goto L_NoMoney;
+        getinventorylist;
+        if (@inventorylist_count == 100 && countitem("Beer") == 0)
+            goto L_TooMany;
+        set Zeny, Zeny - 95;
+        getitem "Beer", 1;
+        mes "";
+        mesn;
+        mesq l("Thanks for the tip!");
+        goto L_Close;
+    case 3:
+        if (Zeny < 100)
+            goto L_NoMoney;
+        getinventorylist;
+        if (@inventorylist_count == 100 && countitem("Beer") == 0)
+            goto L_TooMany;
+        set Zeny, Zeny - 100;
+        getitem "Beer", 1;
+        mes "";
+        mesn;
+        mesq l("Thank you, sweetie! Want to hear a secret?");
+        switch (select(l("What is it, darling?"),
+                       l("Nah, I don't feel like chatting.")))
+        {
+            case 1:
+                mes "";
+                mesn;
+                mesq l("The master bowyer in this village used to construct exceptional bows. When you want one you should go and ask him.");
+                goto L_Close;
+            case 2:
+                goto L_No;
+        }
+        goto L_Close;
+    case 4:
+        goto L_No;
+}
+ 
+L_NoMoney:
+    mes "";
+    mesn;
+    mesq l("You look broke. Don't think that you can dine and dash here!");
+    goto L_Close;
+ 
+L_No:
+    mes "";
+    mesn;
+    mesq l("Just call me when you changed your mind.");
+    goto L_Close;
+   
+L_Close:
+    initnpctimer;
+    close;
+   
+L_TooMany:
+    mes "";
+    mesn;
+    mesq l("You don't have room for a beer!");
+    goto L_Close;
+   
+OnTimer1000:
+    dographmovestep;
+   
+OnTouch:
+    StartConversation;
+    end;
+ 
+OnInit:
+    .sex = G_FEMALE;
+    .distance = 5;
+    .speed = 300;
+    initmovegraph "startspot",  40, 29,
+                  "barkeeper",  43, 30,
+                  "kfahr_r",    45, 36,
+                  "kfahr_l",    43, 35,
+                  "l_table_b",  36, 36,
+                  "l_table_r",  38, 33,
+                  "m_table_l",  39, 33,
+                  "m_table_b",  41, 36,
+                  "r_table_r",  46, 33,
+                  "fireplace",  36, 28,
+                  "firewood",   33, 28,
+                  "to_basement",   52, 32,
+                  "basement_entrance", 24, 25,
+                  "basement_cabinet",  30,31,
+                  "cabinet",    42, 28,
+                  "bucket",     46, 30;
+                 
+                 
+                 
+     setmovegraphcmd "startspot",  "firewood",   1,  "dir 4; wait 5",
+                     "firewood",   "fireplace",  1,  "dir 4; wait 3",
+                     "fireplace",  "startspot",  1,  "dir 0; wait 10",
+                     
+                     "startspot",  "l_table_b",  1,   "dir 4; wait 3",
+                     "l_table_b",  "l_table_r",  1,  "dir 2; wait 3", 
+                     "l_table_r",  "m_table_l",  1,  "dir 6; wait 3",
+                     "m_table_l",  "m_table_b",  1,  "dir 4; wait 3",
+                     "m_table_b",  "r_table_r",  1,  "dir 2; wait 3",
+                     "r_table_r",  "bucket",     1,  "dir 4; wait 1; emote 1;"
+                                                     "wait 15; moveon", 
+                     "bucket",     "startspot",  1,  "dir 0; wait 5",
+                     
+                     "startspot",  "kfahr_r",    2,  "dir 4; wait 5",
+                     "kfahr_r",    "barkeeper",  1,  "dir 4; wait 1;" 
+                                                     "say Another round for kfahr's table.;"
+                                                     "wait 1; say They sure are thirsty today;"
+                                                     "wait 5; moveon",
+                     "barkeeper",  "kfahr_l",    1,  "dir 6; wait 3;"
+                                                     "say Cheers!;"
+                                                     "wait 3; moveon",
+                     "kfahr_l",    "startspot",  1,  "dir 0; wait 10",  
+                     
+                     "startspot",         "to_basement",   1,  "dir 4; warp 008-2-5 basement_entrance",
+                     "basement_entrance", "basement_cabinet", 1, "dir 4; wait 5",
+                     "basement_cabinet",  "basement_entrance", 1, "dir 4; warp 008-2-2 to_basement",
+                     "to_basement",       "cabinet",   1,  "dir 4; wait 5",
+                     "cabinet",           "startspot",  1,  "dir 0; wait 15";
+                     
+     
+                     
+   
+    firstmove "wait 8";    
+    initnpctimer;
+}
diff --git a/npc/008-2-2/note.txt b/npc/008-2-2/note.txt
new file mode 100644
index 00000000..2fcce90f
--- /dev/null
+++ b/npc/008-2-2/note.txt
@@ -0,0 +1,28 @@
+// Evol scripts.
+// Author:
+//    gumi
+
+008-2-2,32,28,0	script	Note#Hurnscald:pub	NPC_PAPER_NOTE,{
+    narrator(8,
+        l("We refuse service to anyone who:"),
+        l("• Has a bubblehead"),
+        l("• Is not properly shaded"),
+        l("• Can't walk without stopping after every step"));
+
+    // In case you don't get the joke, know that it's a parody on Illutia.
+
+    close;
+
+OnInit:
+    .distance = 3;
+
+////////// UNFINISHED //////////
+////////////////////////////////
+// REMOVE THIS CODE WHEN THIS //
+// NPC IS NO LONGER A WIP //////
+////////////////////////////////
+//if (!debug) disablenpc(.name$);
+///////// UNFINISHED ///////////
+
+    end;
+}
diff --git a/npc/008-2-2/shop.txt b/npc/008-2-2/shop.txt
new file mode 100644
index 00000000..861843f7
--- /dev/null
+++ b/npc/008-2-2/shop.txt
@@ -0,0 +1,45 @@
+// Evol scripts.
+// Authors:
+//    4144
+//    Reid
+// Description:
+//    Inn hidden shop.
+
+008-2-2,40,30,0	trader	#Invisible008-2-2	NPC_HIDDEN,{
+
+OnInit:
+    tradertype(NST_MARKET);
+
+    sellitem Beer, -1, 50;
+    sellitem Bread, -1, 50;
+    sellitem RedPlushWine, -1, 50;
+    sellitem Cheese, -1, 50;
+    sellitem CherryCake, -1, 50;
+    sellitem SmallHealing, -1, 50;
+    
+    .sex = G_OTHER;
+    .distance = 10;
+    end;
+
+OnClock0000:
+    restoreshopitem Beer, 20;
+    restoreshopitem Bread, 20;
+    restoreshopitem RedPlushWine, 20;
+    restoreshopitem Cheese, 20;
+    restoreshopitem CherryCake, 20;
+    restoreshopitem SmallHealing, 20;
+OnClock0800:
+    restoreshopitem Beer, 20;
+    restoreshopitem Bread, 20;
+    restoreshopitem RedPlushWine, 20;
+    restoreshopitem Cheese, 20;
+    restoreshopitem CherryCake, 20;
+    restoreshopitem SmallHealing, 20;
+OnClock1600:
+    restoreshopitem Beer, 20;
+    restoreshopitem Bread, 20;
+    restoreshopitem RedPlushWine, 20;
+    restoreshopitem Cheese, 20;
+    restoreshopitem CherryCake, 20;
+    restoreshopitem SmallHealing, 20;
+}