From ecf927b6b48061ef4699495bf6c38fc6a77b2ef3 Mon Sep 17 00:00:00 2001 From: Paradox924X Date: Tue, 28 Oct 2008 00:50:32 +0000 Subject: Removed leftovers of "bLoseSPWhenUnequip" and "bDamageWhenUnequip" -- deprecated in r6204. Item 2385 was still using bLoseSPWhenUnequip -- fixed. npc/custom/events/xmas_rings_event.txt still uses both in conjunction with setitemscript. Someone will need to make it so equip and/or unequip scripts change be changed as well, or find an alternative solution. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13327 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ db/Changelog.txt | 2 ++ db/item_db.txt | 2 +- doc/item_bonus.txt | 3 --- doc/script_commands.txt | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 5574dab0b..a5d2ab0c1 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2008/10/27 + * Removed leftovers of "bLoseSPWhenUnequip" and "bDamageWhenUnequip". [Paradox924X] 2008/10/24 * Added protection from segfault by int overflow in charcommand heal and fixed a typo in atcommand heal. (Follow-up to r13321) [Paradox924X] * Added protection from segfault by int overflow in atcommand heal. (bugreport:1886) [Paradox924X] diff --git a/db/Changelog.txt b/db/Changelog.txt index bd645f3a3..09b7b1f53 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/10/27 + * Removed a leftover instance of "bLoseSPWhenUnequip" in item 2385, Recuperative_Armor. [Paradox924X] 2008/10/25 * Rev. 13324 iRO lied to me. Reverted casting range of traps to 3. [L0ne_W0lf] * Rev. 13323 Just some random updates and bugfixes! [L0ne_W0lf] diff --git a/db/item_db.txt b/db/item_db.txt index 94dde862b..74219c3fc 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -1229,7 +1229,7 @@ 2382,Elite_Shooter's_Suit,Elite Shooter's Suit,5,0,,0,,3,,1,0x01000000,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2540) && isequipped(2437)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{} 2383,Brynhild,Brynhildr,5,0,,400,,,,0,0xFFFFFFFF,7,2,16,,94,0,0,{ bonus bMdef,10; bonus bMaxHP,20*BaseLevel; bonus bMaxSP,5*BaseLevel; bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus bMatkRate,10; bonus bUnbreakableArmor,0; bonus bNoKnockback,0; },{},{} 2384,Spiritual_Tunic,Spiritual Tunic,5,20,,0,,10,,0,0xFFFFFFFF,7,2,16,,0,0,0,{ bonus2 bSubEle,Ele_Neutral,20; bonus2 bSubEle,Ele_Water,20; bonus bMaxHP,800; bonus2 bResEff,Eff_Freeze,10000; },{},{} -2385,Recuperative_Armor,Recuperative Armor,5,20,,0,,12,,0,0xFFFFFFFF,7,2,16,,0,0,0,{ bonus bNoRegen,1; bonus bNoRegen,2; bonus bHPGainValue,60; bonus bSPGainValue,6; bonus bLoseSPWhenUnequip,100; },{},{} +2385,Recuperative_Armor,Recuperative Armor,5,20,,0,,12,,0,0xFFFFFFFF,7,2,16,,0,0,0,{ bonus bNoRegen,1; bonus bNoRegen,2; bonus bHPGainValue,60; bonus bSPGainValue,6; },{},{ heal 0,-100; } 2386,Chameleon_Armor,Chameleon Armor,5,20,,1700,,5,,0,0x00CFDF80,2,2,16,,70,1,0,{ if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus bDef,3; else if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte) bonus bMDef,5; },{},{} 2387,Sprint_Mail,Sprint Mail,5,20,,1000,,1,,1,0x00CFDF80,2,2,16,,0,1,0,{ bonus bVit,1; bonus bHPrecovRate,5; bonus2 bAddItemHealRate,IG_Recovery,3; },{},{} 2388,Gandora,Gandora,5,20,,300,,4,,1,0x00021040,2,2,16,,70,1,0,{ bonus bAgi,1; bonus bFlee,5; bonus bAspdRate,2; },{},{} diff --git a/doc/item_bonus.txt b/doc/item_bonus.txt index cfdc22e21..dd3fab3ef 100644 --- a/doc/item_bonus.txt +++ b/doc/item_bonus.txt @@ -192,7 +192,6 @@ bonus bSPGainValue,n; When killing a monster by physical attack, you gain n SP bonus bHPGainValue,n; When killing a monster by physical attack, you gain n HP bonus bIgnoreDefMob,n; Ignore monster's DEF when attacking. n: 0=All normal monster except Bosses, 1=All monsters -bonus bDamageWhenUnequip,n; You lose n HP when the item is unequipped bonus2 bCriticalAddRace,n,r; Critical + n vs. enemies of race r r: 0=Formless, 1=Undead, 2=Brute, 3=Plant, 4=Insect, @@ -283,8 +282,6 @@ bonus2 bAddItemHealRate,n,x; Increases HP recovered by n type items by x%, //---- 3/15 new card effects ---- -bonus bLoseSPWhenUnequip,n; Lose n SP when the item is unequipped - bonus2 bSPRegenRate,n,x; Gain n SP every x milliseconds bonus2 bSPLossRate,n,x; Lose n SP every x milliseconds bonus2 bExpAddRace,n,x; Increase exp gained by x% vs. enemies of race n diff --git a/doc/script_commands.txt b/doc/script_commands.txt index c8737ac51..886a2b6b3 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -5948,7 +5948,7 @@ You can remove an item's itemscript by leaving empty the itemscript argument. Example: -setitemscript 2637,"{ bonus bDamageWhenUnequip,40; if(isequipped(2236)==0)end; if(getskilllv(26)){skill 40,1;}else{skill 26,1+isequipped(2636);} }"; +setitemscript 2637,"{ if(isequipped(2236)==0)end; if(getskilllv(26)){skill 40,1;}else{skill 26,1+isequipped(2636);} }"; setitemscript 2639,""; --------------------------------------- -- cgit v1.2.3-70-g09d2