Add another wedding location

1 files changed, 11 insertions, 16 deletions

diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt
index 2cc50197..bd19c734 100644
--- a/npc/014-1_Woodland/wedding-officiator.txt
+++ b/npc/014-1_Woodland/wedding-officiator.txt
@@ -1,11 +1,6 @@
 // Wedding officiator:  Marriages and divorces
 
 014-1.gat,31,31,0	script	Wedding Officiator	164,{
-
-        set @WEDDING_FEE, 100;
-        set @DIVORCE_FEE_PER_LEVEL, 500;
-        set @WEDDING_MIN_LEVEL, 32;
-
 	mes "[Wedding Officiator]";
         mes "A young lady in a long, green dress is overseeing the park.  As she notices you looking at her, she gives you a broad and happy smile.";
         mes "\"Hi there!  I'm Wendy, here for all your marriage needs!\"";
@@ -32,10 +27,10 @@ L_explain_self:
 
 L_explain_marriage:
 	mes "[Wedding Officiator]";
-        mes "\"If you are sure that you are ready to get married, then first you come and talk to me here-- I need to register you, after all.  You will first have to pay me a small fee of " + @WEDDING_FEE + " GP.\"";
+        mes "\"If you are sure that you are ready to get married, then first you come and talk to me here-- I need to register you, after all.  You will first have to pay me a small fee of " + WEDDING_FEE + " GP.\"";
         next;
 	mes "[Wedding Officiator]";
-        mes "\"Both you and your partner must be at least " + @WEDDING_MIN_LEVEL + " levels of age, though; the law is very firm on that.  But if all of that works out, I will give you two wedding rings for the ceremony.\"";
+        mes "\"Both you and your partner must be at least " + WEDDING_MIN_LEVEL + " levels of age, though; the law is very firm on that.  But if all of that works out, I will give you two wedding rings for the ceremony.\"";
         next;
 	mes "[Wedding Officiator]";
         mes "\"To complete the marriage, each of you has to put on one of these rings, and you have to stand next to each other in the southern part of this park.  Then one of you says `marry' and then the other person's name.\"";
@@ -47,9 +42,9 @@ L_explain_marriage:
         goto L_main;
 
 L_get_married:
-        if (zeny < @WEDDING_FEE)
+        if (zeny < WEDDING_FEE)
            goto L_too_poor;
-        if (BaseLevel < @WEDDING_MIN_LEVEL)
+        if (BaseLevel < WEDDING_MIN_LEVEL)
            goto L_too_young;
 
 	mes "[Wedding Officiator]";
@@ -92,14 +87,14 @@ L_get_married:
              "This is taking too long.", L_end,
              "No.", L_end;
 
-        if (zeny < @WEDDING_FEE)
+        if (zeny < WEDDING_FEE)
            goto L_too_poor;
-        if (BaseLevel < @WEDDING_MIN_LEVEL)
+        if (BaseLevel < WEDDING_MIN_LEVEL)
            goto L_too_young;
 	getinventorylist;
 	if (@inventorylist_count > 98) goto L_No_Room_For_Rings;
 
-        set zeny, zeny - @WEDDING_FEE;
+        set zeny, zeny - WEDDING_FEE;
         getitem "WeddingRing", 1;
         getitem "WeddingRing", 1;
 
@@ -126,14 +121,14 @@ L_end:
 L_too_young:
 	mes "[Wedding Officiator]";
         mes "Wendy looks at her notes, shaking her head; pain is evident in her eyes.";
-        mes "\"I'm really, really sorry-- I wish I could allow that, but you are still too young.  You have to be at least " + @WEDDING_MIN_LEVEL + " levels of age.\"";
+        mes "\"I'm really, really sorry-- I wish I could allow that, but you are still too young.  You have to be at least " + WEDDING_MIN_LEVEL + " levels of age.\"";
         close;
 
 L_too_poor:
 	mes "[Wedding Officiator]";
         mes "\"Oh, this is so sad... you want to get married but don't have the money!\"";
         mes "Wendy is visibly unhappy.";
-        mes "\"I wish I could help you, but the rules... you see...  Well, I'm afraid that you will just have to come back when you have " + @WEDDING_FEE + " GP.\"";
+        mes "\"I wish I could help you, but the rules... you see...  Well, I'm afraid that you will just have to come back when you have " + WEDDING_FEE + " GP.\"";
         close;
 
 L_main_married:
@@ -211,7 +206,7 @@ L_loot:
         close;
 
 L_makesure_divorce:
-        set @divorce_cost, @DIVORCE_FEE_PER_LEVEL * BaseLevel;
+        set @divorce_cost, DIVORCE_FEE_PER_LEVEL * BaseLevel;
 
         mes "[Wedding Officiator]";
         mes "Resigned, Wendy looks down at her notes.";
@@ -241,7 +236,7 @@ L_do_divorce:
 	next;
 
         mes "[Server]";
-        mes "You can only divorce if both you and your partner are logged in at the same time.";
+        mes "Try again when your partner is online too.";
 	close;
 
 L_DidDivorce: