Merge branch 'master' of https://github.com/HerculesWS/Hercules

2 files changed, 24 insertions, 24 deletions

diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index 5d8ebffb6..24d583989 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -1953,18 +1953,18 @@
 2914,Wizard_Left_Eye,Wizard Left Eye,5,20,,100,,1,,1,0x000FDF80,63,2,136,,0,0,0,{ bonus bInt,4; bonus bMdef,3; },{},{}
 2915,Ettlang_Keepsake,Ettlang Keepsake,5,20,,50,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bMdef,10; },{},{}
 2916,Fairy_Wing,Fairy Wing,5,0,,10,,0,,0,0xFFFFFFFF,63,2,136,,90,0,0,{},{},{}
-2917,Str_Glove,Str Glove,5,75000,,100,,0,,0,0xFFFFFFFF,63,2,136,,100,0,0,{},{},{}
-2918,Int_Glove,Int Glove,5,75000,,100,,0,,0,0xFFFFFFFF,63,2,136,,100,0,0,{},{},{}
-2919,Agi_Glove,Agi Glove,5,75000,,100,,0,,0,0xFFFFFFFF,63,2,136,,100,0,0,{},{},{}
-2920,Vit_Glove,Vit Glove,5,75000,,100,,0,,0,0xFFFFFFFF,63,2,136,,100,0,0,{},{},{}
-2921,Dex_Glove,Dex Glove,5,75000,,100,,0,,0,0xFFFFFFFF,63,2,136,,100,0,0,{},{},{}
-2922,Luk_Glove,Luk Glove,5,75000,,100,,0,,0,0xFFFFFFFF,63,2,136,,100,0,0,{},{},{}
-2923,Str_Glove_,Str Glove,5,75000,,100,,0,,1,0xFFFFFFFF,63,2,136,,100,0,0,{},{},{}
-2924,Int_Glove_,Int Glove,5,75000,,100,,0,,1,0xFFFFFFFF,63,2,136,,100,0,0,{},{},{}
-2925,Agi_Glove_,Agi Glove,5,75000,,100,,0,,1,0xFFFFFFFF,63,2,136,,100,0,0,{},{},{}
-2926,Vit_Glove_,Vit Glove,5,75000,,100,,0,,1,0xFFFFFFFF,63,2,136,,100,0,0,{},{},{}
-2927,Dex_Glove_,Dex Glove,5,75000,,100,,0,,1,0xFFFFFFFF,63,2,136,,100,0,0,{},{},{}
-2928,Luk_Glove_,Luk Glove,5,75000,,100,,0,,1,0xFFFFFFFF,63,2,136,,100,0,0,{},{},{}
+2917,Str_Glove,Str Glove,5,75000,,100,,0,,0,0xFFFFFFFF,63,2,136,,100,0,0,{ bonus bMaxHP,100; bonus bMaxSP,20; bonus bBaseAtk,(readparam(bStr)/10); if(readparam(bStr)>=110) bonus bAtkRate,1; },{},{}
+2918,Int_Glove,Int Glove,5,75000,,100,,0,,0,0xFFFFFFFF,63,2,136,,100,0,0,{ bonus bMaxHP,100; bonus bMaxSP,20; bonus bMatk,(readparam(bInt)/10); if(readparam(bInt)>=110) bonus bMatkRate,1; },{},{}
+2919,Agi_Glove,Agi Glove,5,75000,,100,,0,,0,0xFFFFFFFF,63,2,136,,100,0,0,{ bonus bMaxHP,100; bonus bMaxSP,20; bonus bFlee,(readparam(bAgi)/10); if(readparam(bAgi)>=110) bonus bFlee2,1; },{},{}
+2920,Vit_Glove,Vit Glove,5,75000,,100,,0,,0,0xFFFFFFFF,63,2,136,,100,0,0,{ bonus bMaxHP,100; bonus bMaxSP,20; bonus bMaxHP,(readparam(bVit)/10)*50; if(readparam(bVit)>=110) bonus bMaxHPrate,1; },{},{}
+2921,Dex_Glove,Dex Glove,5,75000,,100,,0,,0,0xFFFFFFFF,63,2,136,,100,0,0,{ bonus bMaxHP,100; bonus bMaxSP,20; bonus bHit,(readparam(bDex)/10); if(readparam(bDex)>=110) bonus bLongAtkRate,1; },{},{}
+2922,Luk_Glove,Luk Glove,5,75000,,100,,0,,0,0xFFFFFFFF,63,2,136,,100,0,0,{ bonus bMaxHP,100; bonus bMaxSP,20; bonus bCritical,(readparam(bLuk)/10); if(readparam(bLuk)>=110) bonus bCritAtkRate,1; },{},{}
+2923,Str_Glove_,Str Glove,5,75000,,100,,0,,1,0xFFFFFFFF,63,2,136,,100,0,0,{ bonus bMaxHP,100; bonus bMaxSP,20; bonus bBaseAtk,(readparam(bStr)/10); if(readparam(bStr)>=110) bonus bAtkRate,1; },{},{}
+2924,Int_Glove_,Int Glove,5,75000,,100,,0,,1,0xFFFFFFFF,63,2,136,,100,0,0,{ bonus bMaxHP,100; bonus bMaxSP,20; bonus bMatk,(readparam(bInt)/10); if(readparam(bInt)>=110) bonus bMatkRate,1; },{},{}
+2925,Agi_Glove_,Agi Glove,5,75000,,100,,0,,1,0xFFFFFFFF,63,2,136,,100,0,0,{ bonus bMaxHP,100; bonus bMaxSP,20; bonus bFlee,(readparam(bAgi)/10); if(readparam(bAgi)>=110) bonus bFlee2,1; },{},{}
+2926,Vit_Glove_,Vit Glove,5,75000,,100,,0,,1,0xFFFFFFFF,63,2,136,,100,0,0,{ bonus bMaxHP,100; bonus bMaxSP,20; bonus bMaxHP,(readparam(bVit)/10)*50; if(readparam(bVit)>=110) bonus bMaxHPrate,1; },{},{}
+2927,Dex_Glove_,Dex Glove,5,75000,,100,,0,,1,0xFFFFFFFF,63,2,136,,100,0,0,{ bonus bMaxHP,100; bonus bMaxSP,20; bonus bHit,(readparam(bDex)/10); if(readparam(bDex)>=110) bonus bLongAtkRate,1; },{},{}
+2928,Luk_Glove_,Luk Glove,5,75000,,100,,0,,1,0xFFFFFFFF,63,2,136,,100,0,0,{ bonus bMaxHP,100; bonus bMaxSP,20; bonus bCritical,(readparam(bLuk)/10); if(readparam(bLuk)>=110) bonus bCritAtkRate,1; },{},{}
 2936,Recovery_Ring,Rings of Recovery,5,20,,100,,5,,1,0xFFFFFFFF,7,2,136,,10,0,0,{ bonus bVit,1; },{},{}
 2940,Ninja_Manual,Ninja Tutorial,5,0,,100,,0,,0,0x00000001,47,2,136,,1:12,0,0,{},{},{}
 2941,Gunslinger_Manual,Gunslinger Tutorial,5,0,,100,,0,,0,0x00000001,47,2,136,,1:12,0,0,{},{},{}
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index 627fd134a..ee24caf60 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -1941,18 +1941,18 @@ INSERT INTO `item_db_re` (`id`, `name_english`, `name_japanese`, `type`, `price_
 (2914, 'Wizard_Left_Eye', 'Wizard Left Eye', 5, 20, 10, 100, 0, 0, 1, 0, 1, 1040256, 63, 2, 136, 0, 0, 0, 0, 0, 'bonus bInt,4; bonus bMdef,3;', '', ''),
 (2915, 'Ettlang_Keepsake', 'Ettlang Keepsake', 5, 20, 10, 50, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 0, 0, 0, 0, 'bonus bMdef,10;', '', ''),
 (2916, 'Fairy_Wing', 'Fairy Wing', 5, 0, 0, 10, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 90, 0, 0, 0, '', '', ''),
-(2917, 'Str_Glove', 'Str Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, '', '', ''),
-(2918, 'Int_Glove', 'Int Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, '', '', ''),
-(2919, 'Agi_Glove', 'Agi Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, '', '', ''),
-(2920, 'Vit_Glove', 'Vit Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, '', '', ''),
-(2921, 'Dex_Glove', 'Dex Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, '', '', ''),
-(2922, 'Luk_Glove', 'Luk Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, '', '', ''),
-(2923, 'Str_Glove_', 'Str Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 1, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, '', '', ''),
-(2924, 'Int_Glove_', 'Int Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 1, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, '', '', ''),
-(2925, 'Agi_Glove_', 'Agi Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 1, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, '', '', ''),
-(2926, 'Vit_Glove_', 'Vit Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 1, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, '', '', ''),
-(2927, 'Dex_Glove_', 'Dex Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 1, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, '', '', ''),
-(2928, 'Luk_Glove_', 'Luk Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 1, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, '', '', ''),
+(2917, 'Str_Glove', 'Str Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, 'bonus bMaxHP,100; bonus bMaxSP,20; bonus bBaseAtk,(readparam(bStr)/10); if(readparam(bStr)>=110) bonus bAtkRate,1;', '', ''),
+(2918, 'Int_Glove', 'Int Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, 'bonus bMaxHP,100; bonus bMaxSP,20; bonus bMatk,(readparam(bInt)/10); if(readparam(bInt)>=110) bonus bMatkRate,1;', '', ''),
+(2919, 'Agi_Glove', 'Agi Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, 'bonus bMaxHP,100; bonus bMaxSP,20; bonus bFlee,(readparam(bAgi)/10); if(readparam(bAgi)>=110) bonus bFlee2,1;', '', ''),
+(2920, 'Vit_Glove', 'Vit Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, 'bonus bMaxHP,100; bonus bMaxSP,20; bonus bMaxHP,(readparam(bVit)/10)*50; if(readparam(bVit)>=110) bonus bMaxHPrate,1;', '', ''),
+(2921, 'Dex_Glove', 'Dex Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, 'bonus bMaxHP,100; bonus bMaxSP,20; bonus bHit,(readparam(bDex)/10); if(readparam(bDex)>=110) bonus bLongAtkRate,1;', '', ''),
+(2922, 'Luk_Glove', 'Luk Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 0, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, 'bonus bMaxHP,100; bonus bMaxSP,20; bonus bCritical,(readparam(bLuk)/10); if(readparam(bLuk)>=110) bonus bCritAtkRate,1;', '', ''),
+(2923, 'Str_Glove_', 'Str Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 1, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, 'bonus bMaxHP,100; bonus bMaxSP,20; bonus bBaseAtk,(readparam(bStr)/10); if(readparam(bStr)>=110) bonus bAtkRate,1;', '', ''),
+(2924, 'Int_Glove_', 'Int Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 1, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, 'bonus bMaxHP,100; bonus bMaxSP,20; bonus bMatk,(readparam(bInt)/10); if(readparam(bInt)>=110) bonus bMatkRate,1;', '', ''),
+(2925, 'Agi_Glove_', 'Agi Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 1, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, 'bonus bMaxHP,100; bonus bMaxSP,20; bonus bFlee,(readparam(bAgi)/10); if(readparam(bAgi)>=110) bonus bFlee2,1;', '', ''),
+(2926, 'Vit_Glove_', 'Vit Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 1, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, 'bonus bMaxHP,100; bonus bMaxSP,20; bonus bMaxHP,(readparam(bVit)/10)*50; if(readparam(bVit)>=110) bonus bMaxHPrate,1;', '', ''),
+(2927, 'Dex_Glove_', 'Dex Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 1, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, 'bonus bMaxHP,100; bonus bMaxSP,20; bonus bHit,(readparam(bDex)/10); if(readparam(bDex)>=110) bonus bLongAtkRate,1;', '', ''),
+(2928, 'Luk_Glove_', 'Luk Glove', 5, 75000, 37500, 100, 0, 0, 0, 0, 1, 4294967295, 63, 2, 136, 0, 100, 0, 0, 0, 'bonus bMaxHP,100; bonus bMaxSP,20; bonus bCritical,(readparam(bLuk)/10); if(readparam(bLuk)>=110) bonus bCritAtkRate,1;', '', ''),
 (2936, 'Recovery_Ring', 'Rings of Recovery', 5, 20, 10, 100, 0, 0, 5, 0, 1, 4294967295, 7, 2, 136, 0, 10, 0, 0, 0, 'bonus bVit,1;', '', ''),
 (2940, 'Ninja_Manual', 'Ninja Tutorial', 5, 0, 0, 100, 0, 0, 0, 0, 0, 1, 47, 2, 136, 0, 1, 12, 0, 0, '', '', ''),
 (2941, 'Gunslinger_Manual', 'Gunslinger Tutorial', 5, 0, 0, 100, 0, 0, 0, 0, 0, 1, 47, 2, 136, 0, 1, 12, 0, 0, '', '', ''),