From 4362a0c677113465c450da34148e10676c32298f Mon Sep 17 00:00:00 2001 From: toms Date: Sun, 30 Jul 2006 19:32:53 +0000 Subject: Merged mpeg's fix on ninja skills and SA_VOLCANO,SA_DELUGE,SA_VIOLENTGALE git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7983 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/item_db.txt | 2 +- db/skill_cast_db.txt | 8 ++++---- db/skill_db.txt | 2 +- db/skill_require_db.txt | 14 +++++++------- db/skill_unit_db.txt | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'db') diff --git a/db/item_db.txt b/db/item_db.txt index a8d1d027d..4850d6057 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -142,7 +142,7 @@ 644,Gift_Box,Gift Box,2,2,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GiftBox),1; },{},{} // ASPD Potions 645,Concentration_Potion,Concentration Potion,2,800,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ASPDPOTION0,1800000,0; },{},{} -656,Awakening_Potion,Awakening Potion,2,1500,,150,,,,,0x00E7DEEF,7,2,,,40,,,{ sc_end SC_Sleep; sc_start SC_ASPDPOTION1,1800000,0; },{},{} +656,Awakening_Potion,Awakening Potion,2,1500,,150,,,,,0x03E7DEEF,7,2,,,40,,,{ sc_end SC_Sleep; sc_start SC_ASPDPOTION1,1800000,0; },{},{} 657,Berserk_Potion,Berserk Potion,2,3000,,200,,,,,0x00E646A6,7,2,,,85,,,{ sc_start SC_ASPDPOTION2,1800000,0; },{},{} 658,Tribal_Solidarity,Tribal Solidarity,2,1000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ guildgetexp rand(600000,1200000); },{},{} // New Pet Tames diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt index 2f1bdbb66..a94c947a5 100644 --- a/db/skill_cast_db.txt +++ b/db/skill_cast_db.txt @@ -447,11 +447,11 @@ 283,3000,0,0,1200000:1200000:1200000:1200000:1800000,0 //-- SA_VOLCANO -285,5000,0,0,60000:120000:180000:240000:300000,0 +285,5000,0,0,60000:120000:180000:240000:300000,60000:120000:180000:240000:300000 //-- SA_DELUGE -286,5000,0,0,60000:120000:180000:240000:300000,0 +286,5000,0,0,60000:120000:180000:240000:300000,60000:120000:180000:240000:300000 //-- SA_VIOLENTGALE -287,5000,0,0,60000:120000:180000:240000:300000,0 +287,5000,0,0,60000:120000:180000:240000:300000,60000:120000:180000:240000:300000 //-- SA_LANDPROTECTOR 288,5000,0,0,120000:165000:210000:245000:300000,0 //-- SA_DISPELL @@ -881,7 +881,7 @@ //===== Ninja ============================== -//-- NJ_HUUMA // Unknown delay. temp value (taken from jA) +//-- NJ_HUUMA // Unknown casting time. temp value (taken from jA) 525,1000,0,0,0,0 //-- NJ_ZENYNAGE 526,0,5000,0,0,0 diff --git a/db/skill_db.txt b/db/skill_db.txt index 1c1e49c31..420d97337 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -557,7 +557,7 @@ 533,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //NJ_NINPOU#NJ_NINPOU# 534,9,8,1,3,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0 //NJ_KOUENKA#NJ_KOUENKA# 535,0,8,4,3,0,0,10,1,yes,0,0,0,magic,0 //NJ_KAENSIN#NJ_KAENSIN# -536,9,8,1,3,2,1,5,3,yes,0,0,0,magic,0 //NJ_BAKUENRYU#NJ_BAKUENRYU# +536,9,8,1,3,2,1,5,-3,yes,0,0,0,magic,0 //NJ_BAKUENRYU#NJ_BAKUENRYU# 537,9,8,1,1,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0,0,magic,0 //NJ_HYOUSENSOU#NJ_HYOUSENSOU# 538,9,6,2,0,1,0,10,1,yes,0,0,0,magic,0 //NJ_SUITON#NJ_SUITON# 539,0,6,4,1,1,0,5,1,yes,0,0,0,magic,0 //NJ_HYOUSYOURAKU#NJ_HYOUSYOURAKU# diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt index e0303c94b..2227f77b7 100644 --- a/db/skill_require_db.txt +++ b/db/skill_require_db.txt @@ -416,13 +416,13 @@ 523,0,0,2,0,0,0,99,6,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_SYURIKEN 524,0,0,30:25:20:15:10,0,0,0,99,7,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_KUNAI 525,0,0,20:25:30:35:40,0,0,0,22,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_HUUMA -526,0,0,50,0,0,1000:2000:3000:4000:5000:6000:7000:8000:9000:10000,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_ZENYNAGE -527,0,0,40,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_TATAMIGAESHI -528,0,0,10:12:14:16:18:20:22:24:26:28,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_KASUMIKIRI -529,0,0,40,0,0,0,0,0,0,hiding,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_SHADOWJUMP -530,0,0,14:16:18:20:22,0,0,0,0,0,0,hiding,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_KIRIKAGE -531,0,0,12:15:18:21:24,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_UTSUSEMI -532,0,0,30:32:34:36:38:40:42:44:46:48,0,0,0,0,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_BUNSINJYUTSU +526,0,0,50,0,0,500:1000:1500:2000:2500:3000:3500:4000:4500:5000,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_ZENYNAGE +527,0,0,40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_TATAMIGAESHI +528,0,0,10:12:14:16:18:20:22:24:26:28,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_KASUMIKIRI +529,0,0,40,0,0,0,99,0,0,hiding,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_SHADOWJUMP +530,0,0,14:16:18:20:22,0,0,0,99,0,0,hiding,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_KIRIKAGE +531,0,0,12:15:18:21:24,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_UTSUSEMI +532,0,0,30:32:34:36:38:40:42:44:46:48,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_BUNSINJYUTSU 533,0,0,10,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_NINPOU 534,0,0,18:20:22:24:26:28:30:32:34:36,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_KOUENKA 535,0,0,25,0,0,0,99,0,0,none,0,7521,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NJ_KAENSIN diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt index c5a83b5d0..7e1627d3f 100644 --- a/db/skill_unit_db.txt +++ b/db/skill_unit_db.txt @@ -90,7 +90,7 @@ 527,0xba, , -1, 0,2000,enemy, 0x000 //NJ_TATAMIGAESHI 535,0xbd, , 2, 0, 100,enemy, 0x008 //NJ_KAENSIN 541,0x86,,0,2:2:3:3:4,1000,enemy,0x000 //NJ_RAIGEKISAI -538,0xbb,,1:1:1:2:2:2:3:3:3:4,0,-1,all,0x010 //NJ_SUITON +538,0xbb,,1:1:1:2:2:2:3:3:3:4,0,-1,all,0x002 //NJ_SUITON 516,0xbc, , 0, 3, 100,enemy, 0x000 //GS_DESPERADO 521,0xc2, , 0, 1,1000,enemy, 0x006 //GS_GROUNDDRIFT -539,0x86, , 0, 3,1000,enemy, 0x008 //NJ_HYOUSYOURAKU +539,0x86, , 0, 3,1000,enemy, 0x000 //NJ_HYOUSYOURAKU -- cgit v1.2.3-70-g09d2