From b6e53c58c1f0562bc6d552cbd81e5704569fdc17 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 23 Feb 2009 11:01:30 -0700 Subject: Fix close bug in Taro --- npc/014-1_Woodland/taro.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'npc/014-1_Woodland') diff --git a/npc/014-1_Woodland/taro.txt b/npc/014-1_Woodland/taro.txt index 3ec76163..34db26b9 100644 --- a/npc/014-1_Woodland/taro.txt +++ b/npc/014-1_Woodland/taro.txt @@ -69,6 +69,6 @@ L_Tree: close; L_Warp: + close2; warp "019-1.gat",56,61; - close; } -- cgit v1.2.3-60-g2f50 From 3ea6b851ee7462f0ecc83b1d7e4f539f48aa502f Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Tue, 24 Feb 2009 18:06:02 -0700 Subject: Fix Taro for older clients --- npc/014-1_Woodland/taro.txt | 2 +- npc/019-1_Snow_field/taro.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'npc/014-1_Woodland') diff --git a/npc/014-1_Woodland/taro.txt b/npc/014-1_Woodland/taro.txt index 34db26b9..3ec76163 100644 --- a/npc/014-1_Woodland/taro.txt +++ b/npc/014-1_Woodland/taro.txt @@ -69,6 +69,6 @@ L_Tree: close; L_Warp: - close2; warp "019-1.gat",56,61; + close; } diff --git a/npc/019-1_Snow_field/taro.txt b/npc/019-1_Snow_field/taro.txt index c84e4e86..f2170390 100644 --- a/npc/019-1_Snow_field/taro.txt +++ b/npc/019-1_Snow_field/taro.txt @@ -67,6 +67,6 @@ L_Tree: close; L_Warp: - close2; warp "014-1.gat", 52, 45; + close; } -- cgit v1.2.3-60-g2f50 From 9480d6bb5c30feb915407c23bc9daee91cbc3381 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sun, 1 Mar 2009 12:08:48 -0700 Subject: Only take GP when divorce was successful --- npc/014-1_Woodland/wedding-officiator.txt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'npc/014-1_Woodland') diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt index 662aafc6..6b7ace7e 100644 --- a/npc/014-1_Woodland/wedding-officiator.txt +++ b/npc/014-1_Woodland/wedding-officiator.txt @@ -236,14 +236,24 @@ L_do_divorce: if (zeny < @divorce_cost) goto L_divorce_nomoney; + if (divorce()) 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: -- cgit v1.2.3-60-g2f50 From 3226368a1cd36e4d6e47302493fe5e0e91dddef3 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Sun, 1 Mar 2009 12:20:01 -0700 Subject: Fix some bugs in the marriage scrcipts --- conf/magic.conf | 1 + npc/014-1_Woodland/wedding-officiator.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'npc/014-1_Woodland') diff --git a/conf/magic.conf b/conf/magic.conf index 390df589..e0fb308c 100644 --- a/conf/magic.conf +++ b/conf/magic.conf @@ -573,6 +573,7 @@ NONMAGIC SILENT SPELL marriage (target : PC) : "marry" = L_yes: if marriage(@caster_name$) announce @caster_name$ + " and " + strcharinfo(0) + " are now married!", 0; + close; } IF not (is_married(caster)) diff --git a/npc/014-1_Woodland/wedding-officiator.txt b/npc/014-1_Woodland/wedding-officiator.txt index 6b7ace7e..20c7297e 100644 --- a/npc/014-1_Woodland/wedding-officiator.txt +++ b/npc/014-1_Woodland/wedding-officiator.txt @@ -236,7 +236,8 @@ L_do_divorce: if (zeny < @divorce_cost) goto L_divorce_nomoney; - if (divorce()) goto L_DidDivorce; + + if divorce(0) goto L_DidDivorce; mes "[Wedding Officiator]"; mes "The officiator searches through her records for your partner."; -- cgit v1.2.3-60-g2f50