summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorkenpachi2k11 <kenpachi2k11@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-12 07:26:36 +0000
committerkenpachi2k11 <kenpachi2k11@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-12 07:26:36 +0000
commit8dc374e90eb6738e089435b65a1608319f19634e (patch)
tree8cc41b93808235ef5f43e222aa699134331b71dd /db
parent3911ae68834246aa93b3da90d467cab95da71f10 (diff)
downloadhercules-8dc374e90eb6738e089435b65a1608319f19634e.tar.gz
hercules-8dc374e90eb6738e089435b65a1608319f19634e.tar.bz2
hercules-8dc374e90eb6738e089435b65a1608319f19634e.tar.xz
hercules-8dc374e90eb6738e089435b65a1608319f19634e.zip
Commented out a combo that contained a commented out item (#5470). (bugreport:6213)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16406 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/pre-re/item_combo_db.txt2
-rw-r--r--db/re/item_combo_db.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/db/pre-re/item_combo_db.txt b/db/pre-re/item_combo_db.txt
index 8aecaee85..9dc0717c9 100644
--- a/db/pre-re/item_combo_db.txt
+++ b/db/pre-re/item_combo_db.txt
@@ -152,5 +152,5 @@
//5184:5657,{ bonus bLongAtkRate,getrefine(); }
5358:5653,{ bonus bAgi,1; bonus bFlee,3; }
5401:5653,{ bonus bInt,1; bonus bMatkRate,2; }
-5470:5653,{ bonus bDex,1; bonus bLongAtkRate,3; }
+//5470:5653,{ bonus bDex,1; bonus bLongAtkRate,3; }
13034:13035,{ bonus bMaxSP,20; bonus bMaxHPRate,5; bonus bHit,10; bonus2 bAddSize,2,30; autobonus "{ bonus bAspdRate,100; }",1,7000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; }
diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index 70ede8db0..e4647c4f4 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -193,7 +193,7 @@
//5184:5657,{ bonus bLongAtkRate,getrefine(); }
5358:5653,{ bonus bAgi,1; bonus bFlee,3; }
5401:5653,{ bonus bInt,1; bonus bMatkRate,2; }
-5470:5653,{ bonus bDex,1; bonus bLongAtkRate,3; }
+//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,2,30; autobonus "{ bonus bAspdRate,100; }",1,7000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; }
18507:18539,{ bonus bUseSPrate,-3; } \ No newline at end of file