added more cards effects

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

2 files changed, 56 insertions, 55 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 73f7b4380..3253e118c 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -2,10 +2,12 @@
 
 	==== progress ====
 	Ayathoya mobs == Added but using poring stats ( ? )
-	Ayathoya items == Added but no effect ( all are "ect" itens)
+	Ayathoya items == Added but no effect ( all are "etc" itens)
 	Skill databases == celest working on them i believe.
 
 02/18
+        * Added more new cards effects (thanks to DracoRPG at this time) [Lupus]
+	  added missing bonus 'bAllStats' into doc/item_bonus.txt
         * Changed Goblin Leader Card to using bAddRace2 -- each player can only save
           10 AddDamageClass, so this would save some space for other cards ^^ [celest]
 	* Started adding new cards effects. Also big thanks to Landarma [Lupus]
diff --git a/db/item_db.txt b/db/item_db.txt
index 3a8556870..9630fed1d 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1186,9 +1186,9 @@
 4153,Crab_Card,Crab Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bAtk,5; bonus2 bAddDamageClass,1266,30; bonus2 bAddEle,4,30; if(isequipped(4247,4273)) bonus3 bAddMonsterDropItem,544,5,3000; }
 4154,Dumpling_Child_Card,Dumpling Child Card,6,20,0,10,,,,,,,,,,,{},{}
 4155,Goblin_Leader_Card,Goblin Leader Card,6,20,0,10,,,,,,,2,,,,{},{ bonus2 bAddRace2,1,30; }
-4156,Goblin_Steamrider_Card,Goblin Steamrider Card,6,20,0,10,,,,,,,2,,,,{},{}
-4157,Goblin_Archer_Card,Goblin Archer Card,6,20,0,10,,,,,,,2,,,,{},{}
-4158,Sky_Deleter_Card,Sky Deleter Card,6,20,0,10,,,,,,,16,,,,{},{}
+4156,Goblin_Steamrider_Card,Goblin Steamrider Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bCritAtkRate,10; }
+4157,Goblin_Archer_Card,Goblin Archer Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bCritAtkRate,10; }
+4158,Sky_Deleter_Card,Sky Deleter Card,6,20,0,10,,,,,,,16,,,,{},{ bonus bNoRegen,1; } // Missing : bonus bHPGainValueWhenKill,100;
 4159,Nine_Tail_Card,Nine Tail Card,6,20,0,10,,,,,,,,,,,{},{}
 4160,Firelock_Soldier_Card,Firelock Soldier Card,6,20,0,10,,,,,,,,,,,{},{}
 4161,Grand_Peco_Card,Grand Peco Card,6,20,0,10,,,,,,,,,,,{},{}
@@ -1196,38 +1196,38 @@
 4163,Gryphon_Card,Gryphon Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bFlee,2; bonus bCritical,7; if (callfunc("Is_Sword_Class")!=0) bonus3 bAutoSpell,62,5,1; }
 4164,Gullinbursti_Card,Gullinbursti Card,6,20,0,10,,,,,,,,,,,{},{}
 4165,Gig_Card,Gig Card,6,20,0,10,,,,,,,,,,,{},{}
-4166,Nightmare_Terror_Card,Nightmare Terror Card,6,20,0,10,,,,,,,16,,,,{},{ bonus bDef,2; }
+4166,Nightmare_Terror_Card,Nightmare Terror Card,6,20,0,10,,,,,,,16,,,,{},{ bonus bDef,2; if(isequipped(4127)) bonus2 bAddEffWhenHit,Eff_Curse,30; }
 4167,Nereid_Card,Neraid Card,6,20,0,10,,,,,,,,,,,{},{}
 4168,Dark_Lord_Card,Dark Lord Card,6,20,0,10,,,,,,,,,,,{},{}
 4169,Dark_Illusion_Card,Dark Illusion Card,6,20,0,10,,,,,,,,,,,{},{}
 4170,Dark_Frame_Card,Dark Frame Card,6,20,0,10,,,,,,,,,,,{},{}
 4171,Dark_Priest_Card,Dark Priest Card,6,20,0,10,,,,,,,2,,,,{},{}
-4172,The_Paper_Card,The Paper Card,6,20,0,10,,,,,,,2,,,,{},{}
+4172,The_Paper_Card,The Paper Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bCritAtkRate,15; if(BaseJob==Job_Assassin) bonus bCritical,4; }
 4173,Demon_Pungus_Card,Demon Pungus Card,6,20,0,10,,,,,,,,,,,{},{}
 4174,Deviling_Card,Deviling Card,6,20,0,10,,,,,,,,,,,{},{}
 4175,Poisonous_Toad_Card,Poisonous Toad Card,6,20,0,10,,,,,,,2,,,,{},{ bonus3 bAutoSpell,52,1,2; }
-4176,Dullahan_Card,Dullahan Card,6,20,0,10,,,,,,,2,,,,{},{}
+4176,Dullahan_Card,Dullahan Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bCritAtkRate,10; }
 4177,Dryad_Card,Dryad Card,6,20,0,10,,,,,,,,,,,{},{}
 4178,Dragon_Tail_Card,Dragon Tail Card,6,20,0,10,,,,,,,,,,,{},{}
-4179,Dragon_Fly_Card,Dragon Fly Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bAgi,1; }
+4179,Dragon_Fly_Card,Dragon Fly Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bAgi,1; if(isequipped(4009)) bonus bFlee,18; }
 4180,Driller_Card,Driller Card,6,20,0,10,,,,,,,,,,,{},{}
-4181,Disguise_Card,Disguise Card,6,20,0,10,,,,,,,16,,,,{},{}
+4181,Disguise_Card,Disguise Card,6,20,0,10,,,,,,,16,,,,{},{ if(readparam(bVit)<=77) bonus bAddEffWhenHit,10,Eff_Blind; if(readparam(bVit)>77) bonus bAddEffWhenHit,30,Eff_Blind; }
 4182,Diabolic_Card,Diabolic Card,6,20,0,10,,,,,,,,,,,{},{}
-4183,Vagabond_Wolf_Card,Vagabond Wolf Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bStr,1; }
+4183,Vagabond_Wolf_Card,Vagabond Wolf Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bStr,1; if(isequipped(4029)) bonus bFlee,18; }
 4184,Lava_Golem_Card,Lava Golem Card,6,20,0,10,,,,,,,2,,,,{},{ bonus2 bAddDamageClass,1040,30; }
-4185,Rideword_Card,Rideword Card,6,20,0,10,,,,,,,769,,,,{},{ bonus bInt,1; }
+4185,Rideword_Card,Rideword Card,6,20,0,10,,,,,,,769,,,,{},{ bonus bInt,1; if(callfunc("Is_Holy_Class")) bonus bMdef,1; }
 4186,Raggler_Card,Raggler Card,6,20,0,10,,,,,,,64,,,,{},{ bonus bStr,1; bonus bVit,1; }
 4187,Raydric_Archer_Card,Raydric Archer Card,6,20,0,10,,,,,,,,,,,{},{}
 4188,Leib_Olmai_Card,Leib Olmai Card,6,20,0,10,,,,,,,,,,,{},{}
 4189,Wraith_Dead_Card,Wraith Dead Card,6,20,0,10,,,,,,,,,,,{},{}
 4190,Wraith_Card,Wraith Card,6,20,0,10,,,,,,,,,,,{},{}
-4191,Loli_Ruri_Card,Loli Ruri Card,6,20,0,10,,,,,,,16,,,,{},{}
-4192,Rotar_Zairo_Card,Rotar Zairo Card,6,20,0,10,,,,,,,2,,,,{},{}
-4193,Lude_Card,Lude Card,6,20,0,10,,,,,,,136,,,,{},{}
-4194,Rybio_Card,Rybio Card,6,20,0,10,,,,,,,16,,,,{},{}
+4191,Loli_Ruri_Card,Loli Ruri Card,6,20,0,10,,,,,,,16,,,,{},{ bonus4 bAutoSpellWhenHit,28,3,5,0; }
+4192,Rotar_Zairo_Card,Rotar Zairo Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bCritAtkRate,10; }
+4193,Lude_Card,Lude Card,6,20,0,10,,,,,,,136,,,,{},{ if((Class==Job_Novice)||(Class==Job_Super_Novice)) bonus3 bAutoSpellWhenHit,8,1,20; if(isequipped(4294)) bonus bMaxHP,300; }
+4194,Rybio_Card,Rybio Card,6,20,0,10,,,,,,,16,,,,{},{ if(readparam(bDex)<=77) bonus bAddEffWhenHit,10,Eff_Stan; if(readparam(bDex)>77) bonus bAddEffWhenHit,30,Eff_Stan; }
 4195,Leaf_Cat_Card,Leaf Cat Card,6,20,0,10,,,,,,,,,,,{},{}
 4196,Marin_Card,Marin Card,6,20,0,10,,,,,,,,,,,{},{}
-4197,Mastering_Card,Mastering Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bLuk,1; }
+4197,Mastering_Card,Mastering Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bLuk,1; if(isequipped(4001)) bonus bFlee,18; }
 4198,Maya_Purple_Card,Maya Purple Card,6,20,0,10,,,,,,,,,,,{},{}
 4199,Merman_Card,Merman Card,6,20,0,10,,,,,,,64,,,,{},{ bonus bHPrecovRate,10; bonus bSPrecovRate,10; }
 4200,Megalith_Card,Megalith Card,6,20,0,10,,,,,,,,,,,{},{}
@@ -1238,13 +1238,13 @@
 4205,Mimic_Card,Mimic Card,6,20,0,10,,,,,,,,,,,{},{}
 4206,Myst_Case_Card,Mystcase Card,6,20,0,10,,,,,,,,,,,{},{}
 4207,Mysteltainn_Card,Mysteltainn Card,6,20,0,10,,,,,,,32,,,,{},{}
-4208,Miyabi_Ningyo_Card,Miyabi Ningyo Card,6,20,0,10,,,,,,,64,,,,{},{ bonus bMaxSPrate,10; }
+4208,Miyabi_Ningyo_Card,Miyabi Ningyo Card,6,20,0,10,,,,,,,64,,,,{},{ bonus bMaxSPrate,10; bonus2 bSkillAtk,15,5; }
 4209,Violy_Card,Violy Card,6,20,0,10,,,,,,,,,,,{},{}
-4210,Wanderer_Card,Wanderer Card,6,20,0,10,,,,,,,4,,,,{},{ bonus3 bAutoSpell,219,1,1; }
-4211,Vocal_Card,Vocal Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bMdef,3; }
+4210,Wanderer_Card,Wanderer Card,6,20,0,10,,,,,,,4,,,,{},{ bonus3 bAutoSpell,219,1,1; if(callfunc("Is_Thief_Class")) bonus bFlee,20; }
+4211,Vocal_Card,Vocal Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bMdef,3; if(isequipped(4021)) bonus bFlee,18; }
 4212,Bon_Gun_Card,Bon Gun Card,6,20,0,10,,,,,,,136,,,,{},{ bonus3 bAutoSpell,5,1,1; bonus2 bAddDefClass,1026,-100; }
 4213,Brilight_Card,Brilight Card,6,20,0,10,,,,,,,,,,,{},{}
-4214,Bloody_Murderer_Card,Bloody Murderer Card,6,20,0,10,,,,,,,2,,,,{},{}
+4214,Bloody_Murderer_Card,Bloody Murderer Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bCritAtkRate,10; }
 4215,Blazer_Card,Blazer Card,6,20,0,10,,,,,,,,,,,{},{}
 4216,Sasquatch_Card,Sasquatch Card,6,20,0,10,,,,,,,,,,,{},{}
 4217,Enchanted_Peach_Tree_Card,Enchanted Peach Tree Card,6,20,0,10,,,,,,,,,,,{},{}
@@ -1252,7 +1252,7 @@
 4219,Sage_Worm_Card,Sage Worm Card,6,20,0,10,,,,,,,,,,,{},{}
 4220,Solider_Card,Solider Card,6,20,0,10,,,,,,,16,,,,{},{ bonus bDef,2; bonus bMdef,2; }
 4221,Skeleton_General_Card,Skeleton General Card,6,20,0,10,,,,,,,,,,,{},{}
-4222,Skeleton_Prisoner_Card,Skel Prisoner Card,6,20,0,10,,,,,,,16,,,,{},{ bonus bDef,2; }
+4222,Skeleton_Prisoner_Card,Skel Prisoner Card,6,20,0,10,,,,,,,16,,,,{},{ bonus bDef,2; if(isequipped(4025)) bonus2 bAddEffWhenHit,30,Eff_Sleep; }
 4223,Stalactic_Golem_Card,Stalactic Golem Card,6,20,0,10,,,,,,,,,,,{},{}
 4224,Stem_Worm_Card,Stem Worm Card,6,20,0,10,,,,,,,,,,,{},{}
 4225,Stone_Shooter_Card,Stone Shooter Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bAtk,10; bonus bHit,10; }
@@ -1263,15 +1263,15 @@
 4230,Shinobi_Card,Shinobi Card,6,20,0,10,,,,,,,,,,,{},{}
 4231,Increase_Soil_Card,Increase Soil Card,6,20,0,10,,,,,,,,,,,{},{}
 4232,Hermit_Plant_Card,Hermit Plant Card,6,20,0,10,,,,,,,,,,,{},{}
-4233,Baby_Leopard_Card,Baby Leopard Card,6,20,0,10,,,,,,,16,,,,{},{ bonus bLuk,3; }
+4233,Baby_Leopard_Card,Baby Leopard Card,6,20,0,10,,,,,,,16,,,,{},{ bonus bLuk,3; if(callfunc("Is_Merc_Class")) bonus bUnbreakableArmor,0; if(callfunc("Is_Merc_Class")) bonus bUnstrippable,0; }
 4234,Anolian_Card,Anolian Card,6,20,0,10,,,,,,,,,,,{},{}
-4235,Anubis_2_Card,Anubis 2 Card,6,20,0,10,,,,,,,,,,,{},{}
-4236,Amon_Ra_Card,Amon Ra Card,6,20,0,10,,,,,,,64,,,,{},{ bonus bAllStats,1; bonus bDef,1; bonus bMdef,1; }
+4235,Cookie_Xmas_Card,Cookie Xmas Card,6,20,0,10,,,,,,,136,,,,{},{}
+4236,Amon_Ra_Card,Amon Ra Card,6,20,0,10,,,,,,,64,,,,{},{ bonus bAllStats,1; bonus bDef,1; bonus bMdef,1; if(readparam(bInt)<99) bonus4 bAutoSpellWhenHit,73,10,1,0; if(readparam(bInt)>=99) bonus4 bAutoSpellWhenHit,73,10,2,0; }
 4237,Owl_Duke_Card,Owl Duke Card,6,20,0,10,,,,,,,,,,,{},{}
 4238,Owl_Baron_Card,Owl Baron Card,6,20,0,10,,,,,,,,,,,{},{}
 4239,Iron_Fist_Card,Iron Fist Card,6,20,0,10,,,,,,,,,,,{},{}
 4240,Arclouze_Card,Arclouze Card,6,20,0,10,,,,,,,,,,,{},{}
-4241,Arc_Angeling_Card,Arc Angeling Card,6,20,0,10,,,,,,,769,,,,{},{ bonus bMaxHP,300; }
+4241,Arc_Angeling_Card,Arc Angeling Card,6,20,0,10,,,,,,,769,,,,{},{ bonus bMaxHP,300; if(readparam(bLuk)>77) bonus bHPrecovRate,100; if(readparam(bLuk)>77) bonus bSPrecovRate,100; }
 4242,Apocalipse_Card,Apocalipse Card,6,20,0,10,,,,,,,,,,,{},{}
 4243,Antonio_Card,Antonio Card,6,20,0,10,,,,,,,,,,,{},{}
 4244,Alarm_Card,Alarm Card,6,20,0,10,,,,,,,,,,,{},{}
@@ -1281,24 +1281,24 @@
 4248,Ancient_Mummy_Card,Ancient Mummy Card,6,20,0,10,,,,,,,,,,,{},{}
 4249,Ancient_Worm_Card,Ancient Worm Card,6,20,0,10,,,,,,,,,,,{},{}
 4250,Executioner_Card,Executioner Card,6,20,0,10,,,,,,,32,,,,{},{}
-4251,Elder_Card,Elder Card,6,20,0,10,,,,,,,2,,,,{},{}
+4251,Elder_Card,Elder Card,6,20,0,10,,,,,,,2,,,,{},{ bonus2 bAddRace2,5,40; }
 4252,Alligator_Card,Alligator Card,6,20,0,10,,,,,,,136,,,,{},{ bonus bLongAtkDef,5; }
 4253,Alice_Card,Alice Card,6,20,0,10,,,,,,,,,,,{},{ bonus2 bSubRace,10,40; bonus2 bSubRace,11,-40; }
 4254,Tirfing_Card,Tirfing Card,6,20,0,10,,,,,,,32,,,,{},{}
-4255,Orc_Lady_Card,Orc Lady Card,6,20,0,10,,,,,,,2,,,,{},{}
+4255,Orc_Lady_Card,Orc Lady Card,6,20,0,10,,,,,,,2,,,,{},{ bonus2 bAddRace2,3,30; }
 4256,Orc_Archer_Card,Orc Archer Card,6,20,0,10,,,,,,,,,,,{},{}
-4257,Wild_Rose_Card,Wild Rose Card,6,20,0,10,,,,,,,64,,,,{},{ bonus bAgi,1; }
+4257,Wild_Rose_Card,Wild Rose Card,6,20,0,10,,,,,,,64,,,,{},{ bonus bAgi,1; if(callfunc("Is_Thief_Class")) bonus bFlee2,5; }
 4258,Evil_Nymph_Card,Evil Nymph Card,6,20,0,10,,,,,,,769,,,,{},{ bonus bInt,1; bonus bMaxSP,50; }
 4259,Wooden_Golem_Card,Wooden Golem Card,6,20,0,10,,,,,,,16,,,,{},{ bonus bDef,1; bonus bHPrecovRate,30; }
 4260,Wootan_Shooter_Card,Wootan Shooter Card,6,20,0,10,,,,,,,769,,,,{},{ bonus bDef,1; bonus2 bResEff, Eff_Confusion,2000; }
-4261,Wootan_Fighter_Card,Wootan Fighter Card,6,20,0,10,,,,,,,769,,,,{},{ bonus bDef,1; }
+4261,Wootan_Fighter_Card,Wootan Fighter Card,6,20,0,10,,,,,,,769,,,,{},{ bonus bDef,1; bonus2 bResEff, Eff_Bleeding,2000; }
 4262,Taoist_Hermit_Card,Taoist Hermit Card,6,20,0,10,,,,,,,,,,,{},{}
-4263,Incantation_Samurai_Card,Incantation Samurai Card,6,20,0,10,,,,,,,2,,,,{},{}
+4263,Incantation_Samurai_Card,Incantation Samurai Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bIgnoreDefMob,0; bonus2 bHPLossRate,300,10; } //Missing : lose 1000HP when unequip
 4264,Wind_Ghost_Card,Wind Ghost Card,6,20,0,10,,,,,,,,,,,{},{}
 4265,Li_Me_Mang_Ryang_Card,Li Me Mang Ryang Card,6,20,0,10,,,,,,,,,,,{},{}
-4266,Eclipse_Card,Eclipse Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bVit,1; }
+4266,Eclipse_Card,Eclipse Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bVit,1; if(isequipped(4006)) bonus bFlee,18; }
 4267,Explosion_Card,Explosion Card,6,20,0,10,,,,,,,,,,,{},{}
-4268,Incubus_Card,Incubus Card,6,20,0,10,,,,,,,769,,,,{},{ bonus bInt,-3; bonus bMaxSP,150; }
+4268,Incubus_Card,Incubus Card,6,20,0,10,,,,,,,769,,,,{},{ bonus bInt,-3; bonus bMaxSP,150; bonus bSPrecovRate,-20; } //Missing : Succubus + Incubus combo because I dunno wether combo effects stack or replace non-combo ones
 4269,Injustice_Card,Injustice Card,6,20,0,10,,,,,,,,,,,{},{}
 4270,Giant_Spider_Card,Giant Spider Card,6,20,0,10,,,,,,,,,,,{},{}
 4271,Giant_Hornet_Card,Giant Hornet Card,6,20,0,10,,,,,,,,,,,{},{}
@@ -1309,59 +1309,58 @@
 4276,Lord_of_Death_Card,Lord of Death Card,6,20,0,10,,,,,,,,,,,{},{}
 4277,Zherlthsh_Card,Zherlthsh Card,6,20,0,10,,,,,,,,,,,{},{}
 4278,Gibbet_Card,Gibbet Card,6,20,0,10,,,,,,,,,,,{},{}
-4279,Earth_Deleter_Card,Earth Deleter Card,6,20,0,10,,,,,,,16,,,,{},{}
+4279,Earth_Deleter_Card,Earth Deleter Card,6,20,0,10,,,,,,,16,,,,{},{ bonus bNoRegen,2; } //Missing : bonus bSPGainValueWhenKill,15;
 4280,Geographer_Card,Geographer Card,6,20,0,10,,,,,,,,,,,{},{}
-4281,Zipper_Bear_Card,Zipper Bear Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bAtk,30; }
+4281,Zipper_Bear_Card,Zipper Bear Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bAtk,30; if(callfunc("Is_Merc_Class")) bonus bUnbreakableWeapon,0; } // Missing : bonus bSPGainValueWhenAttack,-1; if(callfunc("Is_Merc_Class")) bonus bUnstrippableWeapon,0;
 4282,Tengu_Card,Tengu Card,6,20,0,10,,,,,,,,,,,{},{}
 4283,Greatest_General_Card,Greatest General Card,6,20,0,10,,,,,,,,,,,{},{}
-4284,Chepet_Card,Chepet Card,6,20,0,10,,,,,,,2,,,,{},{}
+4284,Chepet_Card,Chepet Card,6,20,0,10,,,,,,,2,,,,{},{ bonus3 bAutoSpell,28,5,5; }
 4285,Choco_Card,Choco Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bFlee2,5; bonus bFlee,10; }
-4286,Karakasa_Card,Karakasa Card,6,20,0,10,,,,,,,16,,,,{},{}
+4286,Karakasa_Card,Karakasa Card,6,20,0,10,,,,,,,16,,,,{},{ if(readparam(bStr)<=77) bonus2 bAddEffWhenHit,10,Eff_Confusion; if(readparam(bStr)>77) bonus2 bAddEffWhenHit,30,Eff_Confusion; }
 4287,Kapha_Card,Kapha Card,6,20,0,10,,,,,,,,,,,{},{}
 4288,Carat_Card,Carat Card,6,20,0,10,,,,,,,,,,,{},{}
 4289,Caterpillar_Card,Caterpillar Card,6,20,0,10,,,,,,,,,,,{},{}
-4290,Cat_o'_Nine_Tail_Card,Cat o' Nine Tail Card,6,20,0,10,,,,,,,64,,,,{},{ bonus bMdef,3; }
-4291,Kobold_Leader_Card,Kobold Leader Card,6,20,0,10,,,,,,,2,,,,{},{}
-4292,Kobold_Archer_Card,Kobold Archer Card,6,20,0,10,,,,,,,2,,,,{},{}
-4293,Cookie_Card,Cookie Card,6,20,0,10,,,,,,,136,,,,{},{ bonus bLuk,2; }
-4294,Quve_Card,Quve Card,6,20,0,10,,,,,,,136,,,,{},{}
+4290,Cat_o'_Nine_Tail_Card,Cat o' Nine Tail Card,6,20,0,10,,,,,,,64,,,,{},{ bonus bMdef,3; bonus bMagicDamageReturn,5; }
+4291,Kobold_Leader_Card,Kobold Leader Card,6,20,0,10,,,,,,,2,,,,{},{ bonus2 bAddRace2,2,30; }
+4292,Kobold_Archer_Card,Kobold Archer Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,7,3; }
+4293,Cookie_Card,Cookie Card,6,20,0,10,,,,,,,136,,,,{},{ bonus bLuk,2; bonus2 bSkillAtk,156,10; }
+4294,Quve_Card,Quve Card,6,20,0,10,,,,,,,136,,,,{},{ if((Class==Job_Novice)||(Class==Job_Super_Novice)) bonus4 bAutoSpellWhenHit,29,1,20,0; if(isequipped(4193)) bonus bMaxSP,60; }
 4295,Kraben_Card,Kraben Card,6,20,0,10,,,,,,,,,,,{},{}
 4296,Cramp_Card,Cramp Card,6,20,0,10,,,,,,,,,,,{},{}
-4297,Cruiser_Card,Cruiser Card,6,20,0,10,,,,,,,2,,,,{},{}
+4297,Cruiser_Card,Cruiser Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,7,2; }
 4298,Creamy_Fear_Card,Creamy Fear Card,6,20,0,10,,,,,,,,,,,{},{}
 4299,Clock_Card,Clock Card,6,20,0,10,,,,,,,,,,,{},{}
-4300,Chimera_Card,Chimera Card,6,20,0,10,,,,,,,16,,,,{},{}
+4300,Chimera_Card,Chimera Card,6,20,0,10,,,,,,,16,,,,{},{ if(BaseJob!=Job_Assassin) bonus2 bAddEffWhenHit,10,Eff_Poison; if(BaseJob==Job_Assassin) bonus2 bAddEffWhenHit,30,Eff_Poison; }
 4301,Killer_Mantis_Card,Killer Mantis Card,6,20,0,10,,,,,,,,,,,{},{}
 4302,Tao_Gunka_Card,Tao Gunka Card,6,20,0,10,,,,,,,,,,,{},{}
 4304,Tamruan_Card,Tamruan Card,6,20,0,10,,,,,,,,,,,{},{}
 4305,Turtle_General_Card,Turtle General Card,6,20,0,10,,,,,,,,,,,{},{}
-4306,Toad_Card,Toad Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bFlee2,1; }
+4306,Toad_Card,Toad Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bFlee2,1; if(isequipped(4014)) bonus bFlee,18; }
 4307,Beetle_King_Card,Beetle King Card,6,20,0,10,,,,,,,,,,,{},{}
 4308,Tri_Joint_Card,Tri Joint Card,6,20,0,10,,,,,,,,,,,{},{}
 4309,Parasite_Card,Parasite Card,6,20,0,10,,,,,,,32,,,,{},{ bonus bDef,1; bonus2 bSubEle,0,5; }
-4310,Panzer_Goblin_Card,Panzer Goblin Card,6,20,0,10,,,,,,,2,,,,{},{}
+4310,Panzer_Goblin_Card,Panzer Goblin Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,7,6; }
 4311,Permeter_Card,Permeter Card,6,20,0,10,,,,,,,769,,,,{},{ bonus2 bSubEle,7,15; bonus2 bSubEle,9,15; }
-4312,Seal_Card,Seal Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bFlee,3; bonus bHit,10; }
+4312,Seal_Card,Seal Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bFlee,3; bonus bHit,10; if(callfunc("Is_Holy_Class")) bonus2 bCriticalAddRace,9,1; if(callfunc("Is_Holy_Class")) bonus2 bCriticalAddRace,9,6; }
 4313,Punk_Card,Punk Card,6,20,0,10,,,,,,,,,,,{},{}
 4314,Penomena_Card,Penomena Card,6,20,0,10,,,,,,,32,,,,{},{ bonus2 bSubRace,0,30; }
-4315,Pest_Card,Pest Card,6,20,0,10,,,,,,,16,,,,{},{}
+4315,Pest_Card,Pest Card,6,20,0,10,,,,,,,16,,,,{},{ if(readparam(bInt)<=77) bonus2 bAddEffWhenHit,10,Eff_Stone; if(readparam(bInt)>77) bonus2 bAddEffWhenHit,30,Eff_Stone; }
 4316,False_Angel_Card,False Angel Card,6,20,0,10,,,,,,,,,,,{},{}
