diff options
author | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-30 11:44:12 +0000 |
---|---|---|
committer | celest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-03-30 11:44:12 +0000 |
commit | c883ca205971275e576d34b54304c3c5c30f3580 (patch) | |
tree | 4d0a218a184099c61a311d65b50e93973c4c773a /db | |
parent | 230ba4e3dd84a19f7dee67fdc97532e5869bef63 (diff) | |
download | hercules-c883ca205971275e576d34b54304c3c5c30f3580.tar.gz hercules-c883ca205971275e576d34b54304c3c5c30f3580.tar.bz2 hercules-c883ca205971275e576d34b54304c3c5c30f3580.tar.xz hercules-c883ca205971275e576d34b54304c3c5c30f3580.zip |
* updated map server to jA1137~1159
* Some tidying up in mob.c and skill.c
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1342 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r-- | db/packet_db.txt | 2 | ||||
-rw-r--r-- | db/skill_cast_db.txt | 6 | ||||
-rw-r--r-- | db/skill_db.txt | 24 | ||||
-rw-r--r-- | db/skill_require_db.txt | 2 | ||||
-rw-r--r-- | db/skill_unit_db.txt | 2 |
5 files changed, 18 insertions, 18 deletions
diff --git a/db/packet_db.txt b/db/packet_db.txt index 95591eacf..81bcf2c89 100644 --- a/db/packet_db.txt +++ b/db/packet_db.txt @@ -237,7 +237,7 @@ prefer_packet_db: yes 0x013c,4 0x013d,6 0x013e,24 -0x013f,26 +0x013F,26,itemmonster,2 0x0140,22,mapmove,2:18:20 0x0141,14 0x0142,6 diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt index 247c77a25..d1b62cf0c 100644 --- a/db/skill_cast_db.txt +++ b/db/skill_cast_db.txt @@ -2,7 +2,7 @@ //id,cast_list,delay_list,upkeep_time,upkeep_time2 6,0,0,30000,0 //SM_PROVOKE#�v���{�b�N# - +7,0,2000,0,0 //SM_MAGNUM#�}�O�i���u���C�N# 8,0,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,0 //SM_ENDURE#�C���f���A# 10,0,0,10000,0 //MG_SIGHT#�T�C�g# @@ -156,7 +156,7 @@ 252,0,0,300000,0 //CR_REFLECTSHIELD#���t���N�g�V�[���h# 253,0,0,0,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 //CR_HOLYCROSS#�z�[���[�N���X# 254,3000,1500,1000,10000:11000:12000:13000:14000:15000:16000:17000:18000:19000 //CR_GRANDCROSS#�O�����h�N���X# - +255,3000,0,0,0 //CR_DEVOTION#�f�B�{�[�V���� 256,3000,0,180000,0 //CR_PROVIDENCE#�v�����B�f���X# 257,0,800,180000,0 //CR_DEFENDER#�f�B�t�F���_�[# 258,0,0,30000:60000:90000:120000:150000:180000:210000:240000:270000:300000,0 //CR_SPEARQUICKEN#�X�s�A�N�C�b�P��# @@ -232,7 +232,7 @@ 365,300,300,0,0 //HW_MAGICCRASHER 366,700,0,30000,0 //HW_MAGICPOWER#���@�͑���# 367,2000:2500:3000:3500:4000,2000:3000:4000:5000:6000,0,2000:3000:4000:5000:6000 //PA_PRESSURE -369,0,0,100000,0 //PA_GOSPEL#�S�X�y��# +369,0,0,60000,20000 //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 ac6acb17f..a1ed5b27f 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -6,7 +6,7 @@ 4,0,0,0,0,0,10,0,no,0,0,0,none,0 //SM_RECOVERY#HP�͌���# 5,-1,6,1,0,0,10,1,no,0,0,0,weapon,0 //SM_BASH#�o�b�V��# 6,8,6,1,0,1,10,1,no,0,0,0,none,0 //SM_PROVOKE#�v��?�b�N# -7,0,6,4,3,2,10,5,no,0,0,0,weapon,2 //SM_MAGNUM#?�O�i?�u���C�N# +7,0,6,4,3,2,10,5,no,0,16,0,weapon,2 //SM_MAGNUM#?�O�i?�u���C�N# 8,0,6,4,0,1,10,1,no,0,0,0,weapon,0 //SM_ENDURE#�C���f���A# 9,0,0,0,0,0,10,0,no,0,0,0,none,0 //MG_SRECOVERY#SP�͌���# 10,8,6,4,3,1,1,1,yes,0,0,0,magic,0 //MG_SIGHT#�T�C�g# @@ -264,10 +264,10 @@ 212,-1,6,1,0,0,10,1,no,0,0,0,weapon,1 //RG_BACKSTAP#�o�b�N�X?�u# 213,0,0,0,0,0,5,0,no,0,0,0,none,0 //RG_TUNNELDRIVE#�g���l���h���C�u# 214,0,6,4,0,1,5,1,no,0,0,0,weapon,0 //RG_RAID#�T�v���C�Y�A?�b�N# -215,1,6,1,0,1,5,1,yes,0,0,0,weapon,0 //RG_STRIPWEAPON#�X�g���b�v�E�F?��# -216,1,6,1,0,1,5,1,yes,0,0,0,weapon,0 //RG_STRIPSHIELD#�X�g���b�v�V?���h# -217,1,6,1,0,1,5,1,yes,0,0,0,weapon,0 //RG_STRIPARMOR#�X�g���b�v�A???# -218,1,6,1,0,1,5,1,yes,0,0,0,weapon,0 //RG_STRIPHELM#�X�g���b�v�w��?# +215,1,6,1,0,1,5,1,no,0,0,0,weapon,0 //RG_STRIPWEAPON#�X�g���b�v�E�F?��# +216,1,6,1,0,1,5,1,no,0,0,0,weapon,0 //RG_STRIPSHIELD#�X�g���b�v�V?���h# +217,1,6,1,0,1,5,1,no,0,0,0,weapon,0 //RG_STRIPARMOR#�X�g���b�v�A???# +218,1,6,1,0,1,5,1,no,0,0,0,weapon,0 //RG_STRIPHELM#�X�g���b�v�w��?# 219,-1,6,1,0,0,5,1,no,0,0,0,weapon,0 //RG_INTIMIDATE#�C���e�B?�f�C�g# 220,1,6,2,0,1,1,1,no,0,0,0,none,0 //RG_GRAFFITI#�O���t�B�e�B# 221,0,6,2,0,1,5,1,no,0,0,0,none,0 //RG_FLAGGRAFFITI#�t���b�O�O���t�B�e�B# @@ -278,8 +278,8 @@ 226,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //AM_AXEMASTERY#?�C��# 227,0,0,0,0,0,10,0,no,0,0,0,none,0 //AM_LEARNINGPOTION#��?�j���O??�V����# 228,0,6,4,0,1,10,0,no,0,0,0,none,0 //AM_PHARMACY#�t???�V?# -229,8,6,2,3,1,5,1,no,0,128,0,weapon,0 //AM_DEMONSTRATION#�f�����X�g��?�V����# -230,8,6,1,0,0,5,0,no,0,0,0,weapon,0 //AM_ACIDTERROR#�A�V�b�h�e��?# +229,8,6,2,3,1,5,1,yes,0,128,0,weapon,0 //AM_DEMONSTRATION#�f�����X�g��?�V����# +230,8,6,1,0,0,5,0,yes,0,0,0,weapon,0 //AM_ACIDTERROR#�A�V�b�h�e��?# 231,8,6,16,0,1,5,1,yes,0,3072,0,none,0 //AM_POTIONPITCHER#??�V�����s�b?��?# 232,3,6,2,0,1,5,1,no,0,0,5,none,0 //AM_CANNIBALIZE#�o�C�I�v�����g# 233,3,6,2,0,1,5,1,no,0,128,3,none,0 //AM_SPHEREMINE#�X�t�B�A??�C��# @@ -303,7 +303,7 @@ 251,3:5:7:9:11,6,1,0,0,5,1,no,0,0,0,weapon,0 //CR_SHIELDBOOMERANG#�V?���h�u?������# 252,0,6,4,0,1,10,1,no,0,0,0,weapon,0 //CR_REFLECTSHIELD#���t���N�g�V?���h# 253,-2,8,1,6,0,10,2,no,0,0,0,weapon,0 //CR_HOLYCROSS#�z?��?�N���X# -254,0,6,4,6,0,10,1,no,33,256,0,magic,0 //CR_GRANDCROSS#�O�����h�N���X# +254,0,5,4,6,0,10,1,no,33,256,0,magic,0 //CR_GRANDCROSS#�O�����h�N���X# 255,8,6,16,0,1,5,1,yes,0,0,0,magic,0 //CR_DEVOTION#�f�B??�V����# 256,8,6,16,0,1,5,1,yes,0,0,0,magic,0 //CR_PROVIDENCE#�v�����B�f���X# 257,0,6,4,0,1,5,1,no,0,0,0,weapon,0 //CR_DEFENDER#�f�B�t�F��??# @@ -404,13 +404,13 @@ //345���� //346���� //347�s�������U�� -//348�U���n�G�t�F�N�g�i��ށH�j +348,2,6,4,0,1,20,0,no,0,0,0,magic,0 //NPC_RUNAWAY#���# 349,0,6,4,0,1,5,0,no,0,0,0,weapon,0 //NPC_EXPLOSIONSPIRITS#NPC�����g��# //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 +354,2,0,4,0,1,1,0,no,0,0,0,magic,0 //NPC_RECALL#��芪���Ăі߂�# 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# @@ -436,7 +436,7 @@ 376,0,0,0,0,1,5,1,no,0,0,0,weapon,0 //ASC_KATAR#�A�h�o���X�h�J??������# 377,0,0,4,0,1,10,1,no,0,0,0,misc,0 //ASC_HALLUCINATION#�n���V�l?�V�����E�H?�N# 378,0,6,4,5,1,5,1,no,0,1024,0,weapon,0 //ASC_EDP#�G��?�����g�f�b�h��??�C�Y��# -379,5,6,1,0,0,10,1,no,0,0,0,weapon,0 //ASC_BREAKER#?�E���u��?�J?# +379,9,6,1,0,0,10,1,yes,0,0,0,weapon,0 //ASC_BREAKER#?�E���u��?�J?# 380,0,6,4,0,1,10,1,no,0,0,0,weapon,0 //SN_SIGHT#�g�D��?�T�C�g# 381,9,8,1,0,0,5,1:2:3:4:5,yes,0,0,0,misc,0 //SN_FALCONASSAULT#�t?���R���A�T���g# 382,14,8,1,0,0,5,1,no,0,0,0,weapon,0 //SN_SHARPSHOOTING#�V��?�v�V��?�e�B���O# @@ -454,7 +454,7 @@ 394,8,8,1,0,0,10,9,no,0,0,0,weapon,0 //CG_ARROWVULCAN#�A��?�o���J��# 395,0,0,4,0,1,1,1,yes,0,0,0,magic,0 //CG_MOONLIT#������̐�ɗ�����Ԃт�# 396,0,6,16,0,1,1,1,yes,0,0,0,magic,1 //CG_MARIONETTE#?���I�l�b�g�R���g��?��# -397,4,8,1,0,0,5,5,no,0,0,0,weapon,0 //LK_SPIRALPIERCE#�X�p�C�����s�A?�X# +397,5,8,1,0,0,5,5,no,0,0,0,weapon,0 //LK_SPIRALPIERCE#�X�p�C�����s�A?�X# 398,4,6,1,0,0,5,1,no,0,0,0,weapon,0 //LK_HEADCRUSH#�w�b�h�N���b�V��# 399,4,6,1,0,0,10,1,no,0,0,0,weapon,0 //LK_JOINTBEAT#�W���C���g�r?�g# 400,8,8,1,8,0,5,1:2:3:4:5,yes,0,0,0,magic,0 //HW_NAPALMVULCAN#�i�p??�o���J��# diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt index 50578ac49..2cccdfe72 100644 --- a/db/skill_require_db.txt +++ b/db/skill_require_db.txt @@ -3,7 +3,7 @@ 5,0,0,8:8:8:8:8:15:15:15:15:15,0,0,0,0:1:2:3:4:5:6:7:8:9:10:12:13:14:15:16:17:18:19:20:21:22,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SM_BASH#�o�b�V��# 6,0,0,4:5:6:7:8:9:10:11:12:13,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SM_PROVOKE#�v���{�b�N# -7,15,0,15,0,0,0,0:1:2:3:4:5:6:7:8:9:10:12:13:14:15:16:17:18:19:20:21:22,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SM_MAGNUM#�}�O�i���u���C�N# +7,20:20:19:19:18:18:17:17:16:16,0,30,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SM_MAGNUM#�}�O�i���u���C�N# 8,0,0,10,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SM_ENDURE#�C���f���A# 10,0,0,10,0,0,0,99,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MG_SIGHT#�T�C�g# diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt index e9e7dffaf..800548745 100644 --- a/db/skill_unit_db.txt +++ b/db/skill_unit_db.txt @@ -75,6 +75,6 @@ 336,0xb2, , 0,-1, -1,all, 0x000,0 //WE_CALLPARTNER#���Ȃ��Ɉ������� 339,0x86, , -1, 0, 300,enemy, 0x000,0 //NPC_DARKGRANDCROSS#�ŃO�����h�N���X 362,0xb4, , 0, 3, 300,all, 0x000,0 //HP_BASILICA#�o�W���J -369,0xb3, , 3, 0, -1,all, 0x000,0 //PA_GOSPEL#�S�X�y�� +369,0xb3, , -1, 0,10000,all, 0x000,0 //PA_GOSPEL#�S�X�y�� 404,0xb6, , -1, 0, -1,all, 0x000,0 //PF_FOGWALL#�t�H�O�E�H�[�� 405,0xb7, , 0, 1,1000,enemy, 0x006,0 //PF_SPIDERWEB#�X�p�C�_�[�E�F�b�u |