- Fixed Auto Spell not working

- Fixed problems with skill level check
- Added text job names support for @job
- Added some new monster skills

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

4 files changed, 23 insertions, 10 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index 1e5dc588d..c220d5b48 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1128,7 +1128,7 @@
 4126,Minorous_Card,Minorous Card,6,20,0,10,,,,,,,2,,,,{},{ bonus2 bAddSize,2,15; bonus bBaseAtk,5; }
 4127,Nightmare_Card,Nightmare Card,6,20,0,10,,,,,,,769,,,,{},{ bonus2 bResEff,Eff_Sleep,10000; bonus bAgi,1; }
 4128,Golden_Bug_Card,Golden Bug Card,6,20,0,10,,,,,,,32,,,,{},{ bonus bNoMagicDamage,0; bonus bUseSPrate,100; }
-4129,Baphomet__Card,Baphomet  Card,6,20,,10,,,,,,,4,,,,{},{ bonus bHit,-10; bonus bSplashRange,10; }
+4129,Baphomet__Card,Baphomet Jr Card,6,20,,10,,,,,,,4,,,,{},{bonus bAgi,3; bonus bCritical,1; }}
 4130,Scorpion_King_Card,Scorpion King Card,6,20,0,10,,,,,,,2,,,,{},{ bonus2 bAddEle,9,20; }
 4131,Moonlight_Flower_Card,Moonlight Flower Card,6,20,0,10,,,,,,,64,,,,{},{ bonus bSpeedRate,25; }
 4132,Mistress_Card,Mistress Card,6,20,0,10,,,,,,,769,,,,{},{ bonus bNoGemStone,0; bonus bUseSPrate,25; }
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index 3ba21845f..d6bfb8606 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -25,7 +25,7 @@
 28,0,1000,0,0	//AL_HEAL#ヒール#
 29,1000,1000,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0	//AL_INCAGI#速度増加#
 30,1000,1000,40000:50000:60000:70000:80000:90000:100000:110000:120000:130000,0	//AL_DECAGI#速度減少#
-31,0,2000,0,0	//AL_HOLYWATER#アクアベネディクタ#
+31,1000,500,0,0	//AL_HOLYWATER#アクアベネディクタ#
 32,500,2000,0,0	//AL_CRUCIS#シグナムクルシス#
 33,500,3500,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0	//AL_ANGELUS#エンジェラス#
 34,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0 //AL_BLESSING#ブレッシング#
@@ -174,8 +174,7 @@
 276,0,1500,400:600:800:1000:1200,0	//SA_MAGICROD#マジックロッド#
 277,700,0,0,0	//SA_SPELLBREAKER#スペルブレイカー#
 
-//279,3000,0,120000:150000:180000:210000:240000:270000:300000:360000:390000,0	//SA_AUTOSPELL#オートスペル#
-279,3000,0,0,0 //SA_AUTOSPELL#オートスペル#
+279,3000,0,120000:150000:180000:210000:240000:270000:300000:360000:390000,0	//SA_AUTOSPELL#オートスペル#
 280,3000,0,1200000,0	//SA_FLAMELAUNCHER#フレイムランチャー#
 281,3000,0,1200000,0	//SA_FROSTWEAPON#フロストウェポン#
 282,3000,0,1200000,0	//SA_LIGHTNINGLOADER#ライトニングローダー#
@@ -225,15 +224,13 @@
 358,0,0,180000,0	//LK_TENSIONRELAX#テンションリラックス#
 359,0,0,300000,0	//LK_BERSERK
 360,0,0,300000,0	//LK_FURY
-
 361,1000:1500:2000:2500:3000,1100:1200:1300:1400:1500,20000:30000:40000:50000:60000,0	//HP_ASSUMPTIO#アスムプティオ#
 362,5000:6000:7000:8000:9000,2000:3000:4000:5000:6000,20000:25000:30000:35000:40000,20000:25000:30000:35000:40000	//HP_BASILICA#バジリカ#
 
 365,300,300,0,0	//HW_MAGICCRASHER
-366,700,0,360000,0	//HW_MAGICPOWER#魔法力増幅#
-
+366,700,0,30000,0	//HW_MAGICPOWER#魔法力増幅#
 367,2000:2500:3000:3500:4000,2000:3000:4000:5000:6000,0,0	//PA_PRESSURE
-369,0,0,360000,0	//PA_GOSPEL#ゴスペル#
+369,0,0,100000,0	//PA_GOSPEL#ゴスペル#
 370,0,300,0,0 //CH_PALMSTRIKE 
 371,0,0,0,2000:4000:6000:8000:10000	//CH_TIGERFIST#伏虎拳#
 372,0,800:800:800:800:800:1000:1000:1000:1000:1000,0,0	//CH_CHAINCRUSH#連柱崩撃#
diff --git a/db/skill_db.txt b/db/skill_db.txt
index 42a9d6ee5..cfdc9ac1b 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -387,7 +387,23 @@
 335,8,6,4,0,1,1,1,yes,0,0,0,magic,0	//WE_FEMALE#あなたに尽くします#
 336,8,6,4,0,1,1,1,yes,0,0,1,magic,0	//WE_CALLPARTNER#あなたに逢いたい#
 
-//338,0,0,0,0,0,0,0,no,0,0,0,none,0	//NPC_DARKCROSS#??ククロス#
+//338					//NPC_DARKCROSS#ダーククロス#
+339,0,6,4,7,0,10,1,no,33,256,0,magic,0		//NPC_DARKGRANDCROSS#闇グランドクロス#
+340,8,8,1,7,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,0,0,magic,0	//NPC_DARKSOULSTRIKE#闇ソウルストライク#
+341,8,8,1,7,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0,0,magic,2:3:3:4:4:5:5:6:6:7//NPC_DARKJUPITEL#闇ユピテル#
+//342束縛
+//343武器壊し
+//344鎧壊し
+//345兜壊し
+//346盾壊し
+//347不死属性攻撃
+//348攻撃系エフェクト（後退？）
+//349赤爆裂
+//350速度増加エフェクト
+//351攻撃系スキルエフェクト
+//352攻撃系スキルエフェクト
+//353攻撃系スキルエフェクト
+//354攻撃系スキルエフェクト
 
 355,0,6,4,0,1,5,1,no,0,0,0,weapon,0	//LK_AURABLADE#オ?ラブレ?ド#
 356,0,6,4,0,1,10,1,no,0,0,0,weapon,0	//LK_PARRYING#パリイング#
diff --git a/db/skill_tree.txt b/db/skill_tree.txt
index 265cddeda..86704eb27 100644
--- a/db/skill_tree.txt
+++ b/db/skill_tree.txt
@@ -895,7 +895,7 @@
 4013,376,10,48,5,134,7,0,0,0,0,0,0//ASC_KATAR		#基本スキル#
 //4013,377,10,49,5,135,5,0,0,0,0,0,0//ASC_HALLUCINATION		#基本スキル#
 4013,378,10,407,1,0,0,0,0,0,0,0,0//ASC_ENCHANTPOISON		#基本スキル#
-4013,379,10,48,5,135,3,138,6,140,5,0,0//ASC_BREAKER		#基本スキル#
+4013,379,10,48,5,135,3,138,6,52,5,0,0//ASC_BREAKER		#基本スキル#
 4013,406,10,132,3,134,5,136,5,379,1,0,0//ASC_METEORASSUALT
 4013,407,1,52,10,53,1,138,5,0,0,0,0//ASC_CDP
 // Peco Lord Knight