summaryrefslogtreecommitdiff
path: root/db/re/item_combo_db.txt
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-11-23 18:30:42 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-11-23 18:30:42 +0000
commitcb78bae6df1f1a989ffd09a46f92445ee2049f03 (patch)
treebcf39aa1e1d39b7491f60622626f26a4cef5abe9 /db/re/item_combo_db.txt
parentefbd5d0dd7dbf038333d65d59d0becad59e6e2a4 (diff)
downloadhercules-cb78bae6df1f1a989ffd09a46f92445ee2049f03.tar.gz
hercules-cb78bae6df1f1a989ffd09a46f92445ee2049f03.tar.bz2
hercules-cb78bae6df1f1a989ffd09a46f92445ee2049f03.tar.xz
hercules-cb78bae6df1f1a989ffd09a46f92445ee2049f03.zip
* Removed duplicate isequipped() entries from item_db already written in item_combo_db (bugreport:6924).
* Moved a few remaining isequipped() entries to item_combo_db. * Follow-up r16940: applied change to SQL and pre-re files, and renamed Size constants to Size_ for consistency. * Follow-up r16947: fixed mob modes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16955 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db/re/item_combo_db.txt')
-rw-r--r--db/re/item_combo_db.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index 24957f025..431f97f15 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -132,8 +132,8 @@
2608:2677,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; }
2608:2711,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; }
2608:2786,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; }
-2620:2746,{ bonus2 bAddSize,SizeMedium,8; bonus bAspdRate,getequiprefinerycnt(EQI_HAND_R)/2; }
-2620:2747,{ bonus2 bAddSize,SizeLarge,8; bonus bHit,getequiprefinerycnt(EQI_HAND_R)/2; bonus bVariableCastrate,-getequiprefinerycnt(EQI_HAND_R)/2; }
+2620:2746,{ bonus2 bAddSize,Size_Medium,8; bonus bAspdRate,getequiprefinerycnt(EQI_HAND_R)/2; }
+2620:2747,{ bonus2 bAddSize,Size_Large,8; bonus bHit,getequiprefinerycnt(EQI_HAND_R)/2; bonus bVariableCastrate,-getequiprefinerycnt(EQI_HAND_R)/2; }
2626:2677,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; }
2626:2711,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; }
2626:2786,{ bonus2 bSkillAtk,"AL_HEAL",50; bonus2 bSkillAtk,"PR_MAGNUS",30; bonus bSPrecovRate,9; }
@@ -195,5 +195,5 @@
5401:5653,{ bonus bInt,1; bonus bMatkRate,2; }
//5470:5653,{ bonus bDex,1; bonus bLongAtkRate,3; }
13027:15044,{ bonus3 bAddMonsterDropItem,929,RC_Brute,100+(getrefine()*10); bonus3 bAddMonsterDropItem,929,RC_DemiHuman,100+(getrefine()*10); bonus3 bAddMonsterDropItem,970,RC_Brute,20+(getrefine()*2); bonus3 bAddMonsterDropItem,970,RC_DemiHuman,20+(getrefine()*2); }
-13034:13035,{ bonus bMaxSP,20; bonus bMaxHPRate,5; bonus bHit,10; bonus2 bAddSize,SizeLarge,30; autobonus "{ bonus bAspdRate,100; }",1,7000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; }
+13034:13035,{ bonus bMaxSP,20; bonus bMaxHPRate,5; bonus bHit,10; bonus2 bAddSize,Size_Large,30; autobonus "{ bonus bAspdRate,100; }",1,7000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; }
18507:18539,{ bonus bUseSPrate,-3; }