Change body type back to gendergenderfix

3 files changed, 19 insertions, 24 deletions

diff --git a/npc/commands/bodytype.txt b/npc/commands/bodytype.txt
index 290c6fd6..6ad1b887 100644
--- a/npc/commands/bodytype.txt
+++ b/npc/commands/bodytype.txt
@@ -1,52 +1,47 @@
-// @bodytype atcommand
-// changes or returns the body type
+// @gender atcommand
+// changes or returns the gender
 
--	script	@bodytype	32767,{
+-	script	@gender	32767,{
     end;
 
 OnCall:
     if (.@atcmd_parameters$[0] == "") {
-        dispbottom("Your current body type is " + bodytypeToString());
+        dispbottom("Your current gender is " + genderToString());
         end;
     }
 
-    .@desired = stringToBodytype(.@atcmd_parameters$[0]);
+    .@desired = stringToGender(.@atcmd_parameters$[0]);
 
-    if (.@desired == BodyType) {
-        dispbottom("Your body type is already " + bodytypeToString());
+    if (.@desired == Gender) {
+        dispbottom("Your gender is already " + genderToString());
     } else {
-        BodyType = .@desired;
-        dispbottom("Body type changed to " + bodytypeToString());
+        Gender = .@desired;
+        dispbottom("Gender changed to " + genderToString());
     }
     end;
 
 OnInit:
-    bindatcmd("gender", "@bodytype::OnCall", 99, 99, false);
-    bindatcmd("bodytype", "@bodytype::OnCall", 99, 99, false);
-    bindatcmd("body", "@bodytype::OnCall", 99, 99, false);
-    bindatcmd("type", "@bodytype::OnCall", 99, 99, false);
-    bindatcmd("changesex", "@bodytype::OnCall", 99, 99, false);
+    bindatcmd("gender", "@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("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/commands/debug-look.txt b/npc/commands/debug-look.txt
index 0a4a953b..bb535ba2 100644
--- a/npc/commands/debug-look.txt
+++ b/npc/commands/debug-look.txt
@@ -38,7 +38,7 @@ function	script	BarberDebug	{
         mes "";
 
         mes "---";
-        mes l("Body type") + ": " + bodytypeToString(BodyType);
+        mes l("Gender") + ": " + genderToString(Gender);
         mes l("Hair style") + ": " + getlook(LOOK_HAIR);
         mes l("Hair color") + ": " + getlook(LOOK_HAIR_COLOR);
         mes l("Race") + ": " + Class + " (" + get_race() + ")";;
@@ -47,7 +47,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("Gender") + " [" + l("Requires logout") + "]"),
             menuimage("actions/edit", l("Hair style")),
             menuimage("actions/edit", l("Hair color")),
             menuimage("actions/edit", l("Race")),
@@ -55,7 +55,7 @@ function	script	BarberDebug	{
 
         switch (@menu)
         {
-            case 1: BarberChangeBodyType(); break;
+            case 1: BarberChangeGender(); break;
             case 2: setStyle; break;
             case 3: setColor; break;
             case 4: setRace; break;
diff --git a/npc/commands/debug-preset.txt b/npc/commands/debug-preset.txt
index 1fbad520..f72ce657 100644
--- a/npc/commands/debug-preset.txt
+++ b/npc/commands/debug-preset.txt
@@ -145,7 +145,7 @@ function	script	DoRoutine	{
                 .@base = readparam(bAgi);
                 statusup2 bAgi, parsev(.@base, .@args$[0], 1, 99) - .@base;
                 break;
-            case 98: /* b => body type */
+            case 98: /* b => gender */
                 .@desired_bt = max(1, min(3, .@a));
                 break;
             case 99: /* c => job */
@@ -225,9 +225,9 @@ function	script	DoRoutine	{
         }
     }
 
-    if (.@desired_bt && BodyType != .@desired_bt) {
+    if (.@desired_bt && Gender != .@desired_bt) {
         sleep2(500);
-        BodyType = .@desired_bt; // this forces a logout so we must be it last
+        Gender = .@desired_bt; // this forces a logout so we must be it last
     }
 
     return;