summaryrefslogtreecommitdiff
path: root/npc/other/marriage.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/other/marriage.txt')
-rw-r--r--npc/other/marriage.txt38
1 files changed, 18 insertions, 20 deletions
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index 6fa8e63eb..eca8001a6 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";
@@ -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";
@@ -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]";
@@ -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";
@@ -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,7 +688,7 @@ 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 (select("Yes, I do.", "^FF0000No.^000000") == 1) {
if (isloggedin(getcharid(3,$@wed_groom$))) {
if (marriage($@wed_groom$)) {
//Call Wedding effect
@@ -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...";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-08-16 09:19:12 +0000