* Reverted the healing staff update. [L0ne_W0lf]

- The discrepancies in Aegis  and eA seem to like in meditatio.
* Updated War of Emeprium SE Sword guardian stats.


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

3 files changed, 15 insertions, 12 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 09f057f63..caf65a1b2 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -44,6 +44,9 @@
 
 =======================
 2008/04/03
+	* Rev. 12469 Reverted the healing staff update. [L0ne_W0lf]
+	- The discrepancies in Aegis  and eA seem to like in meditatio.
+	* Updated War of Emeprium SE Sword guardian stats.
 	* Rev. 12468 updated Healing_Staff heal boosting effect. [L0ne_W0lf]
 2008/04/02
 	* Rev. 12462 Added new castles to castle database. [L0ne_W0lf]
diff --git a/db/item_db.txt b/db/item_db.txt
index 7e4edab2b..c0d9b5787 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -826,7 +826,7 @@
 1622,Hypnotist's_Staff_,Hypnotist's Staff,4,,10,500,70,,1,2,0x00000001,7,2,2,3,30,1,10,{ bonus bInt,1; bonus bMatkRate,25; },{},{}
 1623,Mighty_Staff_C,Refined Mighty Staff,4,,10,700,165,,1,0,0x00818314,7,2,2,3,1,0,10,{ bonus bStr,10; bonus bInt,4; bonus bMatkRate,20; bonus bSPDrainValue,-1; },{},{}
 1624,Lich_Bone_Wand,Lich's Bone Wand,4,,10,800,60,,1,2,0x00018314,2,2,2,3,70,1,10,{ bonus bInt,1; bonus bDex,1; bonus bAtkEle,Ele_Undead; bonus bMatkRate,20; bonus3 bAutoSpellWhenHit,677,5,10+(getrefine()/1000); if(getrefine()>=9){ bonus bMatkRate,3; bonus bMaxSP,300; } },{},{}
-1625,Healing_Staff,Recovery Staff,4,,10,400,10,,1,0,0x00008110,7,2,2,3,55,1,10,{ bonus bAtkEle,Ele_Holy; bonus bMatkRate,15; bonus2 bSkillHeal,28,(getrefine()*20)/10+2*(getrefine()>9); bonus2 bSkillHeal,70,(getrefine()*15)/10+2*(getrefine()>9); },{},{}
+1625,Healing_Staff,Recovery Staff,4,,10,400,10,,1,0,0x00008110,7,2,2,3,55,1,10,{ bonus bAtkEle,Ele_Holy; bonus bMatkRate,15; bonus2 bSkillHeal,28,(getrefine()*15)/10+2*(getrefine()>9); bonus2 bSkillHeal,70,(getrefine()*15)/10+2*(getrefine()>9); },{},{}
 1626,Piercing_Staff,Staff of Piercing,4,,10,500,80,,1,0,0x00018314,2,2,2,3,70,1,10,{ bonus bInt,4; bonus bMatkRate,15; bonus bIgnoreMdefRate,10+getrefine(); },{},{}
 1627,Staffy,Staffy,4,,10,0,120,,1,0,0x00818315,7,2,2,1,1,0,10,{ bonus bMatkRate,15; bonus2 bAddRace,RC_Boss,50; bonus2 bAddRace,RC_NonBoss,50; },{},{}
 1628,Survival_Rod_C,Refined Survivor's Rod,4,,0,0,71,,1,0,0x00818314,7,2,2,3,1,0,10,{ bonus bDex,4; bonus bMatkRate,20; bonus bMaxHP,500; },{},{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index a7063ae27..2994cd8d4 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -935,8 +935,8 @@
 1896,EVENT_KATRINN,Katrinn,Kathryne Keyron,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1897,EVENT_BAPHOMET_,Baphomet,Baphomet,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1898,G_ZOMBIE,Zombie,Zombie,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1899,SWORD_GUARDIAN_,Knight Guardian,Knight Guardian,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x20A5,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1900,BOW_GUARDIAN_,Archer Guardian,Archer Guardian,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x20A5,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1899,SWORD_GUARDIAN_,Sword Guardian,Sword Guardian,86,152533,0,0,0,2,7590,1550,60,33,110,40,54,65,125,65,14,16,2,7,80,0x20A5,170,140,384,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+//1900,BOW_GUARDIAN_,Archer Guardian,Archer Guardian,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x20A5,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1901,E_CONDOR,Condor,Condor,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1902,E_TREASURE_BOX1,Treasure Box,Treasure Box,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1903,E_TREASURE_BOX2,Treasure Box,Treasure Box,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -977,15 +977,15 @@
 1935,RED_FLOWER,Red Flower,Red Flower,1,10000,0,0,0,1,7,10,100,99,1,1,1,1,6,30,10,12,1,3,22,0x40,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1936,YELL_FLOWER,Yellow Flower,Yellow Flower,1,10000,0,0,0,1,7,10,100,99,1,1,1,1,6,30,10,12,1,3,22,0x40,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1937,G_CONSTANT_,Constant,Constant,55,10000,0,3230,116,1,460,580,12,12,50,28,26,47,66,14,10,12,0,0,67,0x3885,150,720,360,360,0,0,0,0,0,0,0,0,7512,100,7507,1500,7325,10,999,10,757,10,0,0,0,0,0,0,0,0,0,0
