From bc4deaf81d9701261baac6a10d762b0f40e7f65f Mon Sep 17 00:00:00 2001 From: mekolat Date: Thu, 11 Jun 2015 11:13:11 -0400 Subject: initial commit for magic v3 Fix Druid Tree and add hug to TMW --- world/map/npc/001-2/government_building.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'world/map/npc/001-2/government_building.txt') diff --git a/world/map/npc/001-2/government_building.txt b/world/map/npc/001-2/government_building.txt index 51b43a8c..03c3eaf7 100644 --- a/world/map/npc/001-2/government_building.txt +++ b/world/map/npc/001-2/government_building.txt @@ -6,7 +6,7 @@ mes "[Estard]"; mes "\"Hello. What can I do for you?\""; next; - if (getpartnerid2()) + if (PARTNER) goto L_main_married; menu @@ -35,7 +35,7 @@ L_marry_do: callsub S_give_rings; mes ""; mes "[Estard]"; - mes "\"Here are your rings. In order to marry each other, you both must stand within one of the designated areas (like that small rug over there in the corner), wear your rings, and say 'marry (your partner's name).'\""; + mes "\"Here are your rings. In order to marry each other, you both must stand within one of the designated areas (like that small rug over there in the corner), wear your rings, and say '#marry (your partner's name).'\""; close; L_marry_too_young: @@ -93,8 +93,8 @@ L_do_divorce: if (Zeny < @divorce_cost) goto L_not_enough_money; - if (divorce()) - goto L_divorce_done; + set PARTNER, 0, PARTNER; // divorce the partner first, which will also divorce the rid if succesful + if (PARTNER < 1) goto L_divorce_done; mes ""; mes "[Estard]"; -- cgit v1.2.3-60-g2f50