Преглед на файлове

Fixed samesex marriages

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@677 54d463be-8e91-2dee-dedb-b68131a5f0ec
amber преди 20 години
родител
ревизия
d0587a7e20
променени са 2 файла, в които са добавени 5 реда и са изтрити 2 реда
  1. 1 0
      npc/Changelog.txt
  2. 4 2
      npc/other/wedding.txt

+ 1 - 0
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	

+ 4 - 2
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: