summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorKomurka <Komurka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-20 01:52:58 +0000
committerKomurka <Komurka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-02-20 01:52:58 +0000
commit8cab2445f2822c85b5f258595cdc52f1a25cf4b1 (patch)
treea9759e36b8468458fe7a45f87b8a5110c3ee808b /db
parent3eb997c393bb851e277551caadcd7940158393bb (diff)
downloadhercules-8cab2445f2822c85b5f258595cdc52f1a25cf4b1.tar.gz
hercules-8cab2445f2822c85b5f258595cdc52f1a25cf4b1.tar.bz2
hercules-8cab2445f2822c85b5f258595cdc52f1a25cf4b1.tar.xz
hercules-8cab2445f2822c85b5f258595cdc52f1a25cf4b1.zip
* 2nd part (status % chances, coma) of item_db.txt update according to Aegis 10.2 file
- all cards, that had 20% on status change now have 6% - all cards, that had 10%+20% on status change now have 3%+3% - some small fixes - fixed Assaulter slaves thanks to Poki#3 There is MUCH more to do ~~ Also obb and ovb databases need to be updated. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5336 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/Changelog.txt5
-rw-r--r--db/item_db.txt70
-rw-r--r--db/mob_skill_db.txt6
3 files changed, 43 insertions, 38 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 3e7858244..32c31913e 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -25,6 +25,11 @@
=========================
02/20
+ * 2nd part (status % chances, coma) of item_db.txt update according to Aegis 10.2 file [Komurka]
+ - all cards, that had 20% on status change now have 6%
+ - all cards, that had 10%+20% on status change now have 3%+3%
+ - some small fixes
+ - fixed Assaulter slaves thanks to Poki#3
* 1st part (autospells) of item_db.txt update according to Aegis 10.2 file [Komurka]
- (to transtation devs) I suggest to update item descriptions
* New mob skill database from Aegis 10.2 (mobs 1001-1691) [Komurka]
diff --git a/db/item_db.txt b/db/item_db.txt
index ae0bf9b36..9c4c66b99 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -485,7 +485,7 @@
1135,Cutlus,Cutlus,4,,10,900,150,,1,0,414946,7,2,2,4,40,1,2,{ skill 5,5; bonus bStr,2; bonus bDef,1; }
1136,Solar_Sword,Solar Sword,4,,10,1200,85,,1,0,414946,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Fire; bonus2 bHPDrainRate,1000,1; bonus2 bSPLossRate,15,10000; }
1137,Excalibur,Excalibur,4,,10,1200,150,,1,0,414946,7,2,2,4,40,1,2,{ bonus bInt,5; bonus bLuk,10; bonus bDex,-1; bonus bAtkEle,Ele_Holy; }
-1138,Mysteltainn,Mysteltainn,4,,10,1000,170,,1,0,414946,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Dark; bonus2 bAddEle,Ele_Ghost,15; bonus3 bAutoSpell,16,3,100; bonus bDex,3; }
+1138,Mysteltainn,Mysteltainn,4,,10,1000,170,,1,0,414946,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Dark; bonus2 bAddEle,Ele_Ghost,15; bonus3 bAutoSpell,16,3,100; bonus2 bAddEff,Eff_Stone,100; bonus bDex,3; }
1139,Tirfing,Tirfing,4,,10,1000,200,,1,0,414946,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Dark; bonus2 bHPLossRate,35,10000; }
1140,Byeollungum,Byeollungum,4,,10,900,150,,1,0,414946,7,2,2,4,40,1,2,{ bonus2 bSubRace,RC_NonBoss,-10; bonus2 bAddRace,RC_Boss,5; bonus bAllStats,2; }
1141,Immaterial_Sword,Immaterial Sword,4,,10,900,140,,1,0,414946,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Ghost; bonus2 bSPDrainRate,1,30; bonus bSPDrainValue,-1; bonus bUnbreakableWeapon,0; }
@@ -510,7 +510,7 @@
1161,Balmung,Balmung,4,,10,1000,250,,2,0,2088959,7,2,2,4,48,1,1,{ bonus bInt,20; bonus bLuk,20; }
1162,Broad_Sword_,Broad Sword,4,65000,,2000,140,,1,2,16514,7,2,34,3,33,1,3,{ bonus bDef,5; }
1163,Claymore,Claymore,4,74000,,2500,180,,1,0,16512,7,2,34,3,33,1,3,{}
-1164,Muramasa,Muramasa,4,,10,1000,155,,1,0,16514,7,2,34,4,48,1,3,{ bonus bCritical,30; bonus bAspdRate,8; bonus2 bAddEff2,Eff_Curse,200; }
+1164,Muramasa,Muramasa,4,,10,1000,155,,1,0,16514,7,2,34,4,48,1,3,{ bonus bCritical,30; bonus bAspdRate,8; bonus2 bAddEff2,Eff_Curse,100; }
1165,Masamune,Masamune,4,,10,1000,200,,1,0,16514,7,2,34,4,48,1,3,{ bonus bFlee,30; bonus bStr,-5; bonus bAspd,2; bonus bDefRate,-67; bonus bDef2Rate,-67; }
1166,Dragon_Slayer,Dragon Slayer,4,,10,1300,150,,1,0,16514,7,2,34,4,48,1,3,{ bonus bIgnoreDefRace,RC_Dragon; bonus2 bAddRace,RC_Dragon,15; }
1167,Schweizersabel,Schweizersabel,4,,10,1600,160,,1,0,16514,7,2,34,4,48,1,3,{ bonus bAtkEle,Ele_Wind; bonus bDef,1; bonus3 bAutoSpell,20,3,100; }
@@ -552,7 +552,7 @@
1232,Assassin_Dagger,Assassin Dagger,4,,10,600,140,,1,0,4096,7,2,2,4,36,1,1,{ bonus bMaxHPrate,20; bonus bMaxSPrate,15; bonus bAspdRate,2; bonus bAtkEle,Ele_Dark; }
1233,Exorciser,Exorciser,4,,10,700,90,,1,0,69164782,7,2,2,4,36,1,1,{ bonus bIgnoreDefRace,RC_Demon; bonus2 bSubRace,RC_Demon,5; bonus2 bSubRace,RC_DemiHuman,-10; }
1234,Moonlight_Dagger,Moonlight Dagger,4,,10,700,50,,1,0,69164782,7,2,2,4,36,1,1,{ bonus bMaxSPrate,10; bonus bSPDrainValue,3; }
-1235,Azoth,Azoth,4,,10,700,110,,1,0,262144,7,2,2,4,36,1,1,{ bonus bClassChange,3; }
+1235,Azoth,Azoth,4,,10,700,110,,1,0,262144,7,2,2,4,36,1,1,{ bonus bClassChange,300; }
1236,Sucsamad,Sucsamad,4,,10,800,140,,1,0,69164782,7,2,2,4,36,1,1,{ bonus2 bAddEle,Ele_Earth,10; bonus2 bAddEle,Ele_Wind,10; bonus bUnbreakableWeapon,0; }
1237,Grimtooth,Grimtooth,4,,10,800,180,,1,0,69164782,7,2,2,4,36,1,1,{ bonus bFlee,10; bonus bFlee2,5; bonus bDefRate,-50; bonus bDef2Rate,-50; }
1238,Zeny_Knife,Zeny Knife,4,,10,700,64,,1,0,69164782,7,2,2,3,40,1,1,{ bonus2 bGetZenyNum,10,100; }
@@ -611,7 +611,7 @@
1364,Great_Axe,Great Axe,4,,10,1800,187,,1,0,279714,7,2,34,4,44,1,7,{ bonus2 bAddSkillBlow,42,5; bonus2 bAddEff,Eff_Stan,1500; }
1365,Sabbath,Sabbath,4,,10,2300,120,,1,0,279714,7,2,34,4,44,1,7,{ bonus2 bWeaponComaRace,RC_Demon,50; bonus bAtkEle,Ele_Dark; bonus2 bCriticalAddRace,RC_Undead,50; }
1366,Light_Epsilon,Light Epsilon,4,,10,2300,180,,1,0,279714,7,2,34,4,44,1,7,{ bonus bAtkEle,Ele_Holy; skill 28,3; bonus2 bAddRace,RC_Demon,3; }
-1367,Slaughter,Slaughter,4,,10,2500,120,,1,0,279714,7,2,34,4,44,1,7,{ bonus bIgnoreDefRace,RC_Brute; bonus2 bWeaponComaRace,RC_Brute,50; bonus bAtkEle,Ele_Earth; }
+1367,Slaughter,Slaughter,4,,10,2500,120,,1,0,279714,7,2,34,4,44,1,7,{ bonus bIgnoreDefRace,RC_Brute; bonus2 bWeaponComaRace,RC_Brute,40; bonus bAtkEle,Ele_Earth; }
1368,Tomahawk,Tomahawk,4,,10,2500,165,,1,0,279714,7,2,34,4,44,1,7,{ bonus bAtkEle,Ele_Wind; skill 337,1; }
1369,Guillotine,Guillotine,4,,10,3000,215,,1,0,279714,7,2,34,4,44,1,7,{ bonus2 bWeaponComaRace,RC_DemiHuman,30; bonus2 bSPGainRace,RC_DemiHuman,20; }
// 1-Handed Spears
@@ -686,7 +686,7 @@
1523,Spike,Spike,4,,10,700,85,,1,0,33040,7,2,2,4,40,1,8,{ bonus bCritical,40; bonus bDefRate,-67; bonus bDef2Rate,-67; }
1524,Golden_Mace,Golden Mace,4,,10,800,110,,1,1,33040,7,2,2,4,40,1,8,{ bonus2 bAddRace,RC_Undead,10; bonus bUnbreakableWeapon,0; }
1525,Long_Mace,Long Mace,4,,10,800,135,,1,0,33040,7,2,2,4,40,1,8,{ bonus bLongAtkDef,10; bonus bAtkRange,3; }
-1526,Slash,Slash,4,,10,1000,145,,1,0,33040,7,2,2,4,40,1,8,{ bonus2 bAddRace,RC_Undead,15; bonus2 bWeaponComaRace,RC_Undead,50; bonus2 bExpAddRace,RC_Undead,5; }
+1526,Slash,Slash,4,,10,1000,145,,1,0,33040,7,2,2,4,40,1,8,{ bonus2 bAddRace,RC_Undead,15; bonus2 bWeaponComaRace,RC_Undead,10; bonus2 bExpAddRace,RC_Undead,5; }
1527,Quadrille,Quadrille,4,,10,900,165,,1,0,33040,7,2,2,4,40,1,8,{ bonus2 bAddRace,RC_Undead,10; bonus2 bAddRace,RC_DemiHuman,10; bonus2 bAddEle,Ele_Earth,10; }
1528,Grand_Cross,Grand Cross,4,,10,1500,140,,1,0,33040,7,2,2,4,40,1,8,{ bonus bAtkEle,Ele_Holy; bonus3 bAutoSpell,77,3,100; bonus bSPDrainValue,1; }
1529,Iron_Driver,Iron Driver,4,,10,3000,155,,1,0,33024,7,2,2,3,78,1,8,{ bonus bAtkRange,1; }
@@ -700,7 +700,7 @@
1554,Book_of_Mother_Earth,Book of Mother Earth,4,35000,,750,90,,1,0,33620224,7,2,2,3,27,1,15,{ bonus bAtkEle,Ele_Earth; }
1555,Book_of_the_Blazing_Sun,Book of the Blazing Sun,4,35000,,750,90,,1,0,33620224,7,2,2,3,27,1,15,{ bonus bAtkEle,Ele_Fire; }
1556,Book_of_Gust_of_Wind,Book of Gust of Wind,4,35000,,750,90,,1,0,33620224,7,2,2,3,27,1,15,{ bonus bAtkEle,Ele_Wind; }
-1557,Book_of_the_Apocalypse,Book of the Apocalypse,4,35000,,800,120,,1,0,33620224,7,2,2,4,40,1,15,{ bonus bAtkEle,Ele_Dark; bonus2 bSubEle,Ele_Holy,-5; bonus2 bAddEle,Ele_Water,7; bonus2 bAddEle,Ele_Earth,7; bonus2 bAddEle,Ele_Fire,7; bonus2 bAddEle,Ele_Wind,7; }
+1557,Book_of_the_Apocalypse,Book of the Apocalypse,4,35000,,800,120,,1,0,33620224,7,2,2,4,40,1,15,{ bonus bAtkEle,Ele_Dark; bonus2 bSubEle,Ele_Holy,5; bonus2 bAddEle,Ele_Water,7; bonus2 bAddEle,Ele_Earth,7; bonus2 bAddEle,Ele_Fire,7; bonus2 bAddEle,Ele_Wind,7; }
1558,Girl's_Diary,Girl's Diary,4,,10,300,60,,1,1,33620224,7,2,2,4,40,1,15,{ bonus2 bAddDamageClass,1188,150; }
1559,Dragon_Legacy,Dragon Legacy,4,,10,700,130,,1,0,33620224,7,2,2,4,70,1,15,{ bonus bInt,3; bonus bIgnoreDefRace,RC_Dragon; bonus2 bSPGainRace,RC_Dragon,10; }
1560,Sage's_Diary,Sage's Diary,4,,10,1100,100,,1,2,33620224,7,2,2,3,60,1,15,{ bonus bMatkRate,15; if(readparam(bStr)>=50) bonus bAspdRate,5; if(readparam(bInt)>=70) bonus bMatkRate,5; }
@@ -764,18 +764,18 @@
1755,Arrow_of_Wind,Arrow of Wind,10,3,,2,30,,,,1706056,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Wind; }
1756,Stone_Arrow,Stone Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Earth; }
1757,Immaterial_Arrow,Immaterial Arrow,10,3,,1,30,,,,1706056,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Ghost; }
-1758,Stun_Arrow,Stun Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus2 bAddEff,Eff_Stan,500; }
-1759,Frozen_Arrow,Frozen Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Water; bonus2 bAddEff,Eff_Freeze,500; }
-1760,Flash_Arrow,Flash Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus2 bAddEff,Eff_Blind,500; }
-1761,Cursed_Arrow,Cursed Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus2 bAddEff,Eff_Curse,500; }
+1758,Stun_Arrow,Stun Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus2 bAddEff,Eff_Stan,1000; }
+1759,Frozen_Arrow,Frozen Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Water; bonus2 bAddEff,Eff_Freeze,1000; }
+1760,Flash_Arrow,Flash Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus2 bAddEff,Eff_Blind,1000; }
+1761,Cursed_Arrow,Cursed Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus2 bAddEff,Eff_Curse,1000; }
1762,Rusty_Arrow,Rusty Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Poison; }
-1763,Poison_Arrow,Poison Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Poison; bonus2 bAddEff,Eff_Poison,500; }
+1763,Poison_Arrow,Poison Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Poison; bonus2 bAddEff,Eff_Poison,2000; }
1764,Sharp_Arrow,Sharp Arrow,10,3,,3,10,,,,1706056,7,2,32768,,1,,,{ bonus bCritical,10; }
1765,Oridecon_Arrow,Oridecon Arrow,10,3,,3,50,,,,1706056,7,2,32768,,1,,,{}
1766,Arrow_of_Counter_Evil,Arrow of Counter Evil,10,40,,3,50,,,,1706056,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Holy; }
1767,Arrow_of_Shadow,Shadow Arrow,10,3,,2,30,,,,1706056,7,2,32768,,1,,,{ bonus bAtkEle,Ele_Dark; }
-1768,Sleep_Arrow,Sleep Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus2 bAddEff,Eff_Sleep,500; }
-1769,Mute_Arrow,Mute Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus2 bAddEff,Eff_Silence,500; }
+1768,Sleep_Arrow,Sleep Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus2 bAddEff,Eff_Sleep,2000; }
+1769,Mute_Arrow,Mute Arrow,10,3,,3,1,,,,1706056,7,2,32768,,1,,,{ bonus2 bAddEff,Eff_Silence,1000; }
1770,Iron_Arrow,Iron Arrow,10,2,,1,30,,,,1706056,7,2,32768,,1,,,{}
1771,Venom_Knife,Venom Knife,10,50,,10,30,,,,4096,7,2,32768,,1,,,{}
// Knuckles
@@ -1084,7 +1084,7 @@
2611,Silver_Ring,Silver Ring,5,20000,,100,,0,,0,127918079,7,2,136,,0,0,0,{}
2612,Flower_Ring,Flower Ring,5,1500,,100,,0,,0,127918079,7,2,136,,0,0,0,{}
2613,Diamond_Ring,Diamond Ring,5,45000,,100,,0,,0,127918079,7,2,136,,0,0,0,{}
-2614,Eye_of_Dullahan,Eye of Dullahan,5,90000,,100,,0,,0,119529470,7,2,136,,50,0,0,{ bonus2 bResEff,Eff_Poison,10000; }
+2614,Eye_of_Dullahan,Eye of Dullahan,5,90000,,100,,0,,0,119529470,7,2,136,,50,0,0,{}
2615,Safety_Ring,Safety Ring,5,75000,,100,,3,,0,119529470,7,2,136,,40,0,0,{ bonus bMdef,3; }
2616,Critical_Ring,Critical Ring,5,75000,,100,,0,,0,119529470,7,2,136,,40,0,0,{ bonus bCritical,5; }
2617,Celebrant's_Mitten,Celebrant's Mitten,5,,10,100,,1,,0,119529470,7,2,136,,35,0,0,{ bonus bInt,1; }
@@ -1300,18 +1300,18 @@
4159,Nine_Tail_Card,Nine Tail Card,6,,10,10,,,,,,,,4,,,,,{ bonus bAgi,2; if(getrefine()>8) bonus bFlee,20; }
4160,Firelock_Soldier_Card,Firelock Soldier Card,6,,10,10,,,,,,,,64,,,,,{ bonus bStr,2; if(getrefine()<=8) end; bonus bMaxHPrate,10; bonus bMaxSPrate,10; }
4161,Grand_Peco_Card,Grand Peco Card,6,,10,10,,,,,,,,769,,,,,{ bonus4 bAutoSpellWhenHit,75,1,50,0; if(isequipped(4031)==0) end; bonus bDef,3; bonus bVit,3; }
-4162,Grizzly_Card,Grizzly Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Blind,1000+2000*(isequipped(4074)); }
+4162,Grizzly_Card,Grizzly Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Blind,300+300*(isequipped(4074)); }
4163,Gryphon_Card,Gryphon Card,6,,10,10,,,,,,,,2,,,,,{ bonus bFlee,2; bonus bCritical,7; if (BaseClass == Job_Swordman) bonus3 bAutoSpell,62,5,10; }
4164,Gullinbursti_Card,Gullinbursti Card,6,,10,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Fish,-20; bonus2 bExpAddRace,RC_Fish,10; }
4165,Gig_Card,Gig Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Insect,5; bonus bLoseSPWhenUnequip,5; }
-4166,Nightmare_Terror_Card,Nightmare Terror Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Curse,1000+2000*(isequipped(4127)); }
+4166,Nightmare_Terror_Card,Nightmare Terror Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Curse,300+300*(isequipped(4127)); }
4167,Nereid_Card,Neraid Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Brute,5; bonus bLoseSPWhenUnequip,5; }
4168,Dark_Lord_Card,Dark Lord Card,6,,10,10,,,,,,,,64,,,,,{ bonus4 bAutoSpellWhenHit,83,5,100,0; if(isequipped(4169)==0) end; bonus bMaxHPrate,20; bonus bMaxSPrate,20; }
4169,Dark_Illusion_Card,Dark Illusion Card,6,,10,10,,,,,,,,769,,,,,{ bonus bMaxHPrate,-10; bonus bMaxSPrate,-10; bonus bCastrate,-10-10*isequipped(4168); }
-4170,Dark_Frame_Card,Dark Frame Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Stone,2000; }
+4170,Dark_Frame_Card,Dark Frame Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Stone,600; }
4171,Dark_Priest_Card,Dark Priest Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPVanishRate,50,10; if(BaseJob==Job_Sage) bonus bSPGainValue,1; }
4172,The_Paper_Card,The Paper Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,20; bonus2 bSPDrainValue,-1,0; }
-4173,Demon_Fungus_Card,Demon Fungus Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Sleep,2000; }
+4173,Demon_Fungus_Card,Demon Fungus Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Sleep,600; }
4174,Deviling_Card,Deviling Card,6,,10,10,,,,,,,,4,,,,,{ bonus2 bSubEle,Ele_Neutral,50; bonus2 bSubEle,Ele_Water,-50; bonus2 bSubEle,Ele_Earth,-50; bonus2 bSubEle,Ele_Fire,-50; bonus2 bSubEle,Ele_Wind,-50; bonus2 bSubEle,Ele_Poison,-50; bonus2 bSubEle,Ele_Holy,-50; bonus2 bSubEle,Ele_Dark,-50; bonus2 bSubEle,Ele_Ghost,-50; bonus2 bSubEle,Ele_Undead,-50; }
4175,Poisonous_Toad_Card,Poisonous Toad Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAutoSpell,52,1,20; }
4176,Dullahan_Card,Dullahan Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Dragon,7; }
@@ -1319,7 +1319,7 @@
4178,Dragon_Tail_Card,Dragon Tail Card,6,,10,10,,,,,,,,4,,,,,{ bonus bAgi,1; bonus bFlee,10; bonus2 bSkillAtk,46,5; bonus2 bSkillAtk,47,5; }
4179,Dragon_Fly_Card,Dragon Fly Card,6,,10,10,,,,,,,,4,,,,,{ bonus bAgi,1; if(isequipped(4009)) bonus bFlee,18; }
4180,Driller_Card,Driller Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Dragon,5; bonus bLoseSPWhenUnequip,5; }
-4181,Disguise_Card,Disguise Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Silence,1000+2000*(readparam(bVit)>=77); }
+4181,Disguise_Card,Disguise Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Silence,300+300*(readparam(bVit)>=77); }
4182,Diabolic_Card,Diabolic Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Demon,5; bonus bLoseSPWhenUnequip,5; }
4183,Vagabond_Wolf_Card,Vagabond Wolf Card,6,,10,10,,,,,,,,4,,,,,{ bonus bStr,1; if(isequipped(4029)) bonus bFlee,18; }
4184,Lava_Golem_Card,Lava Golem Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bAddRace2,4,30; }
@@ -1327,19 +1327,19 @@
4186,Raggler_Card,Raggler Card,6,,10,10,,,,,,,,64,,,,,{ bonus bStr,1; bonus bVit,1; if(isequipped(4233,4281,4321,4206)==0) end; bonus bLuk,10; bonus2 bSPDrainValue,2,0; bonus2 bSkillAtk,42,20; if(BaseClass != Job_Merchant) end; bonus2 bAddMonsterDropItem,617,-2; bonus bMagicDamageReturn,20; }
4187,Raydric_Archer_Card,Raydric Archer Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12030,6,10; }
4188,Leib_Olmai_Card,Leib Olmai Card,6,,10,10,,,,,,,,769,,,,,{ bonus2 bSubEle,Ele_Fire,10; bonus3 bAddMonsterDropItem,990,2,500; }
-4189,Wraith_Dead_Card,Wraith Dead Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Curse,2000; }
+4189,Wraith_Dead_Card,Wraith Dead Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Curse,600; }
4190,Wraith_Card,Wraith Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12027,1,10; }
4191,Loli_Ruri_Card,Loli Ruri Card,6,,10,10,,,,,,,,16,,,,,{ bonus4 bAutoSpellWhenHit,28,3,50,0; }
4192,Rotar_Zairo_Card,Rotar Zairo Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Fish,7; }
4193,Lude_Card,Lude Card,6,,10,10,,,,,,,,136,,,,,{ if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) bonus4 bAutoSpellWhenHit,8,1,200,0; }
-4194,Rybio_Card,Rybio Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Stan,1000+2000*(readparam(bDex)>=77); }
+4194,Rybio_Card,Rybio Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Stan,300+300*(readparam(bDex)>=77); }
4195,Leaf_Cat_Card,Leaf Cat Card,6,,10,10,,,,,,,,769,,,,,{ bonus2 bSubEle,Ele_Water,10; bonus3 bAddMonsterDropItem,991,5,500; }
4196,Marin_Card,Marin Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,10,500; }
4197,Mastering_Card,Mastering Card,6,,10,10,,,,,,,,4,,,,,{ bonus bLuk,1; if(isequipped(4001)) bonus bFlee,18; }
4198,Maya_Purple_Card,Maya Purple Card,6,,10,10,,,,,,,,769,,,,,{ bonus bIntravision,0; }
-4199,Merman_Card,Merman Card,6,,10,10,,,,,,,,64,,,,,{ bonus bHPrecovRate,10; bonus bSPrecovRate,10; if(isequipped(4297,4234,4252,4178)==0) end; bonus bAgi,5; bonus bDex,3; bonus bLongAtkRate,20; bonus bPerfectHitAddRate,20; if(BaseClass != Job_Archer) end; bonus2 bExpAddRace,RC_Brute,5; bonus2 bWeaponComaRace,RC_Brute,50; }
+4199,Merman_Card,Merman Card,6,,10,10,,,,,,,,64,,,,,{ bonus bHPrecovRate,10; bonus bSPrecovRate,10; if(isequipped(4297,4234,4252,4178)==0) end; bonus bAgi,5; bonus bDex,3; bonus bLongAtkRate,20; bonus bPerfectHitAddRate,20; if(BaseClass != Job_Archer) end; bonus2 bExpAddRace,RC_Brute,5; bonus2 bWeaponComaRace,RC_Brute,100; }
4200,Megalith_Card,Megalith Card,6,,10,10,,,,,,,,64,,,,,{ if(getrefine()<6) bonus bMdef,7; }
-4201,Majoruros_Card,Majoruros Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Stan,2000; }
+4201,Majoruros_Card,Majoruros Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Stan,600; }
4202,Civil_Servant_Card,Civil Servant Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bAddEle,Ele_Ghost,20; }
4203,Mutant_Dragonoid_Card,Mutant Dragonoid Card,6,,10,10,,,,,,,,2,,,,,{ bonus bBaseAtk,15; bonus3 bAutoSpell,17,3+7*(getskilllv(17)==10),50; }
4204,Mini_Demon_Card,Mini Demon Card,6,,10,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Brute,-20; bonus2 bExpAddRace,RC_Brute,10; }
@@ -1351,16 +1351,16 @@
4210,Wanderer_Card,Wanderer Card,6,,10,10,,,,,,,,4,,,,,{ if(BaseClass == Job_Thief) bonus bFlee,20; if(isequipped(4172,4257,4230,4272)) goto THIEF_SET; bonus3 bAutoSpell,219,1,20; end; THIEF_SET: bonus bAgi,5; bonus bStr,5; bonus bAspdRate,5; bonus bSpeedRate,5; bonus2 bSPDrainValue,1,0; if(BaseClass == Job_Thief) bonus bNoGemStone,0;}
4211,Vocal_Card,Vocal Card,6,,10,10,,,,,,,,4,,,,,{ bonus bMdef,3; if(isequipped(4021)) bonus bFlee,18; }
4212,Bongun_Card,Bongun Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAutoSpell,5,1,20; bonus2 bAddSkillBlow,5,5; bonus2 bAddDamageByClass,1026,100; }
-4213,Brilight_Card,Brilight Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Silence,2000; }
+4213,Brilight_Card,Brilight Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Silence,600; }
4214,Bloody_Murderer_Card,Bloody Murderer Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Insect,7; }
4215,Blazer_Card,Blazer Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,12,500; }
-4216,Sasquatch_Card,Sasquatch Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Freeze,2000; }
+4216,Sasquatch_Card,Sasquatch Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Freeze,600; }
4217,Enchanted_Peach_Tree_Card,Enchanted Peach Tree Card,6,,10,10,,,,,,,,32,,,,,{ bonus4 bAutoSpell,28,1+9*(getskilllv(28)==10),20,0; if(isequipped(4280,4185,4293,4312)==0) end; bonus bVit,10; bonus bCastrate,-10; bonus bUseSPRate,-10; if(BaseClass != Job_Acolyte) end; bonus2 bExpAddRace,RC_Undead,5; bonus2 bExpAddRace,RC_Demon,5; bonus2 bSubRace,RC_Undead,30; bonus2 bSubRace,RC_Demon,30; }
4218,Succubus_Card,Succubus Card,6,,10,10,,,,,,,,16,,,,,{ bonus bMaxHP,1000; bonus bVit,-3+4*isequipped(4269); bonus bHPrecovRate,-20+30*isequipped(4269); }
4219,Sage_Worm_Card,Sage Worm Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,9,500; }
4220,Solider_Card,Solider Card,6,,10,10,,,,,,,,16,,,,,{ bonus bDef,2; bonus bMdef,2; }
4221,Skeleton_General_Card,Skeleton General Card,6,,10,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Insect,-20; bonus2 bExpAddRace,RC_Insect,10; }
-4222,Skel_Prisoner_Card,Skel Prisoner Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Sleep,1000+2000*(isequipped(4025)); }
+4222,Skel_Prisoner_Card,Skel Prisoner Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Sleep,300+300*(isequipped(4025)); }
4223,Stalactic_Golem_Card,Stalactic Golem Card,6,,10,10,,,,,,,,769,,,,,{ bonus bDef,1; bonus2 bResEff,Eff_Stan,2000; }
4224,Stem_Worm_Card,Stem Worm Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12032,2,10; }
4225,Stone_Shooter_Card,Stone Shooter Card,6,,10,10,,,,,,,,2,,,,,{ bonus bBaseAtk,10; bonus bHit,10; }
@@ -1408,13 +1408,13 @@
4267,Explosion_Card,Explosion Card,6,,10,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Dragon,-20; bonus2 bExpAddRace,RC_Dragon,10; }
4268,Injustice_Card,Injustice Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,136,1,50; if(isequipped(4277)==0) end; bonus bBaseAtk,20; bonus bLuk,3; }
4269,Incubus_Card,Incubus Card,6,,10,10,,,,,,,,769,,,,,{ bonus bMaxSP,150; bonus bInt,-3+4*isequipped(4218); bonus bSPrecovRate,-20+30*isequipped(4218); }
-4270,Giant_Spider_Card,Giant Spider Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Poison,2000; }
+4270,Giant_Spider_Card,Giant Spider Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Poison,600; }
4271,Giant_Hornet_Card,Giant Hornet Card,6,,10,10,,,,,,,,769,,,,,{ bonus2 bSubEle,Ele_Wind,10; bonus3 bAddMonsterDropItem,992,4,6000; }
4272,Dancing_Dragon_Card,Dancing Dragon Card,6,,10,10,,,,,,,,136,,,,,{ bonus bAgi,1; bonus bCritical,3; }
4273,Shell_Fish_Card,Shell Fish Card,6,,10,10,,,,,,,,2,,,,,{ bonus bBaseAtk,5; bonus2 bAddDamageClass,1073,30; }
4274,Zombie_Master_Card,Zombie Master Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Undead,5; bonus bLoseSPWhenUnequip,5; }
4275,Zombie_Prisoner_Card,Zombie Prisoner Card,6,,10,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Undead,-20; bonus2 bExpAddRace,RC_Undead,10; }
-4276,Lord_of_Death_Card,Lord of Death Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bAddEff,Eff_Stan,50; bonus2 bAddEff,Eff_Curse,50; bonus2 bAddEff,Eff_Poison,50; bonus2 bAddEff,Eff_Bleeding,50; bonus2 bWeaponComaRace,RC_NonBoss,1; }
+4276,Lord_of_Death_Card,Lord of Death Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bAddEff,Eff_Stan,500; bonus2 bAddEff,Eff_Curse,500; bonus2 bAddEff,Eff_Poison,500; bonus2 bAddEff,Eff_Bleeding,500; bonus2 bWeaponComaRace,RC_NonBoss,1; }
4277,Zherlthsh_Card,Zherlthsh Card,6,,10,10,,,,,,,,32,,,,,{ bonus bLuk,2; bonus2 bSkillAtk,316,10; bonus2 bSkillAtk,324,10; }
4278,Gibbet_Card,Gibbet Card,6,,10,10,,,,,,,,769,,,,,{ if(getrefine()<6) bonus bMdef,5; }
4279,Earth_Deleter_Card,Earth Deleter Card,6,,10,10,,,,,,,,16,,,,,{ bonus bSPrecovRate,-100; bonus bSPGainValue,10; bonus bLoseSPWhenUnequip,100; }
@@ -1424,7 +1424,7 @@
4283,Greatest_General_Card,Greatest General Card,6,,10,10,,,,,,,,136,,,,,{ bonus4 bAutoSpell,261,5,2+18*(BaseClass == Job_Acolyte),0; }
4284,Chepet_Card,Chepet Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,28,5,50; }
4285,Choco_Card,Choco Card,6,,10,10,,,,,,,,4,,,,,{ bonus bFlee2,5; bonus bFlee,10; }
-4286,Karakasa_Card,Karakasa Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Confusion,1000+2000*(readparam(bStr)>=77); }
+4286,Karakasa_Card,Karakasa Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Confusion,300+300*(readparam(bStr)>=77); }
4287,Kapha_Card,Kapha Card,6,,10,10,,,,,,,,4,,,,,{ if(getrefine()<6) bonus bMdef,8; }
4288,Carat_Card,Carat Card,6,,10,10,,,,,,,,769,,,,,{ bonus bInt,2; if(getrefine()>8) bonus bMaxSP,150; }
4289,Caterpillar_Card,Caterpillar Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Plant,5; bonus bLoseSPWhenUnequip,5; }
@@ -1433,13 +1433,13 @@
4292,Kobold_Archer_Card,Kobold Archer Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Plant,7; }
4293,Cookie_Card,Cookie Card,6,,10,10,,,,,,,,136,,,,,{ bonus bLuk,2; bonus2 bSkillAtk,156,10; }
4294,Quve_Card,Quve Card,6,,10,10,,,,,,,,136,,,,,{ if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) bonus4 bAutoSpellWhenHit,29,1,100,0; if(isequipped(4193)==0) end; bonus bMaxHP,300; bonus bMaxSP,60; }
-4295,Kraben_Card,Kraben Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Blind,2000; }
+4295,Kraben_Card,Kraben Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Blind,600; }
4296,Cramp_Card,Cramp Card,6,,10,10,,,,,,,,769,,,,,{ bonus2 bGetZenyNum,10,3; if(isequipped(4028)) bonus bStr,3; }
4297,Cruiser_Card,Cruiser Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Brute,7; }
-4298,Creamy_Fear_Card,Creamy Fear Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Confusion,2000; }
+4298,Creamy_Fear_Card,Creamy Fear Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Confusion,600; }
4299,Clock_Card,Clock Card,6,,10,10,,,,,,,,16,,,,,{ bonus4 bAutoSpellWhenHit,249,3+7*(getskilllv(249)==10),30,0; }
-4300,Chimera_Card,Chimera Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Poison,1000+2000*(BaseJob==Job_Assassin); }
-4301,Killer_Mantis_Card,Killer Mantis Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Bleeding,2000; }
+4300,Chimera_Card,Chimera Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Poison,300+300*(BaseJob==Job_Assassin); }
+4301,Killer_Mantis_Card,Killer Mantis Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Bleeding,600; }
4302,Tao_Gunka_Card,Tao Gunka Card,6,,10,10,,,,,,,,16,,,,,{ bonus bMaxHPrate,100; bonus bDef,-50; bonus bMdef,-50; }
4303,Giant_Whisper_Card,Giant Whisper Card,6,,10,10,,,,,,,,4,,,,,{ bonus bFlee,10; if(readparam(bStr)>=80) bonus bBaseAtk,20; if(readparam(bVit)>=80) bonus bMaxHPrate,3; if(readparam(bLuk)>=80) bonus bCritical,3; }
4304,Tamruan_Card,Tamruan Card,6,,10,10,,,,,,,,32,,,,,{ bonus bDef,2; bonus2 bSkillAtk,250,10; bonus2 bSkillAtk,251,10; }
@@ -1453,13 +1453,13 @@
4312,Seal_Card,Seal Card,6,,10,10,,,,,,,,2,,,,,{ bonus bFlee,3; bonus bHit,10; if(BaseClass != Job_Acolyte) end; bonus2 bCriticalAddRace,RC_Undead,9; bonus2 bCriticalAddRace,RC_Demon,9; }
4313,Punk_Card,Punk Card,6,,10,10,,,,,,,,4,,,,,{ bonus4 bAutoSpellWhenHit,92,1+4*(getskilllv(92)==5),50,0; }
4314,Penomena_Card,Penomena Card,6,,10,10,,,,,,,,32,,,,,{ bonus2 bSubRace,RC_Formless,30; }
-4315,Pest_Card,Pest Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Stone,1000+2000*(readparam(bInt)>=77); }
+4315,Pest_Card,Pest Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Stone,300+300*(readparam(bInt)>=77); }
4316,False_Angel_Card,False Angel Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Angel,5; bonus bLoseSPWhenUnequip,5; }
4317,Mobster_Card,Mobster Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,15; if(BaseClass == Job_Thief) bonus bCritical,4; }
4318,Stormy_Knight_Card,Stormy Knight Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,89,2,20; bonus2 bAddEffWhenHit,Eff_Freeze,2000; }
4319,Freezer_Card,Freezer Card,6,,10,10,,,,,,,,64,,,,,{ bonus bMaxHP,300; if(getrefine()>=9) bonus2 bSkillAtk,5,10; if(isequipped(4246,4311,4220,4331)==0) end; bonus bStr,10; bonus bMaxHPrate,20; bonus bHPrecovRate,50; bonus4 bAutoSpell,112,1,3,0; bonus2 bAddMonsterDropItem,501,100; if(BaseClass != Job_Swordman) end; bonus2 bAddItemHealRate,1,50; }
4320,Bloody_Knight_Card,Bloody Knight Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,83,1,20; }
-4321,Hylozoist_Card,Hylozoist Card,6,,10,10,,,,,,,,136,,,,,{ bonus bClassChange,1; }
+4321,Hylozoist_Card,Hylozoist Card,6,,10,10,,,,,,,,136,,,,,{ bonus bClassChange,100; }
4322,High_Orc_Card,High Orc Card,6,,10,10,,,,,,,,32,,,,,{ bonus bDef,1; bonus bShortWeaponDamageReturn,5; }
4323,Garm_Baby_Card,Garm Baby Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,15,3,50+250*isequipped(4324); }
4324,Garm_Card,Garm Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Freeze,5000; }
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 59b2c8898..f4dfd3148 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -1447,7 +1447,7 @@
1315,Assaulter@NPC_EMOTION,attack,197,1,2000,0,600000,yes,self,myhpltmaxrate,20,23,,,,,
1315,Assaulter@NPC_EMOTION,chase,197,1,20,0,5000,yes,self,always,0,19,129,,,,
1315,Assaulter@NPC_EMOTION,idle,197,1,200,0,5000,yes,self,always,0,7,1173,,,,
-1315,Assaulter@NPC_SUMMONSLAVE,chase,196,1,10000,0,600000,yes,self,myhpltmaxrate,10,,,,,,
+1315,Assaulter@NPC_SUMMONSLAVE,chase,196,3,10000,0,600000,yes,self,myhpltmaxrate,10,1364,,,,,
1315,Assaulter@NPC_WINDATTACK,attack,187,3,500,500,5000,no,target,always,0,,,,,,6
1315,Assaulter@TF_BACKSLIDING,attack,150,1,10000,500,600000,no,target,myhpltmaxrate,10,,,,,,
1316,Solider@CR_AUTOGUARD,attack,249,2,500,0,300000,yes,self,always,0,,,,,,
@@ -3247,6 +3247,8 @@
1685,Vesper@NPC_SUMMONSLAVE,attack,196,3,10000,2000,5000,no,self,slavele,15,1365,1669,1675,,,
1685,Vesper@WZ_METEOR,attack,83,10,500,10000,20000,yes,target,always,0,,,,,,
1686,Orc Baby@SM_BASH,attack,5,5,500,800,5000,no,target,always,0,,,,,,6
+//1686,Orc Baby@NPC_EMOTION,attack,197,1,10000,0,5000,no,self,slavele,0,,,,,,
+//1686,Orc Baby@NPC_EMOTION,idle,197,1,10000,0,5000,no,self,slavele,0,,,,,,
1688,Lady Tany@AC_CHARGEARROW,attack,148,1,2000,0,5000,yes,target,always,0,,,,,,6
1688,Lady Tany@AL_HEAL,attack,28,11,10000,0,5000,yes,self,myhpltmaxrate,30,,,,,,2
1688,Lady Tany@AL_HEAL,idle,28,11,10000,0,5000,yes,self,myhpltmaxrate,30,,,,,,2
@@ -3283,8 +3285,6 @@
//1505,Loli Ruri@NPC_SUMMONSLAVE,idle,196,1,50,2000,60000,no,self,slavele,0,no_sub_mob_data,,,,,
//1645,High Wizard Katrinn@NPC_SUMMONSLAVE,attack,196,1,10000,700,30000,no,self,slavele,2,no_sub_mob_data,,,,,
//1645,High Wizard Katrinn@NPC_SUMMONSLAVE,idle,196,1,10000,700,30000,no,self,slavele,2,no_sub_mob_data,,,,,
-//1686,Orc Baby@NPC_EMOTION,attack,197,1,10000,0,5000,no,self,slavele,0,no_sub_mob_data,,,,,
-//1686,Orc Baby@NPC_EMOTION,idle,197,1,10000,0,5000,no,self,slavele,0,no_sub_mob_data,,,,,
//1686,Orc Baby@NPC_SUMMONSLAVE,attack,196,1,10000,0,6000000,yes,self,slavele,0,no_sub_mob_data,,,,,
//1686,Orc Baby@NPC_SUMMONSLAVE,chase,196,1,10000,0,6000000,yes,self,slavele,0,no_sub_mob_data,,,,,
//1686,Orc Baby@NPC_SUMMONSLAVE,idle,196,1,10000,0,6000000,yes,self,slavele,0,no_sub_mob_data,,,,,