-1938,TREASURE_BOX41,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0
-1939,TREASURE_BOX42,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0
-1940,TREASURE_BOX43,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0
-1941,TREASURE_BOX44,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0
-1942,TREASURE_BOX45,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0
-1943,TREASURE_BOX46,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0
-1944,TREASURE_BOX47,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0
-1945,TREASURE_BOX48,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0
-1946,TREASURE_BOX49,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0
+1938,TREASURE_BOX41,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7830,80,658,500,12999,10000,984,4850,985,7275,2514,40,1625,150,1268,150,0,0,0,0
+1939,TREASURE_BOX42,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7831,80,658,500,12999,10000,984,4850,985,7275,2513,40,1375,150,1269,150,0,0,0,0
+1940,TREASURE_BOX43,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7832,80,658,500,12999,10000,984,4850,985,7275,13027,150,1376,150,1271,150,0,0,0,0
+1941,TREASURE_BOX44,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7833,80,658,500,12999,10000,984,4850,985,7275,13404,150,1730,150,0,50,0,0,0,0
+1942,TREASURE_BOX45,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7834,80,658,500,12999,10000,984,4850,985,7275,1176,150,1734,150,1819,150,0,0,0,0
+1943,TREASURE_BOX46,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7835,80,658,500,12999,10000,984,4850,985,7275,1421,150,1731,150,1822,150,0,0,0,0
+1944,TREASURE_BOX47,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7836,80,658,500,12999,10000,984,4850,985,7275,1478,150,1732,150,2531,50,0,0,0,0
+1945,TREASURE_BOX48,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7837,80,658,500,12999,10000,984,4850,985,7275,1624,150,1733,150,1821,150,0,0,0,0
+1946,TREASURE_BOX49,Treasure Chest,Treasure Chest,99,0,0,0,0,0,0,0,0,0,0,0,0,0,255,0,0,0,0,0,20,0x120,0,0,0,0,0,0,0,0,0,0,0,0,7838,80,658,500,12999,10000,984,4850,985,7275,1626,150,1270,150,2532,50,0,0,0,0
 1947,G_PIAMETTE,Piamette,Piamette,90,300000,0,0,0,1,7,10,35,35,1,1,1,1,6,30,10,12,0,7,20,0x37B5,150,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1949,G_SWORD_GUARDIAN_,Sword Guardian,Sword Wardian,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 1950,G_ARCHER_GUARDIAN_,Archer Guardian,Archer Guardian,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0