- Fixed Novice Figure not giving the HP+30 bonus to Novice High and Super Novice

- Updated mob_boss.txt to official
- Fixed an exploit that caused Byorgue to re-summon his slaves every 60000ms rather than every 60000s

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17330 54d463be-8e91-2dee-dedb-b68131a5f0ec

db/pre-re/item_db.txt

@@ -1583,7 +1583,7 @@
 2762,Dragoon_Ring,Dragon Ring,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus2 bExpAddRace,RC_Dragon,15; },{},{}
 2763,Skul_Ring_C,Neo Skull Ring,5,0,,0,,0,,0,0xFFFFFFFE,2,2,136,,95,0,0,{ bonus bAtkRate,5; bonus bMatkrate,5; bonus bMaxHPrate,5; bonus2 bSkillHeal,"AL_HEAL",5; skill "MG_SIGHT",1; },{},{}
 2764,Small_Fishing_Rod,Small Fishing Rod,5,10,,250,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{}
-2765,Novice_Figure,Novice Figure,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bMaxHP,70; if(Class==Job_Novice) bonus bMaxHP,30; },{},{}
+2765,Novice_Figure,Novice Figure,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bMaxHP,70; if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) bonus bMaxHP,30; },{},{}
 2766,Swordman_Figure,Swordman Figure,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bVit,1; if(Class==Job_Swordman) bonus bDef,2; },{},{}
 2767,Acolyte_Figure,Acolyte Figure,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bInt,1; if(Class==Job_Acolyte) bonus bMaxSP,50; },{},{}
 2768,Mage_Figure,Mage Figure,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bInt,1; if(Class==Job_Mage) bonus bSPrecovRate,5; },{},{}

db/pre-re/mob_boss.txt

@@ -4,47 +4,46 @@
 // MobID,DummyName,Rate
 
 0,Baphomet,1039
-1038,Osiris,1000000
-1039,Baphomet,1000000
-1046,Doppelganger,1000000
-1059,Mistress,1000000
-1086,Golden Thief Bug,1000000
-1087,Orc Hero,1000000
-1096,Angeling,1000000
-1112,Drake,1000000
-1115,Eddga,1000000
-1120,Ghostring,1000000
-1147,Maya,1000000
-1150,Moonlight Flower,1000000
-1157,Pharaoh,1000000
-1159,Phreeoni,1000000
-1190,Orc Lord,1000000
-1251,Stormy Knight,1000000
-1252,Hatii,1000000
-1272,Dark Lord,1000000
-1312,Turtle General,1000000
-1373,Lord of the Dead,1000000
-1388,Arc Angeling,1000000
-1389,Dracula,1000000
-1418,Evil Snake Lord,1000000
-1492,Samurai Specter,1000000
-1511,Amon Ra,1000000
-1582,Deviling,1000000
-1583,Tao Gunka,1000000
-1623,RSX-0806,1000000
-1630,White Lady,1000000
-1658,Egnigem Cenia,1000000
-1685,Vesper,1000000
-1688,Lady Tanee,1000000
-1708,Thanatos Phantom,1000000
-1719,Detardeurus,1000000
-1734,Kiel D-01,1000000
-1751,Valkyrie Randgris,1000000
-1768,Gloom Under Night,1000000
-1779,Ktullanux,1000000
+1038,Osiris,500000
+1039,Baphomet,500000
+1046,Doppelganger,500000
+1059,Mistress,500000
+1086,Golden Thief Bug,500000
+1087,Orc Hero,500000
+1096,Angeling,500000
+1112,Drake,500000
+1115,Eddga,500000
+1120,Ghostring,500000
+1147,Maya,500000
+1150,Moonlight Flower,500000
+1157,Pharaoh,500000
+1159,Phreeoni,500000
+1190,Orc Lord,500000
+1251,Stormy Knight,500000
+1252,Hatii,500000
+1272,Dark Lord,500000
+1312,Turtle General,500000
+1373,Lord of the Dead,500000
+1388,Arc Angeling,500000
+1389,Dracula,500000
+1418,Evil Snake Lord,500000
+1492,Samurai Specter,500000
+1511,Amon Ra,500000
+1582,Deviling,500000
+1583,Tao Gunka,500000
+1623,RSX-0806,500000
+1630,White Lady,500000
+1658,Egnigem Cenia,500000
+1685,Vesper,500000
+1688,Lady Tanee,500000
+1708,Thanatos Phantom,500000
+1719,Detardeurus,500000
+1734,Kiel D-01,500000
+1751,Valkyrie Randgris,500000
+1768,Gloom Under Night,500000
+1779,Ktullanux,500000
 1785,Atroce,1000000
