Toams/rowboat + Micksha/galmatia

14 files changed, 224 insertions, 12 deletions

diff --git a/npc/001-1/_import.txt b/npc/001-1/_import.txt
index 1b748d55..d8a08d54 100644
--- a/npc/001-1/_import.txt
+++ b/npc/001-1/_import.txt
@@ -30,6 +30,7 @@
 "npc/001-1/qonan.txt",
 "npc/001-1/qpid.txt",
 "npc/001-1/rowboat.txt",
+"npc/001-1/rowboathelper.txt",
 "npc/001-1/rumly.txt",
 "npc/001-1/salem.txt",
 "npc/001-1/shop.txt",
diff --git a/npc/001-1/rowboat.txt b/npc/001-1/rowboat.txt
index 8682ba0e..a5e158d3 100644
--- a/npc/001-1/rowboat.txt
+++ b/npc/001-1/rowboat.txt
@@ -1,20 +1,48 @@
 // Evol scripts.
 // Author:
-//    Micksha
+//    Micksha, Toams
 // Description:
 //    The rowboat, picking up the player on small beach in order to bring it to Koga.
-// THIS IS A PLACEHOLDER!
+// TODO:
+// Check if the player who wants to enter the boat is the same as the one who called for the boat. 
+// Make the rowboat move back to the cave if the player doesnt enter in time.
 
-001-1,203,64,0	script	Rowboat	NPC_ROWBOAT_STAND_WE,{
-    speech
+001-1,193,26,0	script	#Rowboat	NPC_ROWBOAT_STAND_WE,{
+    
+
+    speech S_LAST_BLANK_LINE | S_LAST_NEXT,
         l("Oh, hi."),
-        l("In case you don't have a commendatory letter from you-know-whom, I am just sitting here and observe the whales.");
-        l("Perhaps, and only perhaps, if you bring me the latter, I can bring you to a ship that will perhaps, and only perhaps, be able to bring you to Woodland.");
+        l("In case you don't have a commendatory letter from you-know-whom, I am just sitting here and observe the whales."),
+        l("Perhaps, and only perhaps, if you bring me the latter, I can bring you to a ship that will perhaps, and only perhaps, be able to bring you to Woodland."),
+        l("Do you have this commendatory letter?");
+        closeclientdialog();
+        if (askyesno() == 1) {
+           slide_or_warp("001-1", 204, 62);
+           movenpc("#Rowboat", 193, 26);
+           setmount 1;
 
     close;
+    }
+
+OnMoveToBeach:
+firstmove;
+end;
+    
+OnTimer1000:
+    dographmovestep;
 
 OnInit:
     .sex = G_MALE;
     .distance = 3;
-    end;
+    .speed = 175;
+    
+    initmovegraph "Cave",  193, 26,
+                  "CP1",   202, 27,
+                  "CP2",   213, 58,
+                  "Beach", 203, 64;
+                  
+    setmovegraphcmd "Cave",   "CP1",      1,  "dir 4",
+                    "CP1",    "CP2",      1,  "dir 4",
+                    "CP2",    "Beach",    1,  "dir 4"; 
+    initnpctimer;
 }
diff --git a/npc/001-1/rowboathelper.txt b/npc/001-1/rowboathelper.txt
new file mode 100644
index 00000000..8e16ee8b
--- /dev/null
+++ b/npc/001-1/rowboathelper.txt
@@ -0,0 +1,55 @@
+// Evol scripts.
+// Author:
+//    Toams
+// Description:
+//    helper scripts for rowboat usage
+// TODO:
+// Check if mona's quest is done before being able to call the boat
+
+// calling the Rowboat
+001-1,200,60,0	script	Curious Hole	NPC_NO_SPRITE,{
+
+narrator(S_LAST_BLANK_LINE | S_LAST_NEXT,
+    l("You see a curious hole behind some rocks"),
+    l("'Hey anyone there?'"),
+    l("..."),
+    l("Altough you can't get rid of the feeling someone is listening on the other side, you don't get any replies"),
+    l("Now if only these lazy developers would write the missing parts of mona's quest so you would know the needed password."),
+    l("So for now just call the boat?"));
+    closeclientdialog();
+    if (askyesno() == 1) {
+        doevent("#Rowboat::OnMoveToBeach");
+    close;
+    }
+
+// Make sure to unmount the boat when player dies
+OnPCDieEvent:
+   setmount 0;
+  
+OnInit:
+    .distance = 1;    
+}
+
+
+//unmounting the rowboat
+001-1,202,62,0	script	unmountrowboat	NPC_HIDDEN,1,1,{
+
+function UnMount {
+    narrator(S_LAST_BLANK_LINE | S_LAST_NEXT,
+        l("Do you want to leave the boat?"));
+    closeclientdialog();
+    if (askyesno() == 1) {
+        slide_or_warp("001-1", 199, 62);
+        setmount 0;
+    close;
+    }
+}
+
+OnTouch:
+    UnMount;
+    end;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 1;
+}
diff --git a/npc/001-3-0/_import.txt b/npc/001-3-0/_import.txt
index a4262ee3..5ead6439 100644
--- a/npc/001-3-0/_import.txt
+++ b/npc/001-3-0/_import.txt
@@ -1,6 +1,5 @@
 // Map 001-3-0: Sewer
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/001-3-0/mundane.txt",
 "npc/001-3-0/_mobs.txt",
 "npc/001-3-0/_warps.txt",
 "npc/001-3-0/mundane.txt",
diff --git a/npc/001-3-0/_warps.txt b/npc/001-3-0/_warps.txt
index d192e4ef..65b56ff5 100644
--- a/npc/001-3-0/_warps.txt
+++ b/npc/001-3-0/_warps.txt
@@ -3,6 +3,6 @@
 001-3-0,196,35,0	warp	#001-3-0_196_35	0,0,001-1,197,35
 001-3-0,172,41,0	warp	#001-3-0_172_41	0,0,001-3-1,34,58
 001-3-0,162,40,0	warp	#001-3-0_162_40	0,0,001-3-1,23,57
-001-3-0,198,60,0	warp	#001-3-0_198_60	0,0,001-1,199,61
+001-3-0,198,61,0	warp	#001-3-0_198_61	0,0,001-1,199,61
 001-3-0,152,55,0	warp	#001-3-0_152_55	0,0,001-1,152,51
 001-3-0,85,130,0	warp	#001-3-0_85_130	0,0,001-1,86,130
diff --git a/npc/008-1-1/_import.txt b/npc/008-1-1/_import.txt
index b6807450..be748cf8 100644
--- a/npc/008-1-1/_import.txt
+++ b/npc/008-1-1/_import.txt
@@ -2,4 +2,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/008-1-1/_mobs.txt",
 "npc/008-1-1/_warps.txt",
+"npc/008-1-1/galimatia.txt",
 "npc/008-1-1/koga.txt",
diff --git a/npc/008-1-1/galimatia.txt b/npc/008-1-1/galimatia.txt
new file mode 100644
index 00000000..a917397d
--- /dev/null
+++ b/npc/008-1-1/galimatia.txt
@@ -0,0 +1,20 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Galmatia the beekeeper.
+// THIS IS A PLACEHOLDER!
+
+008-1-1,113,59,0	script	Galimatia	NPC_GALIMATIA,{
+    speech
+        l("Hello."),
+        l("If only someone could help me to make my flowers bloom again."),
+        l("I just dont know what to do. Perhaps all gets better when I stay here, whining and waiting. Please, leave me alone.");
+
+    close;
+
+OnInit:
+    .sex = G_FEMALE;
+    .distance = 2;
+    end;
+}
diff --git a/npc/008-1/_import.txt b/npc/008-1/_import.txt
index 31bb5966..96d03c46 100644
--- a/npc/008-1/_import.txt
+++ b/npc/008-1/_import.txt
@@ -4,6 +4,7 @@
 "npc/008-1/_warps.txt",
 "npc/008-1/auldsbel.txt",
 "npc/008-1/banu.txt",
+"npc/008-1/blossom.txt",
 "npc/008-1/confused-tree.txt",
 "npc/008-1/hinnak.txt",
 "npc/008-1/jack.txt",
@@ -14,6 +15,7 @@
 "npc/008-1/old-woman.txt",
 "npc/008-1/oscar.txt",
 "npc/008-1/sabine.txt",
+"npc/008-1/shop.txt",
 "npc/008-1/snarfles.txt",
 "npc/008-1/soul-menhir.txt",
 "npc/008-1/voltain.txt",
