summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorflaid <flaid@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-12 10:57:32 +0000
committerflaid <flaid@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-12 10:57:32 +0000
commit79cb8649ce5c13def3ba0d256ca84d46a0ccfc3d (patch)
tree8636224f5ef5002e7841c5ffac74e279b8d0b184 /db
parent8b49859f833ac4e90ecd822c0c97bc9f85c095da (diff)
downloadhercules-79cb8649ce5c13def3ba0d256ca84d46a0ccfc3d.tar.gz
hercules-79cb8649ce5c13def3ba0d256ca84d46a0ccfc3d.tar.bz2
hercules-79cb8649ce5c13def3ba0d256ca84d46a0ccfc3d.tar.xz
hercules-79cb8649ce5c13def3ba0d256ca84d46a0ccfc3d.zip
Small db error fix bugreport:5997
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16277 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/pre-re/item_db.txt4
-rw-r--r--db/re/item_db.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
index c96a304ea..e5b131704 100644
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -6528,9 +6528,9 @@
//
18595,Horn_Of_Ancient,Horn of Ancient,5,40,,200,,8,,1,0xFFFFFFFF,7,2,256,,50,1,757,{ autobonus "{ bonus bAtk,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{}
18596,Sprout_Hat,Sprout Hat,5,20,,200,,4,,0,0xFFFFFFFF,7,2,256,,70,1,758,{ skill "WZ_HEAVENDRIVE", 3; },{},{}
-18597,Mercury_Riser,Mercury Riser,5,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() == 7 || getrefine() == 8) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; },{},{}
+18597,Mercury_Riser,Mercury Riser,5,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() == 7 || getrefine() == 8) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }},{},{}
//
-18600,Cat_Ear_Beret,Cat Ear Beret,5,20,,100,,5,,0,0xFFFFFFFF,7,2,256,,0,1,761,{ if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,2*(getrefine() - 4); bonus2 bSubRace,RC_DemiHuman,2*(getrefine() - 4); },{},{}
+18600,Cat_Ear_Beret,Cat Ear Beret,5,20,,100,,5,,0,0xFFFFFFFF,7,2,256,,0,1,761,{ if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,2*(getrefine() - 4); bonus2 bSubRace,RC_DemiHuman,2*(getrefine() - 4); }},{},{}
//
18612,White_Musang_Hat,White Musang Hat,5,40,,200,,3,,1,0xFFFFFFFF,7,2,256,,0,1,770,{ bonus bStr,2; bonus bVit,2; bonus bLuk,1; bonus bUnbreakableHelm,0; },{},{}
18613,Black_Musang_Hat,Black Musang Hat,5,40,,200,,3,,1,0xFFFFFFFF,7,2,256,,0,1,770,{ bonus bInt,2; bonus bDex,2; bonus bAgi,1; bonus bUnbreakableHelm,0; },{},{}
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index abc8c2974..abbe9ae65 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -7244,9 +7244,9 @@
//
18595,Horn_Of_Ancient,Horn of Ancient,5,40,,200,,8,,1,0xFFFFFFFF,7,2,256,,50,1,757,{ autobonus "{ bonus bAtk,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{}
18596,Sprout_Hat,Sprout Hat,5,20,,200,,4,,0,0xFFFFFFFF,7,2,256,,70,1,758,{ skill "WZ_HEAVENDRIVE", 3; },{},{}
-18597,Mercury_Riser,Mercury Riser,5,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() == 7 || getrefine() == 8) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; },{},{}
+18597,Mercury_Riser,Mercury Riser,5,40,,200,,10,,1,0xFFFFFFFF,7,2,256,,0,,759,{ bonus bAspdRate,3; bonus bCritical,3; if(getrefine() == 7 || getrefine() == 8) { bonus bAspdRate,2; bonus bCritical,2; } if(getrefine() >= 9) { bonus bAspdRate,2; bonus bCritical,2; }},{},{}
//
-18600,Cat_Ear_Beret,Cat Ear Beret,5,20,,100,,5,,0,0xFFFFFFFF,7,2,256,,0,1,761,{ if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,2*(getrefine() - 4); bonus2 bSubRace,RC_DemiHuman,2*(getrefine() - 4); },{},{}
+18600,Cat_Ear_Beret,Cat Ear Beret,5,20,,100,,5,,0,0xFFFFFFFF,7,2,256,,0,1,761,{ if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,2*(getrefine() - 4); bonus2 bSubRace,RC_DemiHuman,2*(getrefine() - 4); }},{},{}
//
18602,Watermelon_Bite,Watermelon Bite,5,20,,100,,4,,0,0xFFFFFFFF,7,2,1,,30,0,763,{ bonus bMdef,4; bonus2 bAddEle,Ele_Fire,4; },{},{}
//