-1832,Ifrit,1000000
-1871,Falling Bishop,1000000
-1873,Beelzebub,1000000
-1885,Gopinich,1000000
-2022,Nidhoggur's Shadow,1000000
+1832,Ifrit,500000
+1871,Falling Bishop,500000
+1873,Beelzebub,500000
+1885,Gopinich,500000

db/pre-re/mob_skill_db.txt

@@ -4573,9 +4573,9 @@
 1838,Knocker@TF_SPRINKLESAND,attack,149,1,1000,0,5000,yes,target,always,0,,,,,,6,
 1838,Knocker@TF_THROWSTONE,chase,152,1,2000,0,10000,yes,target,always,0,,,,,,29,
 1838,Knocker@TF_THROWSTONE,attack,152,1,1000,0,10000,yes,target,always,0,,,,,,29,
-1839,Byorgue@NPC_SUMMONSLAVE,idle,196,2,10000,1000,60000,no,self,slavele,1,1829,1830,,,,,
-1839,Byorgue@NPC_SUMMONSLAVE,chase,196,2,10000,1000,60000,no,self,slavele,1,1829,1830,,,,,
-1839,Byorgue@NPC_SUMMONSLAVE,attack,196,2,10000,1000,60000,no,self,slavele,1,1829,1830,,,,,
+1839,Byorgue@NPC_SUMMONSLAVE,idle,196,2,10000,1000,60000000,no,self,slavele,1,1829,1830,,,,,
+1839,Byorgue@NPC_SUMMONSLAVE,chase,196,2,10000,1000,60000000,no,self,slavele,1,1829,1830,,,,,
+1839,Byorgue@NPC_SUMMONSLAVE,attack,196,2,10000,1000,60000000,no,self,slavele,1,1829,1830,,,,,
 1839,Byorgue@NPC_CALLSLAVE,idle,352,1,10000,0,10000,yes,self,always,0,,,,,,,
 1839,Byorgue@SM_BASH,attack,5,5,500,0,5000,yes,target,always,0,,,,,,,
 1839,Byorgue@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,

db/re/item_db.txt

@@ -1778,7 +1778,7 @@
 2762,Dragoon_Ring,Dragon Ring,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,1,0,0,{ bonus2 bExpAddRace,RC_Dragon,15; },{},{}
 2763,Skul_Ring_C,Neo Skull Ring,5,0,,0,,0,,0,0xFFFFFFFE,2,2,136,,95,0,0,{ bonus bAtkRate,5; bonus bMatkrate,5; bonus bMaxHPrate,5; bonus2 bSkillHeal,"AL_HEAL",5; skill "MG_SIGHT",1; },{},{}
 2764,Small_Fishing_Rod,Small Fishing Rod,5,10,,250,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{}
-2765,Novice_Figure,Novice Figure,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bMaxHP,70; if(Class==Job_Novice) bonus bMaxHP,30; },{},{}
+2765,Novice_Figure,Novice Figure,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bMaxHP,70; if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) bonus bMaxHP,30; },{},{}
 2766,Swordman_Figure,Swordman Figure,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bVit,1; if(Class==Job_Swordman) bonus bDef,2; },{},{}
 2767,Acolyte_Figure,Acolyte Figure,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bInt,1; if(Class==Job_Acolyte) bonus bMaxSP,50; },{},{}
 2768,Mage_Figure,Mage Figure,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bInt,1; if(Class==Job_Mage) bonus bSPrecovRate,5; },{},{}

db/re/mob_boss.txt

@@ -4,49 +4,46 @@
 // MobID,DummyName,Rate
 
 0,Baphomet,1039
