summaryrefslogtreecommitdiff
path: root/npc/custom/etc/marriage.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/custom/etc/marriage.txt')
-rw-r--r--npc/custom/etc/marriage.txt52
1 files changed, 25 insertions, 27 deletions
diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt
index 00f44193a..0d25be9d5 100644
--- a/npc/custom/etc/marriage.txt
+++ b/npc/custom/etc/marriage.txt
@@ -4,8 +4,6 @@
//= AppleGirl, Evera
//===== Current Version: =====================================
//= 2.9
-//===== Compatible With: =====================================
-//= Hercules
//===== Description: =========================================
//= Fully working wedding script for all kind of weddings
//===== Additional Comments: =================================
@@ -14,7 +12,7 @@
// 2.9 Somewhat iRO-official NPC names [DracoRPG]
//============================================================
-// Configuration Variables:
+// Configuration Variables:
- script marriage_init -1,{
OnInit:
set $@wed_allow, 0; //If 1, allows same sex marriages.
@@ -32,7 +30,7 @@ OnInit:
// Other Configuration:
// Line 61,62: Priest location, sprite and name.
-// Line 437,438: Registration location, sprite and name.
+// Line 437,438: Registration location, sprite and name.
// Line 813,814: Divorcing location, sprite and name.
// Variable Notes:
@@ -54,7 +52,7 @@ OnInit:
// $@divorcee id of the partner, who has to accept the divorce and pay.
//The Priest - official iRO sprite & in-dialog name (on-map name not confirmed)
-prt_church,100,123,4 script Vomars 60,{
+prt_church,100,123,4 script Vomars 1_M_PASTOR,{
set @name$,"Vomars";
function SF_wed_end;
@@ -394,19 +392,19 @@ OnTimer55000:
//Subfunction: Checks that the groom/bride is still wearing their stuff.
function SF_equip_check {
- if (sex && getequipid(2) != 7170) {
+ if (Sex && getequipid(2) != 7170) {
mes "["+@name$+"]";
mes "Child, what did you do with your "+getitemname(7170)+"?";
emotion e_dots;
return 0;
}
- if (sex == 0 && getequipid(2) != 2338) {
+ if (Sex == 0 && getequipid(2) != 2338) {
mes "["+@name$+"]";
mes "Child, you are supposed to wear a "+getitemname(2338)+" at all times during the ceremony...";
emotion e_dots;
return 0;
}
- if (sex == 0 && $@wed_veil && getequipid(1) != 2206) {
+ if (Sex == 0 && $@wed_veil && getequipid(1) != 2206) {
mes "["+@name$+"]";
mes "Child, you can't take off your "+getitemname(2206)+" yet....";
emotion e_dots;
@@ -435,7 +433,7 @@ OnInit:
}
//Registration & Status
-prt_church,106,99,3 script Happy Marry 67,{
+prt_church,106,99,3 script Happy Marry 1_F_02,{
set @name$,"Marry";
if (getpartnerid() > 0) {
mes "["+@name$+"]";
@@ -489,7 +487,7 @@ function SF_Register {
mes "Very well, whom would you like to register as?";
next;
set @submenu, select("Groom","Bride","Cancel");
- } else if (sex) { //Groom
+ } else if (Sex) { //Groom
mes "["+@name$+"]";
mes "Very well, will you register as the Groom?";
next;
@@ -543,13 +541,13 @@ function SF_WedProgress {
}
if (strcharinfo(0) == $wed_bride$) {
mes "["+@name$+"]";
- if ($wed_groom_progress > 0)
+ if ($wed_groom_progress > 0)
mes "The Priest will handle the rest of the ceremony.";
else
mes "Tell your groom to register, what is taking so long? Time is running out.";
close;
}
- if (($wed_groom_progress == 0) && (sex == 1 || $@wed_allow == 1)) {
+ if (($wed_groom_progress == 0) && (Sex == 1 || $@wed_allow == 1)) {
mes "["+@name$+"]";
mes $wed_bride$+" is waiting for the groom to register. Are you the one who came to register as groom?";
next;
@@ -558,7 +556,7 @@ function SF_WedProgress {
stopnpctimer;
set $wed_groom_progress,1;
mes "["+@name$+"]";
- mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin.";
+ mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin.";
emotion e_no1;
close2;
npctalk "Registration finished. "+$wed_groom$+" and "+$wed_bride$+", please reaffirm your vows with the Priest.";
@@ -571,7 +569,7 @@ function SF_WedProgress {
}
}
- if (($wed_bride_progress == 0) && (sex == 0 || $@wed_allow == 1)) {
+ if (($wed_bride_progress == 0) && (Sex == 0 || $@wed_allow == 1)) {
mes "["+@name$+"]";
mes $wed_groom$+" is waiting for the bride to register. Are you the one who came to register as the bride?";
next;
@@ -579,7 +577,7 @@ function SF_WedProgress {
SF_TryRegister(1);
stopnpctimer;
mes "["+@name$+"]";
- mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin.";
+ mes "Very well, now go to the Priest to reaffirm your vows and the ceremony will begin.";
emotion e_no1;
close2;
npctalk "Registration finished. "+$wed_groom$+" and "+$wed_bride$+", please reaffirm your vows with the Priest.";
@@ -687,7 +685,7 @@ function SF_TryRegister {
emotion e_gasp;
close;
}
- if (sex)
+ if (Sex)
set @item, 7170;
else
set @item, 2338;
@@ -697,7 +695,7 @@ function SF_TryRegister {
mes "You should be wearing a "+getitemname(@item)+" if you want to get married.";
close;
}
- if (sex == 0 && $@wed_veil && getequipid(1) != 2206) {
+ if (Sex == 0 && $@wed_veil && getequipid(1) != 2206) {
mes "["+@name$+"]";
mes "Where is your "+getitemname(2206)+"? It's a necessary complement to your dress.";
close;
@@ -709,27 +707,27 @@ function SF_TryRegister {
}
if (@bride)
set @cost, $@wed_bride_reg;
- else
+ else
set @cost, $@wed_groom_reg;
if (Zeny < @cost) {
mes "["+@name$+"]";
mes "I am sorry, but you don't have enough to pay for the registration fee.";
- mes "Come back once you have collected "+@cost+"z.";
+ mes "Come back once you have collected "+@cost+"z.";
close;
}
- set Zeny,Zeny-@cost;
- sc_start SC_Wedding,3600000000,1; //Start Wedding Effect (SC_WEDDING)
+ Zeny -= @cost;
+ sc_start SC_WEDDING,3600000,1; //Start Wedding Effect (SC_WEDDING)
if (@bride) {
set $wed_bride_progress,1;
set $wed_bride$,strcharinfo(0);
- set $wed_bride_sex, sex;
+ set $wed_bride_sex, Sex;
if ($@wedding_effect == 1) //Store account id for effect.
set $wedding_effect_id, getcharid(3);
} else {
set $wed_groom_progress,1;
set $wed_groom$,strcharinfo(0);
- set $wed_groom_sex, sex;
+ set $wed_groom_sex, Sex;
if ($@wedding_effect == 2) //Store account id for effect.
set $wedding_effect_id, getcharid(3);
}
@@ -811,7 +809,7 @@ function SF_Procedure {
}
}
-prt_church,94,99,4 script Sister Lisa 79,{
+prt_church,94,99,4 script Sister Lisa 1_F_PRIEST,{
set @name$,"Lisa";
function SF_DivorceEnd;
@@ -866,7 +864,7 @@ prt_church,94,99,4 script Sister Lisa 79,{
mes "["+@name$+"]";
mes "You should think this through.";
close;
- }
+ }
mes "["+@name$+"]";
set $@divorcee,getpartnerid();
set $@divorcer$,strcharinfo(0);
@@ -879,7 +877,7 @@ prt_church,94,99,4 script Sister Lisa 79,{
end;
function SF_InProgress {
- if (strcharinfo(0) == $@divorcer$) {
+ if (strcharinfo(0) == $@divorcer$) {
mes "["+@name$+"]";
mes "...I am still waiting for your partner to confirm the divorce procedure.";
close;
@@ -913,7 +911,7 @@ function SF_InProgress {
emotion e_swt2;
close;
}
- set Zeny,Zeny-$@wed_divorce_fee;
+ Zeny -= $@wed_divorce_fee;
announce $@divorcer$+" has just divorced "+strcharinfo(0)+"...", 8;
mes "["+@name$+"]";
mes "Your divorce has been filed. You are no longer wed.";
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-30 11:05:17 +0000