summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-10 04:59:53 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-10 04:59:53 +0000
commitd574e16397271aa01b5a8ce41738a89be911b0ac (patch)
treef61928bb6ac559f81a9263524b6a29206208bafd /db
parenta1427a9fd0b12fd8da24e8e322917ab992c6252a (diff)
downloadhercules-d574e16397271aa01b5a8ce41738a89be911b0ac.tar.gz
hercules-d574e16397271aa01b5a8ce41738a89be911b0ac.tar.bz2
hercules-d574e16397271aa01b5a8ce41738a89be911b0ac.tar.xz
hercules-d574e16397271aa01b5a8ce41738a89be911b0ac.zip
- 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
Diffstat (limited to 'db')
-rw-r--r--db/item_db.txt2
-rw-r--r--db/skill_cast_db.txt11
-rw-r--r--db/skill_db.txt18
-rw-r--r--db/skill_tree.txt2
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#�q�[��#
29,1000,1000,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0 //AL_INCAGI#���x����#
30,1000,1000,40000:50000:60000:70000:80000:90000:100000:110000:120000:130000,0 //AL_DECAGI#���x����#
-31,0,2000,0,0 //AL_HOLYWATER#�A�N�A�x�l�f�B�N�^#
+31,1000,500,0,0 //AL_HOLYWATER#�A�N�A�x�l�f�B�N�^#
32,500,2000,0,0 //AL_CRUCIS#�V�O�i���N���V�X#
33,500,3500,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0 //AL_ANGELUS#�G���W�F���X#
34,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0 //AL_BLESSING#�u���b�V���O#
@@ -174,8 +174,7 @@
276,0,1500,400:600:800:1000:1200,0 //SA_MAGICROD#�}�W�b�N���b�h#
277,700,0,0,0 //SA_SPELLBREAKER#�X�y���u���C�J�[#
-//279,3000,0,120000:150000:180000:210000:240000:270000:300000:360000:390000,0 //SA_AUTOSPELL#�I�[�g�X�y��#
-279,3000,0,0,0 //SA_AUTOSPELL#�I�[�g�X�y��#
+279,3000,0,120000:150000:180000:210000:240000:270000:300000:360000:390000,0 //SA_AUTOSPELL#�I�[�g�X�y��#
280,3000,0,1200000,0 //SA_FLAMELAUNCHER#�t���C�������`���[#
281,3000,0,1200000,0 //SA_FROSTWEAPON#�t���X�g�E�F�|��#
282,3000,0,1200000,0 //SA_LIGHTNINGLOADER#���C�g�j���O���[�_�[#
@@ -225,15 +224,13 @@
358,0,0,180000,0 //LK_TENSIONRELAX#�e���V���������b�N�X#
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#�A�X���v�e�B�I#
362,5000:6000:7000:8000:9000,2000:3000:4000:5000:6000,20000:25000:30000:35000:40000,20000:25000:30000:35000:40000 //HP_BASILICA#�o�W���J#
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#�S�X�y��#
+369,0,0,100000,0 //PA_GOSPEL#�S�X�y��#
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#�A������#
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#���Ȃ��ɐs�����܂�#
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#??�N�N���X#
+//338 //NPC_DARKCROSS#�_�[�N�N���X#
+339,0,6,4,7,0,10,1,no,33,256,0,magic,0 //NPC_DARKGRANDCROSS#�ŃO�����h�N���X#
+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#�Ń\�E���X�g���C�N#
+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#���s�e��#
+//342����
+//343�����
+//344�Z��
+//345����
+//346����
+//347�s�������U��
+//348�U���n�G�t�F�N�g�i��ށH�j
+//349�Ԕ���
+//350���x�����G�t�F�N�g
+//351�U���n�X�L���G�t�F�N�g
+//352�U���n�X�L���G�t�F�N�g
+//353�U���n�X�L���G�t�F�N�g
+//354�U���n�X�L���G�t�F�N�g
355,0,6,4,0,1,5,1,no,0,0,0,weapon,0 //LK_AURABLADE#�I?���u��?�h#
356,0,6,4,0,1,10,1,no,0,0,0,weapon,0 //LK_PARRYING#�p���C���O#
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 #��{�X�L��#
//4013,377,10,49,5,135,5,0,0,0,0,0,0//ASC_HALLUCINATION #��{�X�L��#
4013,378,10,407,1,0,0,0,0,0,0,0,0//ASC_ENCHANTPOISON #��{�X�L��#
-4013,379,10,48,5,135,3,138,6,140,5,0,0//ASC_BREAKER #��{�X�L��#
+4013,379,10,48,5,135,3,138,6,52,5,0,0//ASC_BREAKER #��{�X�L��#
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