summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-07-08 11:18:04 -0300
committershennetsind <ind@henn.et>2013-07-08 11:18:04 -0300
commit4abfdc61a3031db5701613807bcd4ecee4434a00 (patch)
treee3b7b26410202e32d1398ce6c7e89d7a5119dcf3 /db
parent939d15818b6f17913a12175e197ac7aea1e2e05d (diff)
parent713bc4da082e8b240ca6e0d9551c21c2931eece5 (diff)
downloadhercules-4abfdc61a3031db5701613807bcd4ecee4434a00.tar.gz
hercules-4abfdc61a3031db5701613807bcd4ecee4434a00.tar.bz2
hercules-4abfdc61a3031db5701613807bcd4ecee4434a00.tar.xz
hercules-4abfdc61a3031db5701613807bcd4ecee4434a00.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'db')
-rw-r--r--db/pre-re/skill_cast_db.txt2
-rw-r--r--db/re/skill_cast_db.txt2
-rw-r--r--db/re/skill_db.txt4
3 files changed, 4 insertions, 4 deletions
diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt
index 38347f931..5dcb1a8d3 100644
--- a/db/pre-re/skill_cast_db.txt
+++ b/db/pre-re/skill_cast_db.txt
@@ -1474,7 +1474,7 @@
//-- SR_GENTLETOUCH_REVITALIZE
2348,1000,1000,0,240000,0,200000:180000:160000:140000:120000
//-- SR_FLASHCOMBO
-2348,0,4000,0,0,0,0
+5009,0,4000,0,0,0,0
//==========================================
//==== Wanderer skills =====================
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index e61b066be..95eec064a 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -1473,7 +1473,7 @@
//-- SR_GENTLETOUCH_REVITALIZE
2348,1000,1000,0,240000,0,200000:180000:160000:140000:120000,1000
//-- SR_FLASHCOMBO
-2348,0,4000,0,0,0,0,-1
+5009,0,4000,0,0,0,0,-1
//==========================================
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index 5164e511a..27224719d 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -440,7 +440,7 @@
394,9,8,1,-1,0,0,10,-9,yes,0,0,0,weapon,0, CG_ARROWVULCAN,Vulcan Arrow
395,0,0,4,0,0x1,3,1,1,yes,0,0x40,0,misc,2, CG_MOONLIT,Sheltering Bliss
396,1,6,16,0,0x1,0,1,1,yes,0,0x600,0,none,0, CG_MARIONETTE,Marionette Control
-397,5,8,1,-1,0x20,0,5,5,no,0,0,0,weapon,0, LK_SPIRALPIERCE,Spiral Pierce
+397,5,8,1,-1,0x0,0,5,5,no,0,0,0,weapon,0, LK_SPIRALPIERCE,Spiral Pierce
398,4,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, LK_HEADCRUSH,Traumatic Blow
399,4,6,1,-1,0,0,10,1,no,0,0,0,weapon,0, LK_JOINTBEAT,Vital Strike
400,9,8,1,8,0x6,1,5,1:2:3:4:5,yes,0,0,0,magic,0, HW_NAPALMVULCAN,Napalm Vulcan
@@ -871,7 +871,7 @@
2300,7,6,2,0,0x1,0,3,1,yes,0,0,1,none,0, SC_DIMENSIONDOOR,Dimension Door
2301,7,6,2,0,0x1,0,3,1,yes,0,0,0,none,0, SC_CHAOSPANIC,Chaos Panic
2302,7,6,2,0,0x1,0,3,1,yes,0,0,0,none,0, SC_MAELSTROM,Maelstrom
-2303,7,6,2,0,0x1,0,3,1,yes,0,0,0,none,0, SC_BLOODYLUST,Bloody Lust
+2303,7,6,2,0,0x1,3,3,1,yes,0,0,1,none,0, SC_BLOODYLUST,Bloody Lust
2304,0,6,4,-1,0,0,3,1,no,0,0,0,weapon,0, SC_FEINTBOMB,Feint Bomb
//****