-1038,Osiris,1000000
-1039,Baphomet,1000000
-1046,Doppelganger,1000000
-1059,Mistress,1000000
-1086,Golden Thief Bug,1000000
-1087,Orc Hero,1000000
-1096,Angeling,1000000
-1112,Drake,1000000
-1115,Eddga,1000000
-1120,Ghostring,1000000
-1147,Maya,1000000
-1150,Moonlight Flower,1000000
-1157,Pharaoh,1000000
-1159,Phreeoni,1000000
-1190,Orc Lord,1000000
-1251,Stormy Knight,1000000
-1252,Hatii,1000000
-1272,Dark Lord,1000000
-1312,Turtle General,1000000
-1373,Lord of the Dead,1000000
-1388,Arc Angeling,1000000
-1389,Dracula,1000000
-1418,Evil Snake Lord,1000000
-1492,Samurai Specter,1000000
-1511,Amon Ra,1000000
-1582,Deviling,1000000
-1583,Tao Gunka,1000000
-1623,RSX-0806,1000000
-1630,White Lady,1000000
-1658,Egnigem Cenia,1000000
-1685,Vesper,1000000
-1688,Lady Tanee,1000000
-1708,Thanatos Phantom,1000000
-1719,Detardeurus,1000000
-1734,Kiel D-01,1000000
-1751,Valkyrie Randgris,1000000
-1768,Gloom Under Night,1000000
-1779,Ktullanux,1000000
+1038,Osiris,500000
+1039,Baphomet,500000
+1046,Doppelganger,500000
+1059,Mistress,500000
+1086,Golden Thief Bug,500000
+1087,Orc Hero,500000
+1096,Angeling,500000
+1112,Drake,500000
+1115,Eddga,500000
+1120,Ghostring,500000
+1147,Maya,500000
+1150,Moonlight Flower,500000
+1157,Pharaoh,500000
+1159,Phreeoni,500000
+1190,Orc Lord,500000
+1251,Stormy Knight,500000
+1252,Hatii,500000
+1272,Dark Lord,500000
+1312,Turtle General,500000
+1373,Lord of the Dead,500000
+1388,Arc Angeling,500000
+1389,Dracula,500000
+1418,Evil Snake Lord,500000
+1492,Samurai Specter,500000
+1511,Amon Ra,500000
+1582,Deviling,500000
+1583,Tao Gunka,500000
+1623,RSX-0806,500000
+1630,White Lady,500000
+1658,Egnigem Cenia,500000
+1685,Vesper,500000
+1688,Lady Tanee,500000
+1708,Thanatos Phantom,500000
+1719,Detardeurus,500000
+1734,Kiel D-01,500000
+1751,Valkyrie Randgris,500000
+1768,Gloom Under Night,500000
+1779,Ktullanux,500000
 1785,Atroce,1000000
-1832,Ifrit,1000000
-1871,Falling Bishop,1000000
-1873,Beelzebub,1000000
-1885,Gopinich,1000000
-2022,Nidhoggur's Shadow,1000000
-2068,Boitata,1000000
-2087,Scaraba Queen,1000000
+1832,Ifrit,500000
+1871,Falling Bishop,500000
+1873,Beelzebub,500000
+1885,Gopinich,500000

db/re/mob_skill_db.txt

@@ -4574,9 +4574,9 @@
 1838,Knocker@TF_SPRINKLESAND,attack,149,1,1000,0,5000,yes,target,always,0,,,,,,6,
 1838,Knocker@TF_THROWSTONE,chase,152,1,2000,0,10000,yes,target,always,0,,,,,,29,
 1838,Knocker@TF_THROWSTONE,attack,152,1,1000,0,10000,yes,target,always,0,,,,,,29,
-1839,Byorgue@NPC_SUMMONSLAVE,idle,196,2,10000,1000,60000,no,self,slavele,1,1829,1830,,,,,
-1839,Byorgue@NPC_SUMMONSLAVE,chase,196,2,10000,1000,60000,no,self,slavele,1,1829,1830,,,,,
-1839,Byorgue@NPC_SUMMONSLAVE,attack,196,2,10000,1000,60000,no,self,slavele,1,1829,1830,,,,,
+1839,Byorgue@NPC_SUMMONSLAVE,idle,196,2,10000,1000,60000000,no,self,slavele,1,1829,1830,,,,,
+1839,Byorgue@NPC_SUMMONSLAVE,chase,196,2,10000,1000,60000000,no,self,slavele,1,1829,1830,,,,,
+1839,Byorgue@NPC_SUMMONSLAVE,attack,196,2,10000,1000,60000000,no,self,slavele,1,1829,1830,,,,,
 1839,Byorgue@NPC_CALLSLAVE,idle,352,1,10000,0,10000,yes,self,always,0,,,,,,,
 1839,Byorgue@SM_BASH,attack,5,5,500,0,5000,yes,target,always,0,,,,,,,
 1839,Byorgue@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,