From 94bad013f7075b5888d3f1f6a148fe6e2d3f5cb1 Mon Sep 17 00:00:00 2001 From: rud0lp20 Date: Thu, 26 Jul 2012 18:08:30 +0000 Subject: Updated NJ_HUUMA to renewal behavior.(bugreport:6330) Updated some wizard skills(WZ_METEOR,WZ_HEAVENDRIVE,WZ_VERMILION) to its RE damage ratio.(bugreport:6334,bugreport:6329, bugreport:6333) Fixed bugreport:6321 where skill ratio of RK_HUNDREDSPEAR is adjusted too much. Follow up r16492 where damage dealt to traps should now show/display w/o affecting other skills behavior. Fixed a glitch in UNT_DUMMYSKILL where it triggers multiple time that causes multiple damage something related with bugreport:6201. Added some Kagerou/Oboro skills and more to come :). (KO_YAMIKUMO, KO_RIGHT, KO_LEFT, KO_JYUMONJIKIRI, KO_SETSUDAN, KO_BAKURETSU, KO_HAPPOKUNAI, KO_MUCHANAGE) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16506 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/pre-re/skill_cast_db.txt | 15 +++++++++++++++ db/pre-re/skill_db.txt | 11 +++++++++++ db/pre-re/skill_require_db.txt | 7 +++++++ db/pre-re/skill_unit_db.txt | 3 +++ db/re/skill_cast_db.txt | 17 ++++++++++++++++- db/re/skill_db.txt | 13 ++++++++++++- db/re/skill_require_db.txt | 7 +++++++ db/re/skill_unit_db.txt | 4 ++++ 8 files changed, 75 insertions(+), 2 deletions(-) (limited to 'db') diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt index 3d79c5bae..d381e6374 100644 --- a/db/pre-re/skill_cast_db.txt +++ b/db/pre-re/skill_cast_db.txt @@ -1639,6 +1639,21 @@ //2537,5000,5000,0,60000,0,60000 //========================================== +//==== Kagerou & Oboro skills ============== +//-- KO_YAMIKUMO +3001,0,0,0,60000,0,0,0 +//-- KO_JYUMONJIKIRI +3004,0,2500,0,5000,0,0,0 +//-- KO_SETSUDAN +3005,0,2000,0,0,0,0,0 +//-- KO_BAKURETSU +3006,1000:1500:2000:2500:3000,1000,0,100,0,3000,0 +//-- KO_HAPPOKUNAI +3007,0,1000,0,0,0,0,0 +//-- KO_MUCHANAGE +3008,0,0,0,100,0,10000,0 +//========================================== + //===== Homunculus Skills ================== //-- HLIF_HEAL 8001,0,2000,0,0,0,0 diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt index a8e2547ce..5e7b6bdf8 100644 --- a/db/pre-re/skill_db.txt +++ b/db/pre-re/skill_db.txt @@ -1007,6 +1007,17 @@ 2536,0,0,4,0,0x1,0,1,0,no,0,0,0,none,0, ALL_GUARDIAN_RECALL,Guardian's Recall //2537,9,6,16,0,0x1,0,2,1,yes,0,0,0,magic,0, ALL_ODINS_POWER,Odin's Power +//**** +// Kagerou & Oboro +3001,0,6,4,0,0,0,1,1,no,0,0,0,none,0, KO_YAMIKUMO,Yamikumo +3002,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0, KO_RIGHT,Right Hand Mastery +3003,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0, KO_LEFT,Left Hand Mastery +3004,3:4:5:6:7,8,1,-1,0,0,5,-2,no,0,0,0,weapon,0, KO_JYUMONJIKIRI,Cross Strike +3005,2,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, KO_SETSUDAN,Soul Sever +3006,7:8:9:10:11,6,2,0,0x2,0,5,0,no,0,0,0,weapon,0, KO_BAKURETSU,Bakuretsu Kunai +3007,0,6,4,-1,0x42,4:4:4:4:5,5,0,no,0,0,0,misc,0, KO_HAPPOKUNAI,Happo Kunai +3008,9,8,2,0,0x52,0,10,-10,no,0,0,0,misc,0, KO_MUCHANAGE,Mucha Nage + 8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0, HLIF_HEAL,Healing Touch 8002,0,6,4,0,0x3,-1,5,1,no,0,0,0,none,0, HLIF_AVOID,Avoid 8003,0,0,0,0,0,1,5,0,no,0,0,0,none,0, HLIF_BRAIN,Brain Surgery diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt index 5e0dc1926..8bda054cd 100644 --- a/db/pre-re/skill_require_db.txt +++ b/db/pre-re/skill_require_db.txt @@ -785,6 +785,13 @@ 2536,0,0,1,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 //ALL_GUARDIAN_RECALL#Guardian's Recall# //2537,0,0,70:100,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 //ALL_ODINS_POWER#Odin's Power# +3001,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 //KO_YAMIKUMO#Yamikumo# +3004,0,0,10:12:14:16:18,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 //KO_JYUMONJIKIRI#Cross Strike# +3005,0,0,12:16:20:24: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 //KO_SETSUDAN#Soul Sever# +3006,0,0,5:6:7:8:9,0,0,0,99,0,0,none,0,13294,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KO_BAKURETSU#Bakuretsu Kunai# +3007,0,0,8:9:10:11:12,0,0,0,99,7,8,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KO_HAPPOKUNAI#Happo Kunai# +3008,0,0,50,0,0,10000:20000:30000:40000:50000:60000:70000:80000:90000:100000,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 //KO_MUCHANAGE#Mucha Nage# + 10010,0,0,1,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 //GD_BATTLEORDER## 10011,0,0,1,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 //GD_REGENERATION## 10012,0,0,1,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 //GD_RESTORE## diff --git a/db/pre-re/skill_unit_db.txt b/db/pre-re/skill_unit_db.txt index 724370952..d2348d568 100644 --- a/db/pre-re/skill_unit_db.txt +++ b/db/pre-re/skill_unit_db.txt @@ -148,6 +148,9 @@ 2488,0xe9, , 0, 3,1000,enemy, 0x000 //GN_FIRE_EXPANSION_TEAR_GAS 2490,0xea, , 0, 1,1000,enemy, 0x000 //GN_HELLS_PLANT +3006,0x86, , 0, 2, 100,enemy, 0x018 //KO_BAKURETSU +3008,0x86, , 0, 2, 100,enemy, 0x018 //KO_MUCHANAGE + 8208,0x86, , 0, 2,1000,enemy, 0x080 //MA_SHOWER 8209,0x90, , 0, 1,1000,enemy, 0x006 //MA_SKIDTRAP 8210,0x93, , 0, 0,1000,enemy, 0x006 //MA_LANDMINE diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt index a8bb7a74a..0ef12eeb9 100644 --- a/db/re/skill_cast_db.txt +++ b/db/re/skill_cast_db.txt @@ -875,7 +875,7 @@ //-- NJ_KUNAI 524,0,1000,0,0,0,0,0 //-- NJ_HUUMA -525,3000,2000,0,0,0,0,0 +525,3000,2000,0,100,0,0,0 //-- NJ_ZENYNAGE 526,0,5000,0,0,0,0,0 //-- NJ_TATAMIGAESHI @@ -1640,6 +1640,21 @@ 2537,5000,5000,0,60000,0,60000,0 //========================================== +//==== Kagerou & Oboro skills ============== +//-- KO_YAMIKUMO +3001,0,0,0,60000,0,0,0 +//-- KO_JYUMONJIKIRI +3004,0,2500,0,5000,0,0,0 +//-- KO_SETSUDAN +3005,0,2000,0,0,0,0,0 +//-- KO_BAKURETSU +3006,1000:1500:2000:2500:3000,1000,0,100,0,3000,0 +//-- KO_HAPPOKUNAI +3007,0,1000,0,0,0,0,0 +//-- KO_MUCHANAGE +3008,0,0,0,100,0,10000,0 +//========================================== + //===== Homunculus Skills ================== //-- HLIF_HEAL 8001,0,2000,0,0,0,0,0 diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index fbb8945b3..ee30b369d 100644 --- a/db/re/skill_db.txt +++ b/db/re/skill_db.txt @@ -568,7 +568,7 @@ 522,0,0,0,0,0,0,10,1,no,0,0,0,weapon,0, NJ_TOBIDOUGU,Shuriken Training 523,9,6,1,-1,0x40,0,10,1,no,0,0,0,weapon,0, NJ_SYURIKEN,Throw Shuriken 524,9,8,1,-1,0x40,0,5,3,no,0,0,0,weapon,0, NJ_KUNAI,Throw Kunai -525,9,8,1,-1,0x6,1,5,-3:-3:-4:-4:-5,no,0,0,0,weapon,0, NJ_HUUMA,Throw Huuma Shuriken +525,9,8,2,-1,0x2,0,5,-3:-3:-4:-4:-5,no,0,0,0,weapon,0, NJ_HUUMA,Throw Huuma Shuriken 526,9,6,1,0,0x50,0,10,1,no,0,0,0,misc,0, NJ_ZENYNAGE,Throw Zeny 527,0,6,4,-1,0,0,5,1,no,0,0,0,weapon,3, NJ_TATAMIGAESHI,Improvised Defense 528,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0, NJ_KASUMIKIRI,Vanishing Slash @@ -1008,6 +1008,17 @@ 2536,0,0,4,0,0x1,0,1,0,no,0,0,0,none,0, ALL_GUARDIAN_RECALL,Guardian's Recall 2537,9,6,16,0,0x1,0,2,1,yes,0,0,0,magic,0, ALL_ODINS_POWER,Odin's Power +//**** +// Kagerou & Oboro +3001,0,6,4,0,0,0,1,1,no,0,0,0,none,0, KO_YAMIKUMO,Yamikumo +3002,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0, KO_RIGHT,Right Hand Mastery +3003,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0, KO_LEFT,Left Hand Mastery +3004,3:4:5:6:7,8,1,-1,0,0,5,-2,no,0,0,0,weapon,0, KO_JYUMONJIKIRI,Cross Strike +3005,2,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, KO_SETSUDAN,Soul Sever +3006,7:8:9:10:11,6,2,0,0x2,0,5,0,no,0,0,0,weapon,0, KO_BAKURETSU,Bakuretsu Kunai +3007,0,6,4,-1,0x42,4:4:4:4:5,5,0,no,0,0,0,misc,0, KO_HAPPOKUNAI,Happo Kunai +3008,9,8,2,0,0x52,0,10,-10,no,0,0,0,misc,0, KO_MUCHANAGE,Mucha Nage + 8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0, HLIF_HEAL,Healing Touch 8002,0,6,4,0,0x3,-1,5,1,no,0,0,0,none,0, HLIF_AVOID,Avoid 8003,0,0,0,0,0,1,5,0,no,0,0,0,none,0, HLIF_BRAIN,Brain Surgery diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt index e7f620517..7d92abae0 100644 --- a/db/re/skill_require_db.txt +++ b/db/re/skill_require_db.txt @@ -786,6 +786,13 @@ 2535,0,0,1,0,0,0,99,0,0,none,0,6377,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ALL_BUYING_STORE#Open Buying Store 2536,0,0,1,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 //ALL_GUARDIAN_RECALL#Guardian's Recall# //2537,0,0,70:100,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 //ALL_ODINS_POWER#Odin's Power# + +3001,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 //KO_YAMIKUMO#Yamikumo# +3004,0,0,10:12:14:16:18,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 //KO_JYUMONJIKIRI#Cross Strike# +3005,0,0,12:16:20:24: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 //KO_SETSUDAN#Soul Sever# +3006,0,0,5:6:7:8:9,0,0,0,99,0,0,none,0,13294,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KO_BAKURETSU#Bakuretsu Kunai# +3007,0,0,8:9:10:11:12,0,0,0,99,7,8,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KO_HAPPOKUNAI#Happo Kunai# +3008,0,0,50,0,0,10000:20000:30000:40000:50000:60000:70000:80000:90000:100000,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 //KO_MUCHANAGE#Mucha Nage# 10010,0,0,1,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 //GD_BATTLEORDER## 10011,0,0,1,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 //GD_REGENERATION## diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt index 5d260298f..2c94386b1 100644 --- a/db/re/skill_unit_db.txt +++ b/db/re/skill_unit_db.txt @@ -91,6 +91,7 @@ 488,0xb9, , 3, 0, -1,all, 0x200 //CG_HERMODE 516,0x86, , 3, 0, 100,enemy, 0x000 //GS_DESPERADO 521,0xbe, , 0, 1,1000,enemy, 0x000 //GS_GROUNDDRIFT +525,0x86, , 0, 2, 100,enemy, 0x018 //NJ_HUUMA 527,0xbc, , -1, 0,2000,enemy, 0x018 //NJ_TATAMIGAESHI 535,0xbd, , -1, 0, 20,enemy, 0x010 //NJ_KAENSIN 538,0xbb, , 1:1:1:2:2:2:3:3:3:4,0,-1,all,0x010 //NJ_SUITON @@ -148,6 +149,9 @@ 2488,0xe9, , 0, 3,1000,enemy, 0x000 //GN_FIRE_EXPANSION_TEAR_GAS 2490,0xea, , 0, 1,1000,enemy, 0x000 //GN_HELLS_PLANT +3006,0x86, , 0, 2, 100,enemy, 0x018 //KO_BAKURETSU +3008,0x86, , 0, 2, 100,enemy, 0x018 //KO_MUCHANAGE + 8020,0xf5, , 0, 3,2300:2100:1900:1700:1500,enemy, 0x018 //MH_POISON_MIST 8033,0x7e, , 0, 0, -1,all, 0x003 //MH_STEINWAND 8025,0x86, , 0, 2:2:3:3:4,1000,enemy, 0x018 //MH_XENO_SLASHER -- cgit v1.2.3-70-g09d2