* Added missing pre-re item database entries (bugreport:6177)

* Fixed a couple wrong SQL item database entries (bugreport:6133)

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

2 files changed, 9 insertions, 3 deletions

diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
index a5696d416..b48a5e6c2 100644
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -1618,6 +1618,12 @@
 2797,Magical_Stone_,Rocks,5,0,,200,,0,,0,0x00810204,7,2,136,,99,0,0,{ bonus2 bAddDamageClass,2049,10; bonus2 bAddDefClass,2050,-10; bonus3 bAddClassDropItem,6151,2049,70; },{},{}
 2798,Will_Of_Exhausted_Angel,Will Of Exhausted Angel,5,0,,200,,0,,0,0x00008100,7,2,136,,99,0,0,{ getmapxy .@map$,.@x,.@y,0; if(.@map$ == "job3_arch02") { bonus2 bAddDefClass,1761,50; bonus2 bAddDefClass,1762,50; } },{},{}
 2799,Kuirpenring,Kuirpenring,5,0,,100,,0,,1,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bMdef,1; },{},{}
+2819,Swordman_Manual,Swordsman Manual,5,0,,100,,0,,0,0x00000001,7,2,136,,1,0,0,{ bonus bMaxSP,100; skill "SM_BASH",1; skill "SM_PROVOKE",1; skill "SM_MAGNUM",1; },{},{}
+2820,Thief_Manual,Thief Manual,5,0,,100,,0,,0,0x00000001,7,2,136,,1,0,0,{ bonus bMaxSP,100; skill "TF_DOUBLE",3; skill "TF_STEAL",1; skill "TF_HIDING",1; skill "TF_POISON",1; },{},{}
+2821,Acolyte_Manual,Acolyte Manual,5,0,,100,,0,,0,0x00000001,7,2,136,,1,0,0,{ bonus bMaxSP,100; skill "AL_HEAL",1; skill "AL_INCAGI",1; skill "AL_BLESSING",1; },{},{}
+2822,Archer_Manual,Archer Manual,5,0,,100,,0,,0,0x00000001,7,2,136,,1,0,0,{ bonus bMaxSP,100; skill "AC_OWL",1; skill "AC_CONCENTRATION",1; },{},{}
+2823,Merchant_Manual,Merchant Manual,5,0,,100,,0,,0,0x00000001,7,2,136,,1,0,0,{ bonus bMaxSP,100; skill "MC_DISCOUNT",1; skill "MC_OVERCHARGE",10; skill "MC_IDENTIFY",1; skill "MC_MAMMONITE",1; },{},{}
+2824,Mage_Manual,Mage Manual,5,0,,100,,0,,0,0x00000001,7,2,136,,1,0,0,{ bonus bMaxSP,100; skill "MG_SRECOVERY",1; skill "MG_COLDBOLT",1; skill "MG_FIREWALL",1; skill "MG_FIREBOLT",1; },{},{}
 // Cards
 //===================================================================
 4001,Poring_Card,Poring Card,6,20,,10,,,,,,,,16,,,,,{ bonus bLuk,2; bonus bFlee2,1; },{},{}
diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql
index 621f45820..a3f9a1415 100644
--- a/sql-files/item_db_re.sql
+++ b/sql-files/item_db_re.sql
@@ -102,7 +102,7 @@ REPLACE INTO `item_db_re` VALUES (1649,'Rafini_Staff','Laphine Staff',4,20,NULL,
 REPLACE INTO `item_db_re` VALUES (1650,'P_Staff1','Eden Staff I',4,0,NULL,0,'60:125',NULL,1,0,0x00818314,7,2,2,2,26,0,10,'bonus bInt,2;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1651,'P_Staff2','Eden Staff II',4,0,NULL,0,'60:150',NULL,1,0,0x00818314,7,2,2,2,40,0,10,'bonus bInt,3;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1652,'Tourist_Staff','Tourist Staff',4,0,NULL,500,'35:0',NULL,1,0,0x00818315,7,2,2,1,1,0,10,'bonus bInt,2; bonus bAgi,1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1653,'Staff_Of_Healing_C','Staff of Healing',4,'10:100',NULL,0,10,NULL,1,0,0x00008110,7,2,2,3,1,0,10,'bonus bAtkEle,Ele_Holy;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1653,'Staff_Of_Healing_C','Staff of Healing',4,20,NULL,0,'10:100',NULL,1,0,0x00008110,7,2,2,3,1,0,10,'bonus bAtkEle,Ele_Holy;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1654,'Mental_Stick','Mental Stick',4,20,NULL,500,'40:170',NULL,1,1,0x00818315,7,2,2,3,102,1,10,'if (getrefine() > 5) { /* bonus bSkillAtk,\"SO_PSYCHIC_WAVE\",(getrefine()-5)*2; */ bonus bMaxHPRate,-(getrefine()-5)*2; } /* bonus2 bVariableCastTime,\"SO_PSYCHIC_WAVE\",-3000; bonus2 bUseSPAmount,\"SO_PSYCHIC_WAVE\",-60; */',NULL,'itemheal 0,-100;');
 # 1655,
 # 1656,
@@ -122,7 +122,7 @@ REPLACE INTO `item_db_re` VALUES (2007,'Golden_Rod_Staff1','Golden Rod Staff I',
 REPLACE INTO `item_db_re` VALUES (2008,'Aqua_Staff1','Aqua Staff I',4,20,NULL,900,'30:230',NULL,1,2,0x00000200,7,2,34,4,100,1,23,'bonus bAtkEle,Ele_Water; bonus bInt,3; bonus2 bSkillAtk,\"MG_COLDBOLT\",12; bonus2 bSkillAtk,\"MG_FROSTDIVER\",12; if (isequipped(2468,2860,15026)) { bonus2 bSubEle,Ele_Wind,-50; };',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2009,'Crimson_Staff1','Crimson Staff I',4,20,NULL,900,'30:230',NULL,1,2,0x00000200,7,2,34,4,100,1,23,'bonus bAtkEle,Ele_Fire; bonus bInt,3; bonus2 bSkillAtk,\"MG_FIREBOLT\",10; bonus2 bSkillAtk,\"MG_FIREBALL\",10; if (isequipped(2469,2861,15027)) { bonus2 bSubEle,Ele_Water,-50; };',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2010,'Forest_Staff1','Forest Staff I',4,20,NULL,900,'30:230',NULL,1,2,0x00000200,7,2,34,4,100,1,23,'bonus bAtkEle,Ele_Earth; bonus bInt,3; bonus2 bSkillAtk,\"WZ_EARTHSPIKE\",10; bonus2 bSkillAtk,\"WZ_HEAVENDRIVE\",10; if (isequipped(2470,2862,15028)) { bonus2 bSubEle,Ele_Fire,-50; };',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (2011,'Golden_Rod_Staff2','Golden Rod Staff II',4,'30:270',NULL,900,30,NULL,1,1,0x00000200,7,2,34,4,130,1,10,'bonus bAtkEle,Ele_Wind; bonus bInt,5; bonus2 bSkillAtk,\"WZ_JUPITEL\",30; if (isequipped(2467,2859,15025)) { bonus2 bSubEle,Ele_Earth,-50; };',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (2011,'Golden_Rod_Staff2','Golden Rod Staff II',4,20,NULL,900,'30:270',NULL,1,1,0x00000200,7,2,34,4,130,1,10,'bonus bAtkEle,Ele_Wind; bonus bInt,5; bonus2 bSkillAtk,\"WZ_JUPITEL\",30; if (isequipped(2467,2859,15025)) { bonus2 bSubEle,Ele_Earth,-50; };',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2012,'Aqua_Staff2','Aqua Staff II',4,20,NULL,900,'30:270',NULL,1,1,0x00000200,7,2,34,4,130,1,10,'bonus bAtkEle,Ele_Water; bonus bInt,5; bonus2 bSkillAtk,\"MG_COLDBOLT\",30; bonus2 bSkillAtk,\"MG_FROSTDIVER\",30; if (isequipped(2468,2860,15026)) { bonus2 bSubEle,Ele_Wind,-50; };',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2013,'Crimson_Staff2','Crimson Staff II',4,20,NULL,900,'30:270',NULL,1,1,0x00000200,7,2,34,4,130,1,10,'bonus bAtkEle,Ele_Fire; bonus bInt,5; bonus2 bSkillAtk,\"MG_FIREBOLT\",30; bonus2 bSkillAtk,\"MG_FIREBALL\",30; if (isequipped(2469,2861,15027)) { bonus2 bSubEle,Ele_Water,-50; };',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (2014,'Forest_Staff2','Forest Staff II',4,20,NULL,900,'30:270',NULL,1,1,0x00000200,7,2,34,4,130,1,10,'bonus bAtkEle,Ele_Earth; bonus bInt,5; bonus2 bSkillAtk,\"WZ_EARTHSPIKE\",30; bonus2 bSkillAtk,\"WZ_HEAVENDRIVE\",30; if (isequipped(2470,2862,15028)) { bonus2 bSubEle,Ele_Fire,-50; };',NULL,NULL);
@@ -138,7 +138,7 @@ REPLACE INTO `item_db_re` VALUES (1561,'Hardback','Hardcover Book',4,20,NULL,150
 REPLACE INTO `item_db_re` VALUES (1563,'Diary_Of_Great_Sage_C','Sage\'s Diary',4,1,NULL,0,'135:140',NULL,1,2,0x00410100,7,2,2,3,1,0,15,'bonus bMatkRate,20; bonus bAspdRate,5;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1564,'Encyclopedia','Encyclopedia',4,20,NULL,2000,'110:100',NULL,1,2,0x00410100,7,2,2,3,70,1,15,'bonus bInt,3; bonus bDex,2; bonus bCritical,20+((readparam(bLuk)*2)/10);','','');
 REPLACE INTO `item_db_re` VALUES (1565,'Death_Note','Ledger of Death',4,20,NULL,1000,'137:100',NULL,1,2,0x00410100,7,2,2,4,85,1,15,'bonus bMatkRate,15; bonus bStr,3; bonus bInt,3; bonus bLuk,-20; bonus2 bWeaponComaRace,RC_DemiHuman,10; bonus bAspdRate,getrefine(); if(BaseJob == Job_Sage) bonus3 bAutoSpell,\"NPC_HELLJUDGEMENT\",5,20;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (1566,'Diary_Of_Great_Basil','Diary Of Great Basil',4,'120:125',NULL,0,120,NULL,1,0,0x00410100,7,2,2,1,0,0,15,'bonus2 bAddRace,RC_Boss,50; bonus2 bAddRace,RC_NonBoss,50;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (1566,'Diary_Of_Great_Basil','Diary Of Great Basil',4,20,NULL,0,'120:125',NULL,1,0,0x00410100,7,2,2,1,0,0,15,'bonus2 bAddRace,RC_Boss,50; bonus2 bAddRace,RC_NonBoss,50;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1567,'Hardback_C','Refined Hardcover Book',4,1,NULL,0,'168:100',NULL,1,0,0x00410100,7,2,2,4,0,0,15,'bonus bStr,5; bonus bDex,2; bonus bMatkRate,20;',NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (1572,'Principles_Of_Magic','Principles of Magic',4,20,NULL,300,'60:160',NULL,1,2,0x00410100,7,2,2,3,60,1,15,'bonus bInt,3; bonus bSPrecovRate,5;','','');
 REPLACE INTO `item_db_re` VALUES (1573,'Ancient_Magic','Ancient Magic',4,20,NULL,700,'30:140',NULL,1,2,0x00410100,7,2,2,3,70,1,15,'if (isequipped(2334) || isequipped(2372)) { bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; };','','');