From 05a2538114972de94352e66586f6f2a5affea9c6 Mon Sep 17 00:00:00 2001 From: Emistry Date: Mon, 25 Jan 2016 23:00:26 +0800 Subject: Replaced the SEX_FEMALE/SEX_MALE constants to scripts, where appropriate --- npc/other/Global_Functions.txt | 5 ++++- npc/other/divorce.txt | 10 +++++----- npc/other/marriage.txt | 18 ++++++++---------- 3 files changed, 17 insertions(+), 16 deletions(-) (limited to 'npc/other') diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt index 8f7899555..1e431b7d8 100644 --- a/npc/other/Global_Functions.txt +++ b/npc/other/Global_Functions.txt @@ -160,7 +160,10 @@ function script F_Rand { // Returns 1st argument if female, 2nd argument otherwise // Example: mes callfunc("F_Sex","What a beautiful lady!","What a handsome man!"); function script F_SexMes { - return getarg(Sex); + if (Sex == SEX_MALE) + return getarg(0); + else + return getarg(1); } //== Function F_Hi ========================================= diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt index e0535e250..dd4bad6b6 100644 --- a/npc/other/divorce.txt +++ b/npc/other/divorce.txt @@ -58,7 +58,7 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{ if (!getpartnerid()) { mes "Bwah hah hah~!"; mes "That look in your eyes~!"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Those are definitely the eyes"; mes "of a lonely male bachelor."; mes "I'm almost 100 percent sure"; @@ -90,7 +90,7 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{ mes "I sense that you carry a"; mes "tiresome burden..."; mes "If I'm not wrong, you're"; - if (Sex) + if (Sex == SEX_MALE) mes "a married man, aren't you?"; else mes "a married woman, aren't you?"; @@ -113,7 +113,7 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{ mes "At the end of the day, you and"; mes "your partner fight, and you feel"; mes "totally totally miserable."; - if (Sex) + if (Sex == SEX_MALE) mes "...all because of HER."; else mes "...all because of HIM."; @@ -137,7 +137,7 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{ mes "[Deviruchi]"; mes "*whispers*"; mes "^555555It's not like you're breaking^000000"; - if (Sex) { + if (Sex == SEX_MALE) { mes "^555555any promises, and it's not"; mes "like your wife will care if she"; mes "doesn't know... Don't you"; @@ -185,7 +185,7 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{ mes "[Deviruchi]"; mes "I understand. But if you think"; mes "about anything, think about"; - if (Sex) { + if (Sex == SEX_MALE) { mes "your wife's nagging, and"; mes "how great it would be to"; mes "finally free yourself of the"; diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index 0795e2606..7522c4242 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -199,7 +199,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ case 3: cutin "wedding_marry02",2; - if (Sex) { + if (Sex == SEX_MALE) { mes "[Marry Happy]"; mes "So you'd like to get married?"; mes "As a groom, you need to prepare"; @@ -273,8 +273,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "Look for it carefully and come"; mes "back after you find it, okay?"; goto L_End; - } - else if (Sex) { + } else if (Sex == SEX_MALE) { if (Zeny < 1300000) { mes "[Marry Happy]"; mes "I'm sorry, but you don't"; @@ -294,8 +293,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "begin the wedding, okay?"; goto L_End; } - } - else if (Sex == 0) { + } else if (Sex == SEX_FEMALE) { if (Zeny < 1200000) { mes "[Marry Happy]"; mes "I'm sorry, but all brides"; @@ -359,7 +357,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ emotion e_lv; next; mes "[Marry Happy]"; - if (Sex) { + if (Sex == SEX_MALE) { mes "Since you're the groom,"; mes "you need to speak to the"; mes "Bishop first. When you're"; @@ -582,7 +580,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ getpartymember(getcharid(1)); .@partymembercount = $@partymembercount; if (.@partymembercount == 2) { - if (Sex) { + if (Sex == SEX_MALE) { $@wedding = 1; initnpctimer; mes "[Vomars]"; @@ -653,7 +651,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ getpartymember(getcharid(1)); .@partymembercount = $@partymembercount; if (.@partymembercount == 2) { - if (Sex == 0) { + if (Sex == SEX_FEMALE) { if (strcharinfo(0) == $@wed_bride$) { mes "[Vomars]"; mes "Young lovers, please"; @@ -893,7 +891,7 @@ prt_church,20,179,4 script Divorce Staff 1_F_LIBRARYGIRL,{ next; switch(select("Drop 1 Wedding Ring.", "Keep it.")) { case 1: - .@ring = (Sex)?2634:2635; //Bridegroom_Ring, Bride_Ring + .@ring = (Sex == SEX_MALE) ? 2634 : 2635; //Bridegroom_Ring, Bride_Ring if (countitem(.@ring)) { delitem .@ring,1; mes "[Bad Ending]"; @@ -948,7 +946,7 @@ prt_church,22,179,4 script Remarry Staff 1_F_LIBRARYGIRL,{ next; switch(select("Make new Wedding Ring.", "Cancel.")) { case 1: - .@ring = (Sex)?2634:2635; //Bridegroom_Ring, Bride_Ring + .@ring = (Sex == SEX_MALE) ? 2634 : 2635; //Bridegroom_Ring, Bride_Ring if (countitem(.@ring) || isequipped(.@ring)) { mes "[Wedding Again]"; mes "Wait, wait..."; -- cgit v1.2.3-60-g2f50