diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:42:48 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-19 09:42:48 -0400 |
| commit | ea7d999c39ead96efb6d9af7e68794c59290cf60 (patch) | |
| tree | 771e06363fe2e7609847a0a63a2e499632d3d7a2 /world/map/npc/001-2/government_building.txt | |
| parent | 9e7f46ac732851c1359a15837c82ebf67ea2be39 (diff) | |
| parent | 91fe3711fcacdfe83794b4347595e56e90e9d3a7 (diff) | |
| download | serverdata-ea7d999c39ead96efb6d9af7e68794c59290cf60.tar.gz serverdata-ea7d999c39ead96efb6d9af7e68794c59290cf60.tar.bz2 serverdata-ea7d999c39ead96efb6d9af7e68794c59290cf60.tar.xz serverdata-ea7d999c39ead96efb6d9af7e68794c59290cf60.zip | |
Merge self-fork from mekolat/magic-v3
Magic v3 spells
Diffstat (limited to 'world/map/npc/001-2/government_building.txt')
| -rw-r--r-- | world/map/npc/001-2/government_building.txt | 8 |
1 files changed, 4 insertions, 4 deletions
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]"; |