Replaced the SEX_FEMALE/SEX_MALE constants to scripts, where appropriate

4 files changed, 52 insertions, 52 deletions

diff --git a/npc/merchants/cash_hair.txt b/npc/merchants/cash_hair.txt
index 6d0d1f3d5..eecdc985b 100644
--- a/npc/merchants/cash_hair.txt
+++ b/npc/merchants/cash_hair.txt
@@ -41,7 +41,7 @@ itemmall,19,74,5	script	Stylist#cash	4_F_02,{
 	mes "Give me a ^FF0000New Style Coupon^000000,";
 	mes "and I'll change your hair~";
 	next;
-	if (Sex == 1) {
+	if (Sex == SEX_MALE) {
 		mes "[Kaniki]";
 		mes "I have two special";
 		mes "hairstyles for men, the";
@@ -101,7 +101,7 @@ itemmall,19,74,5	script	Stylist#cash	4_F_02,{
 			mes "Alright, which hairstyle";
 			mes "did you want to have?";
 			next;
-			if (Sex == 1) {
+			if (Sex == SEX_MALE) {
 				if(select("Emergency Heal Perm", "Aura Blade Cut") == 1) {
 					delitem New_Style_Coupon,1;	// New_Style_Coupon
 					setlook 1,24;
diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt
index f0b20256f..431a51cab 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -89,40 +89,40 @@ function Dyes;
 			// Colors: [1]Orange, [2]Violet, [3]Red, [4]Black, [5]Green, [6]Blue, [7]White, [8]Yellow
 			switch(BaseJob) {
 			case Job_Novice:
-				if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,3,2,5,3,4,4);
+				if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(6,1,3,2,5,3,4,4);
 			case Job_Swordman:
-				if (Sex) Dyes(4,1,6,2,5,3); else Dyes(3,1,5,3,4,4);
+				if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(3,1,5,3,4,4);
 			case Job_Mage:
-				if (Sex) Dyes(3,1,2,2,1,3,7,4); else Dyes(3,1,2,2,7,3,4,4);
+				if (Sex == SEX_MALE) Dyes(3,1,2,2,1,3,7,4); else Dyes(3,1,2,2,7,3,4,4);
 			case Job_Archer:
-				if (Sex) Dyes(4,1,2,2,5,3); else Dyes(3,1,5,2,7,3,4,4);
+				if (Sex == SEX_MALE) Dyes(4,1,2,2,5,3); else Dyes(3,1,5,2,7,3,4,4);
 			case Job_Acolyte:
-				if (Sex) Dyes(6,1,3,2,7,3,4,4); else Dyes(3,1,5,3,4,4);
+				if (Sex == SEX_MALE) Dyes(6,1,3,2,7,3,4,4); else Dyes(3,1,5,3,4,4);
 			case Job_Merchant:
-				if (Sex) Dyes(4,1,6,2,5,3); else Dyes(2,1,5,3,4,4);
+				if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(2,1,5,3,4,4);
 			case Job_Thief:
-				if (Sex) Dyes(5,1,3,2,7,4); else Dyes(3,1,7,3,4,4);
+				if (Sex == SEX_MALE) Dyes(5,1,3,2,7,4); else Dyes(3,1,7,3,4,4);
 			case Job_Knight:
 			case Job_Crusader:
-				if (Sex) Dyes(2,1,3,3,4,4); else Dyes(6,1,7,3,4,4);
+				if (Sex == SEX_MALE) Dyes(2,1,3,3,4,4); else Dyes(6,1,7,3,4,4);
 			case Job_Priest:
 			case Job_Monk:
-				if (Sex) Dyes(6,1,5,2,3,3,7,4); else Dyes(3,1,5,2,7,3,4,4);
+				if (Sex == SEX_MALE) Dyes(6,1,5,2,3,3,7,4); else Dyes(3,1,5,2,7,3,4,4);
 			case Job_Wizard:
 			case Job_Sage:
-				if (Sex) Dyes(6,1,5,3,4,4); else Dyes(3,1,6,2,7,3,5,4);
+				if (Sex == SEX_MALE) Dyes(6,1,5,3,4,4); else Dyes(3,1,6,2,7,3,5,4);
 			case Job_Blacksmith:
 			case Job_Alchemist:
-				if (Sex) Dyes(4,4,5,2,7,3); else Dyes(3,1,5,2,2,3,4,4);
+				if (Sex == SEX_MALE) Dyes(4,4,5,2,7,3); else Dyes(3,1,5,2,2,3,4,4);
 			case Job_Hunter:
 			case Job_Bard:
 			case Job_Dancer:
-				if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,5,3,2,4);
+				if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(6,1,5,3,2,4);
 			case Job_Assassin:
 			case Job_Rogue:
-				if (Sex) Dyes(6,1); else Dyes(4,1,8,2,7,3);
+				if (Sex == SEX_MALE) Dyes(6,1); else Dyes(4,1,8,2,7,3);
 			case Job_SuperNovice:
-				if (Sex) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4);
+				if (Sex == SEX_MALE) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4);
 			default:
 				mes "Wow, I've never seen clothes like that before! I'm sorry, but I don't think I can paint it.";
 				close;
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index 62916ac28..bd07727fb 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -41,15 +41,15 @@ prt_in,243,168,4	script	Jovovich	4_F_02,{
 	mes "How may I help you?";
 	next;
 	mes "[Hairdresser Jovovich]";
-	if (Sex) mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come.";
-	else {
-		if (rand(20) > 11) {
-			mes "Eh!? Oh my! Oh no no no no! Your hair is sooo damaged! It's not good if you leave your hair like this.";
-			next;
-			mes "[Hairdresser Jovovich]";
-			mes "Would you let me treat your hair? Please?";
-		}
-		else mes "Wow! Your hair would be perfect once it's dyed~ How about dying your hair for a change?";
+	if (Sex == SEX_MALE) {
+		mes "Oh, no! Your hair is damaged. It seems as if you may need professional treatment. Come sit over here, please. Come.";
+	} else if (rand(20) > 11) {
+		mes "Eh!? Oh my! Oh no no no no! Your hair is sooo damaged! It's not good if you leave your hair like this.";
+		next;
+		mes "[Hairdresser Jovovich]";
+		mes "Would you let me treat your hair? Please?";
+	} else {
+		mes "Wow! Your hair would be perfect once it's dyed~ How about dying your hair for a change?";
 	}
 	next;
 	while(1) {
@@ -176,7 +176,7 @@ S_NoDye:
 //== Lighthalzen ===========================================
 lhz_in02,100,134,3	script	Hair Dyer#lich	4_F_EINWOMAN,{
 	mes "[Rossa]";
-	if (Sex == 1) {
+	if (Sex == SEX_MALE) {
 		mes "Welcome, come in~";
 		mes "Oh, I see that you take";
 		mes "much better care of your";
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index 83db489ae..f940a5982 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -73,7 +73,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 			mes "[Veronica]";
 			switch(.@style) {
 			case 1:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Play Dead' style!";
 					mes "It's a nice, basic haircut.";
 					mes "I notice that usually the";
@@ -89,7 +89,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "choice for Novices.";
 					close2; cutin "",255; end;
 			case 2:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's the 'Two Handed Sword";
 					mes "Mastery' style! It's perfect for";
 					mes "for Swordmen who might muss their";
@@ -105,7 +105,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "while wildly flailing a sword.";
 					close2; cutin "",255; end;
 			case 3:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Napalm Beat' style!";
 					mes "It's a unique look with a hint";
 					mes "of eccentricity that's offset";
@@ -119,7 +119,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "off the boys with their spells.";
 					close2; cutin "",255; end;
 			case 4:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's the 'Double Strafe'";
 					mes "style! The arrangement of the";
 					mes "hair conducts ambient static";
@@ -136,7 +136,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "granny-style hairbuns.";
 					close2; cutin "",255; end;
 			case 5:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Angelus' style!";
 					mes "It's for calm and devout people,";
 					mes "as well as those bashful,";
@@ -151,7 +151,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "is also practical in battle.";
 					close2; cutin "",255; end;
 			case 6:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Push Cart' style!";
 					mes "It was based on the design of a";
 					mes "cart...at least, that's what";
@@ -164,7 +164,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "it's also economical.";
 					close2; cutin "",255; end;
 			case 7:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Ooh, that's 'Envenom' style!";
 					mes "It looks great on Thieves and";
 					mes "and Assassins when they're";
@@ -180,7 +180,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "some cute guy.";
 					close2; cutin "",255; end;
 			case 8:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Bowling Bash' style!";
 					mes "A popular style for Knights, its";
 					mes "manly, rugged look tends to";
@@ -197,7 +197,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "to fighting with their hands.";
 					close2; cutin "",255; end;
 			case 9:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Venom Dust' style!";
 					mes "Definitely a look for rebels,";
 					mes "the sweeping, yet decidedly";
@@ -213,7 +213,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "...Although, it acutally doesn't.";
 					close2; cutin "",255; end;
 			case 10:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Turn Undead' style!";
 					mes "This is popular among Priests";
 					mes "that want a serious, yet a bit";
@@ -229,7 +229,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "make their hair to stick out anyway.";
 					close2; cutin "",255; end;
 			case 11:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Dragonology' style!";
 					mes "It's neat and clean cut, perfect";
 					mes "for studious people and looks";
@@ -246,7 +246,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "religious services.";
 					close2; cutin "",255; end;
 			case 12:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Mace Mastery' style!";
 					mes "A lot of care goes into making";
 					mes "that tussled hair say, 'I don't";
@@ -261,7 +261,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "stockings...";
 					close2; cutin "",255; end;
 			case 13:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Thunder Storm' style!";
 					mes "This hot, flamboyant hairstyle";
 					mes "flares out wildly like thunder.";
@@ -276,7 +276,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "that it can't be cute.";
 					close2; cutin "",255; end;
 			case 14:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Encore' style!";
 					mes "The elegant, flowing locks";
 					mes "fit well with Bards, or men who";
@@ -291,7 +291,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "with glasses.";
 					close2; cutin "",255; end;
 			case 15:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Grimtooth' style!";
 					mes "Spiky and unkempt, this style";
 					mes "is a popular counterculture";
@@ -308,7 +308,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "foreheads and cheekbones.";
 					close2; cutin "",255; end;
 			case 16:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Blitz Beat' style!";
 					mes "A funky and lively fashion,";
 					mes "this style was developed for a";
@@ -325,7 +325,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "lets their hair get trapped?";
 					close2; cutin "",255; end;
 			case 17:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Find Ore' style!";
 					mes "It's a practical, economical look";
 					mes "that is popular among Blacksmiths.";
@@ -342,7 +342,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "Blacksmith favorite.";
 					close2; cutin "",255; end;
 			case 18:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Fire Pillar' style!";
 					mes "It's a trendy look, in which";
 					mes "you cover one eye for that";
@@ -359,7 +359,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 					mes "looks great with Mage Hats.";
 					close2; cutin "",255; end;
 			case 19:
-				if(Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "Oh, that's 'Guillotine Fist'";
 					mes "style! The smooth, slicked back";
 					mes "pompadour shows that you're";
@@ -529,7 +529,7 @@ alberta_in,55,142,7	script	Hair Dresser	4_F_02,{
 	}
 
 L_cutin:
-	if(Sex == 1) {
+	if (Sex == SEX_MALE) {
 		if(getarg(0) < 10)
 			cutin "hair_m_0"+getarg(0),4;
 		else
@@ -725,7 +725,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	2_M_DYEINGER,{
 		next;
 		switch(select("Old Hairstyles", "New Hairstyles")) {
 		case 1:
-			if (Sex == 1) {
+			if (Sex == SEX_MALE) {
 				switch(select("Petite Style", "Executioner Style", "Prince Style", "Deviace Style", "Cancel")) {
 				case 1:
 					cutin "hair_m_20",4;
@@ -830,7 +830,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	2_M_DYEINGER,{
 			}
 			break;
 		case 2:
-			if (Sex == 1) {
+			if (Sex == SEX_MALE) {
 				switch(select("Emergency Heal Perm", "Aura Blade Cut", "Power Swing", "Renovatio Cut", "Cancel")) {
 				case 1:
 					cutin "hair_m_24",4;
@@ -955,7 +955,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	2_M_DYEINGER,{
 		mes "Here's a list of the style names just in case you need them~";
 		next;
 		mes "[Prince Shammi]";
-		if (Sex == 1) {
+		if (Sex == SEX_MALE) {
 			mes "No. 20: Petite Style";
 			mes "No. 21: Executioner Style";
 			mes "No. 22: Prince Style";
@@ -1006,7 +1006,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	2_M_DYEINGER,{
 			close;
 		}
 		else {
-			if (Sex == 1)
+			if (Sex == SEX_MALE)
 				cutin "hair_m_"+.@input+".BMP",4;
 			else
 				cutin "hair_f_"+.@input+".BMP",4;
@@ -1079,7 +1079,7 @@ lhz_in02,100,143,3	script	Hair Dresser#li	2_M_DYEINGER,{
 				mes "And my, oh my, you look even";
 				mes "more fabulous that I thought";
 				mes "you would! Oh, I can't believe";
-				if (Sex == 1) {
+				if (Sex == SEX_MALE) {
 					mes "how tough and elegant you are~";
 					mes "So ruggedly manly and handsome!";
 				}
@@ -1221,7 +1221,7 @@ lhz_in02,91,155,5	script	Assistant Beautician#li	4_F_LGTGIRL,{
 					mes "So this is the";
 					mes "style you want me";
 					mes "to try to do for you?";
-					if (Sex == 1) {
+					if (Sex == SEX_MALE) {
 						if (.@input < 10)
 							cutin "hair_m_0"+.@input+".BMP",4;
 						else