diff options
Diffstat (limited to 'npc/other/marriage.txt')
| -rw-r--r-- | npc/other/marriage.txt | 96 |
1 files changed, 47 insertions, 49 deletions
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index 6fa8e63eb..0f640af2a 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -50,7 +50,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "marriage. Now, did you"; mes "have any questions?"; next; - if (select("I want to get married.:I don't need your help!") == 1) { + if (select("I want to get married.", "I don't need your help!") == 1) { mes "[Marry Happy]"; mes "Oh, I'm sorry, but"; mes "adopted characters"; @@ -58,7 +58,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "married. For now, why"; mes "don't you enjoy the simple"; mes "pleasures of childhood?"; - goto L_End; + callsub L_End; } mes "[Marry Happy]"; mes "Oh, of course you"; @@ -67,7 +67,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "are too many laws against"; mes "that~ Aren't you the most"; mes "adorable little thing?"; - goto L_End; + callsub L_End; } mes "[Marry Happy]"; mes "Marriage is the beautiful"; @@ -77,7 +77,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "Is there a special someone"; mes "like that in your life?"; next; - switch(select("Ask about Wedding Ceremony:Ask about Procedure:Apply for Wedding:We are the Invincible Single Army!")) { + switch(select("Ask about Wedding Ceremony", "Ask about Procedure", "Apply for Wedding", "We are the Invincible Single Army!")) { case 1: mes "[Marry Happy]"; mes "Wise and benevolent"; @@ -130,7 +130,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "speak to the Bishop and tell"; mes "him the name of her groom."; mes "If these names are correctly"; - mes "told to the Biship, they will"; + mes "told to the Bishop, they will"; mes "be able to exchange rings."; next; mes "[Marry Happy]"; @@ -158,7 +158,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "Vomars after their grooms"; mes "have finished speaking to him."; next; - if (select("Thanks, that helps a lot!:Easiest way to say my partner's name?") == 1) { + if (select("Thanks, that helps a lot!", "Easiest way to say my partner's name?") == 1) { mes "[Marry Happy]"; mes "Well, I'm here to help"; mes "weddings proceed as"; @@ -166,7 +166,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "If there was something"; mes "you didn't understand,"; mes "feel free to ask me again."; - goto L_End; + callsub L_End; } mes "[Marry Happy]"; mes "The easiest way to write"; @@ -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"; @@ -232,7 +232,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "Now, would you like to"; mes "apply for marriage?"; next; - if (select("Yes:No") == 1) { + if (select("Yes", "No") == 1) { if (getpartnerid()) { cutin "wedding_marry02",2; mes "[Marry Happy]"; @@ -262,7 +262,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "you can consider marriage."; mes "After you grow stronger,"; mes "come and talk to me again."; - goto L_End; + callsub L_End; } else if (countitem(Diamond_Ring) < 1) { mes "[Marry Happy]"; @@ -272,9 +272,8 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "during the wedding ceremony?"; mes "Look for it carefully and come"; mes "back after you find it, okay?"; - goto L_End; - } - else if (Sex) { + callsub L_End; + } else if (Sex == SEX_MALE) { if (Zeny < 1300000) { mes "[Marry Happy]"; mes "I'm sorry, but you don't"; @@ -282,7 +281,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "that all grooms must pay"; mes "for the wedding ceremony."; mes "Did you misplace your money?"; - goto L_End; + callsub L_End; } else if (countitem(Tuxedo) < 1) { mes "[Marry Happy]"; @@ -292,10 +291,9 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "ceremony! Find it, bring it"; mes "to me, and then we can finally"; mes "begin the wedding, okay?"; - goto L_End; + callsub L_End; } - } - else if (Sex == 0) { + } else if (Sex == SEX_FEMALE) { if (Zeny < 1200000) { mes "[Marry Happy]"; mes "I'm sorry, but all brides"; @@ -304,7 +302,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "wedding ceremony. Perhaps"; mes "you could ask your partner"; mes "to help you with the funds?"; - goto L_End; + callsub L_End; } else if (countitem(Wedding_Dress) < 1) { mes "[Marry Happy]"; @@ -314,7 +312,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ mes "bring it to me-- you"; mes "absolutely need it"; mes "for the wedding!"; - goto L_End; + callsub L_End; } } mes "[Marry Happy]"; @@ -332,7 +330,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ next; while(1) { input .@name$; - if (.@name$ == strcharinfo(0)) + if (.@name$ == strcharinfo(PC_NAME)) break; mes "[Marry Happy]"; mes "Hmmm, you have to write"; @@ -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"; @@ -381,7 +379,7 @@ prt_church,97,100,4 script Wedding Staff#w 1_F_LIBRARYGIRL,{ } delitem Diamond_Ring,1; wedding_sign = 1; - goto L_End; + callsub L_End; } mes "[Marry Happy]"; mes "No...?"; @@ -579,10 +577,10 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ if (!getpartnerid()) { if (!$@wedding) { if (wedding_sign == 1) { - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; if (.@partymembercount == 2) { - if (Sex) { + if (Sex == SEX_MALE) { $@wedding = 1; initnpctimer; mes "[Vomars]"; @@ -592,7 +590,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ mes "and joy. May the love you share"; mes "grow with each passing day."; next; - mapannounce "prt_church","It's the marriage proposal from the groom, Mr. " + strcharinfo(0) + "...",bc_map; + mapannounce "prt_church","It's the marriage proposal from the groom, Mr. " + strcharinfo(PC_NAME) + "...",bc_map; mes "[Vomars]"; mes "Until the end of the"; mes "world, may you stand"; @@ -603,21 +601,21 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ next; input $@wed_bride$; mes "[Vomars]"; - mes "Mr. " + strcharinfo(0) + "..."; + mes "Mr. " + strcharinfo(PC_NAME) + "..."; mes "Do you swear on your life"; mes "that you will forever cherish"; mes "and care for your bride,"; mes "Miss " + $@wed_bride$ + "?"; next; select("I do."); - $@wed_groom$ = strcharinfo(0); + $@wed_groom$ = strcharinfo(PC_NAME); mes "[Vomars]"; mes "Now, it is time for"; mes "your bride to make"; mes "her wedding vows."; mes "If she will come forward..."; close2; - mapannounce "prt_church","The groom, Mr. " + strcharinfo(0) + ", has made his vows to Miss " + $@wed_bride$ + "...",bc_map; + mapannounce "prt_church","The groom, Mr. " + strcharinfo(PC_NAME) + ", has made his vows to Miss " + $@wed_bride$ + "...",bc_map; cutin "",255; end; } @@ -628,7 +626,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ mes "It's old fashioned protocol,"; mes "but I'll admit that it does"; mes "keep things running smoothly."; - goto L_End; + callsub L_End; } mes "[Vomars]"; mes "Before you can be"; @@ -637,7 +635,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ mes "two with your partner."; mes "Then, we can proceed"; mes "with the ceremony."; - goto L_End; + callsub L_End; } mes "[Vomars]"; mes "You must apply for"; @@ -646,15 +644,15 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ mes "Happy Marry will let you know"; mes "what else you'll need to do"; mes "to prepare for marriage."; - goto L_End; + callsub L_End; } else if ($@wedding == 1) { if (wedding_sign == 1) { - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; if (.@partymembercount == 2) { - if (Sex == 0) { - if (strcharinfo(0) == $@wed_bride$) { + if (Sex == SEX_FEMALE) { + if (strcharinfo(PC_NAME) == $@wed_bride$) { mes "[Vomars]"; mes "Young lovers, please"; mes "remember this moment for"; @@ -670,7 +668,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ mes "to be by his side, no matter"; mes "what the dangers may be?"; next; - if (select("^FF0000No.^000000:I do.") == 1) { + if (select("^FF0000No.^000000", "I do.") == 1) { cutin "wedding_bomars03",2; mapannounce "prt_church","Next couple, please proceed...",bc_map; mes "[Vomars]"; @@ -690,8 +688,8 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ mes "fidelity and patience?"; mes "Will you marry "+$@wed_groom$+"?"; next; - if (select("Yes, I do.:^FF0000No.^000000") == 1) { - if (isloggedin(getcharid(3,$@wed_groom$))) { + if (select("Yes, I do.", "^FF0000No.^000000") == 1) { + if (isloggedin(getcharid(CHAR_ID_ACCOUNT,$@wed_groom$))) { if (marriage($@wed_groom$)) { //Call Wedding effect wedding; @@ -699,12 +697,12 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ sc_start SC_WEDDING,3600000,1; getitem Bride_Ring,1; //Give ring to Groom, and change to wedding sprite. - attachrid(getcharid(3,$@wed_groom$)); + attachrid(getcharid(CHAR_ID_ACCOUNT,$@wed_groom$)); sc_start SC_WEDDING,3600000,1; getitem Bridegroom_Ring,1; detachrid; //Switch Script progression back to Bride - attachrid(getcharid(3,$@wed_bride$)); + attachrid(getcharid(CHAR_ID_ACCOUNT,$@wed_bride$)); cutin "wedding_bomars02",2; mapannounce "prt_church","I now pronounce you, "+$@wed_groom$+" and "+$@wed_bride$+", husband and wife.",bc_map; mes "[Vomars]"; @@ -736,7 +734,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ mes "the ceremony has finished"; mes "Please try again once he's"; mes "returned."; - goto L_End; + callsub L_End; } else { cutin "wedding_bomars03",2; @@ -763,7 +761,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ } callsub S_Busy; } - if (strcharinfo(0) == $@wed_bride$) { + if (strcharinfo(PC_NAME) == $@wed_bride$) { mes "[Vomars]"; mes "Hm? It appears that"; mes "Happy Marry still hasn't"; @@ -771,7 +769,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ mes "application. Please speak"; mes "to her so that we can begin"; mes "the wedding ceremony."; - goto L_End; + callsub L_End; } callsub S_Busy; } @@ -798,14 +796,14 @@ S_Busy: mes "Mister "+ $@wed_groom$; mes "is currently in progress."; mes "Please keep your voice down."; - goto L_End; + callsub L_End; } mes "[Vomars]"; mes "I'm conducting a wedding"; mes "for another couple now, so"; mes "please wait patiently for your"; mes "turn. Thanks for understanding... "; - goto L_End; + callsub L_End; OnStop: stopnpctimer; @@ -847,7 +845,7 @@ prt_church,28,178,4 script The King of Midgart 1_M_PRON_KING,{ mes "I can reset the Bishop"; mes "Vomars NPC if you like."; next; - switch(select("No, thanks:RESET")) { + switch(select("No, thanks", "RESET")) { case 1: mes "[Wedding Switch]"; mes "Alright, then."; @@ -891,9 +889,9 @@ prt_church,20,179,4 script Divorce Staff 1_F_LIBRARYGIRL,{ mes "Wedding Ring in your"; mes "inventory?"; next; - switch(select("Drop 1 Wedding Ring.:Keep it.")) { + 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]"; @@ -946,9 +944,9 @@ prt_church,22,179,4 script Remarry Staff 1_F_LIBRARYGIRL,{ mes "lost your Wedding Ring,"; mes "I can make you a new one."; next; - switch(select("Make new Wedding Ring.:Cancel.")) { + 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..."; |