1 files changed, 20 insertions, 16 deletions

diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index 9d2d4bb3..7c6a589f 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -86,10 +86,10 @@ L_Carpet:
     mes "[Sorfina]";
     mes "\"Try to take a few steps and walk to that carpet over there.";
     next;
-    npcaction 2, "#Carpet";
+    camera "#Carpet";
     mapmask getmask() | 4;
     next;
-    npcaction 3;
+    camera;
     mes "Press [###keyMoveUp;] to move up, press [###keyMoveDown;] to move down, ";
     mes "press [###keyMoveLeft;] to move left, press [###keyMoveRight;] to move right ";
     mes " or click on the place you want to go to.\"";
@@ -100,12 +100,12 @@ L_Dresser:
     mes "[Sorfina]";
     mes "\"You should get dressed now.\"";
     next;
-    npcaction 2, "Dresser#tutorial";
+    camera "Dresser#tutorial";
     mapmask getmask() | 32;
     mes "\"In that dresser there are some clothes you can wear.\"";
     mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press [###keyTargetNPC;] to focus and [###keyTalk;] to talk/activate.\"";
     next;
-    npcaction 3;
+    camera;
     mes "\"Now get the clothes out of the dresser.\"";
     goto L_Close;
 
@@ -169,6 +169,7 @@ L_Explain:
         "... the inventory and items?",L_Items,
         "... shortcuts?",L_Shortcut,
         "... what to do in Candor?",L_Aidan,
+        "... change my appearence?",L_Barber,
         "... nevermind.",L_Close;
 
 L_Walk:
@@ -241,6 +242,15 @@ L_Aidan:
     mes "Talk to everybody. You can never tell when they might know something useful.\"";
     goto L_Close;
 
+L_Barber:
+    mes "[Sorfina]";
+    mes "\"Jessie downstairs can change your appearance.\"";
+    mes "\"They will allow you to change your hair color or style as well as gender.\"";
+    next;
+    mes "\"There are a number of people across the continent that can change this for you.\"";
+    mes "\"There is no cost or limit to the number of times it can be changed.\"";
+    goto L_Close;
+
 L_Hasan:
     mes "[Sorfina]";
     mes "\"Make yourself at home! Do you have any questions?\"";
@@ -303,12 +313,12 @@ OnTouch:
     mes "[Sorfina]";
     mes "\"You should get dressed now.\"";
     next;
-    npcaction 2, "Dresser#tutorial";
+    camera "Dresser#tutorial";
     mapmask getmask() | 16;
     mes "\"In that dresser there are some clothes you can wear.\"";
     mes "\"To interact with things in your environment or talk to NPCs you can either click on it or press N to focus and T to talk/activate.\"";
     next;
-    npcaction 3;
+    camera;
     mes "\"Now get the clothes out of the dresser.\"";
     set QL_BEGIN, 2;
     close;
@@ -389,27 +399,21 @@ L_Block:
 {
     if (TUT_var == 0)
         goto L_KnockBack;
-    goto L_Close;
+    end;
 
 L_KnockBack:
     message strcharinfo(0), "Server : ##BPlease Accept the Game rules";
     warp "029-2", 22, 24;
-    goto L_Close;
-
-L_Close:
-    close;
+    end;
 }
 029-2,24,24,0|script|#GameRules4|32767,0,1
 {
     if (TUT_var == 0)
         goto L_KnockBack;
-    goto L_Close;
+    end;
 
 L_KnockBack:
     message strcharinfo(0), "Server : ##BPlease Accept the Game rules";
     warp "029-2", 22, 24;
-    goto L_Close;
-
-L_Close:
-    close;
+    end;
 }