From ca8acfddf85f6a4826f72eb279328c96490d32f5 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Fri, 25 Jul 2008 15:22:54 +0000 Subject: * 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 --- db/Changelog.txt | 2 ++ db/item_db.txt | 2 +- npc/Changelog.txt | 4 ++++ npc/merchants/socket_enchant.txt | 15 ++++++++------- npc/other/marriage.txt | 24 ++++++++++++------------ npc/quests/quests_juperos.txt | 2 ++ 6 files changed, 29 insertions(+), 20 deletions(-) diff --git a/db/Changelog.txt b/db/Changelog.txt index 2ac3b0f5a..9ec9c5bea 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -40,6 +40,8 @@ 2385 Recuvative_Armor Should trigger HP/SP return with magical kills as well. ======================= +2008/07/25 + * Rev. 12993 Corrected Luna Bow Bonuses. (bugreport:1919) [L0ne_W0lf] 2008/07/24 * Removed an extra ) in Item 2765's script. [Paradox924X] 2008/07/22 diff --git a/db/item_db.txt b/db/item_db.txt index 42fcc1198..84d6a31c3 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -860,7 +860,7 @@ 1720,Bow_Of_Rudra,Rudra Bow,4,,10,1200,150,,5,0,0x000A0808,7,2,34,4,48,1,11,{ bonus bAtkEle,Ele_Holy; bonus bInt,5; skill "AL_CURE",1; skill "AL_HEAL",1; bonus2 bResEff,Eff_Poison,5000; bonus2 bResEff,Eff_Curse,5000; bonus2 bResEff,Eff_Silence,5000; bonus2 bResEff,Eff_Confusion,5000; bonus2 bResEff,Eff_Blind,5000; },{},{} 1721,Repeting_CrossBow,Repeating Crossbow,4,89000,,2000,95,,9,1,0x00020840,7,2,34,3,65,1,11,{},{},{} 1722,Balistar,Ballista,4,124000,,3500,145,,5,0,0x00080800,7,2,34,4,77,1,11,{},{},{} -1723,Luna_Bow,Luna Bow,4,,10,2000,100,,5,2,0x00000800,7,2,34,3,30,1,11,{ bonus bDef,2+3*(getrefine()>9)+(getrefine()>6 && getrefine()<=9); if(isequipped(2718)) bonus bDex,1; bonus bMaxSP,05; bonus bSPrecovRate,10; },{},{} +1723,Luna_Bow,Luna Bow,4,,10,2000,100,,5,2,0x00000800,7,2,34,3,30,1,11,{ bonus bDef,2+3*(getrefine()>=9)+(getrefine()>6 && getrefine()<9); if(isequipped(2718)) { bonus bDex,1; bonus bMaxSP,50; bonus bSPrecovRate,10; } },{},{} 1724,Dragon_Wing,Dragon Wing,4,,10,1200,100,,5,0,0x000A0848,7,2,34,4,60,1,11,{ bonus3 bAddMonsterDropItem,1765,RC_Dragon,300; bonus bIgnoreDefRace,RC_Dragon; },{},{} 1725,Bow_Of_Mintrel,Minstrel Bow,4,,10,1700,120,,5,1,0x00080800,7,2,34,4,70,1,11,{ bonus bInt,2; bonus bSPrecovRate,10; },{},{} 1726,Hunter_Bow_,Hunter Bow,4,64000,,1500,125,,5,1,0x00000800,7,2,34,3,33,1,11,{},{},{} diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 33bb418b1..42c71905e 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,9 @@ Date Added ====== +2008/07/25 + * Rev. 12993 Swapped dis/enable for hideon/off in wedding script. [L0ne_W0lf] + * Corrected Slotting NPCs triggering on touch. (bugreport:1916) + * Added a missing close in juperos quest. (bugreport:1918) 2008/07/24 * Rev. 12988 Enabled Ontouchnpc event in a rachel quest. [L0ne_W0lf] 2008/07/22 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 diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index d5fa4890f..a5c5b9d6e 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -451,11 +451,11 @@ prt_church,97,102,0 script Single Army#Prontera 105,{ close; OnInit: - disablenpc "Single Army#Prontera"; + hideonnpc "Single Army#Prontera"; end; OnEnable: - enablenpc "Single Army#Prontera"; + hideoffnpc "Single Army#Prontera"; Emotion e_go; end; @@ -473,11 +473,11 @@ prt_church,98,102,0 script Single Army#Geffen 705,{ close; OnInit: - disablenpc "Single Army#Geffen"; + hideonnpc "Single Army#Geffen"; end; OnEnable: - enablenpc "Single Army#Geffen"; + hideoffnpc "Single Army#Geffen"; Emotion e_go; end; @@ -495,11 +495,11 @@ prt_church,99,102,0 script Single Army#Morocc 707,{ close; OnInit: - disablenpc "Single Army#Morocc"; + hideonnpc "Single Army#Morocc"; end; OnEnable: - enablenpc "Single Army#Morocc"; + hideoffnpc "Single Army#Morocc"; Emotion e_go; end; @@ -517,11 +517,11 @@ prt_church,100,102,0 script Single Army#Payon 708,{ close; OnInit: - disablenpc "Single Army#Payon"; + hideonnpc "Single Army#Payon"; end; OnEnable: - enablenpc "Single Army#Payon"; + hideoffnpc "Single Army#Payon"; Emotion e_go; end; @@ -538,11 +538,11 @@ prt_church,101,102,0 script Single Army#Amatsu 767,{ close; OnInit: - disablenpc "Single Army#Amatsu"; + hideonnpc "Single Army#Amatsu"; end; OnEnable: - enablenpc "Single Army#Amatsu"; + hideoffnpc "Single Army#Amatsu"; Emotion e_go; end; @@ -558,11 +558,11 @@ prt_church,102,102,0 script Single Army#Gonryun 780,{ close; OnInit: - disablenpc "Single Army#Gonryun"; + hideonnpc "Single Army#Gonryun"; end; OnEnable: - enablenpc "Single Army#Gonryun"; + hideoffnpc "Single Army#Gonryun"; Emotion e_go; end; diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index 8f8e6edf5..a8a29be93 100644 --- a/npc/quests/quests_juperos.txt +++ b/npc/quests/quests_juperos.txt @@ -20,6 +20,7 @@ //= 1.3b Minor updates to juperos elevator NPCs. [L0ne_W0lf] //= 1.4 Fixed Elevator not working after failing once. [L0ne_W0lf] //= 1.5 Lots of Fixes, missing stopnpctimers, cleanup. [Zephyrus] +//= 1.6 Added missing close in "Popular Feats" [L0ne_W0lf] //============================================================ yuno_in04,190,125,4 script Scholar 700,{ @@ -1499,6 +1500,7 @@ yuno_in04,102,106,1 script Popular Feasts 111,{ mes "I guess Poring Salad is"; mes "the most popular feast"; mes "in this entire book."; + close; case 3: mes "^8B6914..."; -- cgit v1.2.3-60-g2f50