diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-03-06 12:58:55 -0700 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-06 12:58:55 -0700 |
| commit | 2a73e3544d6ac4d4f000c621753d70e8695e203c (patch) | |
| tree | b3784983e268ecf01a506229255116ac64fb0f57 /npc/014-1_Woodland | |
| parent | 7464175373616085130e0d2e3b9ddc8e0322f291 (diff) | |
| parent | 3226368a1cd36e4d6e47302493fe5e0e91dddef3 (diff) | |
| download | serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.gz serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.bz2 serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.tar.xz serverdata-2a73e3544d6ac4d4f000c621753d70e8695e203c.zip | |
Merge commit 'mainline/master'
Conflicts:
conf/magic.conf
Diffstat (limited to 'npc/014-1_Woodland')
| -rw-r--r-- | npc/014-1_Woodland/wedding-officiator.txt | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt index d17fc3b8..6e09af99 100644 --- a/npc/014-1_Woodland/wedding-officiator.txt +++ b/npc/014-1_Woodland/wedding-officiator.txt @@ -236,14 +236,25 @@ L_do_divorce: if (zeny < @divorce_cost) goto L_divorce_nomoney; + + if divorce(0) goto L_DidDivorce; + + mes "[Wedding Officiator]"; + mes "The officiator searches through her records for your partner."; + mes "\"I can't find your partner's record, you'll have to come back later.\""; + next; + + mes "[Server]"; + mes "You can only divorce if both you and your partner are logged in at the same time."; + close; + +L_DidDivorce: set zeny, zeny - @divorce_cost; - divorce; mes "[Wedding Officiator]"; mes "After collecting her fee, Wendy licks her quill and writes down some notes."; mes "Then she sighs heavily."; mes "\"You are divorced now. Thank you for your business.\""; - next; close; L_No_Room_For_Rings: |