Merge branch 'rowboat_improvements' of https://gitlab.com/toams/serverdata into rowboat_improvements

5 files changed, 117 insertions, 43 deletions

diff --git a/maps/re/001-3-0.mcache b/maps/re/001-3-0.mcache
index 1c422edc..fbbd9c66 100644
--- a/maps/re/001-3-0.mcache
+++ b/maps/re/001-3-0.mcache
diff --git a/npc/001-1/rowboat.txt b/npc/001-1/rowboat.txt
index 9087c010..3c8429a4 100644
--- a/npc/001-1/rowboat.txt
+++ b/npc/001-1/rowboat.txt
@@ -5,43 +5,43 @@
 //    The rowboat, picking up the player on small beach in order to bring it to Koga.
 // 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,193,26,0	script	#Rowboat	NPC_ROWBOAT_STAND_WE,{
+001-1,192,25,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("Do you have this commendatory letter?");
         closeclientdialog();
-        if (askyesno() == 1) {
-           slide_or_warp("001-1", 204, 62);
-           movenpc("#Rowboat", 193, 26);
-           setmount 1;
-
+    if (askyesno() == 1) {
+        slide 204, 62;
+        movenpc("#Rowboat", 192, 25);
+        setmount 1;
     close;
     }
 
 OnMoveToBeach:
-    firstmove;
+    startnpctimer;
+    initialmove;
 end;
 
 OnTimer1000:
-    dographmovestep;
+    getmapxy(.@map$, .@cx, .@cy, 1);
+    if (.@cx == 192 && .@cy == 25) stopnpctimer;
+    else domovestep;
 
 OnInit:
     .sex = G_MALE;
     .distance = 3;
     .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";
-    firstmove;
+    initpath "move", 202, 27,
+             "move", 213, 58,
+             "move", 203, 64,
+             "wait", 15, 0,
+             "move", 213, 58,
+             "move", 202, 27,
+             "move", 192, 25;
     initnpctimer;
 }
diff --git a/npc/001-1/rowboathelper.txt b/npc/001-1/rowboathelper.txt
index 81fd3927..675cfdaf 100644
--- a/npc/001-1/rowboathelper.txt
+++ b/npc/001-1/rowboathelper.txt
@@ -4,22 +4,40 @@
 // Description:
 //    helper scripts for rowboat usage
 // TODO:
-// Check if mona's quest is done before being able to call the boat
+// make the script dialog different if there is no rowboat present at the cave
 
 // 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;
+    .@monadad = getq(ArtisQuests_MonaDad);
+
+    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"));
+    if  (.@monadad < 3)
+    {
+        close;
+    }
+    else
+    {
+        narrator(S_LAST_BLANK_LINE | S_LAST_NEXT,
+            l("Suddenly you remember the strange phrase Mona overheard Sophialla saying"),
+            l("Maybe you should try this phrase?"));
+        if (askyesno() == ASK_YES)
+        {
+            narrator(S_LAST_BLANK_LINE | S_LAST_NEXT,
+                l("'Enter strange phrase here.'"));
+
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                l("Hello, a rowboat is on his way to the beach. Please wait for a while for it to arrive.");
+
+            doevent("#Rowboat::OnMoveToBeach");
+            close;
+        }
+        else
+            close;
     }
 
 // Make sure to unmount the boat when player dies
@@ -31,18 +49,66 @@ OnInit:
 }
 
 
-//unmounting the rowboat
-001-1,202,62,0	script	unmountrowboat	NPC_HIDDEN,1,1,{
+//unmounting the rowboat at eastern beach
+001-1,202,62,0	script	unmountrowboateast	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;
-    }
+    function UnMount {
+        narrator(S_LAST_BLANK_LINE | S_LAST_NEXT,
+            l("Do you want to leave the boat?"));
+        if (askyesno() == ASK_YES)
+        {
+            slide_or_warp("001-1", 199, 62);
+            setmount 0;
+            close;
+        }
+}
+
+OnTouch:
+    UnMount;
+    end;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 1;
+}
+
+
+//unmounting the rowboat at southern beach
+001-1,68,143,0	script	unmountrowboatsouth	NPC_HIDDEN,1,1,{
+
+    function UnMount {
+        narrator(S_LAST_BLANK_LINE | S_LAST_NEXT,
+            l("Do you want to leave the boat?"));
+        if (askyesno() == ASK_YES)
+        {
+            slide_or_warp("001-1", 68, 138);
+            setmount 0;
+            close;
+        }
+}
+
+OnTouch:
+    UnMount;
+    end;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 1;
+}
+
+
+//unmounting the rowboat at western beach
+001-1,25,101,0	script	unmountrowboatwest	NPC_HIDDEN,1,1,{
+
+    function UnMount {
+        narrator(S_LAST_BLANK_LINE | S_LAST_NEXT,
+            l("Do you want to leave the boat?"));
+        if (askyesno() == ASK_YES)
+        {
+            slide_or_warp("001-1", 27, 101);
+            setmount 0;
+            close;
+        }
 }
 
 OnTouch:
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/_mobs.txt b/npc/001-3-0/_mobs.txt
index fff529b1..cfae2cf4 100644
--- a/npc/001-3-0/_mobs.txt
+++ b/npc/001-3-0/_mobs.txt
@@ -21,9 +21,18 @@
 001-3-0,120,85,7,2	monster	Little Green Slime	1025,2,500,2000
 001-3-0,147,122,3,5	monster	Green Slime	1024,2,500,2000
 001-3-0,147,122,3,5	monster	Green Slime	1024,2,500,2000
-001-3-0,99,106,3,5	monster	Green Slime	1024,3,500,2000
+001-3-0,107,109,4,2	monster	Green Slime	1024,3,500,2000
 001-3-0,139,32,10,4	monster	Little Green Slime	1025,2,500,2000
 001-3-0,86,131,4,2	monster	Little Green Slime	1025,3,500,2000
 001-3-0,175,31,4,2	monster	Little Green Slime	1025,2,500,2000
 001-3-0,147,67,4,2	monster	Little Green Slime	1025,2,500,2000
 001-3-0,54,53,5,3	monster	Poison Skull	1100,1,35000,60000
+001-3-0,117,60,5,0	monster	Cave Maggot	1027,25,500,2000
+001-3-0,156,43,5,2	monster	Crafty	1018,3,12000,20000
+001-3-0,178,76,5,1	monster	Crafty	1018,3,12000,20000
+001-3-0,86,97,5,1	monster	Crafty	1018,3,12000,20000
+001-3-0,86,48,5,1	monster	Crafty	1018,3,12000,20000
+001-3-0,61,104,5,0	monster	Tortuga	1004,1,35000,300000
+001-3-0,54,85,5,0	monster	Tortuga	1004,1,35000,300000
+001-3-0,114,62,5,0	monster	Tortuga	1004,1,35000,300000
+001-3-0,167,100,6,1	monster	Tortuga	1004,1,35000,300000