diff options
| author | Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-01 12:52:11 +0000 |
|---|---|---|
| committer | Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-03-01 12:52:11 +0000 |
| commit | 37e408da625b996af03fcdfa6347a16d2cae4934 (patch) | |
| tree | d0d3efd6dccdd041c4730916fac9fba6add4863e | |
| parent | f0a41cf9855f91de3aa3aa57307e14e42e4b12dc (diff) | |
| download | hercules-37e408da625b996af03fcdfa6347a16d2cae4934.tar.gz hercules-37e408da625b996af03fcdfa6347a16d2cae4934.tar.bz2 hercules-37e408da625b996af03fcdfa6347a16d2cae4934.tar.xz hercules-37e408da625b996af03fcdfa6347a16d2cae4934.zip | |
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9942 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | npc/Changelog.txt | 1 | ||||
| -rw-r--r-- | npc/merchants/socket_enchant.txt | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index ada3f4310..71bd1f5fc 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -30,6 +30,7 @@ Date Added * The Sign: Fixed possible exploit, thanks to happylight [Lupus] - Added npc/sample/npc_test_setitemx.txt - Redo "conditional bug" in cool_event_corp.txt. That wasn't a bug. + - Fixed ingredients check in Slot Enchant, thanks to Tantarian 2007/02/28 * Fixes to Merchant/Smith skill quests according to ragnainfo wiki [DracoRPG] - Added missing 1 Banana Juice requirement to Cart Revolution quest diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt index ba61b71e0..ee1818ab6 100644 --- a/npc/merchants/socket_enchant.txt +++ b/npc/merchants/socket_enchant.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Sousuke_PL //===== Current Version: ===================================== -//= 0.3 +//= 1.0 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 0.1b Removed duplicates [Toms] //= 0.2 Added missing next;'s [Evera] //= 0.3 Fixed Zweihander[+] id [Lupus] +//= 1.0 Fixed ingredients check [Lupus] //============================================================ @@ -613,7 +614,7 @@ function script addslot2 { if(countitem(@olditem)<1) goto L_NoItem; if(Zeny<@addprice) goto L_NoZeny; - if((countitem(@itemup1)<@itemupiece1) && (countitem(@itemup2)<@itemupiece2)) goto L_NoItemUp; + if(countitem(@itemup1)<@itemupiece1 || countitem(@itemup2)<@itemupiece2) goto L_NoItemUp; delitem @itemup1,@itemupiece1; delitem @itemup2,@itemupiece2; |