* Monster and Item update

- implemented Endless Tower and Sealed Shrine mobs properly
- added the official drops to them
- some skills are still missing so be careful
- fixed up the remaining 12.1 cards (chances)

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

3 files changed, 18 insertions, 13 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 53400abe7..a02688f35 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -38,6 +38,11 @@
 
 =======================
 2009/04/04
+	* Monster and Item update [Playtester]
+	- implemented Endless Tower and Sealed Shrine mobs properly
+	- added the official drops to them
+	- some skills are still missing so be careful
+	- fixed up the remaining 12.1 cards (chances)
 	* Fixed many of the 12.1 gears [Playtester]
 	- for details create a diff of the changes
 2009/04/03
diff --git a/db/item_db.txt b/db/item_db.txt
index 5eab3419b..acd7ebc97 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1945,17 +1945,17 @@
 4412,Isilla_Card,Isilla Card,6,20,,10,,,,,,,,769,,,,,{ bonus bInt,2; bonusautoscript "{ specialeffect2 EF_SUFFRAGIUM; sc_start SC_FASTCAST,5000,50; sc_start SC_INCFLEE,5000,30; }",50,BF_MAGIC; },{},{}
 4413,Hodremlin_Card,Hodremlin Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubSize,0,15; bonus2 bSubSize,1,15; bonus2 bSubSize,2,15; bonusautoscript2 "{ specialeffect2 EF_WIND; sc_start SC_INCFLEE2,10000,30; }",3,BF_WEAPON|BF_MAGIC; },{},{}
 4414,Seeker_Card,Seeker Card,6,20,,10,,,,,,,,32,,,,,{ skill "MG_STONECURSE",1; bonus2 bResEff,Eff_Stone,3000; bonus bMdef,10; },{},{}
-4415,Snowier_Card,Snowier Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItem,536,200; bonus2 bAddItemHealRate,536,100; },{},{}
+4415,Snowier_Card,Snowier Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItem,536,2000; bonus2 bAddItemHealRate,536,100; },{},{}
 4416,Siroma_Card,Siroma Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bSkillAtk,14,25; bonus2 bCastrate,14,-25; },{},{}
 4417,Ice_Titan_Card,Ice Titan Card,6,20,,10,,,,,,,,64,,,,,{ bonus bVit,2; bonusautoscript2 "{ specialeffect2 EF_FREEZED; sc_start SC_INCDEF,10000,10; }",3,BF_WEAPON|BF_MAGIC; },{},{}
 4418,Gazeti_Card,Gazeti Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAutoSpell,"MG_COLDBOLT",2,100; },{},{}
-4419,Ktullanux_Card,Ktullanux Card,6,20,,10,,,,,,,,16,,,,,{  bonus2 bAddEle,Ele_Fire,50; bonus5 bAutoSpellWhenHit,"WZ_FROSTNOVA",10,30,BF_WEAPON|BF_MAGIC,0; },{},{}
+4419,Ktullanux_Card,Ktullanux Card,6,20,,10,,,,,,,,16,,,,,{  bonus2 bAddEle,Ele_Fire,50; bonus5 bAutoSpellWhenHit,"WZ_FROSTNOVA",10,20,BF_WEAPON|BF_MAGIC,0; },{},{}
 4420,Muscipular_Card,Muscipular Card,6,20,,10,,,,,,,,32,,,,,{ bonus5 bAutoSpellWhenHit,"AL_HEAL",1,100,BF_SHORT,0; bonus5 bAutoSpellWhenHit,"AL_INCAGI",1,100,BF_SHORT,0; },{},{}
 4421,Drosera_Card,Drosera Card,6,20,,10,,,,,,,,2,,,,,{ if (getiteminfo(getequipid(EQI_HAND_R),9) > 3) bonus bCritical,15; },{},{}
 4422,Roween_Card,Roween Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,5; bonus bFlee2,3; bonus2 bAddEle,Ele_Water,10; bonus2 bCriticalAddRace,RC_Fish,15; },{},{}
 4423,Galion_Card,Galion Card,6,20,,10,,,,,,,,136,,,,,{ bonus bHit,5; bonus2 bAddEle,Ele_Water,5; },{},{}
 4424,Stapo_Card,Stapo Card,6,20,,10,,,,,,,,136,,,,,{ skill "TF_PICKSTONE",1; skill "TF_THROWSTONE",1; },{},{}
-4425,Atroce_Card,Atroce Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,25; bonusautoscript "{ sc_start SC_INCASPDRATE,10000,100; }",10; },{},{}
+4425,Atroce_Card,Atroce Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,25; bonusautoscript "{ sc_start SC_INCASPDRATE,10000,100; }",5; },{},{}
 4426,Byorgue_Card,Byorgue Card,6,20,,10,,,,,,,,16,,,,,{ if(BaseJob == Job_Rogue) { bonus bMatkRate,10; bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; } },{},{}
 4427,Sword_Guardian_Card,Sword Guardian Card,6,20,,10,,,,,,,,2,,,,,{ if (getiteminfo(getequipid(EQI_HAND_R),11) == 2 || getiteminfo(getequipid(EQI_HAND_R),11) == 3) { bonus bHit,5; bonus bCritical,5; bonus2 bSkillAtk,62,25; } },{},{}
 4428,Bow_Guardian_Card,Bow Guardian Card,6,20,,10,,,,,,,,2,,,,,{ if (getiteminfo(getequipid(EQI_HAND_R),11) == 11) { bonus bHit,5; bonus bCritical,5; bonus2 bSkillAtk,47,50; } },{},{}
