diff options
| author | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-04-20 19:11:16 +0000 |
|---|---|---|
| committer | Playtester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-04-20 19:11:16 +0000 |
| commit | fad3d92f5b8c45f6c3c4e3138802b5006fd23f3e (patch) | |
| tree | 35e361ffa09da9ae50f1e87922b3d3f63ac47c2e /db | |
| parent | 75732c9f26870604b0ef7c58c5af5e53fd268ca6 (diff) | |
| download | hercules-fad3d92f5b8c45f6c3c4e3138802b5006fd23f3e.tar.gz hercules-fad3d92f5b8c45f6c3c4e3138802b5006fd23f3e.tar.bz2 hercules-fad3d92f5b8c45f6c3c4e3138802b5006fd23f3e.tar.xz hercules-fad3d92f5b8c45f6c3c4e3138802b5006fd23f3e.zip | |
* Applied BrianL's castle switch fix (bugreport:2969)
* Fixed slotted Memory Book not giving the combo bonus (bugreport:2997)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13683 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
| -rw-r--r-- | db/Changelog.txt | 2 | ||||
| -rw-r--r-- | db/item_db.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt index ff96a762e..7c55116e4 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -37,6 +37,8 @@ 2385 Recuvative_Armor Should trigger HP/SP return with magical kills as well. ======================= +2009/04/20 + * Fixed slotted Memory Book not giving the combo bonus (bugreport:2997) [Playtester] 2009/04/17 * Fixed a few items [Playtester] - Windhawk can be equipped by thief class diff --git a/db/item_db.txt b/db/item_db.txt index 1c2aa9049..942e37bb8 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -1042,7 +1042,7 @@ 2118,Arm_Guard_,Arm Guard,5,10000,,150,,5,,1,0x02000000,7,2,32,,20,1,,{},{},{} 2119,Improved_Arm_Guard,Improved Arm Guard,5,40000,,150,,4,,0,0x02000000,7,2,32,,50,1,,{ bonus bMdef,5; },{},{} 2120,Improved_Arm_Guard_,Improved Arm Guard,5,40000,,150,,4,,1,0x02000000,7,2,32,,50,1,,{ bonus bMdef,5; },{},{} -2121,Memory_Book_,Memory Book,5,20,,1000,,3,,1,0x00810204,7,2,32,,0,1,0,{ bonus bInt,1; bonus bMdef,2; },{},{} +2121,Memorize_Book_,Memory Book,5,20,,1000,,3,,1,0x00810204,7,2,32,,0,1,0,{ bonus bInt,1; bonus bMdef,2; if (isequipped(2717) && isequipped(2212)) { bonus bHPrecovRate,15; bonus bSPrecovRate,15; bonus bMatkRate,7; }; },{},{} 2122,Platinum_Shield,Platinum Shield,5,20,,1200,,5,,0,0xFFFFFFFE,2,2,32,,68,1,1,{ bonus bMdef,5; bonus2 bSubSize,1,15; bonus2 bSubSize,2,15; bonus2 bSubRace,RC_Undead,10; bonus5 bAutoSpellWhenHit,"NPC_MAGICMIRROR",2,150,BF_MAGIC,0; },{},{} 2123,Orleans_Server,Orleans' Plate,5,20,,1000,,5,,1,0xFFFFFFFE,2,2,32,,55,1,1,{ bonus bMDef,2; bonus bMagicDamageReturn,5; if (isequipped(2701)) bonus bCastrate,-10; },{},{} 2124,Thorny_Buckler,Thorny Shield,5,20,,1000,,5,,1,0xFFFFFFFE,2,2,32,,55,1,1,{ bonus bMDef,2; if (isequipped(2702)) { bonus bAspdRate,10; bonus bShortWeaponDamageReturn,5; } },{},{} |