diff options
| author | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-25 15:22:54 +0000 |
|---|---|---|
| committer | L0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-25 15:22:54 +0000 |
| commit | ca8acfddf85f6a4826f72eb279328c96490d32f5 (patch) | |
| tree | e6b7f0031e145af18cf86ad947a6a8e2ca16808c /npc/merchants | |
| parent | 4d2d99c0ac7d70d3d19284c499cd74066ebec197 (diff) | |
| download | hercules-ca8acfddf85f6a4826f72eb279328c96490d32f5.tar.gz hercules-ca8acfddf85f6a4826f72eb279328c96490d32f5.tar.bz2 hercules-ca8acfddf85f6a4826f72eb279328c96490d32f5.tar.xz hercules-ca8acfddf85f6a4826f72eb279328c96490d32f5.zip | |
* Corrected Luna Bow Bonuses. (bugreport:1919)
* Swapped dis/enable for hideon/off in wedding script.
* Corrected Slotting NPCs triggering on touch. (bugreport:1916)
* Added a missing close in juperos quest. (bugreport:1918)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12993 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/merchants')
| -rw-r--r-- | npc/merchants/socket_enchant.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt index 266408697..63f67a920 100644 --- a/npc/merchants/socket_enchant.txt +++ b/npc/merchants/socket_enchant.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena dev team //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -20,6 +20,7 @@ //= 1.2 Fixed some typos and a nasty bug. [SinSloth] //= 1.3 Fixed a wrong item ID with Sphinx Hat. [SinSloth] //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 1.5 Removed Ontouch trigger area from NPCs. [L0ne_W0lf] //============================================================ payon,140,151,5 script Seiyablem 84,{ @@ -401,9 +402,9 @@ function script Func_Socket { } } -lhz_in02,281,35,5 duplicate(Seiyablem) Seiyablem#lhz 84,0,0 -prt_in,33,70,5 duplicate(Seiyablem) Seiyablem#prt 84,0,0 -morocc,51,41,5 duplicate(Seiyablem) Seiyablem#moc 84,0,0 +lhz_in02,281,35,5 duplicate(Seiyablem) Seiyablem#lhz 84 +prt_in,33,70,5 duplicate(Seiyablem) Seiyablem#prt 84 +morocc,51,41,5 duplicate(Seiyablem) Seiyablem#moc 84 payon,143,143,7 script Young Man#socket 97,{ @@ -423,6 +424,6 @@ payon,143,143,7 script Young Man#socket 97,{ close; } -lhz_in02,269,33,5 duplicate(Young Man#socket) Young Man#lhz 97,0,0 -prt_in,31,57,1 duplicate(Young Man#socket) Young Man#prt 97,0,0 -morocc,60,42,3 duplicate(Young Man#socket) Young Man#moc 97,0,0 +lhz_in02,269,33,5 duplicate(Young Man#socket) Young Man#lhz 97 +prt_in,31,57,1 duplicate(Young Man#socket) Young Man#prt 97 +morocc,60,42,3 duplicate(Young Man#socket) Young Man#moc 97 |