5 files changed, 99 insertions, 13 deletions
diff --git a/world/map/npc/022-1/_warps.txt b/world/map/npc/022-1/_warps.txt
index 2b39a96d..e9d31b8e 100644
--- a/world/map/npc/022-1/_warps.txt
+++ b/world/map/npc/022-1/_warps.txt
@@ -1,5 +1,7 @@
 // This file is generated automatically. All manually changes will be removed when running the Converter.
 // Tulimshar Port warps
 
+022-1.gat,19,38|warp|To Tulismhar Subrubs|-1,2,042-1.gat,96,40
+022-1.gat,30,20|warp|To Lighthouse Beach|0,-1,023-1.gat,107,146
 022-1.gat,73,110|warp|To North Tulimshar|3,-1,021-1.gat,73,23
 022-1.gat,113,110|warp|To North Tulimshar|3,-1,021-1.gat,113,23
diff --git a/world/map/npc/022-1/dock.txt b/world/map/npc/022-1/dock.txt
index 2dfc9764..2f90c4a9 100644
--- a/world/map/npc/022-1/dock.txt
+++ b/world/map/npc/022-1/dock.txt
@@ -1,8 +1,51 @@
 // The ferry dock
+// Author: Wushin
 
-022-1.gat,84,72,0|script|#tulimshardock|45,6,1,
+// Ferry Sign
+022-1.gat,62,36,0|script|Ferry Schedule#2|396,
 {
-    set @loc, DOCK_tulimshar;
-    callfunc "Ferry";
+    callfunc "FerryManifest";
+    end;
+}
+
+022-1.gat,65,71,0|script|Ferry Schedule#3|396,
+{
+    callfunc "FerryManifest";
+    end;
+}
+
+022-1.gat,85,71,0|script|Tulimshar South Koga|395,6,2,
+{
+    callfunc "BoardFerry";
+    close;
+}
+
+022-1.gat,80,62,0|script|#Tulimshar SouthDock|45,
+{
+    end;
+OnCommandArrive:
+    enablenpc "Tulimshar South Koga";
+    end;
+
+OnCommandWarp:
+    disablenpc "Tulimshar South Koga";
+    end;
+}
+
+022-1.gat,60,24,0|script|Tulimshar North Koga|395,4,4,
+{
+    callfunc "BoardCandorFerry";
+    close;
+}
+
+022-1.gat,65,25,0|script|#Tulimshar NorthDock|45,
+{
+    end;
+OnCommandArrive:
+    enablenpc "Tulimshar North Koga";
+    end;
+
+OnCommandWarp:
+    disablenpc "Tulimshar North Koga";
     end;
 }
diff --git a/world/map/npc/022-1/ferry_master.txt b/world/map/npc/022-1/ferry_master.txt
index 099c75cc..5c78dc77 100644
--- a/world/map/npc/022-1/ferry_master.txt
+++ b/world/map/npc/022-1/ferry_master.txt
@@ -1,18 +1,29 @@
 //
 
-022-1.gat,73,71,0|script|Ferry Master|138,
+022-1.gat,71,71,0|script|Ferry Master|138,
 {
     mes "[Ferry Master]";
     mes "\"Hello! Do you need something?\"";
-    next;
+    goto L_Main;
+
+L_Main:
     menu
         "How do I use the ferry?", L_Explain,
         "Nothing I guess", L_Close;
 
 L_Explain:
     mes "[Ferry Master]";
-    mes "\"You'll step up on the dock and select your destination. Each destination has an associated price that you need to pay. You don't have to go anywhere. Choosing the current port will result in nothing.\"";
-    goto L_Close;
+    mes "\"You wait on the dock for the ship to come in. You'll be given a chance to board the boat when it comes into port.\"";
+    mes "\"It lingers in port to allow you some time to board in case you are running behind.\"";
+    mes "\"Once on the ship, it will sail to different ports and annouce where it is docking.\"";
+    next;
+    mes "\"There are 2 Ferrys, both ferrys are free to ride.\"";
+    mes "\"The Main ferry travels from Argeas, Kaizei and Tonori. It docks in the major ports Hurnscald, Nivalis and the Tulimshar South Dock.\"";
+    mes "\"The Candor Ferry only travels betwen Candor and the Tulimshar North Dock.\"";
+    next;
+    mes "\"Refreshments and supplies are offered aboard both ships during the voyage.\"";
+    mes "\"We also have some slot machines in case you get bored.\"";
+    goto L_Main;
 
 L_Close:
     close;
diff --git a/world/map/npc/022-1/mapflags.txt b/world/map/npc/022-1/mapflags.txt
index 930d1fdf..1977e88c 100644
--- a/world/map/npc/022-1/mapflags.txt
+++ b/world/map/npc/022-1/mapflags.txt
@@ -1 +1,2 @@
 022-1.gat|mapflag|town
+022-1.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/022-1/tutorial.txt b/world/map/npc/022-1/tutorial.txt
index b8fcf2c6..93f1700a 100644
--- a/world/map/npc/022-1/tutorial.txt
+++ b/world/map/npc/022-1/tutorial.txt
@@ -1,20 +1,49 @@
 // This file is part of the Tutorial
 // Author: Jenalya
 // if you enter the tutorial area from outside, it is set to be already done
+// Tutorial
+// Nibble 0
+// 1-4: Sorfina
 
-022-1.gat,19,37,0|script|#tutorial-outside1|45,0,2
+022-1.gat,46,82,0|script|#tutorial-outside1|45,2,1
 {
     callfunc "TutorialCompleted";
-    warp "042-1.gat", 95, 69;
+    warp "042-1.gat", 115, 85;
     end;
 }
 
+-|script|#TutorialConfig|-1,
+{
+    end;
+
+OnInit:
+    set $@ScorpionFighter, 0;
+    set $@ScorpionTimer, 0;
+    set $@ScorpDeath, 0; 
+    set $@SorfinaHasanBit, (1 << 4); 
+    set $@TanishaHasanBit, (1 << 5); 
+    end;
+}
+
+function|script|TutorialState|,
+{
+    callfunc "ClearVariables";
+    set @tutorial, ((TUTORIAL & NIBBLE_0_MASK) >> NIBBLE_0_SHIFT);
+    set @sorfina_hasan, (TUTORIAL & $@SorfinaHasanBit);
+    set @tanisha_hasan, (TUTORIAL & $@TanishaHasanBit);
+    return;
+}
+
+function|script|SetTutorialMask|,
+{
+    set TUTORIAL, (TUTORIAL & ~(NIBBLE_0_MASK) | (@tutorial_tmp << NIBBLE_0_SHIFT));
+    set @tutorial_tmp, 0;
+    return;
+}
+
 function|script|TutorialCompleted|,
 {
-    set hasan, 0;
-    set kaan, 0;
-    set sorfina, 0;
-    set tanisha, 0;
     set FLAGS, FLAGS | FLAG_TUTORIAL_DONE;
+    callfunc "ClearVariables";
     return;
 }