remove the notion of sex and gender

4 files changed, 47 insertions, 23 deletions

diff --git a/npc/commands/debug-look.txt b/npc/commands/debug-look.txt
index cf63a207..c95c24ab 100644
--- a/npc/commands/debug-look.txt
+++ b/npc/commands/debug-look.txt
@@ -8,9 +8,9 @@ function	script	BarberDebug	{
         mes(l("Please choose the desired body type:"));
         next();
         menuint(
-            l("Tanky"), GENDER_MALE,
-            l("Boobed"), GENDER_FEMALE,
-            l("Neutral"), GENDER_HIDDEN);
+            l("Body type %i", 1), GENDER_HIDDEN,
+            l("Body type %i", 2), GENDER_FEMALE,
+            l("Body type %i", 3), GENDER_MALE);
 
         Gender = @menuret;
         return;
@@ -54,7 +54,7 @@ function	script	BarberDebug	{
         mes "";
 
         mes "---";
-        mes l("Body Type") + ": " + genderToString(Gender);
+        mes l("Body type") + ": " + genderToString(Gender);
         mes l("Hair style") + ": " + getlook(LOOK_HAIR);
         mes l("Hair color") + ": " + getlook(LOOK_HAIR_COLOR);
         mes l("Race") + ": " + Class + " (" + get_race() + ")";;
@@ -63,7 +63,7 @@ function	script	BarberDebug	{
         next;
         mes l("What do you want to change?");
         select
-            menuimage("actions/edit", l("Body Type") + " [" + l("Requires logout") + "]"),
+            menuimage("actions/edit", l("Body type") + " [" + l("Requires logout") + "]"),
             menuimage("actions/edit", l("Hair style")),
             menuimage("actions/edit", l("Hair color")),
             menuimage("actions/edit", l("Race")),
diff --git a/npc/commands/gender.txt b/npc/commands/gender.txt
index 9ba2c9a4..dce4cd90 100644
--- a/npc/commands/gender.txt
+++ b/npc/commands/gender.txt
@@ -16,20 +16,38 @@ OnCall:
         dispbottom("Your body type is already " + genderToString());
     } else {
         Gender = .@desired;
-        dispbottom("Body Type changed to " + genderToString());
+        dispbottom("Body type changed to " + genderToString());
     }
     end;
 
 OnInit:
     bindatcmd("gender", "@gender::OnCall", 99, 99, false);
-    add_group_command("gender", 40, true, false);
-    add_group_command("gender", 50, true, true);
-    add_group_command("gender", 60, true, true);
-    add_group_command("gender", 80, true, true);
-
+    bindatcmd("bodytype", "@gender::OnCall", 99, 99, false);
+    bindatcmd("body", "@gender::OnCall", 99, 99, false);
+    bindatcmd("type", "@gender::OnCall", 99, 99, false);
     bindatcmd("changesex", "@gender::OnCall", 99, 99, false);
+
+    add_group_command("gender", 40, true, false);
+    add_group_command("bodytype", 40, true, false);
+    add_group_command("body", 40, true, false);
+    add_group_command("type", 40, true, false);
     add_group_command("changesex", 40, true, false);
-    add_group_command("changesex", 50, true, true);
-    add_group_command("changesex", 60, true, true);
-    add_group_command("changesex", 80, true, true);
+
+    add_group_command("gender", 50, true, false);
+    add_group_command("bodytype", 50, true, false);
+    add_group_command("body", 50, true, false);
+    add_group_command("type", 50, true, false);
+    add_group_command("changesex", 50, true, false);
+
+    add_group_command("gender", 60, true, false);
+    add_group_command("bodytype", 60, true, false);
+    add_group_command("body", 60, true, false);
+    add_group_command("type", 60, true, false);
+    add_group_command("changesex", 60, true, false);
+
+    add_group_command("gender", 80, true, false);
+    add_group_command("bodytype", 80, true, false);
+    add_group_command("body", 80, true, false);
+    add_group_command("type", 80, true, false);
+    add_group_command("changesex", 80, true, false);
 }
diff --git a/npc/functions/barber.txt b/npc/functions/barber.txt
index c7004eb8..89701510 100644
--- a/npc/functions/barber.txt
+++ b/npc/functions/barber.txt
@@ -117,9 +117,9 @@ function	script	BarberChangeGender	{
 
     mes(l("Please select the desired body type:"));
     menuint(
-        l("Boobed"), GENDER_FEMALE,
-        l("Tanky"), GENDER_MALE,
-        l("Neutral"), GENDER_HIDDEN);
+        l("Body type %i", 1), GENDER_HIDDEN,
+        l("Body type %i", 2), GENDER_FEMALE,
+        l("Body type %i", 3), GENDER_MALE);
 
     Gender = @menuret;
     return;
diff --git a/npc/functions/gender.txt b/npc/functions/gender.txt
index 209dcc37..c8b74872 100644
--- a/npc/functions/gender.txt
+++ b/npc/functions/gender.txt
@@ -1,13 +1,19 @@
 function	script	stringToGender	{
-    .@short$ = strtolower(charat(getarg(0, ""), 0));
-
-    return .@short$ == "f" ? GENDER_FEMALE :
-        .@short$ == "m" ? GENDER_MALE : GENDER_HIDDEN;
+    switch (ord(strtolower(charat(getarg(0, "n"), 0)))) {
+    case 50: // 2
+    case 102: // f
+        return GENDER_FEMALE;
+    case 51: // 3
+    case 109: // m
+        return GENDER_MALE;
+    default:
+        return GENDER_HIDDEN;
+    }
 }
 
 function	script	genderToString	{
     .@gender = getarg(0, Gender);
 
-    return .@gender == GENDER_FEMALE ? l("boobed") :
-        .@gender == GENDER_MALE ? l("tanky") : l("neutral");
+    return .@gender == GENDER_FEMALE ? l("type %i", 2) :
+        .@gender == GENDER_MALE ? l("type %i", 3) : l("type %i", 1);
 }