diff --git a/npc/008-1/blossom.txt b/npc/008-1/blossom.txt
new file mode 100644
index 00000000..8cbae406
--- /dev/null
+++ b/npc/008-1/blossom.txt
@@ -0,0 +1,39 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Blossom the flower-seller girl.
+// THIS IS A PLACEHOLDER!
+
+008-1,198,138,0	script	Blossom#008-1	NPC_BLOSSOM,{
+    speech
+        l("Hi, my name is Blossom."),
+        l("Strange, it seems I became younger lately."),
+        l("Are you in need of some flowers?");
+
+    switch (select(l("I love flowers! What do you have for sale?"),
+                   l("Not now, thank you."),
+                   l("Dont you know something about fertility? I heard rumors.")))
+    {
+    case 1:
+        closeclientdialog;
+        shop "#Invisible008-1";
+        close;
+    case 2:
+        speech S_FIRST_BLANK_LINE,
+        l("Oh, ok. Come back later if you need something.");
+        close;
+    case 3:
+        speech S_FIRST_BLANK_LINE,
+        l("I heard something too. A girl named Galimatia seems to need help. If only those lazy developers could tell her what she needs.");
+        close;
+    }
+        
+
+    close;
+
+OnInit:
+    .sex = G_FEMALE;
+    .distance = 2;
+    end;
+}
diff --git a/npc/008-1/shop.txt b/npc/008-1/shop.txt
new file mode 100644
index 00000000..838062b6
--- /dev/null
+++ b/npc/008-1/shop.txt
@@ -0,0 +1,55 @@
+// Evol scripts.
+// Authors:
+//    4144
+//    Micksha
+//    Reid
+//    toams
+// Description:
+//    Blossom flower shop.
+
+008-1,201,136,0	trader	#Invisible008-1	NPC_HIDDEN,{
+
+OnInit:
+    tradertype(NST_MARKET);
+
+    sellitem ARedRose, -1, 50;
+    sellitem AWhiteRose, -1, 50;
+    sellitem AYellowRose, -1, 50;
+    sellitem ABlueRose, -1, 20;
+    sellitem ARedTulip, -1, 50;
+    sellitem AWhiteTulip, -1, 50;
+    sellitem AYellowTulip, -1, 50;
+    sellitem ABlueTulip, -1, 20;
+    
+    .sex = G_OTHER;
+    .distance = 10;
+    end;
+
+OnClock0000:
+    restoreshopitem ARedRose, 10;
+    restoreshopitem AWhiteRose, 10;
+    restoreshopitem AYellowRose, 10;
+    restoreshopitem ABlueRose, 5;
+    restoreshopitem ARedTulip, 10;
+    restoreshopitem AWhiteTulip, 10;
+    restoreshopitem AYellowTulip, 10;
+    restoreshopitem ABlueTulip, 5;
+OnClock0800:
+    restoreshopitem ARedRose, 10;
+    restoreshopitem AWhiteRose, 10;
+    restoreshopitem AYellowRose, 10;
+    restoreshopitem ABlueRose, 5;
+    restoreshopitem ARedTulip, 10;
+    restoreshopitem AWhiteTulip, 10;
+    restoreshopitem AYellowTulip, 10;
+    restoreshopitem ABlueTulip, 5;
+OnClock1600:
+    restoreshopitem ARedRose, 10;
+    restoreshopitem AWhiteRose, 10;
+    restoreshopitem AYellowRose, 10;
+    restoreshopitem ABlueRose, 5;
+    restoreshopitem ARedTulip, 10;
+    restoreshopitem AWhiteTulip, 10;
+    restoreshopitem AYellowTulip, 10;
+    restoreshopitem ABlueTulip, 5;
+}
diff --git a/npc/008-2-2/barron.txt b/npc/008-2-2/barron.txt
index c64efa40..3eb3baab 100644
--- a/npc/008-2-2/barron.txt
+++ b/npc/008-2-2/barron.txt
@@ -1,6 +1,7 @@
 // Evol scripts.
 // Author:
 //    Micksha
+//    toams
 // Description:
 //    Barron, the bartender of the Rusty Pick.
 
diff --git a/npc/008-2-2/melania.txt b/npc/008-2-2/melania.txt
index 52efda05..9d9473f2 100644
--- a/npc/008-2-2/melania.txt
+++ b/npc/008-2-2/melania.txt
@@ -7,7 +7,7 @@
 
 008-2-2,28,27,0	script	Melania	NPC_AIRLIA,{
     speech
-        l("Hello Sir."),
+        lg("Hello Sir.","Hello Miss."),
         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.");
diff --git a/npc/008-2-2/melinda.txt b/npc/008-2-2/melinda.txt
index a418b4e2..09fd9ff5 100644
--- a/npc/008-2-2/melinda.txt
+++ b/npc/008-2-2/melinda.txt
@@ -1,4 +1,3 @@
-
 // Evol scripts.
 // Authors:
 //    Toams
@@ -23,7 +22,17 @@ function StartConversation {
             @Hurns_Rusty_Pick_WaitressTick = .@tick;
         }
     }
- 
+    
+function face_to_PC {
+        getmapxy(.@map$, .@cx, .@cy, 0);
+        @Melinda_ols_dir = .dir;
+        npc_turntoxy(.@cx, .@cy);
+
+        return;
+    }
+    
+npc_pausemove;
+face_to_PC;
 mes "";
 mesn;
 mesq l("Hi, sweetie! Want a fresh beer for 90 Florin?");
@@ -97,6 +106,7 @@ L_No:
    
 L_Close:
     initnpctimer;
+    npc_resumemove;
     close;
    
 L_TooMany:
diff --git a/npc/008-2-2/shop.txt b/npc/008-2-2/shop.txt
index 861843f7..8cd55f83 100644
--- a/npc/008-2-2/shop.txt
+++ b/npc/008-2-2/shop.txt
@@ -2,6 +2,7 @@
 // Authors:
 //    4144
 //    Reid
+//    toams
 // Description:
 //    Inn hidden shop.