@@ -1964,10 +1964,10 @@
 4431,Kasa_Card,Kasa Card,6,20,,10,,,,,,,,4,,,,,{ bonus3 bAutoSpell,"MG_FIREBALL",5,20; bonus3 bAutoSpell,"MG_FIREBOLT",5,20; },{},{}
 4432,Magmaring_Card,Magmaring Card,6,20,,10,,,,,,,,4,,,,,{ bonus bBaseAtk,5; bonus2 bAddEle,Ele_Earth,10; bonus2 bCriticalAddRace,RC_Brute,15; },{},{}
 4433,Imp_Card,Imp Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bSkillAtk,"MG_FIREBOLT",25; bonus2 bCastrate,"MG_FIREBOLT",-25; },{},{}
-4434,Knocker_Card,Knocker Card,6,20,,10,,,,,,,,769,,,,,{ bonus2 bAddRace,RC_Formless,5; bonus3 bAddMonsterDropItem,756,RC_Formless,100; bonus3 bAddMonsterDropItem,757,RC_Formless,100; },{},{}
+4434,Knocker_Card,Knocker Card,6,20,,10,,,,,,,,769,,,,,{ bonus2 bAddRace,RC_Formless,5; bonus3 bAddMonsterDropItem,756,RC_Formless,10; bonus3 bAddMonsterDropItem,757,RC_Formless,10; },{},{}
 4435,Zombie_Slaughter_Card,Zombie Slaughter Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bAddRace,RC_DemiHuman,1; bonus2 bMagicAddRace,RC_DemiHuman,1; bonus bHPGainValue,50; },{},{}
