From d0b2262fc38ecfa47671e1738d657b4317238499 Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Tue, 26 Jan 2016 13:32:37 -0600
Subject: Move gender selection to intro dialogue

---
 world/map/npc/029-2/sorfina.txt    | 38 +++++++++++++++++++++++++++++++++-----
 world/map/npc/029-2/stat_reset.txt | 12 ++++++++++--
 world/map/npc/029-2/tanisha.txt    |  3 ++-
 3 files changed, 45 insertions(+), 8 deletions(-)

(limited to 'world/map/npc/029-2')

diff --git a/world/map/npc/029-2/sorfina.txt b/world/map/npc/029-2/sorfina.txt
index 9e35b549..9d2d4bb3 100644
--- a/world/map/npc/029-2/sorfina.txt
+++ b/world/map/npc/029-2/sorfina.txt
@@ -26,13 +26,43 @@ L_Start:
     mes "\"You didn't have any possessions on you when we found you and no one knows who you are.\"";
     mes "Do you have a name?";
     menu
-        strcharinfo(0), L_name;
+        strcharinfo(0), L_Name;
 
-L_name:
+L_Name:
     mes "[Old Woman]";
     mes "\"Well " + strcharinfo(0) + " what else can you tell me about yourself?.\"";
     menu
-        "Umm... I... I don't remember anything...", L_KnowNothing;
+        "I'm a woman from ...", L_Woman,
+        "I'm a man that lived in ...", L_Man,
+        "My home is in ...", L_N;
+
+L_Woman:
+    set Sex, 0;
+    goto L_Species;
+
+L_Man:
+    set Sex, 1;
+    goto L_Species;
+
+L_N:
+    set Sex, 2;
+    goto L_Species;
+
+L_Species:
+    mes "[Old Woman]";
+    mes "\"Go on. If you need to think a bit, take your time.\"";
+    menu
+        "... Tulimshar in Tonori ... I'm a Talpan.", L_Talpan;
+
+L_Talpan:
+    set Class, 1;
+    goto L_AnythingElse;
+
+L_AnythingElse:
+    mes "[Old Woman]";
+    mes "\"Anything else you can remember?\"";
+    menu
+        "Umm... no... I... I don't remember anything else...", L_KnowNothing;
 
 L_KnowNothing:
     mes "[Old Woman]";
@@ -342,7 +372,6 @@ L_Block:
     mes "[Server/Client Notice]";
     mes "The explanations in this tutorial are based on the official client, Manaplus.";
     mes "If you're using another client, settings and controls may be different.";
-    callfunc "ChangeSex";
     callfunc "GameRules";
     close;
 }
@@ -353,7 +382,6 @@ L_Block:
     mes "[Server/Client Notice]";
     mes "The explanations in this tutorial are based on the official client, Manaplus.";
     mes "If you're using another client, settings and controls may be different.";
-    callfunc "ChangeSex";
     callfunc "GameRules";
     close;
 }
diff --git a/world/map/npc/029-2/stat_reset.txt b/world/map/npc/029-2/stat_reset.txt
index 6123f632..427a1da5 100644
--- a/world/map/npc/029-2/stat_reset.txt
+++ b/world/map/npc/029-2/stat_reset.txt
@@ -11,11 +11,18 @@
     mes "[Jessie]";
     mes "\"I know a spell that will";
     mes "reset status points on the youngings.";
+    mes "";
+    mes "I can also change their appearance.\"";
     next;
     menu
         "Reset my stats",L_Reset,
+        "Change my appearance", L_Appearance,
         "Forget about it",L_Pass;
 
+L_Appearance:
+    callfunc "Barber";
+    goto L_Pass;
+
 L_Reset:
     resetstatus;
 
@@ -35,8 +42,9 @@ L_Sorry:
     mes "\"My spell only works on the very young, sorry.\"";
     next;
     mes "\"You can try Mailvox in the Tulimshar Bazaar or Wyara in the Potion Shop in Hurnscald.\"";
-    next;
-    goto L_Close;
+    menu
+        "Change my appearance", L_Appearance,
+        "Bye", L_Close;
 
 L_Close:
     close;
diff --git a/world/map/npc/029-2/tanisha.txt b/world/map/npc/029-2/tanisha.txt
index d69195a5..7142721e 100644
--- a/world/map/npc/029-2/tanisha.txt
+++ b/world/map/npc/029-2/tanisha.txt
@@ -110,7 +110,8 @@ L_StatsRe:
     next;
     mes "\"Think about how you want to play before assigning the points.\"";
     mes "\"My Uncle sitting at the counter knows a spell to help the younglings reset their stats.\"";
-    mes "\"He also knows of mages with even more powerful reset spells.\"";
+    mes "\"He can also change your hair style and color, along with your gender.\"";
+    mes "\"Furthermore, he knows of mages with even more powerful reset spells for your stats.\"";
     next;
     if (QL_BEGIN == 7)
         goto L_Money;
-- 
cgit v1.2.3-60-g2f50