diff options
Diffstat (limited to 'npc/other/marriage.txt')
| -rw-r--r-- | npc/other/marriage.txt | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index eca8001a6..bbd659420 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -330,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"; @@ -577,7 +577,7 @@ 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 == SEX_MALE) { @@ -590,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"; @@ -601,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; } @@ -648,11 +648,11 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ } else if ($@wedding == 1) { if (wedding_sign == 1) { - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; if (.@partymembercount == 2) { if (Sex == SEX_FEMALE) { - if (strcharinfo(0) == $@wed_bride$) { + if (strcharinfo(PC_NAME) == $@wed_bride$) { mes "[Vomars]"; mes "Young lovers, please"; mes "remember this moment for"; @@ -689,7 +689,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ mes "Will you marry "+$@wed_groom$+"?"; next; if (select("Yes, I do.", "^FF0000No.^000000") == 1) { - if (isloggedin(getcharid(3,$@wed_groom$))) { + if (isloggedin(getcharid(CHAR_ID_ACCOUNT,$@wed_groom$))) { if (marriage($@wed_groom$)) { //Call Wedding effect wedding; @@ -697,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]"; @@ -761,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"; |