-4436,Ragged_Zombie_Card,Ragged Zombie Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bCriticalAddRace,RC_DemiHuman,5; bonus2 bAddRace,RC_DemiHuman,1; bonus2 bMagicAddRace,RC_DemiHuman,1; bonus2 bAddEff2,Eff_Bleeding,50; if(isequipped(4435)) bonus2 bSPGainRace,RC_DemiHuman,2; },{},{}
-4437,Hell_Poodle_Card,Hell Poodle Card,6,20,,10,,,,,,,,136,,,,,{ bonus bHit,1; bonus2 bAddItemHealRate,517,100; bonus2 bAddEff,Eff_Bleeding,100; },{},{}
+4436,Ragged_Zombie_Card,Ragged Zombie Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bCriticalAddRace,RC_DemiHuman,5; bonus2 bAddRace,RC_DemiHuman,1; bonus2 bMagicAddRace,RC_DemiHuman,1; bonus2 bAddEff2,Eff_Bleeding,10; if(isequipped(4435)) bonus2 bSPGainRace,RC_DemiHuman,2; },{},{}
+4437,Hell_Poodle_Card,Hell Poodle Card,6,20,,10,,,,,,,,136,,,,,{ bonus bHit,1; bonus2 bAddItemHealRate,517,100; bonus2 bAddEff,Eff_Bleeding,50; },{},{}
 4438,Banshee_Card,Banshee Card,6,20,,10,,,,,,,,769,,,,,{ if(BaseClass == Job_Mage){ bonus bMaxSP,100; bonus bMaxHP,-100; bonus2 bSkillAtk,"MG_NAPALMBEAT",20; bonus2 bSkillAtk,"MG_SOULSTRIKE",20; bonus2 bSkillAtk,"HW_NAPALMVULCAN",20; } },{},{}
 4439,Flame_Skull_Card,Flame Skull Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bResEff,Eff_Blind,3000; bonus2 bResEff,Eff_Stun,3000; bonus2 bResEff,Eff_Curse,3000; bonus2 bResEff,Eff_Stone,3000; bonus2 bAddEffWhenHit,Eff_Blind,500; bonus2 bAddEffWhenHit,Eff_Stun,500; bonus2 bAddEffWhenHit,Eff_Curse,500; bonus2 bAddEffWhenHit,Eff_Stone,500; },{},{}
 4440,Necromancer_Card,Necromancer Card,6,20,,10,,,,,,,,2,,,,,{ if (getiteminfo(getequipid(EQI_HAND_R),11) == 10) { bonus bInt,1; bonus bIgnoreMdefRate,2; } },{},{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 5c272590f..935b53726 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -968,7 +968,7 @@
 1926,JAKK_H,Jakk,Jakk,38,300,0,0,0,1,5,5,5,30,1,38,38,43,75,45,10,12,1,0,43,0x3695,200,1180,648,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
 1927,WHISPER_H,Whisper,Whisper,34,100,0,0,0,1,5,5,0,45,1,51,14,0,60,0,10,12,0,6,68,0x3195,150,1960,504,960,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
 1928,DEVIRUCHI_H,Deviruchi,Deviruchi,46,500,0,0,0,1,5,5,10,25,1,69,40,55,70,30,10,12,0,6,27,0x3795,150,980,384,600,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
-1929,I_BAPHOMET,Great Demon Baphomet,Great Demon Baphomet,98,4520000,0,4520000,2520000,1,16000,16001,35,45,1,152,5,85,200,95,10,12,2,6,67,0x37B5,100,768,768,576,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
+1929,I_BAPHOMET,Great Demon Baphomet,Great Demon Baphomet,98,4520000,0,4520000,2520000,1,16000,16001,35,45,1,152,5,85,200,95,10,12,2,6,67,0x37B5,100,768,768,576,0,0,0,0,0,0,0,0,6004,500,2514,7000,1181,5000,2655,100,2513,7000,2327,7000,1466,9000,0,0,0,0,4147,1
 1930,PIAMETTE,Piamette,Piamette,90,3000000,0,0,0,1,15000,20000,35,35,1,1,5,100,1,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
 1931,WISH_MAIDEN,Wish Maiden,Wish Maiden,98,3567200,0,0,0,1,32000,32001,25,42,1,1,30,130,1,30,10,12,2,8,28,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
 1932,GARDEN_KEEPER,Garden Keeper,Garden Keeper,80,200,0,0,0,1,1,2,100,99,1,1,1,1,1,1,10,12,1,3,42,0xC1,512,1872,512,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
@@ -997,12 +997,12 @@
 1954,G_CRYSTAL_9,Crystal,Crystal,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
 1955,TREASURE_BOX_I,Treasure Chest,Treasure Chest,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
 // Endless Tower
-1956,NAGHT_SIEGER,Naght Seiger,Naght Seiger,99,8000000,0,4000000,2000000,1,32000,64000,60,40,1,50,80,220,220,30,10,12,2,6,88,0x37B5,100,868,768,480,2000000,10000,617,5500,603,5000,732,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1957,ENTWEIHEN,Entweihen Crothen,Entweihen Crothen,90,5400000,0,2700000,1350000,12,32000,40000,44,66,1,70,40,250,220,30,10,12,1,6,87,0x1A4,400,1872,672,480,1350000,10000,617,5500,603,5000,732,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1958,G_ENTWEIHEN_R,Thorny Skeleton,Thorny Skeleton,89,350000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,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
-1959,G_ENTWEIHEN_H,Thorn of Recovery,Thorn of Recovery,89,5400000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,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
-1960,G_ENTWEIHEN_M,Thorn of Magic,Thorn of Magic,89,5400000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,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
-1961,G_ENTWEIHEN_S,Thorn of Purification,Thorn of Purification,89,5400000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,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
+1956,NAGHT_SIEGER,Naght Seiger,Naght Seiger,99,8000000,0,4000000,2000000,1,32000,64000,60,40,1,50,80,220,220,30,10,12,2,6,88,0x37B5,100,76,432,504,0,0,0,0,0,0,0,0,13412,9000,13413,9000,2542,9000,5017,9000,616,9000,2514,9000,7294,9000,0,0,0,0,0,0
+1957,ENTWEIHEN,Entweihen Crothen,Entweihen Crothen,90,5400000,0,2700000,1350000,12,32000,40000,44,66,1,70,40,250,220,30,10,12,1,6,87,0x1A4,100,140,540,576,0,0,0,0,0,0,0,0,1631,9000,1636,9000,1624,9000,1618,9000,2513,9000,616,9000,7291,9000,0,0,0,0,0,0
+1958,G_ENTWEIHEN_R,Thorny Skeleton,Thorny Skeleton,89,5400000,0,0,0,12,4040,4720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,100,432,288,576,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
+1959,G_ENTWEIHEN_H,Thorn of Recovery,Thorn of Recovery,89,350000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,100,2864,288,576,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
+1960,G_ENTWEIHEN_M,Thorn of Magic,Thorn of Magic,89,5400000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,100,1024,288,576,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
+1961,G_ENTWEIHEN_S,Thorn of Purification,Thorn of Purification,89,5400000,0,0,0,12,2040,2720,44,66,1,35,33,180,125,30,10,12,0,6,87,0x1A4,100,2864,288,576,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
 // Additional Monsters
 1962,ANTONIO_,Christmas Thief,Christmas Thief,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
 1963,P_CHUNG_E,New Year Doll,New Year Doll,49,23900,0,2396,993,1,460,1050,8,15,38,65,43,30,90,15,10,12,1,7,40,0x3695,170,1728,816,1188,0,0,0,0,0,0,0,0,7053,4850,740,100,1806,10,518,500,0,0,0,0,0,0,5042,2,0,0,0,0