summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-15 06:09:47 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-15 06:09:47 +0000
commit217c9014a8b4be1fe23e0b263e5f42a2876c6fbf (patch)
tree51a7e05978be3a334ea650df9ea38667581aa780 /db
parent1838d7a34123b596a9a8411da5991a91f49ea713 (diff)
downloadhercules-217c9014a8b4be1fe23e0b263e5f42a2876c6fbf.tar.gz
hercules-217c9014a8b4be1fe23e0b263e5f42a2876c6fbf.tar.bz2
hercules-217c9014a8b4be1fe23e0b263e5f42a2876c6fbf.tar.xz
hercules-217c9014a8b4be1fe23e0b263e5f42a2876c6fbf.zip
Eek, made it so the Memory of Wedding item only works if you're married.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11477 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/item_db.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 33bf1d294..ec4574851 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -34,6 +34,7 @@
=======================
10/14
+ * Rev. 11477 Eek, made it so the Memory of Wedding item only works if you're married. [L0ne_W0lf]
* Rev. 11476 Added information pertaining to "Enlarge Weight Limit R." [L0ne_W0lf]
* Rev. 11475 Item Database updates. [L0ne_W0lf]
- Updated Memory of Wedding effect, and some item names.
diff --git a/db/item_db.txt b/db/item_db.txt
index 2bb2aa5e1..45c7dcfa7 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -182,7 +182,7 @@
678,Poison_Bottle,Poison Bottle,0,5000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ if(Class == Job_Assassin_Cross) { sc_start SC_DPoison,60000,0; sc_start SC_ASPDPOTION2,60000,0; } else percentheal -100,-100; },{},{}
679,Gold_Pill,Pilule,0,5000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 50,50; },{},{}
680,Magical_Carnation,Magic Carnation,0,,0,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 0,20; },{},{}
-681,Memory_Of_Wedding,Sweet Memory of Marriage,2,50000,,10,,,,,0xFFFFFFFF,7,3,,,,,,{ sc_start SC_WEDDING,600000,0; },{},{}
+681,Memory_Of_Wedding,Sweet Memory of Marriage,2,50000,,10,,,,,0xFFFFFFFF,7,3,,,,,,{ if (getpartnerid()) sc_start SC_WEDDING,600000,0; },{},{}
// ATK/MATK Potions
682,Realgar_Wine,Distilled Fighting Spirit,0,,0,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKPOTION,60000,30; },{},{}
683,Exorcize_Herb,Herb of Incantation,0,,0,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MATKPOTION,60000,30; },{},{}