Merge branch 'master' into kfahrkfahr

1 files changed, 15 insertions, 1 deletions

diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 76870170..1e2fe739 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -34,7 +34,7 @@ OnTouch:
     next;
 
     setcamnpc "Sailors", 0, -32;
-    mesn "Human Voice";
+    mesn "Viro Voice";
     mesq lg("I think he's from the East...");
     next;
 
@@ -53,6 +53,20 @@ OnTouch:
 
     asklanguage(LANG_ON_SEA);
 
+    // TODO: This is gumi's code, I have no idea if it works or not
+    // Besides, is it lv 90, 95, 99, 100, or...?
+    // I believe Micksha said level 90 was plenty, but.
+    /*** FIXME ***
+    if ((LEGACY[1] & 0x7FFFFF00) >> 8) > 90)
+        REBIRTH=1;
+    *** FIXME ***/
+
+    // Players coming from TMW Legacy didn't got a chance to do this yet.
+    // So allow them now.
+    if (LEGACY) {
+        BarberChangeRace();
+    }
+
     setcamnpc;
     mes "";
     mesn;