fixed 6 item combo bonuses

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5397 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 7 insertions, 4 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index a8d6cc5ee..80da22267 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -30,6 +30,9 @@
 	* Temp plug: 2620,Rogue's_Treasure steal rate -> 1 (have to fix formula) [Lupus]

 	- Fixed all Vesper Acessories (removed doubled DEF bonus), thanks to Irmin

 	- Rearranged Stone Buckler: normally it gives +4 DEF, with CARD COMBO it gives +5 DEF, and with CARD COMBO+SWORDMAN CLASS it would give +10 DEF

+	- Removed DOUBLED combo bonus from some items. Also fixed missing brackets

+		Chnaged:	2115,Valkyrie's_Shield, 2114,Stone_Buckler, 2353,Odin's_Blessing,

+					5122,Magni's_Cap, 5123,Ulle's_Cap, 5124,Fricca's_Circlet

 02/24

 	* Changed bosses slaves in Bio Labs level 3 - they will spawn only once now [Komurka]

 02/22

diff --git a/db/item_db.txt b/db/item_db.txt
index 34991b640..e208b943b 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -853,7 +853,7 @@
 2112,Novice_Guard,Novice Guard,5,,10,1,,3,,0,8388609,7,2,32,,0,0,1,{}

 2113,Novice_Shield,Novice Shield,5,5000,,1000,,3,,1,8388609,7,2,32,,40,1,3,{ bonus2 bSubEle,Ele_Water,20; bonus2 bSubEle,Ele_Earth,20; bonus2 bSubEle,Ele_Fire,20; bonus2 bSubEle,Ele_Wind,20; bonus2 bSubEle,Ele_Poison,20; bonus2 bSubEle,Ele_Ghost,20; bonus2 bSubEle,Ele_Undead,20; }

 2114,Stone_Buckler,Stone Buckler,5,,10,1500,,4,,1,119529470,7,2,32,,65,1,2,{ bonus2 bSubEle,Ele_Neutral,5; if (isequipped(2353,5122)==0) end; bonus bStr,2; bonus bDef,1; bonus bMdef,5; if(BaseClass == Job_Swordman) bonus bDef,5; }

-2115,Valkyrie's_Shield,Valkyrie's Shield,5,,10,500,,3,,1,119529470,7,2,32,,65,1,3,{  bonus2 bSubEle,Ele_Water,20; bonus2 bSubEle,Ele_Fire,20; bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Undead,20; if(isequipped(2353,5124)==0) bonus bMdef,5; end; bonus bDef,2; bonus bMdef,25; }

+2115,Valkyrie's_Shield,Valkyrie's Shield,5,,10,500,,3,,1,119529470,7,2,32,,65,1,3,{ bonus2 bSubEle,Ele_Water,20; bonus2 bSubEle,Ele_Fire,20; bonus2 bSubEle,Ele_Dark,20; bonus2 bSubEle,Ele_Undead,20; if(isequipped(2353,5124)==0){ bonus bMdef,5; end; } bonus bDef,2; bonus bMdef,25; }

 2116,Angelic_Guard,Angelic Guard,5,,10,500,,3,,1,8388609,7,2,32,,20,1,3,{ bonus2 bSubRace,RC_Fish,5; }

 2199,Ahura_Mazdah,Ahura Mazdah,5,,10,100,,0,,0,127918079,7,2,32,,1,1,0,{ bonus bShortWeaponDamageReturn,100; bonus2 bSubRace,RC_DemiHuman,95; }

 

@@ -1593,9 +1593,9 @@
 5119,Super_Novice_Hat_,Super Novice Hat,5,8500,,400,,4,,1,8388609,7,2,256,,40,1,193,{ bonus bAllStats,1; }

 5120,Bucket_Hat_,Bucket Hat,5,6000,,300,,3,,1,127918079,7,2,256,,0,1,195,{}

 5121,Zherlthsh_Mask,Zherlthsh Mask,5,,10,100,,3,,0,119529470,7,2,768,,0,1,200,{ bonus2 bAddRace,RC_DemiHuman,5; bonus2 bSubRace,RC_DemiHuman,5; }

-5122,Magni's_Cap,Magni's Cap,5,,10,1000,,5,,0,119529470,7,2,256,,65,1,201,{ bonus bStr,2; if(BaseClass == Job_Swordman) bonus bDef,5; if(isequipped(2114,2353)==0) end; bonus bStr,2; bonus bDef,5; bonus bMdef,5; }

-5123,Ulle's_Cap,Ulle's Cap,5,,10,500,,3,,1,119529470,7,2,256,,65,1,202,{ bonus bDex,2; bonus bAgi,1;  if(isequipped(2353)==0) end; if(bDex>=70) bonus bUseSPrate,-10; }

-5124,Fricca's_Circlet,Fricca's Circlet,5,,10,300,,3,,0,119529470,7,2,256,,65,1,203,{ bonus bMdef,10; bonus bInt,2; bonus bMaxSP,50; if(isequipped(2115,2353)==0) end; bonus bDef,2; bonus bMdef,25; }

+5122,Magni's_Cap,Magni's Cap,5,,10,1000,,5,,0,119529470,7,2,256,,65,1,201,{ bonus bStr,2; }

+5123,Ulle's_Cap,Ulle's Cap,5,,10,500,,3,,1,119529470,7,2,256,,65,1,202,{ bonus bDex,2; bonus bAgi,1; if(isequipped(2353) && bDex>=70) bonus bUseSPrate,-10; }

+5124,Fricca's_Circlet,Fricca's Circlet,5,,10,300,,3,,0,119529470,7,2,256,,65,1,203,{ bonus bMdef,10; bonus bInt,2; bonus bMaxSP,50; }

 5125,Angel's_Kiss,Angel's Kiss,5,,10,300,,2,,1,8388609,7,2,256,,50,1,204,{ bonus bSPrecovRate,3; }

 5126,Morpheus's_Hood,Morpheus's Hood,5,,10,200,,3,,0,119529470,7,2,256,,33,1,205,{ bonus bInt,2; if(isequipped(2518,2648,2649)==0) end; bonus bInt,5; bonus bMdef,11; bonus bMaxSPrate,20; if(Upper == 1) bonus bCastrate,25; }

 5127,Morrigane's_Helm,Morrigane's Helm,5,,10,500,,4,,0,119529470,7,2,256,,61,1,206,{ bonus bLuk,2; bonus bAtk,3; if(isequipped(2519,2650,2651)==0) end; bonus bStr,2; bonus bLuk,9; bonus bCritical,13; bonus bAtk,18; bonus bFlee2,13; }