From 8b63621196b61b105009b1ca40d208afb825dd7e Mon Sep 17 00:00:00 2001 From: rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> Date: Tue, 31 Jul 2012 16:38:47 +0000 Subject: Fixed SC_CRYSTALIZE where it stacks with other opt and ignore SC_WARMER. Fixed weapon check in dual wielding where it doesn't function properly specially in checking with the dual-wield constants. Added some Kagerou/Oboro skills. (KO_KAIHOU,KO_ZENKAI,KO_GENWAKU,KO_IZAYOI) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16539 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/pre-re/skill_cast_db.txt | 8 ++++++++ db/pre-re/skill_db.txt | 6 +++++- db/pre-re/skill_require_db.txt | 6 +++++- db/pre-re/skill_unit_db.txt | 1 + db/re/skill_cast_db.txt | 8 ++++++++ db/re/skill_db.txt | 4 ++++ db/re/skill_require_db.txt | 6 +++++- db/re/skill_unit_db.txt | 1 + 8 files changed, 37 insertions(+), 3 deletions(-) (limited to 'db') diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt index d156682c7..53b65bcdb 100644 --- a/db/pre-re/skill_cast_db.txt +++ b/db/pre-re/skill_cast_db.txt @@ -1673,6 +1673,14 @@ 3017,500,0,0,300000,0,0,0 //-- KO_DOHU_KOUKAI 3018,500,0,0,300000,0,0,0 +//-- KO_KAIHOU +3019,1000,0,0,0,0,0,0 +//-- KO_ZENKAI +3020,1000,0,0,10000,10000,0,0 +//-- KO_GENWAKU +3021,500,0,0,5000,0,0,0 +//-- KO_IZAYOI +3022,0,0,0,30000:45000:60000:75000:90000,0,60000,0 //========================================== //===== Homunculus Skills ================== diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt index 19645896c..3c9abf906 100644 --- a/db/pre-re/skill_db.txt +++ b/db/pre-re/skill_db.txt @@ -1026,7 +1026,11 @@ 3015,0,6,4,3,0x1,0,1,1,no,0,0,0,none,0, KO_KAHU_ENTEN,Kahu Enten 3016,0,6,4,1,0x1,0,1,1,no,0,0,0,none,0, KO_HYOUHU_HUBUKI,Hyouhu Hubuki 3017,0,6,4,4,0x1,0,1,1,no,0,0,0,none,0, KO_KAZEHU_SEIRAN,Kazehu Seiran -3018,0,6,4,2,0x1,0,1,1,no,0,0,0,none,0, KO_DOHU_KOUKAI,Dohu Koukai +3018,0,6,4,2,0x1,0,1,1,no,0,0,0,none,0, KO_DOHU_KOUKAI,Dohu Koukai +3019,11,6,1,0,0,0,5,0,no,0,0,0,weapon,0, KO_KAIHOU,Technique Kaihou +3020,7,6,2,0,0,0,1,3,yes,0,0,0,magic,0, KO_ZENKAI,Zenkai +3021,5:6:7:8:9,6,16,0,0x1,0,5,1,no,0,0,0,none,0, KO_GENWAKU,Genwaku +3022,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0, KO_IZAYOI,Izayoi 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 diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt index 9a36a896a..edea39007 100644 --- a/db/pre-re/skill_require_db.txt +++ b/db/pre-re/skill_require_db.txt @@ -788,7 +788,7 @@ //**** // Kagerou/Oboro 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# +3004,0,0,10:12:14:16:18,0,0,0,25:26:28,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# @@ -803,6 +803,10 @@ 3016,0,0,20,0,0,0,99,0,0,none,0,6513,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KO_HYOUHU_HUBUKI#Hyouhu Hubuki# 3017,0,0,20,0,0,0,99,0,0,none,0,6514,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KO_KAZEHU_SEIRAN#Kazehu Seiran# 3018,0,0,20,0,0,0,99,0,0,none,0,6515,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KO_DOHU_KOUKAI#Dohu Koukai# +3019,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_KAIHOU#Technique Kaihou# +3020,0,0,30,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_ZENKAI#Zenkai# +3021,0,0,40:44:48:52:56,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_GENWAKU#Genwaku# +3022,0,0,70:75:80:85:90,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_IZAYOI#Izayoi# 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/pre-re/skill_unit_db.txt b/db/pre-re/skill_unit_db.txt index a0d0f4890..37f2eb317 100644 --- a/db/pre-re/skill_unit_db.txt +++ b/db/pre-re/skill_unit_db.txt @@ -151,6 +151,7 @@ 3006,0x86, , 0, 2, 100,enemy, 0x018 //KO_BAKURETSU 3008,0x86, , 0, 2, 100,enemy, 0x018 //KO_MUCHANAGE 3009,0x86, , 0, 3, 500,enemy, 0x018 //KO_HUUMARANKA +3020,0xf8, , 0, 3, 100,all, 0x018 //KO_ZENKAI //3010,0xfc, , 0, 2,1000,enemy, 0x022 //KO_MAKIBISHI 8208,0x86, , 0, 2,1000,enemy, 0x080 //MA_SHOWER diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt index 3b59e7c35..2278444b0 100644 --- a/db/re/skill_cast_db.txt +++ b/db/re/skill_cast_db.txt @@ -1673,6 +1673,14 @@ 3017,500,0,0,300000,0,0,0 //-- KO_DOHU_KOUKAI 3018,500,0,0,300000,0,0,0 +//-- KO_KAIHOU +3019,1000,0,0,0,0,0,0 +//-- KO_ZENKAI +3020,1000,0,0,10000,10000,0,0 +//-- KO_GENWAKU +3021,500,0,0,5000,0,0,0 +//-- KO_IZAYOI +3022,0,0,0,30000:45000:60000:75000:90000,0,60000,0 //========================================== //===== Homunculus Skills ================== diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index d2304725a..47ea9b5b1 100644 --- a/db/re/skill_db.txt +++ b/db/re/skill_db.txt @@ -1028,6 +1028,10 @@ 3016,0,6,4,1,0x1,0,1,1,no,0,0,0,none,0, KO_HYOUHU_HUBUKI,Hyouhu Hubuki 3017,0,6,4,4,0x1,0,1,1,no,0,0,0,none,0, KO_KAZEHU_SEIRAN,Kazehu Seiran 3018,0,6,4,2,0x1,0,1,1,no,0,0,0,none,0, KO_DOHU_KOUKAI,Dohu Koukai +3019,11,6,1,0,0,0,5,0,no,0,0,0,weapon,0, KO_KAIHOU,Technique Kaihou +3020,7,6,2,0,0,0,1,3,yes,0,0,0,magic,0, KO_ZENKAI,Zenkai +3021,5:6:7:8:9,6,16,0,0x1,0,5,1,no,0,0,0,none,0, KO_GENWAKU,Genwaku +3022,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0, KO_IZAYOI,Izayoi 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 diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt index ecbb3da9a..ce9159859 100644 --- a/db/re/skill_require_db.txt +++ b/db/re/skill_require_db.txt @@ -790,7 +790,7 @@ //**** // Kagerou/Oboro 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# +3004,0,0,10:12:14:16:18,0,0,0,25:26:28,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# @@ -805,6 +805,10 @@ 3016,0,0,20,0,0,0,99,0,0,none,0,6513,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KO_HYOUHU_HUBUKI#Hyouhu Hubuki# 3017,0,0,20,0,0,0,99,0,0,none,0,6514,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KO_KAZEHU_SEIRAN#Kazehu Seiran# 3018,0,0,20,0,0,0,99,0,0,none,0,6515,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //KO_DOHU_KOUKAI#Dohu Koukai# +3019,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_KAIHOU#Technique Kaihou# +3020,0,0,30,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_ZENKAI#Zenkai# +3021,0,0,40:44:48:52:56,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_GENWAKU#Genwaku# +3022,0,0,70:75:80:85:90,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_IZAYOI#Izayoi# 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 0e247ccf5..d59f0a60f 100644 --- a/db/re/skill_unit_db.txt +++ b/db/re/skill_unit_db.txt @@ -153,6 +153,7 @@ 3006,0x86, , 0, 2, 100,enemy, 0x018 //KO_BAKURETSU 3008,0x86, , 0, 2, 100,enemy, 0x018 //KO_MUCHANAGE 3009,0x86, , 0, 3, 500,enemy, 0x018 //KO_HUUMARANKA +3020,0xf8, , 0, 3, 100,all, 0x018 //KO_ZENKAI //3010,0xfc, , 0, 2,1000,enemy, 0x022 //KO_MAKIBISHI 8020,0xf5, , 0, 3,2300:2100:1900:1700:1500,enemy, 0x018 //MH_POISON_MIST -- cgit v1.2.3-70-g09d2