summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-20 19:58:04 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-20 19:58:04 +0000
commit1873f00935e96730fdb52ca357ffbd2311d79bec (patch)
tree1cd37b2159f8d25ec4559456e789203c841060c6
parent0822199f38915337bf0f59f4e0cb8818b2688fab (diff)
downloadhercules-1873f00935e96730fdb52ca357ffbd2311d79bec.tar.gz
hercules-1873f00935e96730fdb52ca357ffbd2311d79bec.tar.bz2
hercules-1873f00935e96730fdb52ca357ffbd2311d79bec.tar.xz
hercules-1873f00935e96730fdb52ca357ffbd2311d79bec.zip
Fixed samesex marriages
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@677 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/other/wedding.txt6
2 files changed, 5 insertions, 2 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index c021be9cc..1e086bf55 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -38,6 +38,7 @@ Date Added
======
12/20
+ * made samesex marriages give out the correct rings [MouseJstr]
* Changed $progress -> $@progress in wedding.txt (shadowlady put in comments but didn't add to code) [Aria]
* xmas.txt: Added Xmas Jakk, fixed 2 possible items exploits, fixed reward Box ID [Lupus]
12/18
diff --git a/npc/other/wedding.txt b/npc/other/wedding.txt
index 48c69dd38..97e45f9f9 100644
--- a/npc/other/wedding.txt
+++ b/npc/other/wedding.txt
@@ -72,7 +72,8 @@ L_GroomCeremony:
mes "[Tristan the Third]";
mes "Please tell your wife to speak to me, and then we will start exchanging rings";
delitem 2613,1;//Items: Diamond_Ring,
- getitem 2635,1;//Items: Wedding_Ring_F,
+ if (sex == 0) getitem 2635,1;//Items: Wedding_Ring_F,
+ if (sex == 1) getitem 2634,1;//Items: Wedding_Ring_M,
set @get_ring,1;
next;
mes "[Tristan the Third]";
@@ -107,7 +108,8 @@ L_BrideCeremony:
deltimer "weddinglimit2";
marriage $name$;
delitem 2613,1;//Items: Diamond_Ring,
- getitem 2634,1;//Items: Wedding_Ring_M,
+ if (sex == 0) getitem 2635,1;//Items: Wedding_Ring_F,
+ if (sex == 1) getitem 2634,1;//Items: Wedding_Ring_M,
set @get_ring,1;
close;
L_CancelWedding: