added more cards effects

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

3 files changed, 13 insertions, 6 deletions

diff --git a/Dev/bugs.txt b/Dev/bugs.txt
index baa63195c..fd78d145a 100644
--- a/Dev/bugs.txt
+++ b/Dev/bugs.txt
@@ -287,3 +287,10 @@ Progress:	0%
 Problem:	[ATCommands] GMs teleportings to non-existing maps crash the server
 Assigned:	N/A
 Progress:	0%
+
+Problem:	[script.c] script command DOEVENT now doesn't work...
+		so Knight JOB Quest is unpassable now, Monks Job Quest is too easy (traps don't work)
+		probably more bugs...
+		I (Lupus) have script-wise solution. But it isn't good! 8((( DOEVENT used to work fine!
+Assigned:	N/A
+Progress:	0%
diff --git a/db/item_cardalbum.txt b/db/item_cardalbum.txt
index 5b32ade89..78abd41c4 100644
--- a/db/item_cardalbum.txt
+++ b/db/item_cardalbum.txt
@@ -226,12 +226,12 @@
 //4232,Hermit Plant Card,10000
 4233,Baby Leopard Card,10000
 //4234,Anolian Card,10000
-//4235,Anubis 2 Card,10000
+//4235,Cookie Xmas Card,10000
 //4237,Owl Duke Card,10000
 //4238,Owl Baron Card,10000
 //4239,Iron Fist Card,10000
 //4240,Arclouze Card,10000
-4241,Arc Angeling Card,10000
+4241,Arcangeling Card,10000
 //4242,Apocalipse Card,10000
 //4243,Antonio Card,10000
 //4244,Alarm Card,10000
@@ -315,4 +315,4 @@
 4328,Hyegun Card,10000
 //4329,Phendark Card,10000
 //4331,Heater Card,10000
-4332,Cookie Xmas Card,10000
+
diff --git a/db/item_db.txt b/db/item_db.txt
index 9630fed1d..7bdd5dc93 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1248,7 +1248,7 @@
 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,,,,,,,,,,,{},{}
-4218,Succubus_Card,Succubus Card,6,20,0,10,,,,,,,16,,,,{},{ bonus bVit,-3; bonus bMaxHP,1000; bonus bHPrecovRate,-20; }
+4218,Succubus_Card,Succubus Card,6,20,0,10,,,,,,,16,,,,{},{ bonus bVit,-3; bonus bMaxHP,1000; bonus bHPrecovRate,-20; if(!isequipped(4268)) end; bonus bVit,7; bonus bHPrecovRate,50; }
 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,,,,,,,,,,,{},{}
@@ -1271,7 +1271,7 @@
 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; if(readparam(bLuk)>77) bonus bHPrecovRate,100; if(readparam(bLuk)>77) bonus bSPrecovRate,100; }
+4241,Arcangeling_Card,Arcangeling 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,,,,,,,,,,,{},{}
@@ -1298,7 +1298,7 @@
 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; 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; bonus bSPrecovRate,-20; } //Missing : Succubus + Incubus combo because I dunno wether combo effects stack or replace non-combo ones
+4268,Incubus_Card,Incubus Card,6,20,0,10,,,,,,,769,,,,{},{ bonus bInt,-3; bonus bMaxSP,150; if(!isequipped(4218)) end; bonus bInt,6; bonus bSPrecovRate,50; }
 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,,,,,,,,,,,{},{}