-4317,Mobster_Card,Mobster Card,6,20,0,10,,,,,,,2,,,,{},{}
-4318,Stormy_Knight_Card,Stormy Knight Card,6,20,0,10,,,,,,,2,,,,{},{ bonus3 bAutoSpell,89,1,1; bonus2 bAddEff,Eff_Freeze,2000; }
+4317,Mobster_Card,Mobster Card,6,20,0,10,,,,,,,2,,,,{},{ bonus bCritAtkRate,20; } // Missing : bonus bSPGainValueWhenAttack,-1;
+4318,Stormy_Knight_Card,Stormy Knight Card,6,20,0,10,,,,,,,2,,,,{},{ bonus3 bAutoSpell,89,1,1; bonus2 bAddEffWhenHit,20,Eff_Freeze; }
 4319,Freezer_Card,Freezer Card,6,20,0,10,,,,,,,,,,,{},{}
 4320,Bloody_Knight_Card,Bloody Knight Card,6,20,0,10,,,,,,,2,,,,{},{ bonus3 bAutoSpell,83,1,1; }
 4321,Heirozoist_Card,Heirozoist Card,6,20,0,10,,,,,,,,,,,{},{}
 4322,High_Orc_Card,High Orc Card,6,20,0,10,,,,,,,,,,,{},{}
 4323,Garm_Baby_Card,Garm Baby Card,6,20,0,10,,,,,,,,,,,{},{}
-4324,Garm_Card,Garm Card,6,20,0,10,,,,,,,16,,,,{},{}
-4325,Harpy_Card,Harpy Card,6,20,0,10,,,,,,,4,,,,{},{ bonus2 bSubEle,0,15; }
+4324,Garm_Card,Garm Card,6,20,0,10,,,,,,,16,,,,{},{ bonus2 bAddEffWhenHit,50,Eff_Freeze; }
+4325,Harpy_Card,Harpy Card,6,20,0,10,,,,,,,4,,,,{},{ bonus2 bSubEle,0,15; bonus2 bSkillAtk,11,5; }
 4326,Sea_Otter_Card,Sea Otter Card,6,20,0,10,,,,,,,,,,,{},{}
-4327,Bloody_Butterfly_Card,Bloody Butterfly Card,6,20,0,10,,,,,,,136,,,,{},{ bonus bCastrate,30; bonus bNoCastCancel2,0; }
+4327,Bloody_Butterfly_Card,Bloody Butterfly Card,6,20,0,10,,,,,,,136,,,,{},{ bonus bCastrate,30; bonus bNoCastCancel2,0; bonus2 bSkillAtk,18,5; }
 4328,Hyegun_Card,Hyegun Card,6,20,0,10,,,,,,,4,,,,{},{ bonus bFlee,15; bonus bCritical,1; }
 4329,Phendark_Card,Phendark Card,6,20,0,10,,,,,,,,,,,{},{}
-4330,Evil_Snake_Lord_Card,Evil Snake Lord Card,6,20,0,10,,,,,,,769,,,,{},{ bonus2 bResEff, Eff_Blind,10000; bonus2 bResEff, Eff_Curse,10000; }
-4331,Heater_Card,Heater Card,6,20,0,10,,,,,,,,,,,{},{}
-4332,Cookie_Xmas_Card,Cookie Xmas Card,6,20,0,10,,,,,,,136,,,,{},{ bonus bCritical,3; }
+4330,Evil_Snake_Lord_Card,Evil Snake Lord Card,6,20,0,10,,,,,,,769,,,,{},{ bonus bInt,3; bonus2 bResEff, Eff_Blind,10000; bonus2 bResEff, Eff_Curse,10000; }
+4331,Heater_Card,Heater Card,6,20,0,10,,,,,,,,,,,{},{ bonus bCritical,3; if(callfunc("Is_Sword_Class")) bonus bFlee2,3; }
 
 // Extra Headgears
 //===================================================================