summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-11-02 11:52:46 +0000
committerrud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-11-02 11:52:46 +0000
commitafa1863b80369377674c1f9b83b5151e51e070f3 (patch)
tree67ff4192c50fb932415033ee97806a1dbbcf5aa5 /db
parent783ff0464941dbd3172b77afba62f3e493733480 (diff)
downloadhercules-afa1863b80369377674c1f9b83b5151e51e070f3.tar.gz
hercules-afa1863b80369377674c1f9b83b5151e51e070f3.tar.bz2
hercules-afa1863b80369377674c1f9b83b5151e51e070f3.tar.xz
hercules-afa1863b80369377674c1f9b83b5151e51e070f3.zip
Fixed bugreport:6839 where SC_CAMOUFLAGE is not ending properly.
Fixed bugreport:6710 where SR_EARTHSHAKER ATK bonus is not applied properly. Implemented KO_MAKIBISHI and updated some Kagerou/Oboro skills. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16857 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/pre-re/skill_db.txt2
-rw-r--r--db/pre-re/skill_nocast_db.txt1
-rw-r--r--db/pre-re/skill_unit_db.txt2
-rw-r--r--db/re/skill_db.txt2
-rw-r--r--db/re/skill_nocast_db.txt1
-rw-r--r--db/re/skill_unit_db.txt2
6 files changed, 6 insertions, 4 deletions
diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt
index 9cf63a79a..b9d4fe4bf 100644
--- a/db/pre-re/skill_db.txt
+++ b/db/pre-re/skill_db.txt
@@ -1036,7 +1036,7 @@
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,2,10,-10,no,0,0,0,misc,0, KO_MUCHANAGE,Mucha Nage
3009,9:10:11:12:13,8,2,-1,0x2,3,5,2,no,0,0,0,weapon,0, KO_HUUMARANKA,Huuma Shuriken Ranka
-//3010,3,6,2,0,0x43,0,5,1,no,0,0x80,0,misc,0, KO_MAKIBISHI,Makibishi
+3010,3,6,4,0,0x43,0,5,1,no,0,0x80,0,misc,0, KO_MAKIBISHI,Makibishi
3011,0,6,4,0,0x1,0,5,0,yes,0,0,0,none,0, KO_MEIKYOUSISUI,Meikyo Shisui
3012,0,6,4,0,0x1,0,5,0,no,0,0,1,none,7, KO_ZANZOU,Zanzou
3013,5,6,1,0,0x1,0,5,0,no,0,0,0,none,0, KO_KYOUGAKU,Kyougaku
diff --git a/db/pre-re/skill_nocast_db.txt b/db/pre-re/skill_nocast_db.txt
index 525fec58c..5e12477a9 100644
--- a/db/pre-re/skill_nocast_db.txt
+++ b/db/pre-re/skill_nocast_db.txt
@@ -86,6 +86,7 @@
//mixed
488,3 //CG_HERMODE
+3013,3 //KO_KYOUGAKU
//Clone Forbidden/pointless skills
77,16 //PR_TURNUNDEAD
diff --git a/db/pre-re/skill_unit_db.txt b/db/pre-re/skill_unit_db.txt
index 557a2c3a1..fc05641a8 100644
--- a/db/pre-re/skill_unit_db.txt
+++ b/db/pre-re/skill_unit_db.txt
@@ -155,7 +155,7 @@
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
+3010,0xfc, , 0, 1,1000,enemy, 0x020 //KO_MAKIBISHI
8208,0x86, , 0, 2,1000,enemy, 0x080 //MA_SHOWER
8209,0x90, , 0, 1,1000,enemy, 0x006 //MA_SKIDTRAP
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index 7ef101b68..989c0e0ed 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -1037,7 +1037,7 @@
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,2,10,-10,no,0,0,0,misc,0, KO_MUCHANAGE,Mucha Nage
3009,9:10:11:12:13,8,2,-1,0x2,3,5,2,no,0,0,0,weapon,0, KO_HUUMARANKA,Huuma Shuriken Ranka
-//3010,3,6,2,0,0x43,0,5,1,no,0,0x80,0,misc,0, KO_MAKIBISHI,Makibishi
+3010,3,6,4,0,0x43,0,5,1,no,0,0x80,0,misc,0, KO_MAKIBISHI,Makibishi
3011,0,6,4,0,0x1,0,5,0,yes,0,0,0,none,0, KO_MEIKYOUSISUI,Meikyo Shisui
3012,0,6,4,0,0x1,0,5,0,no,0,0,1,none,7, KO_ZANZOU,Zanzou
3013,5,6,1,0,0x1,0,5,0,no,0,0,0,none,0, KO_KYOUGAKU,Kyougaku
diff --git a/db/re/skill_nocast_db.txt b/db/re/skill_nocast_db.txt
index 525fec58c..5e12477a9 100644
--- a/db/re/skill_nocast_db.txt
+++ b/db/re/skill_nocast_db.txt
@@ -86,6 +86,7 @@
//mixed
488,3 //CG_HERMODE
+3013,3 //KO_KYOUGAKU
//Clone Forbidden/pointless skills
77,16 //PR_TURNUNDEAD
diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt
index 3b7d9c26c..16b0fba52 100644
--- a/db/re/skill_unit_db.txt
+++ b/db/re/skill_unit_db.txt
@@ -158,7 +158,7 @@
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
+3010,0xfc, , 0, 1,1000,enemy, 0x020 //KO_MAKIBISHI
8020,0xf5, , 0, 3,2300:2100:1900:1700:1500,enemy, 0x018 //MH_POISON_MIST
8033,0x7e, , 0, 0, -1,all, 0x003 //MH_STEINWAND