summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorMichieru <Michieru@users.noreply.github.com>2014-08-06 15:07:26 +0100
committerMichieru <Michieru@users.noreply.github.com>2014-08-06 15:07:26 +0100
commit356a83b11ae56778992b27b0c9b358d7d79722cd (patch)
treef113b57f6276ff0ed4c26c9042b7e41c11382e51 /db
parent254f47e4f04141f6ceeb68d0dbbb4a0001d01a24 (diff)
downloadhercules-356a83b11ae56778992b27b0c9b358d7d79722cd.tar.gz
hercules-356a83b11ae56778992b27b0c9b358d7d79722cd.tar.bz2
hercules-356a83b11ae56778992b27b0c9b358d7d79722cd.tar.xz
hercules-356a83b11ae56778992b27b0c9b358d7d79722cd.zip
- Fix 3rd class skills on pre-renewal.
- When under Mind Break Matk Effect and Mdef reduction should not show on ALT Q(bug:7915) - Plagiarism should not copy New 3rd class skills. Thanks to OmegaRed (bug:8118) - Update Runstone Lux Anima to official formula (bug:8285) - Add official formula for Demonic Fire - Update damage formula for Unlimit, apply Def and Mdef to 1 during the skill and adjust the cooldown to official. (bug:8227) - Flash Combo should not consume hp-sp and the skill not ignore the distance. - Fix a bug with Full Throttle that not consuming sp correctly and adjust the cooldown to official. - All WoE items are inactive outside WoE or PVP - Add bonus3 bSPVanishRate for Vellum Items. - Script Vellum Items. - Add 2 new bonus bSetDefRace and bSetMDefRace for the Vellum Items. (rAthena c046668034) - Fixed Bowling Bash, Brandish Spear, Grand Darkness and Meteor Assault reducing def during cast; the only skill that does this officially is Grand Cross (rAthena 694719048e) - Implemented official Bowling Bash with all its special behaviors including the gutter line * As many servers probably want to remove the gutter line problem, it is configurable; just adjust the bowling_bash_area setting in skill.conf (Bug:4209) - Sonic Blow now has a fixed range of 1, even for monsters; a monster can't use this skill if you tank it from farther away (rAthena a15cee063d)
Diffstat (limited to 'db')
-rw-r--r--db/const.txt2
-rw-r--r--db/pre-re/skill_cast_db.txt644
-rw-r--r--db/pre-re/skill_db.txt116
-rw-r--r--db/pre-re/skill_require_db.txt124
-rw-r--r--db/pre-re/skill_unit_db.txt60
-rw-r--r--db/produce_db.txt4
-rw-r--r--db/re/item_db.conf26
-rw-r--r--db/re/map_zone_db.conf97
-rw-r--r--db/re/skill_cast_db.txt4
-rw-r--r--db/re/skill_db.txt15
10 files changed, 596 insertions, 496 deletions
diff --git a/db/const.txt b/db/const.txt
index c27ee4f4b..3323928b2 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -591,6 +591,8 @@ bSkillUseSP 2055
bMagicAtkEle 2056
bFixedCast 2057
bVariableCast 2058
+bSetDefRace 2059
+bSetMDefRace 2060
//reference to script.c::script_defaults():equip[] array used for easy-conversion
EQI_HEAD_TOP 1
diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt
index 2ee662070..95a402c4f 100644
--- a/db/pre-re/skill_cast_db.txt
+++ b/db/pre-re/skill_cast_db.txt
@@ -1071,7 +1071,7 @@
1019,2000,1000,0,1800000,0,0
//==========================================
-//===== Rune Knight ========================
+//===== Rune Knight ========================
//-- RK_ENCHANTBLADE
2001,1000,0,0,300000,0,0
//-- RK_SONICWAVE
@@ -1086,7 +1086,7 @@
2006,1000,0,0,0,0,2000
//-- RK_DRAGONBREATH
-2008,0:0:0:1000:1000:1000:1500:1500:2000:2000,2000,0,42000,0,0
+2008,0:0:0:1000:1000:1000:1500:1500:2000:2000,2000,0,10000,0,0
//-- RK_DRAGONHOWLING
2009,0,0,0,15000,0,10000
@@ -1102,19 +1102,19 @@
2015,0,0,0,180000,10000,0
//-- RK_VITALITYACTIVATION
2016,0,0,0,180000,0,0
-//-- RK_STORMBLAST
-2017,0,2000,0,0,0,0
+//-- RK_STORMBLAST
+2017,2000,2000,0,0,0,0
//-- RK_FIGHTINGSPIRIT
2018,0,0,0,180000,0,0
//-- RK_ABUNDANCE
2019,0,0,0,180000,0,0
//-- RK_DRAGONBREATH_WATER
-5004,0:0:0:1000:1000:1000:1500:1500:2000:2000,2000,0,40000,0,0
+5004,0:0:0:1000:1000:1000:1500:1500:2000:2000,2000,0,10000,0,0
//-- RK_LUXANIMA
5005,0,0,0,60000,0,0
-//==========================================
+//==========================================
-//===== Gillotine Cross ====================
+//===== Guillotine Cross ====================
//-- GC_VENOMIMPRESS
2021,0,3000:2500:2000:1500:1000,0,10000:20000:30000:40000:50000,0,0
//-- GC_CROSSIMPACT
@@ -1124,8 +1124,6 @@
//-- GC_CREATENEWPOISON
2025,0,500,0,0,0,0
-//-- GC_ANTIDOTE
-2026,0,0,0,0,0,0
//-- GC_POISONINGWEAPON
2027,0,1000,0,60000:120000:180000:240000:300000,300000,0
//-- GC_WEAPONBLOCKING
@@ -1144,79 +1142,78 @@
2034,0,1000,0,0,0,0
//-- GC_HALLUCINATIONWALK
2035,0,0,0,30000:35000:40000:45000:50000,25000,300000
-//-- GC_ROLLINGCUTTER
+//-- GC_ROLLINGCUTTER
2036,0,200,0,3000,0,0
-//-- GC_CROSSRIPPERSLASHER
+//-- GC_CROSSRIPPERSLASHER
2037,0,1000,0,0,0,0
//-- GC_DARKCROW
5001,0,1500,0,5000,0,60000
-//==========================================
+//==========================================
-//===== Arch Bishop ========================
-//-- AB_JUDEX
+//===== Arch Bishop ========================
+//-- AB_JUDEX
2038,2000,500,0,0,0,0
-//-- AB_ANCILLA
+//-- AB_ANCILLA
2039,1000,1000,0,0,0,0
//-- AB_ADORAMUS
2040,2000,500,0,6000:7000:8000:9000:10000:11000:12000:13000:14000:15000,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,2000
-//-- AB_CLEMENTIA
+//-- AB_CLEMENTIA
2041,3000,0,0,120000:180000:240000,0,0
-//-- AB_CANTO
+//-- AB_CANTO
2042,3000,0,0,120000:180000:240000,0,0
-//-- AB_CHEAL
+//-- AB_CHEAL
2043,3000,0,0,0,0,2000
-//-- AB_EPICLESIS
+//-- AB_EPICLESIS
2044,2000:2500:3000:3500:4000,2000,0,18000:21000:24000:27000:30000,0,60000
-//-- AB_PRAEFATIO
+//-- AB_PRAEFATIO
2045,2000,0,0,120000,0,13000:16000:19000:22000:25000:28000:31000:34000:37000:40000
-//-- AB_ORATIO
+//-- AB_ORATIO
2046,4000,0,0,30000,0,2000
-//-- AB_LAUDAAGNUS
+//-- AB_LAUDAAGNUS
2047,1000,0,0,60000,0,3000
-//-- AB_LAUDARAMUS
+//-- AB_LAUDARAMUS
2048,1000,0,0,60000,0,3000
-//-- AB_RENOVATIO
-2050,3000,0,0,90000,0,0
-//-- AB_HIGHNESSHEAL
+//-- AB_RENOVATIO
+2050,3000,0,0,90000,0,1000
+//-- AB_HIGHNESSHEAL
2051,1000,1000,0,0,0,3000
-//-- AB_CLEARANCE
+//-- AB_CLEARANCE
2052,4000,0,0,0,0,10000
-//-- AB_EXPIATIO
+//-- AB_EXPIATIO
2053,1000,0,0,150000:180000:210000:240000:270000,0,0
-//-- AB_DUPLELIGHT
+//-- AB_DUPLELIGHT
2054,2000,1000,0,90000:120000:150000:180000:210000:240000:270000:300000:330000:360000,0,0
-//-- AB_SILENTIUM
+//-- AB_SILENTIUM
2057,4000,0,0,20000:30000:40000:50000:60000,0,15000
//-- AB_OFFERTORIUM
5011,4000,0,0,90000,0,0
-//==========================================
+//==========================================
-//===== Warlock ============================
+//===== Warlock ============================
//-- WL_WHITEIMPRISON
2201,0,0,0,6000:8000:10000:12000:14000,15000,4000
-//-- WL_SOULEXPANSION
+//-- WL_SOULEXPANSION
2202,2000,500,0,0,0,0
-//-- WL_FROSTMISTY
+//-- WL_FROSTMISTY
2203,2000:2500:3000:3500:4000,1000,0,40000,0,4000
-//-- WL_JACKFROST
+//-- WL_JACKFROST
2204,2000:2500:3000:3500:4000,1000,0,10000:15000:20000:25000:30000,0,0
//-- WL_MARSHOFABYSS
-2205,2500,1000,0,25000,0,0
-//-- WL_RECOGNIZEDSPELL
+2205,0,1000,0,30000,0,2500:3000:3500:4000:4500
+//-- WL_RECOGNIZEDSPELL
2206,1000,1000,0,60000:90000:120000:150000:180000,0,50000:80000:110000:140000:170000
//-- WL_SIENNAEXECRATE
2207,2000,2000,0,10000:12000:14000:16000:18000,0,0
-
//-- WL_STASIS
-2209,3000,1000,0,10000:15000:20000:25000:30000,0,300000
-//-- WL_DRAINLIFE
+2209,3000,2000,0,10000:15000:20000:25000:30000,1000,180000:190000:200000:210000:220000
+//-- WL_DRAINLIFE
2210,4000,0,0,0,0,2000
-//-- WL_CRIMSONROCK
-2211,5000,2000,0,3000:4000:5000:6000:7000,0,5000
-//-- WL_HELLINFERNO
-2212,3000,1000,0,42000,0,0
+//-- WL_CRIMSONROCK
+2211,5000,2000,0,5000,0,5000
+//-- WL_HELLINFERNO
+2212,3000,1000,0,20000:30000:40000:50000:60000,0,0
//-- WL_COMET
2213,10000:11000:12000:13000:14000,0,0,100,42000,60000
//-- WL_CHAINLIGHTNING
@@ -1225,354 +1222,354 @@
2216,2000:3000:4000:5000:6000,1000,0,100,75000:90000:105000:120000:135000,10000
//-- WL_TETRAVORTEX
2217,5000:6000:7000:8000:9000,2000,0,15000:120000:40000:5000,0,15000
-//-- WL_SUMMONFB
+//-- WL_SUMMONFB
2222,2000,0,0,120000:160000:200000:240000:280000,0,0
-//-- WL_SUMMONBL
+//-- WL_SUMMONBL
2223,2000,0,0,120000:160000:200000:240000:280000,0,0
-//-- WL_SUMMONWB
+//-- WL_SUMMONWB
2224,2000,0,0,120000:160000:200000:240000:280000,0,0
-//-- WL_SUMMONSTONE
+//-- WL_SUMMONSTONE
2229,2000,0,0,120000:160000:200000:240000:280000,0,0
-
//-- WL_READING_SB
2231,5000,500,0,0,0,0
//-- WL_TELEKINESIS_INTENSE
-5012,1000,0,0,180000,0,0
-//==========================================
+5012,1000,0,0,60000,0,300000
+//==========================================
-//===== Ranger =============================
-//-- RA_ARROWSTORM
-2233,2000:2200:2400:2600:2800,0,0,0,0,5400:5600:5800:6000:6400
-//-- RA_FEARBREEZE
-2234,2000,0,0,60000:90000:120000:150000:180000,0,0
+//===== Ranger =============================
+//-- RA_ARROWSTORM
+2233,2000:2200:2400:2600:2800:3000:3200:3400:3600:3800,0,0,0,0,5000:4800:4600:4400:4200:4000:3800:3600:3400:3200
+//-- RA_FEARBREEZE
+2234,0,0,0,60000:90000:120000:150000:180000,0,0
-//-- RA_AIMEDBOLT
+//-- RA_AIMEDBOLT
2236,4000,1000,0,0,0,0
-//-- RA_DETONATOR
+//-- RA_DETONATOR
2237,0,0,0,1000,0,0
//-- RA_ELECTRICSHOCKER
-2238,0,0,0,15000,20000:22000:24000:26000,0
+2238,0,0,0,15000,20000:22000:24000:26000:28000,0
//-- RA_CLUSTERBOMB
2239,0,0,0,15000,0,0
-//-- RA_WUGMASTERY
+//-- RA_WUGMASTERY
2240,0,1000,0,0,0,0
-//-- RA_WUGRIDER
+//-- RA_WUGRIDER
2241,0,500,0,0,0,0
-//-- RA_WUGBITE
+//-- RA_WUGBITE
2244,0,2000,0,1000:2000:3000:4000:5000,0,4000:6000:8000:10000:12000
-//-- RA_SENSITIVEKEEN
+//-- RA_SENSITIVEKEEN
2246,0,3000,0,0,0,0
-//-- RA_CAMOUFLAGE
+//-- RA_CAMOUFLAGE
2247,0,0,0,10000,0,0
-//-- RA_MAGENTATRAP
+//-- RA_MAGENTATRAP
2249,0,2000,0,15000,10000,0
-//-- RA_COBALTTRAP
+//-- RA_COBALTTRAP
2250,0,2000,0,15000,10000,0
-//-- RA_MAIZETRAP
+//-- RA_MAIZETRAP
2251,0,2000,0,15000,10000,0
-//-- RA_VERDURETRAP
+//-- RA_VERDURETRAP
2252,0,2000,0,15000,10000,0
-//-- RA_FIRINGTRAP
-2253,0,0,0,20000,15000,0
-//-- RA_ICEBOUNDTRAP
-2254,0,0,0,20000,15000,0
+//-- RA_FIRINGTRAP
+2253,0,0,0,15000,40000,0
+//-- RA_ICEBOUNDTRAP
+2254,0,0,0,15000,20000,0
//-- RA_UNLIMIT
-5002,0,0,0,60000,0,0
-//==========================================
+5002,0,500,0,60000,0,300000
+//==========================================
-//===== Mechanic ===========================
-//-- NC_BOOSTKNUCKLE
+//===== Mechanic ===========================
+//-- NC_BOOSTKNUCKLE
2256,200:400:600:800:1000,0,0,0,0,0
-//-- NC_PILEBUNKER
+//-- NC_PILEBUNKER
2257,0,2000,0,0,0,5000
-//-- NC_VULCANARM
+//-- NC_VULCANARM
2258,0,300:200:100,0,0,0,0
-//-- NC_FLAMELAUNCHER
-2259,1000:1500:2000,1500:1000:500,0,7000:14000:21000,0,0
-//-- NC_COLDSLOWER
-2260,1000,1000:2000:3000,0,7000:14000:21000,0,0
-// -- NC_ARMSCANNON
+//-- NC_FLAMELAUNCHER
+2259,500:1000:1500,1500:1000:500,0,7000:14000:21000,0,0
+//-- NC_COLDSLOWER
+2260,1000,1000:2000:3000,0,7000:14000:21000,40000,0
+// -- NC_ARMSCANNON
2261,1400:1600:1800,500:1000:2000,0,0,0,0
-//-- NC_ACCELERATION
-2262,0,0,0,30000:60000:90000,0,0
-//-- NC_HOVERING
+//-- NC_ACCELERATION
+2262,0,0,0,60000:90000:120000,0,0
+//-- NC_HOVERING
2263,0,0,0,90000,0,0
-//-- NC_F_SIDESLIDE
+//-- NC_F_SIDESLIDE
2264,0,500,0,0,0,0
-//-- NC_B_SIDESLIDE
+//-- NC_B_SIDESLIDE
2265,0,500,0,0,0,0
-//-- NC_SELFDESTRUCTION
+//-- NC_SELFDESTRUCTION
2267,2000:1500:1000,0,0,0,0,300000
-//-- NC_SHAPESHIFT
+//-- NC_SHAPESHIFT
2268,0,2000,0,300000,0,0
-//-- NC_EMERGENCYCOOL
+//-- NC_EMERGENCYCOOL
2269,0,500,0,0,0,5000
-//-- NC_INFRAREDSCAN
+//-- NC_INFRAREDSCAN
2270,0,500,0,3000,0,3000
-//-- NC_ANALYZE
+//-- NC_ANALYZE
2271,0,1000,0,20000,0,0
-//-- NC_MAGNETICFIELD
-2272,500:1000:1500,0,0,15000,0,20000:15000:10000
-//-- NC_NEUTRALBARRIER
-2273,500:1000:1500,0,0,30000:45000:60000,0,20000:15000:10000
-//-- NC_STEALTHFIELD
-2274,500:1000:1500,0,0,15000:20000:25000,0,20000:15000:10000
-//-- NC_REPAIR
+//-- NC_MAGNETICFIELD
+2272,0,0,0,4000:6000:8000,0,20000:15000:10000
+//-- NC_NEUTRALBARRIER
+2273,0,0,0,30000:45000:60000,0,90000
+//-- NC_STEALTHFIELD
+2274,0,0,0,15000:20000:25000,0,20000:15000:10000
+//-- NC_REPAIR
2275,200:300:400:500:600,1000,0,0,0,0
-//-- NC_AXEBOOMERANG
+//-- NC_AXEBOOMERANG
2278,0,0,0,0,0,5000:4500:4000:3500:3000
-//-- NC_POWERSWING
-2279,0,1000,0,2000,0,0
-//-- NC_AXETORNADO
+//-- NC_POWERSWING
+2279,0,1000,0,3000,0,0
+//-- NC_AXETORNADO
2280,0,500,0,0,0,4000:3500:3000:2500:2000
-//-- NC_SILVERSNIPER
+//-- NC_SILVERSNIPER
2281,0,0,0,20000:30000:40000:50000:60000,0,0
-//-- NC_MAGICDECOY
+//-- NC_MAGICDECOY
2282,0,0,0,20000:30000:40000:50000:60000,0,0
-//-- NC_DISJOINT
+//-- NC_DISJOINT
2283,2000,0,0,0,0,0
//-- NC_MAGMA_ERUPTION
5006,1000,0,0,10000,42000,0
-//==========================================
+//==========================================
-//===== Shadow Chaser ======================
-//-- SC_FATALMENACE
+//===== Shadow Chaser ======================
+//-- SC_FATALMENACE
2284,0,500,0,0,0,0
//-- SC_REPRODUCE
2285,0,1000,0,60000,0,0
-//-- SC_AUTOSHADOWSPELL
+//-- SC_AUTOSHADOWSPELL
2286,4000:3600:3200:2800:2400:2000:1600:1200:800:400,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:300000,0,0
-//-- SC_SHADOWFORM
+//-- SC_SHADOWFORM
2287,0,1000,0,30000:40000:50000:60000:70000,0,0
-//-- SC_TRIANGLESHOT
+//-- SC_TRIANGLESHOT
2288,1000,500,0,0,0,0
-//-- SC_BODYPAINT
-2289,0,1000,0,5000:7000:9000:11000:13000,0,2000
-//-- SC_INVISIBILITY
-2290,1000,1000,0,20000,0,20000:30000:40000:50000:60000
-//-- SC_DEADLYINFECT
+//-- SC_BODYPAINT
+2289,0,1000,0,5000:7000:9000:11000:13000,10000,2000
+//-- SC_INVISIBILITY
+2290,1000,1000,0,60000,0,20000:30000:40000:50000:60000
+//-- SC_DEADLYINFECT
2291,0,1000,0,10000:15000:20000:25000:30000,0,2000
-//-- SC_ENERVATION
+//-- SC_ENERVATION
2292,2000,1000,0,10000:15000:20000,0,2000
-//-- SC_GROOMY
+//-- SC_GROOMY
2293,2000,1000,0,10000:15000:20000,0,2000
-//-- SC_IGNORANCE
+//-- SC_IGNORANCE
2294,2000,1000,0,10000:15000:20000,0,2000
-//-- SC_LAZINESS
+//-- SC_LAZINESS
2295,2000,1000,0,10000:15000:20000,0,2000
-//-- SC_UNLUCKY
+//-- SC_UNLUCKY
2296,2000,1000,0,10000:15000:20000,0,2000
-//-- SC_WEAKNESS
+//-- SC_WEAKNESS
2297,2000,1000,0,10000:15000:20000,0,2000
-//-- SC_STRIPACCESORY
+//-- SC_STRIPACCESORY
2298,1000,1000,0,60000:70000:80000:90000:100000,0,0
-//-- SC_MANHOLE
+//-- SC_MANHOLE
2299,1000,2000,0,5000:10000:15000,5000:10000:15000,0
-//-- SC_DIMENSIONDOOR
+//-- SC_DIMENSIONDOOR
2300,1000,2000,0,4000:8000:12000,0,0
-//-- SC_CHAOSPANIC
+//-- SC_CHAOSPANIC
2301,2000,2000,0,5000:10000:15000,4000:8000:12000,0
-//-- SC_MAELSTROM
+//-- SC_MAELSTROM
2302,2000,2000,0,7000:14000:21000,0,0
-//-- SC_BLOODYLUST //dur2=intr
-2303,2000,2000,0,10000:20000:30000,0,180000
-//-- SC_FEINTBOMB
+//-- SC_BLOODYLUST
+2303,2000,2000,0,5000:10000:15000,0,180000
+//-- SC_FEINTBOMB
2304,1000,0,0,1000,0,5000
//-- SC_ESCAPE
5010,0,0,0,1000,0,15000
-//==========================================
+//==========================================
-//==== Royal Guard skills ==================
-//-- LG_CANNONSPEAR
+//==== Royal Guard skills ==================
+//-- LG_CANNONSPEAR
2307,0,0,0,0,0,2000
-//-- LG_TRAMPLE
-2309,0,0,0,0,0,1000
-//-- LG_SHIELDPRESS
+//-- LG_TRAMPLE
+2309,0,1000,0,0,0,0
+//-- LG_SHIELDPRESS
2310,0,0,0,3500:4000:4500:5000:5500,0,2000
-//-- LG_REFLECTDAMAGE
+//-- LG_REFLECTDAMAGE
2311,0,0,0,300000,0,0
//-- LG_PINPOINTATTACK
2312,0,1000,0,5000,0,5000
-//-- LG_FORCEOFVANGUARD
+//-- LG_FORCEOFVANGUARD
2313,0,1000,0,300000,0,0
-//-- LG_RAGEBURST
+//-- LG_RAGEBURST
2314,0,3000,0,0,0,0
-//-- LG_SHIELDSPELL //TODO apply proper duration [malufett]
-2315,1000,1000,0,3000:30000:30000,0,2000
-//-- LG_EXEEDBREAK
+//-- LG_SHIELDSPELL //Durations are hard coded as they follow special formula's for each level and effect.
+2315,1000,1000,0,0,0,2000
+//-- LG_EXEEDBREAK
2316,5000:5500:6000:6500:7000,1000,0,300000,0,0
-//-- LG_OVERBRAND
+//-- LG_OVERBRAND
2317,500,2000,0,0,0,0
-//-- LG_PRESTIGE
+//-- LG_PRESTIGE
2318,1000,0,0,30000:45000:60000:75000:90000,0,60000
-//-- LG_BANDING
+//-- LG_BANDING
2319,0,0,0,-1,2000:4000:6000:8000:10000,0
-//-- LG_MOONSLASHER
+//-- LG_MOONSLASHER
2320,1000,1000,0,0,0,6000:5000:4000:3000:2000
-//-- LG_RAYOFGENESIS
+//-- LG_RAYOFGENESIS
2321,2000:2500:3000:3500:4000,2000,0,10000,0,5000
-//-- LG_PIETY
+//-- LG_PIETY
2322,3000:2500:2000:1500:1000,0,0,60000:80000:100000:120000:140000,0,0
-//-- LG_EARTHDRIVE
+//-- LG_EARTHDRIVE
2323,1000,1000,0,3000:6000:9000:12000:15000,0,7000:6000:5000:4000:3000
-//-- LG_HESPERUSLIT
+//-- LG_HESPERUSLIT
2324,1000,3000,0,0,0,20000
-//-- LG_INSPIRATION
+//-- LG_INSPIRATION
2325,2000,2000,0,30000:45000:60000:75000:90000,0,540000:480000:420000:360000:300000
//-- LG_KINGS_GRACE
5013,1000,0,0,5000,0,0
-//==========================================
+//==========================================
-//===== Sura Skills ========================
-//-- SR_DRAGONCOMBO
+//===== Sura Skills ========================
+//-- SR_DRAGONCOMBO
2326,0,0,0,3000,0,0
-//-- SR_SKYNETBLOW
+//-- SR_SKYNETBLOW
2327,0,500,0,0,0,0
//-- SR_EARTHSHAKER
2328,0,0,0,1000,0,3000
-//-- SR_FALLENEMPIRE
+//-- SR_FALLENEMPIRE
2329,0,0,0,500:1000:1500:2000:2500,0,0
-//-- SR_TIGERCANNON
+//-- SR_TIGERCANNON
2330,1100:1200:1300:1400:1500:1600:1700:1800:1900:2000,1000,0,0,0,5000
-//-- SR_RAMPAGEBLASTER
+//-- SR_RAMPAGEBLASTER
2332,0,1000,0,0,0,10000
-//-- SR_CRESCENTELBOW
+//-- SR_CRESCENTELBOW
2333,0,1000,0,3000:4000:5000:6000:7000,0,5000
-//-- SR_CURSEDCIRCLE
+//-- SR_CURSEDCIRCLE
2334,0,1000,0,3000:4000:5000:6000:7000,0,10000
-//-- SR_LIGHTNINGWALK
+//-- SR_LIGHTNINGWALK
2335,0,1000,0,5000:6000:7000:8000:9000,0,5000
-//-- SR_KNUCKLEARROW
+//-- SR_KNUCKLEARROW
2336,0,1000,0,0,0,0
-//-- SR_WINDMILL
+//-- SR_WINDMILL
2337,1000,500,0,0,0,3000
-//-- SR_RAISINGDRAGON
+//-- SR_RAISINGDRAGON
2338,0,1000,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,0,30000
-//-- SR_ASSIMILATEPOWER
+//-- SR_ASSIMILATEPOWER
2340,0,1000,0,0,0,5000
-//-- SR_POWERVELOCITY
+//-- SR_POWERVELOCITY
2341,1500,0,0,0,0,0
-//-- SR_GATEOFHELL
+//-- SR_GATEOFHELL
2343,1000:1200:1400:1600:1800:2000:2200:2400:2600:2800,100:200:300:400:500:600:700:800:900:1000,0,0,0,0
-//-- SR_GENTLETOUCH_QUIET
+//-- SR_GENTLETOUCH_QUIET
2344,0,0,0,5000:7000:9000:11000:13000,0,1000:1500:2000:2500:3000
-//-- SR_GENTLETOUCH_CURE
+//-- SR_GENTLETOUCH_CURE
2345,0,1000,0,0,0,1000:1500:2000:2500:3000
//-- SR_GENTLETOUCH_ENERGYGAIN
2346,1000,1000,0,240000,0,0
-//-- SR_GENTLETOUCH_CHANGE
+//-- SR_GENTLETOUCH_CHANGE
2347,1000,1000,0,240000,0,200000:180000:160000:140000:120000
-//-- SR_GENTLETOUCH_REVITALIZE
+//-- SR_GENTLETOUCH_REVITALIZE
2348,1000,1000,0,240000,0,200000:180000:160000:140000:120000
//-- SR_FLASHCOMBO
-5009,0,4000,0,0,0,0
-//==========================================
+5009,0,4000,0,4000,0,0
-//==== Wanderer skills =====================
-//-- WA_SWING_DANCE
+//==========================================
+
+//==== Wanderer skills =====================
+//-- WA_SWING_DANCE
2350,1000,2000,0,60000,0,0
-//-- WA_SYMPHONY_OF_LOVER
+//-- WA_SYMPHONY_OF_LOVER
2351,1000,2000,0,60000,0,0
-//-- WA_MOONLIT_SERENADE
+//-- WA_MOONLIT_SERENADE
2352,1000,2000,0,60000,0,0
-//==========================================
+//==========================================
-//==== Minstresl skills ====================
-//-- MI_RUSH_WINDMILL
-2381,0,2000,0,60000,0,0
-//-- MI_ECHOSONG
+//==== Minstresl skills ====================
+//-- MI_RUSH_WINDMILL
+2381,1000,2000,0,60000,0,0
+//-- MI_ECHOSONG
2382,1000,2000,0,60000,0,0
-//-- MI_HARMONIZE
+//-- MI_HARMONIZE
2383,1000,1000,0,60000,0,5000
-//==========================================
+//==========================================
-//==== Minstrel/Wanderer skills ============
-//-- WM_METALICSOUND
+//==== Minstrel/Wanderer skills ============
+//-- WM_METALICSOUND
2413,1000:1500:2000:2500:3000,1000,0,0,0,2000:2500:3000:3500:4000
-//-- WM_REVERBERATION
+//-- WM_REVERBERATION
2414,1100:1200:1300:1400:1500,1000,0,9000:10000:11000:12000:13000,0,0
-//-- WM_DOMINION_IMPULSE
+//-- WM_DOMINION_IMPULSE
2417,0,1000,0,0,0,0
-//-- WM_SEVERE_RAINSTORM
-2418,1000:1500:2000:2500:3000,1000,0,900:1500:2100:2700:3000,0,5000:5500:6000:6500:7000
-//-- WM_POEMOFNETHERWORLD
+//-- WM_SEVERE_RAINSTORM
+2418,1500:2000:2500:3000:3500,1000,0,3400,0,5000:5500:6000:6500:7000
+//-- WM_POEMOFNETHERWORLD
2419,3000,0,0,9000:11000:13000:15000:17000,8000:10000:12000:14000:16000,0
-//-- WM_VOICEOFSIREN
+//-- WM_VOICEOFSIREN
2420,2000:2200:2400:2600:2800,1000,0,15000:18000:21000:24000:27000,0,5000
-//-- WM_DEADHILLHERE
-2421,4000:3500:3000:2500:2000,1000,0,0,0,0
-//-- WM_LULLABY_DEEPSLEEP
+//-- WM_DEADHILLHERE
+2421,3000:2500:2000:1500:1000,1000,0,0,0,0
+//-- WM_LULLABY_DEEPSLEEP
2422,2000,1000,0,12000:14000:16000:18000:20000,0,10000
-//-- WM_SIRCLEOFNATURE
+//-- WM_SIRCLEOFNATURE
2423,2000,1000,0,60000,0,15000
-//-- WM_RANDOMIZESPELL
+//-- WM_RANDOMIZESPELL
2424,0,1000,0,0,0,3000
-//-- WM_GLOOMYDAY
+//-- WM_GLOOMYDAY
2425,1000,1000,0,30000:45000:60000:75000:90000,0,10000
-//-- WM_GREAT_ECHO
+//-- WM_GREAT_ECHO
2426,2000:2200:2400:2600:2800,1000,0,0,0,10000
-//-- WM_SONG_OF_MANA
+//-- WM_SONG_OF_MANA
2427,1000,1000,0,30000:60000:90000:120000:150000,0,90000
-//-- WM_DANCE_WITH_WUG
+//-- WM_DANCE_WITH_WUG
2428,1500:2000:2500:3000:3500,1000,0,30000:60000:90000:120000:150000,0,90000
-//-- WM_SOUND_OF_DESTRUCTION
-2429,0:500:1000:1500:2000,1000,0,0,0,20000
-//-- WM_SATURDAY_NIGHT_FEVER
-2430,1000:2000:3000:4000:5000,1000,0,10000:15000:20000:25000:30000,10000:8000:6000:4000:2000,180000
-//-- WM_LERADS_DEW
+//-- WM_SOUND_OF_DESTRUCTION
+2429,0:500:1000:1500:2000,1000,0,5000,0,6000:7000:8000:9000:10000
+//-- WM_SATURDAY_NIGHT_FEVER
+2430,1000:2000:3000:4000:5000,1000,0,10000:15000:20000:25000:30000,3000,180000
+//-- WM_LERADS_DEW
2431,1000,1000,0,20000:30000:40000:50000:60000,0,180000
-//-- WM_MELODYOFSINK
-2432,100,1000,0,20000:30000:40000:50000:60000,0,180000
-//-- WM_BEYOND_OF_WARCRY
+//-- WM_MELODYOFSINK
+2432,1000,1000,0,20000:30000:40000:50000:60000,0,180000
+//-- WM_BEYOND_OF_WARCRY
2433,1000,1000,0,20000:30000:40000:50000:60000,0,180000
-//-- WM_UNLIMITED_HUMMING_VOICE
+//-- WM_UNLIMITED_HUMMING_VOICE
2434,1000,1000,0,60000:90000:120000:150000:180000,0,110000:120000:130000:140000:150000
//-- WM_FRIGG_SONG
5007,0,0,0,60000,0,0
-//==========================================
+//==========================================
-//==== Sorcerer skills =====================
-//-- SO_FIREWALK //CHECK Duration 2 needs to be added for the PROPERTYWALK status ID. Ask me for more info. [Rytech]
+//==== Sorcerer skills =====================
+//-- SO_FIREWALK
2443,1000,1000,0,12000,0,0
-//-- SO_ELECTRICWALK //CHECK Duration 2 needs to be added for the PROPERTYWALK status ID. Ask me for more info. [Rytech]
+//-- SO_ELECTRICWALK
2444,1000,1000,0,12000,0,0
-//-- SO_SPELLFIST
+//-- SO_SPELLFIST
2445,0,1000,0,20000:25000:30000:35000:40000,0,0
-//-- SO_EARTHGRAVE
+//-- SO_EARTHGRAVE
2446,2200:2400:2600:2800:3000,1000,0,500,8000:11000:14000:17000:20000,5000
-//-- SO_DIAMONDDUST
+//-- SO_DIAMONDDUST
2447,5000:5500:6000:6500:7000,1000,0,500,12000:14000:16000:18000:20000,5000
-//-- SO_POISON_BUSTER
-2450,2200:3400:4600:5800:7000,1000,0,0,0,2000
-//-- SO_PSYCHIC_WAVE
+//-- SO_POISON_BUSTER
+2448,2200:3400:4600:5800:6000,1000,0,0,0,2000
+//-- SO_PSYCHIC_WAVE
2449,8000:9000:10000:11000:12000,1000,0,1200:1700:2200:2700:3200,0,5000
-//-- SO_CLOUD_KILL
+//-- SO_CLOUD_KILL
2450,2300:2500:2700:2900:3100,1000,0,8000:10000:12000:14000:16000,10000:15000:20000:25000:30000,5000
-//-- SO_STRIKING
+//-- SO_STRIKING
2451,1000,1000,0,60000,0,2000
-//-- SO_WARMER
+//-- SO_WARMER
2452,2200:2400:2600:2800:3000,1000,0,40000:45000:50000:55000:60000,30000,35000:40000:45000:50000:55000
//-- SO_VACUUM_EXTREME
-2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,0,5000
-//-- SO_VARETYR_SPEAR
+2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,1000,5000
+//-- SO_VARETYR_SPEAR
2454,2200:2400:2600:2800:3000,1000,0,0,2200:2400:2600:2800:3000,2000
-//-- SO_ARULLO
+//-- SO_ARULLO
2455,2200:2400:2600:2800:3000,1000,0,8000:10000:12000:14000:16000,0,5000:6000:7000:8000:9000
-//-- SO_EL_CONTROL
+//-- SO_EL_CONTROL
2456,2000,0,0,0,0,5000
//-- SO_SUMMON_AGNI
2457,1000:2000:3000,0,0,600000:900000:1200000,0,60000
-//-- SO_SUMMON_AQUA
+//-- SO_SUMMON_AQUA
2458,1000:2000:3000,0,0,600000:900000:1200000,0,60000
//-- SO_SUMMON_VENTUS
2459,1000:2000:3000,0,0,600000:900000:1200000,0,60000
@@ -1580,94 +1577,95 @@
2460,1000:2000:3000,0,0,600000:900000:1200000,0,60000
//-- SO_EL_ACTION
2461,0,0,0,0,0,5000
-//-- SO_EL_ANALYSIS
+//-- SO_EL_ANALYSIS
2462,0,0,0,0,0,0
-//-- SO_EL_CURE
+//-- SO_EL_CURE
2464,2000,1000,0,0,0,0
-//-- SO_FIRE_INSIGNIA
+//-- SO_FIRE_INSIGNIA
2465,1000,0,0,60000,0,60000
-//-- SO_WATER_INSIGNIA
+//-- SO_WATER_INSIGNIA
2466,1000,0,0,60000,0,60000
-//-- SO_WIND_INSIGNIA
+//-- SO_WIND_INSIGNIA
2467,1000,0,0,60000,0,60000
-//-- SO_EARTH_INSIGNIA
+//-- SO_EARTH_INSIGNIA
2468,1000,0,0,60000,0,60000
//-- SO_ELEMENTAL_SHIELD
-5008,1000,0,0,0,0,10000
-//==========================================
+5008,1000,0,0,10000,0,10000
+//==========================================
-//==== Genetic skills ======================
-//-- GN_CART_TORNADO
+//==== Genetic skills ======================
+//-- GN_CART_TORNADO
2476,0,500,0,5000,0,0:500:1000:1500:2000
-//-- GN_CARTCANNON
+//-- GN_CARTCANNON
2477,1000:1500:2000:2500:3000,500,0,0,0,0
-//-- GN_CARTBOOST
+//-- GN_CARTBOOST
2478,1500,500,0,90000,0,0
-//-- GN_THORNS_TRAP
+//-- GN_THORNS_TRAP
2479,1500,500,0,10000:12000:14000:16000:18000,20000,0
-//-- GN_BLOOD_SUCKER
+//-- GN_BLOOD_SUCKER
2480,1500,500,0,20000:22000:24000:26000:28000,0,0
-//-- GN_SPORE_EXPLOSION
+//-- GN_SPORE_EXPLOSION
2481,1500,500,0,2000:2000:3000:3000:4000,0,5000
-//-- GN_WALLOFTHORN
+//-- GN_WALLOFTHORN
2482,1500,500,0,10000:11000:12000:13000:14000,0,5000
//-- GN_CRAZYWEED
2483,3000:3500:4000:4500:5000:5500:6000:6500:7000:7500,500,0,0,0,5000
-//-- GN_CRAZYWEED_ATK
+//-- GN_CRAZYWEED_ATK
2484,0,0,0,100,0,0
-//-- GN_DEMONIC_FIRE
-2485,3000:3500:4000:4500:5000,500,0,10000:12000:14000:16000:18000,15000,5000
-//-- GN_FIRE_EXPANSION
+//-- GN_DEMONIC_FIRE
+2485,3000:3500:4000:4500:5000,500,0,10000:12000:14000:16000:18000,8000:16000:24000:32000:40000,5000
+//-- GN_FIRE_EXPANSION
2486,2000,500,0,0,0,0
-//-- GN_FIRE_EXPANSION_SMOKE_POWDER
+//-- GN_FIRE_EXPANSION_SMOKE_POWDER
2487,0,0,0,10000:12000:14000:16000:18000,0,0
-//-- GN_FIRE_EXPANSION_TEAR_GAS
+//-- GN_FIRE_EXPANSION_TEAR_GAS
2488,0,0,0,10000:12000:14000:16000:18000,0,0
-//-- GN_HELLS_PLANT
+//-- GN_HELLS_PLANT
2490,3000:3500:4000:4500:5000,500,0,14000:21000:28000:35000:42000,0,0
//-- GN_HELLS_PLANT_ATK
2491,0,0,0,20000,0,0
-//-- GN_MANDRAGORA
-2492,1000,500,0,10000:15000:20000:25000:30000,0,15000
-//-- GN_SLINGITEM
-2493,0,0,0,77000,10000,1000
+//-- GN_MANDRAGORA
+2492,1000,500,0,10000:15000:20000:25000:30000,0,10000
+//-- GN_SLINGITEM
+2493,0,0,0,0,0,1000
-//-- GN_SLINGITEM_RANGEMELEEATK
+//-- GN_SLINGITEM_RANGEMELEEATK
2498,0,0,0,3000,0,0
+
//-- GN_ILLUSIONDOPING
5003,0,0,0,10000,0,10000
-//==========================================
+//==========================================
-//===== Extra 3rd Class Skills =============
-//-- AB_SECRAMENT
+//===== Extra 3rd Class Skills =============
+//-- AB_SECRAMENT
2515,1000,500,0,60000:90000:120000:150000:180000,0,0
-//-- SR_HOWLINGOFLION
+//-- SR_HOWLINGOFLION
2517,1000,0,0,12000:14000:16000:18000:20000,0,10000
-//-- SR_RIDEINLIGHTNING
-2518,1000:2000:3000:4000:5000,200,0,0,0,1000
-//==========================================
+//-- SR_RIDEINLIGHTNING
+2518,1000:2000:3000:4000:5000,1000,0,0,0,0
+//==========================================
-//===== Misc. Skills =======================
-//-- ALL_ODINS_RECALL
+//===== Misc. Skills =======================
+//-- ALL_ODINS_RECALL
2533,10000,0,0,0,0,300000
-//-- RETURN_TO_ELDICASTES
+//-- RETURN_TO_ELDICASTES
2534,3000,0,0,0,0,300000
-//-- ALL_GUARDIAN_RECALL
+//-- ALL_GUARDIAN_RECALL
2536,3000,0,0,0,0,300000
-//-- ALL_ODINS_POWER
-2537,5000,5000,0,60000,0,60000
-//==========================================
+//-- ALL_ODINS_POWER
+2537,0,0,0,60000,0,0
+//==========================================
//===== Rebellion ==========================
//-- RL_B_TRAP
2555,0,0,0,0,0,10000:11000:12000:13000:14000
//==========================================
-//==== Kagerou & Oboro skills ==============
+//==== Kagerou & Oboro skills ==============
//-- KO_YAMIKUMO
3001,0,0,0,60000,0,0
//-- KO_JYUMONJIKIRI
@@ -1722,7 +1720,7 @@
//==========================================
//-- ALL_FULL_THROTTLE
-5014,0,0,0,10000:15000:20000:25000:30000,10000,20000:25000:30000:35000:40000
+5014,0,0,0,10000:15000:20000:25000:30000,10000,1800000
//===== Homunculus Skills ==================
//-- HLIF_HEAL
@@ -1751,16 +1749,16 @@
8016,0,0,1000,0,0,0
//==========================================
-//-- MH_SUMMON_LEGION
+//-- MH_SUMMON_LEGION
8018,1600:1400:1200:1000:800,0,0,20000:30000:40000:50000:60000,0,0
//-- MH_NEEDLE_OF_PARALYZE
8019,1000:1100:1200:1300:1400,0,0,12000:14000:16000:18000:20000,0,0
-//-- MH_POISON_MIST
+//-- MH_POISON_MIST
8020,500:700:900:1100:1300,0,0,12000:14000:16000:18000:20000,4000:6000:8000:10000:12000,0
-//-- MH_PAIN_KILLER
+//-- MH_PAIN_KILLER
8021,1000:1200:1400:1600:1800,0,0,20000:30000:40000:50000:60000,0,0
//-- MH_LIGHT_OF_REGENE
-8022,1600:1400:1200:1000:800,0,0,360000:420000:480000:540000:600000,0,0
+8022,0,0,0,360000:420000:480000:540000:600000,0,0
//-- MH_OVERED_BOOST
8023,800:700:600:500:400,0,0,30000:45000:60000:75000:90000,0,0
//-- MH_ERASER_CUTTER
@@ -1769,39 +1767,39 @@
8025,1500:2500:3500:4500:5500,5000,0,500,0,0
//-- MH_SILENT_BREEZE
8026,1000:1200:1400:1600:1800,0,0,9000:12000:15000:18000:21000,0,0
-//-- MH_STYLE_CHANGE
+//-- MH_STYLE_CHANGE
//8027,0,0,0,0,0,0,0
-//-- MH_SONIC_CRAW
+//-- MH_SONIC_CRAW
//8028,0,0,0,0,0,0,0
-//-- MH_SILVERVEIN_RUSH
+//-- MH_SILVERVEIN_RUSH
//8029,0,0,0,0,0,0,0
-//-- MH_MIDNIGHT_FRENZY
+//-- MH_MIDNIGHT_FRENZY
//8030,0,0,0,0,0,0,0
//-- MH_STAHL_HORN
8031,800:600:400:200:0,0,0,5000,0,0
-//-- MH_GOLDENE_FERSE
+//-- MH_GOLDENE_FERSE
8032,1000:1200:1400:1600:1800,0,0,30000:45000:60000:75000:90000,0,0
-//-- MH_STEINWAND
+//-- MH_STEINWAND
8033,1000,0,0,30000:45000:60000:75000:90000,0,0
-//-- MH_HEILIGE_STANGE
+//-- MH_HEILIGE_STANGE
8034,200:400:600:800:1000,0,0,0,0,0
-//-- MH_ANGRIFFS_MODUS
+//-- MH_ANGRIFFS_MODUS
8035,200:400:600:800:1000,0,0,30000:45000:60000:75000:90000,0,0
-//-- MH_TINDER_BREAKER
+//-- MH_TINDER_BREAKER
//8036,0,0,0,0,0,0,0
-//-- MH_CBC
+//-- MH_CBC
//8037,0,0,0,0,0,0,0
-//-- MH_EQC
+//-- MH_EQC
//8038,0,0,0,0,0,0,0
-//-- MH_MAGMA_FLOW
+//-- MH_MAGMA_FLOW
8039,2000:2500:3000:3500:4000,0,0,30000:45000:60000:75000:90000,0,0
-//-- MH_GRANITIC_ARMOR
+//-- MH_GRANITIC_ARMOR
8040,6000:5500:5000:4500:4000,0,0,60000,0,0
-//-- MH_LAVA_SLIDE
+//-- MH_LAVA_SLIDE
8041,6000:5500:5000:4500:4000,0,0,12000:14000:16000:18000:20000,0,0
-//-- MH_PYROCLASTIC
+//-- MH_PYROCLASTIC
8042,5000:4500:4000:3500:3000,0,0,60000:90000:120000:150000:180000,0,0
-//-- MH_VOLCANIC_ASH
+//-- MH_VOLCANIC_ASH
8043,5000:4500:4000:3500:3000,0,0,12000:14000:16000:18000:20000,0,0
//==========================================
@@ -1866,66 +1864,66 @@
8240,1000,1000,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0,0
//==========================================
-//===== Elemental Skills =======================
-//-- EL_CIRCLE_OF_FIRE
+//===== Elemental Skills =======================
+//-- EL_CIRCLE_OF_FIRE
8401,0,0,0,-1,0,0
-//-- EL_FIRE_CLOAK
+//-- EL_FIRE_CLOAK
8402,0,0,0,-1,0,0
-//-- EL_FIRE_MANTLE
+//-- EL_FIRE_MANTLE
8403,0,0,0,15000,0,0
-//-- EL_WATER_SCREEN
+//-- EL_WATER_SCREEN
8404,0,0,0,-1,0,0
-//-- EL_WATER_DROP
+//-- EL_WATER_DROP
8405,0,0,0,-1,0,0
-//-- EL_WATER_BARRIER
+//-- EL_WATER_BARRIER
8406,1000,0,0,15000,0,0
-//-- EL_WIND_STEP
+//-- EL_WIND_STEP
8407,0,0,0,-1,0,0
-//-- EL_WIND_CURTAIN
+//-- EL_WIND_CURTAIN
8408,0,0,0,-1,0,0
-//-- EL_ZEPHYR
+//-- EL_ZEPHYR
8409,0,0,0,15000,0,0
-//-- EL_STONE_SHIELD
+//-- EL_STONE_SHIELD
8411,0,0,0,-1,0,0
-//-- EL_POWER_OF_GAIA
+//-- EL_POWER_OF_GAIA
8412,0,0,0,15000,0,0
-//-- EL_PYROTECHNIC
+//-- EL_PYROTECHNIC
8413,0,0,0,-1,0,0
-//-- EL_HEATER
+//-- EL_HEATER
8414,0,0,0,-1,0,0
-//-- EL_TROPIC
+//-- EL_TROPIC
8415,0,0,0,-1,0,0
-//-- EL_AQUAPLAY
+//-- EL_AQUAPLAY
8416,0,0,0,-1,0,0
-//-- EL_COOLER
+//-- EL_COOLER
8417,0,0,0,-1,0,0
-//-- EL_CHILLY_AIR
+//-- EL_CHILLY_AIR
8418,0,0,0,-1,0,0
-//-- EL_GUST
+//-- EL_GUST
8419,0,0,0,-1,0,0
-//-- EL_BLAST
+//-- EL_BLAST
8420,0,0,0,-1,0,0
-//-- EL_WILD_STORM
+//-- EL_WILD_STORM
8421,0,0,0,-1,0,0
-//-- EL_PETROLOGY
+//-- EL_PETROLOGY
8422,0,0,0,-1,0,0
-//-- EL_CURSED_SOIL
+//-- EL_CURSED_SOIL
8423,0,0,0,-1,0,0
-//-- EL_UPHEAVAL
+//-- EL_UPHEAVAL
8424,0,0,0,-1,0,0
-//-- EL_TIDAL_WEAPON
+//-- EL_TIDAL_WEAPON
8433,0,0,0,-1,0,0
//-- EL_WIND_SLASH
8434,1000,0,0,0,0,0
//-- EL_HURRICANE
8435,1000,0,0,0,0,0
-//-- EL_TYPOON_MIS
+//-- EL_TYPOON_MIS
8437,1000,0,0,15000,0,0
-//-- EL_STONE_HAMMER
+//-- EL_STONE_HAMMER
8439,0,0,0,5000,0,0
-//-- EL_ROCK_CRUSHER
+//-- EL_ROCK_CRUSHER
8440,0,0,0,15000,0,0
-//-- EL_ROCK_CRUSHER_ATK
+//-- EL_ROCK_CRUSHER_ATK
8441,0,0,0,15000,0,0
//==========================================
diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt
index ffeadd5e9..4c085b8df 100644
--- a/db/pre-re/skill_db.txt
+++ b/db/pre-re/skill_db.txt
@@ -101,12 +101,12 @@
54,9,6,16,6,0x1,0,4,1,yes,0,0,0,magic,0, ALL_RESURRECTION,Resurrection
55,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, KN_SPEARMASTERY,Spear Mastery
56,-2,8,1,-1,0,0,10,3,no,0,0,0,weapon,0, KN_PIERCE,Pierce
-57,-2,6,1,-1,0x1,0,10,1,no,33,0,0,weapon,3, KN_BRANDISHSPEAR,Brandish Spear
+57,-2,6,1,-1,0x1,0,10,1,no,0,0,0,weapon,3, KN_BRANDISHSPEAR,Brandish Spear
58,-4,6,1,-1,0x2,0,10,1,no,0,0,0,weapon,6, KN_SPEARSTAB,Spear Stab
59,3:5:7:9:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, KN_SPEARBOOMERANG,Spear Boomerang
60,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0, KN_TWOHANDQUICKEN,Twohand Quicken
61,0,6,4,-1,0x20,0,5,1,no,0,0,0,weapon,0, KN_AUTOCOUNTER,Counter Attack
-62,-2,6,1,-1,0x2,1,10,1,no,33,0,0,weapon,1, KN_BOWLINGBASH,Bowling Bash
+62,-2,6,1,-1,0x2,1,10,1,no,0,0,0,weapon,1, KN_BOWLINGBASH,Bowling Bash
63,0,0,0,0,0,0,1,0,no,0,0,0,weapon,0, KN_RIDING,Peco Peco Riding
64,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0, KN_CAVALIERMASTERY,Cavalier Mastery
65,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, PR_MACEMASTERY,Mace Mastery
@@ -179,7 +179,7 @@
133,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0, AS_LEFT,Lefthand Mastery
134,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, AS_KATAR,Katar Mastery
135,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0, AS_CLOAKING,Cloaking
-136,-1,8,1,-1,0,0,10,-8,no,0,0,0,weapon,0, AS_SONICBLOW,Sonic Blow
+136,1,8,1,-1,0,0,10,-8,no,0,0,0,weapon,0, AS_SONICBLOW,Sonic Blow
137,3:4:5:6:7,6,1,-1,0x2,1,5,1,no,0,0,0,weapon,0,AS_GRIMTOOTH,Grimtooth
138,1,6,16,5,0x1,0,10,1,no,0,0x400,0,weapon,0, AS_ENCHANTPOISON,Enchant Poison
139,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0, AS_POISONREACT,Poison React
@@ -382,7 +382,7 @@
336,9,6,4,0,0x1,3,1,1,yes,0,0x4,1,none,0, WE_CALLPARTNER,I miss You
337,9,6,1,-1,0,0,1,1,no,0,0x2,0,weapon,0, ITM_TOMAHAWK,Throw Tomahawk
338,-1,8,1,7,0,0,10,-2,no,0,0x2,0,weapon,0, NPC_DARKCROSS,Cross of Darkness
-339,5,6,4,7,0x48,0,10,1,no,33,0x102,0,magic,0, NPC_GRANDDARKNESS,Grand cross of Darkness
+339,5,6,4,7,0x48,0,10,1,no,0,0x102,0,magic,0, NPC_GRANDDARKNESS,Grand cross of Darkness
340,9,8,1,7,0,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,0x2,0,magic,0, NPC_DARKSTRIKE,Soul Strike of Darkness
341,9,8,1,7,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0x2,0,magic,2:3:3:4:4:5:5:6:6:7, NPC_DARKTHUNDER,Darkness Jupitel
342,9,6,1,0,0x1,0,1,0,no,0,0x2,0,none,0, NPC_STOP,Stop
@@ -681,11 +681,11 @@
2001,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0, RK_ENCHANTBLADE,Enchant Blade
2002,7:8:9:10:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, RK_SONICWAVE,Sonic Wave
2003,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,3, RK_DEATHBOUND,Death Bound
-2004,1,8,1,-1,0,0,10,-5,no,0,0,0,weapon,0, RK_HUNDREDSPEAR,Hundred Spear
+2004,5,8,1,-1,0,0,10,-5,no,0,0,0,weapon,0, RK_HUNDREDSPEAR,Hundred Spear
2005,1,6,2,4,0x2,2,5,1,no,0,0,0,weapon,3, RK_WINDCUTTER,Wind Cutter
2006,0,6,4,-1,0x2,5,5,1,no,0,0,0,weapon,0, RK_IGNITIONBREAK,Ignition Break
2007,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0, RK_DRAGONTRAINING,Dragon Training
-2008,9,6,2,3,0xC2,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,misc,0, RK_DRAGONBREATH,Dragon Breath
+2008,9,6,2,3,0x2,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,weapon,0, RK_DRAGONBREATH,Dragon Breath
2009,0,6,4,0,0x3,3:4:5:6:7,5,1,yes,0,0,0,none,0, RK_DRAGONHOWLING,Dragon Howling
2010,0,0,0,0,0,0,10,0,no,0,0,0,none,0, RK_RUNEMASTERY,Rune Mastery
2011,0,6,4,0,0x1,0,1,1,yes,0,0,0,none,0, RK_MILLENNIUMSHIELD,Millenium Shield
@@ -753,7 +753,7 @@
2204,0,8,4,1,0x2,13,5,-5,yes,0,0,0,magic,0, WL_JACKFROST,Jack Frost
2205,11,6,1,0,0x1,0,5,1,yes,0,0,0,magic,0, WL_MARSHOFABYSS,Marsh of Abyss
2206,0,6,4,0,0x1,0,5,1,yes,0,0,0,magic,0, WL_RECOGNIZEDSPELL,Recognized Spell
-2207,7,6,1,2,0x3,1:2:2:3:3,5,1,yes,0,0,0,magic,0, WL_SIENNAEXECRATE,Sienna Execrate
+2207,7,6,1,2,0x3,1:2:2:3:3,5,0,yes,0,0,0,magic,0, WL_SIENNAEXECRATE,Sienna Execrate
2208,0,0,0,0,0,0,3,0,no,0,0,0,none,0, WL_RADIUS,Radius
2209,0,6,4,0,0x3,9:10:11:12:13,5,1,yes,0,0,0,magic,0, WL_STASIS,Stasis
2210,11,6,1,0,0,0,5,1,yes,0,0,0,magic,0, WL_DRAINLIFE,Drain Life
@@ -803,39 +803,39 @@
2250,3,6,2,1,0x43,2,1,1,no,0,0x80,1,misc,0, RA_COBALTTRAP,Cobalt Trap
2251,3,6,2,2,0x43,2,1,1,no,0,0x80,1,misc,0, RA_MAIZETRAP,Maize Trap
2252,3,6,2,4,0x43,2,1,1,no,0,0x80,1,misc,0, RA_VERDURETRAP,Verdure Trap
-2253,3,6,2,0,0x42,2,5,1,no,0,0x80,2,misc,0, RA_FIRINGTRAP,Firing Trap
-2254,3,6,2,0,0x42,2,5,1,no,0,0x80,2,misc,0, RA_ICEBOUNDTRAP,Icebound Trap
+2253,3,6,2,3,0x42,2,5,1,no,0,0x80,2,misc,0, RA_FIRINGTRAP,Firing Trap
+2254,3,6,2,1,0x42,2,5,1,no,0,0x80,2,misc,0, RA_ICEBOUNDTRAP,Icebound Trap
//****
// NC Mechanic
2255,0,0,0,0,0,0,5,0,no,0,0,0,none,0, NC_MADOLICENCE,Mado License
2256,11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, NC_BOOSTKNUCKLE,Boost Knuckle
2257,3,6,1,-1,0,0,3,1,no,0,0,0,weapon,0, NC_PILEBUNKER,Pile Bunker
-2258,13,6,1,-1,0,0,3,1,no,0,0,0,weapon,0, NC_VULCANARM,Vulcan Arm
-2259,5,6,1,3,0,2,3,1,no,0,0,5,weapon,0, NC_FLAMELAUNCHER,Flame Launcher
+2258,13,6,1,-1,0x2,1,3,1,no,0,0,0,weapon,0, NC_VULCANARM,Vulcan Arm
+2259,7,6,1,3,0,2,3,1,no,0,0,5,weapon,0, NC_FLAMELAUNCHER,Flame Launcher
2260,7,6,2,1,0x2,2:3:4,3,1,no,0,0,0,weapon,0, NC_COLDSLOWER,Cold Slower
-2261,7,6,2,-1,0x42,3:2:1,3,1,no,0,0,0,weapon,0, NC_ARMSCANNON,Arm Cannon
+2261,9:11:13,6,1,-1,0x42,3:2:1,3,1,no,0,0,0,weapon,0, NC_ARMSCANNON,Arm Cannon
2262,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0, NC_ACCELERATION,Acceleration
2263,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, NC_HOVERING,Hovering
2264,0,6,4,0,0x1,0,1,1,no,0,0,0,none,7, NC_F_SIDESLIDE,Front-Side Slide
2265,0,6,4,0,0x1,0,1,1,no,0,0,0,none,7, NC_B_SIDESLIDE,Back-Side Slide
2266,0,0,0,0,0,0,4,0,no,0,0,0,none,0, NC_MAINFRAME,Mainframe Restructure // Check me. Part of the code notes translated to "The amount of fuel have".
-2267,0,6,4,-1,0x42,2:3:4,3,1,no,0,0,0,misc,5, NC_SELFDESTRUCTION,Self Destruction
+2267,0,6,4,-1,0xC2,2:3:4,3,1,no,0,0,0,misc,5, NC_SELFDESTRUCTION,Self Destruction
2268,0,6,4,0,0x1,0,4,1,yes,0,0,0,none,0, NC_SHAPESHIFT,Shape Shift
2269,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, NC_EMERGENCYCOOL,Emergency Cool
2270,0,6,4,0,0x3,7,1,1,yes,0,0,0,none,0, NC_INFRAREDSCAN,Infrared Scan
2271,9,6,1,0,0x1,0,3,1,yes,0,0,0,none,0, NC_ANALYZE,Analyze
-2272,0,6,4,0,0x3,1:2:3,3,1,yes,0,0,0,none,0, NC_MAGNETICFIELD,Magnetic Field
+2272,0,6,4,0,0x3,2,3,1,yes,0,0,0,none,0, NC_MAGNETICFIELD,Magnetic Field
2273,0,6,4,0,0x1,0,3,1,yes,0,0,0,none,0, NC_NEUTRALBARRIER,Neutral Barrier
2274,0,6,4,0,0x1,0,3,1,yes,0,0,0,none,0, NC_STEALTHFIELD,Stealth Field
-2275,5,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0, NC_REPAIR,Repair
+2275,5:6:7:8:9,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0, NC_REPAIR,Repair
2276,0,0,0,0,0,0,10,0,no,0,0,0,none,0, NC_TRAININGAXE,Axe Training
2277,0,0,0,0,0,0,5,0,no,0,0,0,none,0, NC_RESEARCHFE,Research Fire/Earth
-2278,4:5:6:7:8,6,1,-1,0,0,5,1,no,0,0,0,weapon,2:3:4:5:6, NC_AXEBOOMERANG,Axe Boomerang
+2278,5:6:7:8:9,6,1,-1,0,0,5,1,no,0,0,0,weapon,2:3:4:5:6, NC_AXEBOOMERANG,Axe Boomerang
2279,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, NC_POWERSWING,Power Swing
-2280,0,8,4,-1,0x2,2:2:3:3:3,5,-6,no,0,0,0,weapon,0, NC_AXETORNADO,Axe Tornado // Check me. Takes 20 * Skill LV amount of HP each use.
+2280,0,8,4,-1,0x2,2:2:3:3:3,5,-3,no,0,0,0,weapon,0, NC_AXETORNADO,Axe Tornado // Check me. Takes 20 * Skill LV amount of HP each use.
2281,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0, NC_SILVERSNIPER,FAW - Silver Sniper
-2282,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0, NC_MAGICDECOY,FAW - Magic Decoy //CHECK FIX ME!!!! Wind and Earth stones spawning opposite decoys.
+2282,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0, NC_MAGICDECOY,FAW - Magic Decoy
2283,2,6,1,0,0x1,0,1,1,no,0,0,0,none,0, NC_DISJOINT,FAW Removal
//****
@@ -855,10 +855,10 @@
2296,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0, SC_UNLUCKY,Masquerade - Unlucky
2297,3,6,1,0,0x1,0,3,1,yes,0,0,0,none,0, SC_WEAKNESS,Masquerade - Weakness
2298,3,6,1,0,0x1,0,5,1,yes,0,0,0,weapon,0, SC_STRIPACCESSARY,Strip Accessory //CHECK Is weapon attack type needed?
-2299,7,6,2,0,0x1,0,3,1,yes,0,0,3,none,0, SC_MANHOLE,Man Hole
-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
+2299,7,6,2,0,0x1,0,3,1,yes,0,0,3,magic,0, SC_MANHOLE,Man Hole
+2300,7,6,2,0,0x1,0,3,1,yes,0,0,1,magic,0, SC_DIMENSIONDOOR,Dimension Door
+2301,7,6,2,0,0x1,2,3,1,yes,0,0,1,magic,0, SC_CHAOSPANIC,Chaos Panic
+2302,7,6,2,0,0x1,2,3,1,yes,0,0,1,magic,0, SC_MAELSTROM,Maelstrom
2303,7,6,2,0,0x1,0,3,1,yes,0,0,0,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
@@ -872,7 +872,7 @@
2312,5,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, LG_PINPOINTATTACK,Pinpoint Attack
2313,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0, LG_FORCEOFVANGUARD,Force of Vanguard
2314,1,6,1,-1,0,0,1,1,no,0,0,0,weapon,0, LG_RAGEBURST,Rage Burst
-2315,0,6,4,0,0x2,3,3,1,yes,0,0,0,none,2, LG_SHIELDSPELL,Shield Spell
+2315,0,6,4,0:6:0,0x2,0,3,1,yes,0,0,0,none,2:0:0,LG_SHIELDSPELL,Shield Spell
2316,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0, LG_EXEEDBREAK,Exceed Break
2317,2,6,2,-1,0x2,0,5,1,yes,0,0,0,weapon,0, LG_OVERBRAND,Over Brand
2318,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0, LG_PRESTIGE,Prestige
@@ -887,15 +887,15 @@
//****
// SR Sura
-2326,-2,8,1,-1,0,0,10,2,no,0,0,0,weapon,0, SR_DRAGONCOMBO,Dragon Combo //CHECK Is this 2 regular hits or sub hits? Yes its 2 sub hits.
-2327,0,8,4,-1,0x2,2,5,-3,no,0,0,0,weapon,3, SR_SKYNETBLOW,Sky Net Blow //CHECK Video shows 3 hits. Its sub hits right? Data check shows no sub, one source shows 3 hits, another shows 5.
+2326,-2,8,1,-1,0,0,10,-2,no,0,0,0,weapon,0, SR_DRAGONCOMBO,Dragon Combo
+2327,0,8,4,-1,0x2,2,5,-3,no,0,0,0,weapon,3, SR_SKYNETBLOW,Sky Net Blow
2328,0,6,4,-1,0x2,1:2:3:4:5,5,1,no,0,0,0,weapon,0, SR_EARTHSHAKER,Earth Shaker //CHECK Must add a check in battle.c to triple damage if hitting a hidden target.
2329,-2,8,4,-1,0,0,5,-2,no,0,0x200,0,weapon,0, SR_FALLENEMPIRE,Fallen Empire //CHECK Video shows 2 hits. Is it sub hits? Yes its divided between 2 hits.
2330,-2,6,1,-1,0x42,1:1:1:1:1:2:2:2:2:2,10,1,yes,0,0,0,weapon,0, SR_TIGERCANNON,Tiger Cannon //CHECK Need to fix to be enemy targeted and also combo after Fallen Empire.
2331,0,0,0,0,0,0,10,0,no,0,0,0,none,0, SR_HELLGATE,Hell Gate
2332,5,6,4,-1,0x2,3,5,1,no,0,0,0,weapon,0, SR_RAMPAGEBLASTER,Rampage Blaster
2333,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, SR_CRESCENTELBOW,Crescent Elbow //CHECK Check the autospell ID.
-2334,0,6,4,0,0x3,1:1:2:2:3,5,1,no,0,0,0,none,0, SR_CURSEDCIRCLE,Cursed Circle //CHECK Code shows it takes up to 5% of your HP upon use?
+2334,0,6,4,0,0x3,1:1:2:2:3,5,1,no,0,0,0,none,0, SR_CURSEDCIRCLE,Cursed Circle
2335,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, SR_LIGHTNINGWALK,Lightning Walk
2336,7:8:9:10:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,2:3:4:5:6, SR_KNUCKLEARROW,Knuckle Arrow
2337,0,6,4,-1,0x2,2,1,1,yes,0,0,0,weapon,0, SR_WINDMILL,Windmill
@@ -903,7 +903,7 @@
2339,0,0,0,0,0,0,5,1,no,0,0,0,none,0, SR_GENTLETOUCH,Gentle Touch
2340,0,6,4,0,0x3,2,1,1,no,0,0,0,none,0, SR_ASSIMILATEPOWER,Assimilate Power
2341,3,6,16,0,0x1,0,1,1,yes,0,0x200,0,none,0, SR_POWERVELOCITY,Power Velocity
-2342,1,6,1,-1,0x20,0,5,1,no,0,0,0,weapon,3, SR_CRESCENTELBOW_AUTOSPELL,Crescent Elbow Autospell //CHECK Does this ignore defense?
+2342,1,6,1,-1,0x20,0,5,1,no,0,0,0,weapon,7, SR_CRESCENTELBOW_AUTOSPELL,Crescent Elbow Autospell //CHECK Does this ignore defense?
2343,1:2:3:3:4:4:5:5:6:7,8,1,0,0,0,10,-7,yes,0,0,0,weapon,0, SR_GATEOFHELL,Gate of Hell //CHECK Need to fix to be enemy targeted and also combo after Fallen Empire
2344,2,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, SR_GENTLETOUCH_QUIET,Gentle Touch - Quiet
2345,2,6,16,0,0x1,0,5,1,no,0,0,0,magic,0, SR_GENTLETOUCH_CURE,Gentle Touch - Cure //CHECK Its a healing skill. Guessing it has to be magic type? Healing isnt working.
@@ -927,27 +927,27 @@
// WM Wanderer/Minstrel
2412,0,0,0,0,0,0,10,0,no,0,0,0,none,0, WM_LESSON,Lesson
2413,9,8,1,-1,0,0,5,-2:-2:-3:-3:-4,yes,0,0,0,magic,0, WM_METALICSOUND,Metallic Sound
-2414,9,6,2,-1,0x3,1,5,1,yes,0,0x80,3,none,0, WM_REVERBERATION,Reverberation
-2415,0,6,1,-1,0x6,1,5,1,no,0,0,0,weapon,0, WM_REVERBERATION_MELEE,Reverberation Melee
-2416,0,6,1,0,0x6,1,5,1,no,0,0,0,magic,0, WM_REVERBERATION_MAGIC,Reverberation Magic
+2414,9,6,2,-1,0x1,1,5,1,yes,0,0x80,0,none,0, WM_REVERBERATION,Reverberation //CHECK May need to recode. Testing needed. Also need to test AoE size.
+2415,0,0,0,-1,0,0,5,1,no,0,0,0,weapon,0, WM_REVERBERATION_MELEE,Reverberation Melee
+2416,0,0,0,-1,0,0,5,1,no,0,0,0,magic,0, WM_REVERBERATION_MAGIC,Reverberation Magic
2417,11,6,2,0,0x3,5,1,1,no,0,0,0,none,0, WM_DOMINION_IMPULSE,Dominion Impulse
-2418,9,6,2,-1,0x1,0,5,1,yes,0,0,0,none,0, WM_SEVERE_RAINSTORM,Severe Rainstorm
+2418,9,6,2,0,0x1,0,5,1,yes,0,0,0,none,0, WM_SEVERE_RAINSTORM,Severe Rainstorm
2419,9,6,2,0,0x3,1,5,1,yes,0,0x80,5,none,0, WM_POEMOFNETHERWORLD,Poem of The Netherworld //CHECK May need to recode too.
-2420,0,6,4,0,0x2,2:3:4:5:6,5,1,yes,0,0,0,none,0, WM_VOICEOFSIREN,Voice of Siren
-2421,7,6,16,0,0x1,0,5,1,yes,0,0,0,none,0, WM_DEADHILLHERE,Valley of Death
-2422,7,6,4,0,0x3,5:6:7:8:9,5,1,yes,0,0,0,none,0, WM_LULLABY_DEEPSLEEP,Deep Sleep Lullaby
-2423,0,6,4,0,0x3,3:4:5:6:7,5,1,yes,0,0,0,none,0, WM_SIRCLEOFNATURE,Circle of Nature's Sound
+2420,0,6,4,0,0x2,2:3:4:5:6,5,1,yes,0,0,0,none,0,WM_VOICEOFSIREN,Voice of Siren
+2421,7,6,16,0,0x1,0,5,1,yes,0,0,0,none,0, WM_DEADHILLHERE,Valley of Death//Enemy targeted magic skill in official. Really? WTF???
+2422,0,6,4,0,0x3,5:6:7:8:9,5,1,yes,0,0,0,none,0,WM_LULLABY_DEEPSLEEP,Deep Sleep Lullaby
+2423,0,6,4,0,0x3,3:4:5:6:7,5,1,yes,0,0,0,none,0,WM_SIRCLEOFNATURE,Circle of Nature's Sound
2424,9,6,4,0,0x1,0,5,1,yes,0,0,0,magic,0, WM_RANDOMIZESPELL,Improvised Song
2425,9,6,16,0,0x1,0,5,1,yes,0,0,0,none,0, WM_GLOOMYDAY,Gloomy Day
-2426,9,6,2,0,0x2,2:3:3:4:4,5,1,yes,0,0x4000,0,weapon,0, WM_GREAT_ECHO,Great Echo
+2426,9,6,2,0,0x2,2:3:3:4:4,5,1,yes,0,0x4000,0,weapon,0, WM_GREAT_ECHO,Great Echo//Skill type in official is set to none. Why?
2427,0,6,4,0,0x3,5:6:7:8:9,5,1,yes,0,0x4000,0,none,0, WM_SONG_OF_MANA,Song of Mana
2428,0,6,4,0,0x3,5:6:7:8:9,5,1,yes,0,0x4000,0,none,0, WM_DANCE_WITH_WUG,Dance With A Warg
-2429,9,6,1,0,0x2,2:2:3:3:4,5,1,yes,0,0x4000,0,weapon,0, WM_SOUND_OF_DESTRUCTION,Sound of Destruction //CHECK Source shows its magic attack. Need to confirm before changing.
-2430,0,6,4,0,0x3,3:4:5:6:7,5,1,yes,0,0x4000,0,none,0, WM_SATURDAY_NIGHT_FEVER,Saturday Night Fever
-2431,0,6,4,0,0x3,5,5,1,yes,0,0x4000,0,magic,0, WM_LERADS_DEW,Lerad's Dew
-2432,0,6,4,0,0x3,5,5,1,yes,0,0x4000,0,none,0, WM_MELODYOFSINK,Melody of Sink
-2433,0,6,4,0,0x3,5,5,1,yes,0,0x4000,0,none,0, WM_BEYOND_OF_WARCRY,Warcry of Beyond
-2434,0,6,4,0,0x3,5,5,1,yes,0,0x4000,0,none,0, WM_UNLIMITED_HUMMING_VOICE,Unlimited Humming Voice
+2429,9,6,2,0,0x42,4:4:5:5:6,5,1,yes,0,0x4000,0,none,0, WM_SOUND_OF_DESTRUCTION,Sound of Destruction//Using clif damage to deal the fixed damage for now. Testing needed to see how it dealed.
+2430,0,6,4,0,0x3,3:4:5:6:7,5,1,yes,0,0x4000,0,none,0, WM_SATURDAY_NIGHT_FEVER,Saturday Night Fever//Info for above skill. Type in official is magic. Has damage changed since 2011? Recheck AoE.
+2431,0,6,4,0,0x3,5:5:6:6:7,5,1,yes,0,0x4000,0,none,0, WM_LERADS_DEW,Lerad's Dew
+2432,0,6,4,0,0x3,5:5:6:6:7,5,1,yes,0,0x4000,0,none,0, WM_MELODYOFSINK,Melody of Sink
+2433,0,6,4,0,0x3,5:5:6:6:7,5,1,yes,0,0x4000,0,none,0, WM_BEYOND_OF_WARCRY,Warcry of Beyond
+2434,0,6,4,0,0x3,5:5:6:6:7,5,1,yes,0,0x4000,0,none,0, WM_UNLIMITED_HUMMING_VOICE,Unlimited Humming Voice
//****
// SO Sorcerer
@@ -988,7 +988,7 @@
2479,9,6,2,0,0,0,5,1,yes,0,0x80,5,misc,0, GN_THORNS_TRAP,Thorn Trap
2480,11,6,1,0,0x1,0,5,1,yes,0,0,3,misc,0, GN_BLOOD_SUCKER,Blood Sucker //CHECK Data says its a magic attack. Hmmmm....
2481,11,6,1,-1,0x2,1:2:3:4:5,5,1,yes,0,0,0,weapon,0, GN_SPORE_EXPLOSION,Spore Explosion //CHECK Data says its element is set to neutral. Need to confirm.
-2482,11,6,16,0,0,0,5,1,yes,0,0,1,weapon,2, GN_WALLOFTHORN,Wall of Thorns
+2482,11,6,16,0,0x1,0,5,-1,yes,0,0,1,weapon,2, GN_WALLOFTHORN,Wall of Thorns
2483,11,6,2,0,0x3,4,10,1,yes,0,0x2000,0,weapon,0, GN_CRAZYWEED,Crazy Weed
2484,0,6,2,2,0x2,3,10,1,no,0,0x2000,0,weapon,0, GN_CRAZYWEED_ATK,Crazy Weed Attack
2485,9,6,2,3,0,0,5,1,yes,0,0,0,magic,0, GN_DEMONIC_FIRE,Demonic Fire
@@ -1017,12 +1017,12 @@
2535,0,0,4,0,0x1,0,1,0,no,0,0x1,0,none,0, ALL_BUYING_STORE,Open Buying Store
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
-//2538,0,0,0,0,0,0,??,0,no,0,0,0,none,0, BEER_BOTTLE_CAP,Beer Bottle Cap
-//2539,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_ASSASSINCROSS,Assassin Cross of Sunset 2
-//2540,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_DISSONANCE,Dissonance 2
-//2541,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_UGLYDANCE,Ugly Dance 2
-//2542,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_TETANY,Tetany
-//2543,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_RAY_OF_PROTECTION,Ray of Protection
+//2538,0,0,0,0,0,0,??,0,no,0,0,0,none,0, BEER_BOTTLE_CAP,Beer Bottle Cap
+//2539,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_ASSASSINCROSS,Assassin Cross of Sunset 2
+//2540,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_DISSONANCE,Dissonance 2
+//2541,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_UGLYDANCE,Ugly Dance 2
+//2542,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_TETANY,Tetany
+//2543,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_RAY_OF_PROTECTION,Ray of Protection
//2544,0,0,0,0,0,0,??,0,no,0,0,0,none,0, MC_CARTDECORATE,Decorate Cart
//2545,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 //GM_ITEM_ATKMAX#Maximum Attack#
//2546,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 //GM_ITEM_ATKMIN#Minimal Attack#
@@ -1097,7 +1097,7 @@
5001,1,8,1,-1,0,0,5,3,no,0,0,0,weapon,0, GC_DARKCROW,Dark Claw
5002,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, RA_UNLIMIT,Unlimited
5003,7,6,1,-1,0x2,4:5:6:7:8,5,1,no,0,0,0,weapon,0, GN_ILLUSIONDOPING,Illusion Doping
-5004,9,6,2,1,0x2,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,misc,0, RK_DRAGONBREATH_WATER,Dragon Breath - Water
+5004,9,6,2,1,0x2,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,weapon,0, RK_DRAGONBREATH_WATER,Dragon Breath - Water
5005,0,6,4,0,0x3,3,1,1,no,0,0,0,none,0, RK_LUXANIMA,Lux Anima
5006,1,6,2,3,0,0,5,1,no,0,0,3,misc,0, NC_MAGMA_ERUPTION,Magma Eruption
5007,0,6,4,0,0x3,5:6:7:8:9,5,1,no,0,0,0,none,0, WM_FRIGG_SONG,Frigg's Song
@@ -1138,7 +1138,7 @@
8023,0,6,4,0,0,0x1,5,1,no,0,0,0,none,0, MH_OVERED_BOOST,Overed Boost
8024,7,8,1,4:0:4:0:4,0,0,5,-6,yes,0,0,0,magic,0, MH_ERASER_CUTTER,Eraser Cutter
8025,7,8,2,4:0:4:0:4,0x2,2:2:3:3:4,5,-6,no,0,0,0,magic,0, MH_XENO_SLASHER,Xeno Slasher
-8026,5:5:7:7:9,6,1,0,0x1,0,5,1,no,0,0,0,magic,0, MH_SILENT_BREEZE,Silent Breeze
+8026,5:5:7:7:9,6,16,0,0x1,0,5,1,no,0,0,0,magic,0, MH_SILENT_BREEZE,Silent Breeze
8027,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, MH_STYLE_CHANGE,Style Change
8028,1,8,1,0,0,0,5,1,no,0,0,0,weapon,0, MH_SONIC_CRAW,Sonic Claw
8029,1,6,4,0,0,0,5,1,no,0,0x200,0,weapon,0, MH_SILVERVEIN_RUSH,Silver Bain Rush
@@ -1160,7 +1160,7 @@
// Mercenary Skill Place holders
8201,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0, MS_BASH,Bash
8202,0,6,4,3,0x2,2,10,1,no,0,0,0,weapon,2, MS_MAGNUM,Magnum_Break
-8203,-2,6,1,-1,0x2,1,10,1,no,33,0,0,weapon,1, MS_BOWLINGBASH,Bowling_Bash
+8203,-2,6,1,-1,0x2,1,10,1,no,0,0,0,weapon,1, MS_BOWLINGBASH,Bowling_Bash
8204,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0, MS_PARRYING,Parry
8205,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0, MS_REFLECTSHIELD,Shield_Reflect
8206,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0, MS_BERSERK,Frenzy
@@ -1174,7 +1174,7 @@
8214,-9,6,1,-1,0x2,0,1,1,no,0,0x1,0,weapon,6, MA_CHARGEARROW,Arrow_Repel
8215,9,8,1,-1,0,2,5,1,yes,0,0,13,weapon,0, MA_SHARPSHOOTING,Focused_Arrow_Strike
8216,-2,8,1,-1,0,0,10,3,no,0,0,0,weapon,0, ML_PIERCE,Pierce
-8217,-2,6,1,-1,0x1,0,10,1,no,33,0,0,weapon,3, ML_BRANDISH,Brandish_Spear
+8217,-2,6,1,-1,0x1,0,10,1,no,0,0,0,weapon,3, ML_BRANDISH,Brandish_Spear
8218,5,8,1,-1,0x20,0,5,5,no,0,0,0,weapon,0, ML_SPIRALPIERCE,Spiral_Pierce
8219,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0, ML_DEFENDER,Defending_Aura
8220,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0, ML_AUTOGUARD,Guard
@@ -1233,15 +1233,15 @@
8431,9,6,1,1,0,1,1,1,no,0,0,0,magic,0, EL_WATER_SCREW,Water Screw
8432,9,6,1,1,0,1,1,1,no,0,0,0,weapon,0, EL_WATER_SCREW_ATK,Water Screw Attack
8433,9,6,1,1,0,1,1,1,no,0,0,0,weapon,0, EL_TIDAL_WEAPON,Tidal Weapon
-8434,11,6,1,4,0,0,1,1,no,0,0,0,weapon,0, EL_WIND_SLASH,Wind Slasher
-8435,11,6,1,4,0,1,1,1,no,0,0,0,weapon,0, EL_HURRICANE,Hurricane Rage
+8434,11,6,1,4,0,0,1,1,no,0,0,0,weapon,0, EL_WIND_SLASH,Wind Slasher
+8435,11,6,1,4,0,1,1,1,no,0,0,0,weapon,0, EL_HURRICANE,Hurricane Rage
8436,7,6,1,4,0,0,1,1,no,0,0,0,magic,0, EL_HURRICANE_ATK,Hurricane Rage Attack
-8437,11,8,1,4,0,1,1,-3,no,0,0,0,weapon,0, EL_TYPOON_MIS,Typhoon Missile
-8438,11,8,1,4,0,1,1,-3,no,0,0,0,magic,0, EL_TYPOON_MIS_ATK,Typhoon Missile Attack
+8437,11,6,1,4,0,1,1,1,no,0,0,0,weapon,0, EL_TYPOON_MIS,Typhoon Missile
+8438,11,6,1,4,0,1,1,1,no,0,0,0,magic,0, EL_TYPOON_MIS_ATK,Typhoon Missile Attack
8439,5,6,1,2,0,0,1,1,no,0,0,0,weapon,0, EL_STONE_HAMMER,Stone Hammer
8440,3,6,1,2,0,1,1,1,no,0,0,0,weapon,0, EL_ROCK_CRUSHER,Rock Launcher
8441,5,6,1,2,0,1,1,1,no,0,0,0,magic,0, EL_ROCK_CRUSHER_ATK,Rock Launcher Attack
-8442,9,6,1,2,0,1,1,-5,no,0,0,0,weapon,0, EL_STONE_RAIN,Stone Rain
+8442,9,6,1,2,0,1,1,-5,no,0,0,0,weapon,0, EL_STONE_RAIN,Stone Rain
10000,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0, GD_APPROVAL,Official Guild Approval
10001,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0, GD_KAFRACONTRACT,Kafra Contract
diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt
index 442933826..d70d9175d 100644
--- a/db/pre-re/skill_require_db.txt
+++ b/db/pre-re/skill_require_db.txt
@@ -490,9 +490,9 @@
2005,0,0,20:24:28:32:36,0,0,0,1:2:3:4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RK_WINDCUTTER#Wind Cutter#
2006,0,0,35:40:45:50:55,0,0,0,1:2:3:4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RK_IGNITIONBREAK#Ignition Break#
2008,0,0,30:35:40:45:50:55:60:65:70:75,0,0,0,99,0,0,dragon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RK_DRAGONBREATH#Dragon Breath#
-2009,0,0,70,0,0,0,99,0,0,dragon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RK_DRAGONHOWLING#Dragon Howling#
+2009,0,0,30,0,0,0,99,0,0,dragon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RK_DRAGONHOWLING#Dragon Howling#
2011,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 //RK_MILLENNIUMSHIELD#Millenium Shield#
-2012,0,0,1,0,0,0,1:2:3:4:5:6:7:8,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RK_CRUSHSTRIKE#Crush Strike#
+2012,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 //RK_CRUSHSTRIKE#Crush Strike#
2013,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 //RK_REFRESH#Refresh#
2014,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 //RK_GIANTGROWTH#Giant Growth#
2015,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 //RK_STONEHARDSKIN#Stone Hard Skin#
@@ -506,7 +506,7 @@
// GC Guilottine Cross
2021,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 //GC_VENOMIMPRESS#Venom Impress#
2022,0,0,25,0,0,0,99,0,0,move_enable,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_CROSSIMPACT#Cross Impact# //CHECK Is this move_enable needed?
-2023,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 //GC_DARKILLUSION#Dark Illusion#
+2023,0,0,20:25:30:35: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 //GC_DARKILLUSION#Dark Illusion#
2025,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 //GC_CREATENEWPOISON#Create New Poison#
2026,0,0,10,0,0,0,99,0,0,none,0,6128,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_ANTIDOTE#Antidote#
@@ -518,7 +518,7 @@
2032,0,0,40,0,0,0,99,0,0,poisonweapon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_POISONSMOKE#Poison Smoke#
2033,0,0,45,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 //GC_CLOAKINGEXCEED#Cloaking Exceed#
2034,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 //GC_PHANTOMMENACE#Phantom Menace#
-2035,0,0,100,10,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 //GC_HALLUCINATIONWALK#Hallucination Walk#
+2035,0,0,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 //GC_HALLUCINATIONWALK#Hallucination Walk#
2036,0,0,5,0,0,0,16,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_ROLLINGCUTTER#Rolling Cutter#
2037,0,0,20:24:28:32:36,0,0,0,16,0,0,rollingcutter,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_CROSSRIPPERSLASHER#Cross Ripper Slasher#
@@ -530,14 +530,14 @@
2203,0,0,40:48:56:64:72,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 //WL_FROSTMISTY#Frosty Misty#
2204,0,0,50:60:70:80: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 //WL_JACKFROST#Jack Frost#
2205,0,0,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 //WL_MARSHOFABYSS#Marsh of Abyss#
-2206,0,0,50:60:70:80: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 //WL_RECOGNIZEDSPELL#Recognized Spell#
-2207,0,0,32:34:36:38: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 //WL_SIENNAEXECRATE#Sienna Execrate#
+2206,0,0,100:120:140:160:180,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 //WL_RECOGNIZEDSPELL#Recognized Spell#
+2207,0,0,32:34:36:38:40,0,0,0,99,0,0,none,0,716,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WL_SIENNAEXECRATE#Sienna Execrate#
2209,0,0,50:60:70:80: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 //WL_STASIS#Stasis#
2210,0,0,20:24:28:32: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 //WL_DRAINLIFE#Drain Life#
2211,0,0,60:70:80:90: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 //WL_CRIMSONROCK#Crimson Rock#
2212,0,0,35:40:45:50:55,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 //WL_HELLINFERNO#Hell Inferno#
-2213,0,0,240:280:320:360:400,0,0,0,99,0,0,none,0,716,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WL_COMET#Comet#
+2213,0,0,480:560:640:720:800,0,0,0,99,0,0,none,0,716,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WL_COMET#Comet#
2214,0,0,80:90:100:110:120,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 //WL_CHAINLIGHTNING#Chain Lightning#
2215,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 //WL_CHAINLIGHTNING_ATK#Chain Lightning Attack#
2216,0,0,70:78:86:94:102,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 //WL_EARTHSTRAIN#Earth Strain#
@@ -564,11 +564,11 @@
2038,0,0,20:23:26:29:32,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 //AB_JUDEX#Judex#
2039,0,0,30,0,-30,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 //AB_ANCILLA#Ancilla#
2040,0,0,20:24:28:32:36:40:44:48:52:56,0,0,0,99,0,0,none,0,717,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_ADORAMUS#Adoramus#
-2041,0,0,200:220:240,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 //AB_CLEMENTIA#Crementia#
-2042,0,0,145:160:175,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 //AB_CANTO#Canto Candidus#
-2043,0,0,130:145:160,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 //AB_CHEAL#Coluceo Heal#
+2041,0,0,280:320:360,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 //AB_CLEMENTIA#Crementia#
+2042,0,0,200:220:240,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 //AB_CANTO#Canto Candidus#
+2043,0,0,200:220:240,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 //AB_CHEAL#Coluceo Heal#
2044,0,0,300,0,0,0,99,0,0,none,0,12333,1,523,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_EPICLESIS#Epiclesis#
-2045,0,0,60:70:80:90:100:110:120:130:140:150,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 //AB_PRAEFATIO#Praefatio#
+2045,0,0,90:100:110:120:130:140:150:160:170:180,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 //AB_PRAEFATIO#Praefatio#
2046,0,0,35:38:41:44:47:50:53:56:59:62,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 //AB_ORATIO#Oratio#
2047,0,0,50:60:70:80,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 //AB_LAUDAAGNUS#Lauda Agnus#
2048,0,0,50:60:70:80,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 //AB_LAUDARAMUS#Lauda Ramus#
@@ -587,17 +587,17 @@
//****
// RA Ranger
2233,0,0,30:32:34:36:38:40:42:44:46:48,0,0,0,11,1,10,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_ARROWSTORM#Arrow Storm#
-2234,0,0,36:40:44:48:52,0,0,0,11,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_FEARBREEZE#Fear Breeze#
+2234,0,0,55:60:65:70:75,0,0,0,11,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_FEARBREEZE#Fear Breeze#
2236,0,0,30:32:34:36:38:40:42:44:46:48,0,0,0,11,1,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_AIMEDBOLT#Aimed Bolt# //How many arrows does it require???
2237,0,0,15,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 //RA_DETONATOR#Detonator#
2238,0,0,35,0,0,0,99,0,0,none,0,7940,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_ELECTRICSHOCKER#Electric Shocker#
2239,0,0,20,0,0,0,99,0,0,none,0,7940,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_CLUSTERBOMB#Cluster Bomb#
2240,0,0,5,0,0,0,99,0,0,none,0,6124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_WUGMASTERY#Warg Mastery#
-2241,0,0,20,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 //RA_WUGRIDER#Warg Rider#
-2242,0,0,40,0,0,0,99,0,0,move_enable,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_WUGDASH#Warg Dash#
+2241,0,0,2,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 //RA_WUGRIDER#Warg Rider#
+2242,0,0,4,0,0,0,99,0,0,move_enable,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_WUGDASH#Warg Dash#
2243,0,0,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 //RA_WUGSTRIKE#Warg Strike#
-2244,0,0,42:44:46:48:50,0,0,0,99,0,0,warg,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
+2244,0,0,40:42:44:46:48,0,0,0,99,0,0,warg,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_WUGBITE#Warg Bite#
2246,0,0,12,0,0,0,99,0,0,warg,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_SENSITIVEKEEN#Sensitive Keen#
2247,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 //RA_CAMOUFLAGE#Camouflage#
@@ -613,35 +613,35 @@
// NC Mechanic
2256,0,0,3:6:9:12:15,0,0,0,99,0,0,mado,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_BOOSTKNUCKLE#Boost Knuckle#
2257,0,0,50,0,0,0,99,0,0,mado,0,1549,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_PILEBUNKER#Pile Bunker#
-2258,0,0,2,0,0,0,99,0,0,mado,0,6145,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm#
-2259,0,0,20,0,0,0,99,0,0,mado,0,2139,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
-2260,0,0,20,0,0,0,99,0,0,mado,0,6147,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower#
-2261,0,0,30:45:60,0,0,0,99,8,1,mado,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon#
-2262,0,0,20:40:60,0,0,0,99,0,0,mado,0,6146,1,2800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration#
-2263,0,0,25,0,0,0,99,0,0,mado,0,6146,1,2801,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_HOVERING#Hovering#
+2258,0,0,2:4:6,0,0,0,99,0,0,mado,0,6145,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm#
+2259,0,0,20,0,0,0,99,0,0,mado,0,2139,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher#
+2260,0,0,20,0,0,0,99,0,0,mado,0,6146,1,6147,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower#
+2261,0,0,40:45:50,0,0,0,99,8,1,mado,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon#
+2262,0,0,20:40:60,0,0,0,99,0,0,mado,0,2800,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration#
+2263,0,0,25,0,0,0,99,0,0,mado,0,2801,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_HOVERING#Hovering#
2264,0,0,5,0,0,0,99,0,0,mado,0,6146,1,,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_F_SIDESLIDE#Front - Side Slide#
2265,0,0,5,0,0,0,99,0,0,mado,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_B_SIDESLIDE#Back - Side Slide#
-2267,0,0,200,0,0,0,99,0,0,mado,0,6146,5,2802,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_SELFDESTRUCTION#Self Destruction#
-2268,0,0,100,0,0,0,99,0,0,mado,0,994,1,997,1,996,1,995,1,6146,2,2803,0,0,0,0,0,0,0,0,0 //NC_SHAPESHIFT#Shape Shift# //CHECK Shouldnt the different stones all be in the same slot?
-2269,0,0,20,0,0,0,99,0,0,mado,0,6146,2,2804,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_EMERGENCYCOOL#Emergency Cool#
+2267,0,0,1,0,0,0,99,0,0,mado,0,2802,0,6146,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_SELFDESTRUCTION#Self Destruction#
+2268,0,0,100,0,0,0,99,0,0,mado,0,6360,1,6363,1,6362,1,6361,1,6146,2,2803,0,0,0,0,0,0,0,0,0 //NC_SHAPESHIFT#Shape Shift# //CHECK Shouldnt the different stones all be in the same slot?
+2269,0,0,20,0,0,0,99,0,0,mado,0,2804,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_EMERGENCYCOOL#Emergency Cool#
2270,0,0,45,0,0,0,99,0,0,mado,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_INFRAREDSCAN#Infrared Scan#
2271,0,0,30,0,0,0,99,0,0,mado,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_ANALYZE#Analyze#
-2272,0,0,90,0,0,0,99,0,0,mado,0,6146,3,2805,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_MAGNETICFIELD#Magnetic Field#
-2273,0,0,90,0,0,0,99,0,0,mado,0,6146,1,2806,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_NEUTRALBARRIER#Neutral Barrier#
-2274,0,0,100:150:200,0,0,0,99,0,0,mado,0,6146,2,2808,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_STEALTHFIELD#Stealth Field#
-2275,0,0,25:30:35:40:45,0,0,0,99,0,0,mado,0,2807,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#
+2272,0,0,60:70:80,0,0,0,99,0,0,mado,0,2805,0,6146,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_MAGNETICFIELD#Magnetic Field#
+2273,0,0,80:90:100,0,0,0,99,0,0,mado,0,2806,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_NEUTRALBARRIER#Neutral Barrier#
+2274,0,0,80:100:120,0,0,0,99,0,0,mado,0,2808,0,6146,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_STEALTHFIELD#Stealth Field#
+2275,0,0,25:30:35:40:45,0,0,0,99,0,0,mado,0,2807,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_REPAIR#Repair#// Must redo requirements source code for this one.
2278,0,0,20:22:24:26:28,0,0,0,6:7,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG#Axe Boomerang#
-2279,0,0,10:12:14:16:18,0,0,0,6:7,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing#
-2280,0,0,18:20:22:24:26,0,0,0,6:7,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado#
-2281,0,0,25:30:35:40:45,0,0,0,99,0,0,none,0,998,1,999,2,612,0,615,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper#
-2282,0,0,40:45:50:55:60,0,0,0,99,0,0,none,0,998,2,7054,1,612,0,615,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
+2279,0,0,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 //NC_POWERSWING#Power Swing#
+2280,20:40:60:80:100,0,18:20:22:24:26,0,0,0,6:7,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado#
+2281,0,0,25:30:35:40:45,0,0,0,99,0,0,none,0,612,0,615,0,998,1,999,2,0,0,0,0,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper#
+2282,0,0,40:45:50:55:60,0,0,0,99,0,0,none,0,612,0,615,0,998,2,7054,1,0,0,0,0,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy#
2283,0,0,15,0,0,0,99,0,0,none,0,6186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_DISJOINT#FAW Removal#
//****
// SC Shadow Chaser
-2284,0,0,40:45:50:55:60,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 //SC_FATALMENACE#Fatal Menace#
+2284,0,0,20:25:30:35: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 //SC_FATALMENACE#Fatal Menace#
2285,0,0,40:45:50:55:60:65:70:75:80:85,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 //SC_REPRODUCE#Reproduce#
2286,0,0,40:45:50:55:60:65:70:75:80:85,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 //SC_AUTOSHADOWSPELL#Auto Shadow Spell#
2287,0,0,40:50:60:70:80,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 //SC_SHADOWFORM#Shadow Form#
@@ -669,21 +669,21 @@
2308,0,0,20:20:20:20:20:25:25:25:25:25,0,0,0,4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_BANISHINGPOINT#Banishing Point#
2309,0,0,30:45:60,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 //LG_TRAMPLE#Trample#
2310,0,0,10:12:14:16:18,0,0,0,99,0,0,shield,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_SHIELDPRESS#Shield Press#
-2311,0,0,40:50:60:70:80,0,0,0,99,0,0,shield,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_REFLECTDAMAGE#Reflect Damage#
-2312,0,0,30,0,0,0,4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_PINPOINTATTACK#Pinpoint Attack#
+2311,0,0,60:80:100:120:140,0,0,0,99,0,0,shield,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_REFLECTDAMAGE#Reflect Damage#
+2312,0,0,50,0,0,0,4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_PINPOINTATTACK#Pinpoint Attack#
2313,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 //LG_FORCEOFVANGUARD#Force of Vanguard#
2314,0,0,150,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 //LG_RAGEBURST#Rage Burst#
2315,0,0,50,0,0,0,99,0,0,shield,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_SHIELDSPELL#Shield Spell#
-2316,0,0,24:28:32:36: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 //LG_EXEEDBREAK#Exceed Break#
-2317,0,0,42:44:46:48:50,0,0,0,4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_OVERBRAND#Over Brand#
+2316,0,0,20:32:44:56:68,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 //LG_EXEEDBREAK#Exceed Break#
+2317,0,0,20:30:40:50:60,0,0,0,4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_OVERBRAND#Over Brand#
2318,0,0,75:80:85:90:95,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 //LG_PRESTIGE#Prestige#
2319,0,0,30:36:42:48:54,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 //LG_BANDING#Banding#
-2320,0,0,20:24:28:32: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 //LG_MOONSLASHER#Moon Slasher#
-2321,0,0,60,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 //LG_RAYOFGENESIS#Ray of Genesis#
+2320,0,0,20:24:28:32:36,0,0,0,4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_MOONSLASHER#Moon Slasher#
+2321,0,0,60:65:70:75:80,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 //LG_RAYOFGENESIS#Ray of Genesis#
2322,0,0,40:45:50:55:60,0,0,0,99,0,0,none,0,523,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_PIETY#Piety#
2323,0,0,52:60:68:76:84,0,0,0,99,0,0,shield,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_EARTHDRIVE#Earth Drive#
-2324,0,0,80:90:100:110:120,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 //LG_HESPERUSLIT#Hesperus Lit#
-2325,0,0,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 //LG_INSPIRATION#Inspiration#
+2324,0,0,80:90:100:110:120,0,0,0,4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_HESPERUSLIT#Hesperus Lit#
+2325,0,0,80:90:100:110:120,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 //LG_INSPIRATION#Inspiration#
//****
// SR Sura
@@ -693,7 +693,7 @@
2329,0,0,20:30:40:50:60,0,0,0,99,0,0,none,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE#Fallen Empire#
2330,0,0,1:2:3:4:5:6:7:8:9:10,-12:-14:-16:-18:-20:-22:-24:-26:-28:-30,-6:-7:-8:-9:-10:-11:-12:-13:-14:-15,0,99,0,0,explosionspirits,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_TIGERCANNON#Tiger Cannon#
2331,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 //SR_HELLGATE#Hell Gate#
-2332,0,0,110:120:130:140:150,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 //SR_RAMPAGEBLASTER#Rampage Blaster#
+2332,0,0,150,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 //SR_RAMPAGEBLASTER#Rampage Blaster#
2333,0,0,80,0,0,0,99,0,0,none,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_CRESCENTELBOW#Crescent Elbow#
2334,0,0,40:60:80:100:120,-1:-2:-3:-4:-5,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 //SR_CURSEDCIRCLE#Cursed Circle#
2335,0,0,80:70:60:50:40,-5:-4:-3:-2:-1,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 //SR_LIGHTNINGWALK#Lightning Walk#
@@ -734,22 +734,22 @@
2416,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 //WM_REVERBERATION_MAGIC#Reverberation Magic#
2417,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 //WM_DOMINION_IMPULSE#Dominion Impulse#
2418,0,0,80:90:100:110:120,0,0,0,11,1,20,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_SEVERE_RAINSTORM#Severe Rainstorm#
-2419,0,0,12:16:20:24:28,0,0,0,99,0,0,none,0,11513,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_POEMOFNETHERWORLD#Poem of Netherworld#
+2419,0,0,12:16:20:24:28,0,0,0,13:14,0,0,none,0,11513,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_POEMOFNETHERWORLD#Poem of Netherworld#
2420,0,0,48:56:64:72:80,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_VOICEOFSIREN#Voice of Siren#
-2421,0,0,50:53:56:59:62,0,0,0,99,0,0,none,0,6144,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_DEADHILLHERE#Valley of Death#
+2421,0,0,50:53:56:59:62,0,0,0,13:14,0,0,none,0,6144,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_DEADHILLHERE#Valley of Death#
2422,0,0,80:90:100:110:120,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_LULLABY_DEEPSLEEP#Deep Sleep Lullaby#
2423,0,0,42:46:50:54:58,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_SIRCLEOFNATURE#Circle of Nature's Sound#
-2424,0,0,40:45:50:55:60,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_RANDOMIZESPELL#Improvised Song#
-2425,0,0,60,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 //MW_GLOOMYDAY#Gloomy Day#
-2426,0,0,80:90:100:110:120,0,0,0,99,0,0,none,0,11513,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_GREAT_ECHO#Great Echo# - Missing 1 Lozange. Need item ID.
-2427,0,0,120:140:160:180:200,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 //WM_SONG_OF_MANA#Song of Mana#
-2428,0,0,120:140:160:180:200,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 //WM_DANCE_WITH_WUG#Dance With Warg#
-2429,0,0,50:60:70:80: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 //WM_SOUND_OF_DESTRUCTION#Sound of Destruction#
-2430,0,0,150:160:170:180:190,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 //WM_SATURDAY_NIGHT_FEVER#Saturday Night Fever#
-2431,0,0,120:130:140:150:160,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 //WM_LERADS_DEW#Lerad's Dew#
-2432,0,0,120:130:140:150:160,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 //WM_MELODYOFSINK#Melody of Sink#
-2433,0,0,120:130:140:150:160,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 //WM_WARCRY_OF_BEYOND#Warcry of Beyond#
-2434,0,0,120:130:140:150:160,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 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice#
+2424,0,0,40:45:50:55:60,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 //WM_RANDOMIZESPELL#Improvised Song#
+2425,0,0,60:75:90:105:120,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MW_GLOOMYDAY#Gloomy Day#
+2426,0,0,80:90:100:110:120,0,0,0,99,0,0,none,0,11513,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_GREAT_ECHO#Great Echo#
+2427,0,0,120:140:160:180:200,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_SONG_OF_MANA#Song of Mana#
+2428,0,0,120:140:160:180:200,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_DANCE_WITH_WUG#Dance With Warg#
+2429,0,0,50:60:70:80:90,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_SOUND_OF_DESTRUCTION#Sound of Destruction#
+2430,0,0,150:160:170:180:190,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_SATURDAY_NIGHT_FEVER#Saturday Night Fever#
+2431,0,0,120:130:140:150:160,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_LERADS_DEW#Lerad's Dew#
+2432,0,0,120:130:140:150:160,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_MELODYOFSINK#Melody of Sink#
+2433,0,0,120:130:140:150:160,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_BEYOND_OF_WARCRY#Warcry of Beyond#
+2434,0,0,120:130:140:150:160,0,0,0,13:14,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_UNLIMITED_HUMMING_VOICE#Unlimited Humming Voice#
//****
// SO Sorcerer
@@ -782,7 +782,7 @@
//****
// GN Genetic
2476,0,0,30,0,0,0,99,0,0,cart,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_CART_TORNADO#Cart Tornado#
-2477,0,0,40:42:46:48:50,0,0,0,99,8,1,cart,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_CARTCANNON#Cart Cannon#
+2477,0,0,40:42:44:46:48,0,0,0,99,8,1,cart,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_CARTCANNON#Cart Cannon#
2478,0,0,20:24:28:32:36,0,0,0,99,0,0,cart,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_CARTBOOST#Cart Boost#
2479,0,0,22:26:30:34:38,0,0,0,99,0,0,none,0,6210,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_THORNS_TRAP#Thorn Trap#
2480,0,0,30:35:40:45:50,0,0,0,99,0,0,none,0,6211,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_BLOOD_SUCKER#Blood Sucker#
@@ -810,7 +810,7 @@
2534,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 //RETURN_TO_ELDICASTES#Return To Eldicastes#
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,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_ODINS_POWER#Odin's Power#
+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#
//2538,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 //BEER_BOTTLE_CAP#Beer Bottle Cap#
@@ -876,18 +876,18 @@
// EP 14.3 Part 2 3rd Job Skills
5001,0,0,22:34:46:58:70,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 //GC_DARKCROW#Dark Claw#
5002,0,0,100:120:140:160:180,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 //RA_UNLIMIT#Unlimited#
-5003,0,0,60:70:80:90: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 //GN_ILLUSIONDOPING#Illusion Doping#
+5003,0,0,60:70:80:90:100,0,0,0,99,0,0,none,0,970,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_ILLUSIONDOPING#Illusion Doping#
5004,0,0,30:35:40:45:50:55:60:65:70:75,0,0,0,99,0,0,dragon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RK_DRAGONBREATH_WATER#Dragon Breath - Water#
5005,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 //RK_LUXANIMA#Lux Anima#
5006,0,0,60:70:80:90: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 //NC_MAGMA_ERUPTION#Magma Eruption#
-5007,0,0,200:230:260:290:320,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 //WM_FRIGG_SONG#Frigg's Song#
-5008,0,0,120:120:120:120:120,0,0,0,99,0,0,elementalspirit,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_ELEMENTAL_SHIELD#Elemental Shield#
-5009,0,0,75:65:55:45:35,0,0,0,99,0,0,none,5:5:4:4:3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO#Flash Combo#
+5007,0,0,200:230:260:290:320,0,0,0,13:14,0,0,none,0,6144,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#Frigg's Song#
+5008,0,0,120,0,0,0,99,0,0,elementalspirit,0,717,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_ELEMENTAL_SHIELD#Elemental Shield#
+5009,0,0,65,0,0,0,99,0,0,none,5:5:4:4:3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO#Flash Combo#
5010,0,0,30:26:22:18:14,0,0,0,99,0,0,none,0,7940,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SC_ESCAPE#Emergency Escape#
5011,0,0,30:60:90:120:150,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 //AB_OFFERTORIUM#Offertorium#
5012,0,0,100:150:200:250:300,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 //WL_TELEKINESIS_INTENSE#Intense Telekinesis#
5013,0,0,200:180:160:140:120,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 //LG_KINGS_GRACE#King's Grace#
-5014,0,0,1:1:1:1: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_FULL_THROTTLE#Full Throttle#
+5014,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_FULL_THROTTLE#Full Throttle#
5015,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 //SR_FLASHCOMBO_ATK_STEP1#Flash Combo Attack Step 1#//All 4 steps are using temp req SP values for now.
5016,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 //SR_FLASHCOMBO_ATK_STEP2#Flash Combo Attack Step 2#
5017,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 //SR_FLASHCOMBO_ATK_STEP3#Flash Combo Attack Step 3#
diff --git a/db/pre-re/skill_unit_db.txt b/db/pre-re/skill_unit_db.txt
index ec2f45efc..bba3670e8 100644
--- a/db/pre-re/skill_unit_db.txt
+++ b/db/pre-re/skill_unit_db.txt
@@ -99,58 +99,57 @@
//706,0xfd, , 0, 0,1000,all, 0x000 //NPC_VENOMFOG
-2044,0xca, , 0, 3,1000,all, 0x018 //AB_EPICLESIS
+2044,0xca, , 0, 2,1000,all, 0x018 //AB_EPICLESIS
2032,0xe1, , 2, 0,1000,enemy, 0x018 //GC_POISONSMOKE
2213,0x86, , 0, 8, 100,enemy, 0x018 //WL_COMET
2216,0xcb, , -1, 0, 100,enemy, 0x018 //WL_EARTHSTRAIN
-2238,0xd8, , 0, 1,1000,enemy, 0x006 //RA_ELECTRICSHOCKER
-2239,0xd9, , 0, 1,1000,enemy, 0x006 //RA_CLUSTERBOMB
-2249,0xd2, , 0, 1,1000,enemy, 0x022 //RA_MAGENTATRAP
-2250,0xd3, , 0, 1,1000,enemy, 0x022 //RA_COBALTTRAP
-2251,0xd4, , 0, 1,1000,enemy, 0x022 //RA_MAIZETRAP
-2252,0xd5, , 0, 1,1000,enemy, 0x022 //RA_VERDURETRAP
+2238,0xd8, , 0, 2,1000,enemy, 0x006 //RA_ELECTRICSHOCKER
+2239,0xd9, , 0, 0,1000,enemy, 0x006 //RA_CLUSTERBOMB
+2249,0xd2, , 0, 2,1000,enemy, 0x022 //RA_MAGENTATRAP
+2250,0xd3, , 0, 2,1000,enemy, 0x022 //RA_COBALTTRAP
+2251,0xd4, , 0, 2,1000,enemy, 0x022 //RA_MAIZETRAP
+2252,0xd5, , 0, 2,1000,enemy, 0x022 //RA_VERDURETRAP
2253,0xd6, , 0, 1,1000,enemy, 0x002 //RA_FIRINGTRAP
2254,0xd7, , 0, 1,1000,enemy, 0x002 //RA_ICEBOUNDTRAP
-2273,0xe2, , 1, 0, 500,friend,0x000 //NC_NEUTRALBARRIER
-2274,0xe3, , 1, 0, 500,all, 0x000 //NC_STEALTHFIELD
+2273,0xe2, , 2, 0, 500,friend,0x000 //NC_NEUTRALBARRIER
+2274,0xe3, , 2, 0, 500,all, 0x000 //NC_STEALTHFIELD
2299,0xcc, , 0, 1,1000,all, 0x006 //SC_MANHOLE
2300,0xcd, , 0, 1,1000,all, 0x006 //SC_DIMENSIONDOOR
-2301,0xce, , 2, 0, -1,all, 0x200E //SC_CHAOSPANIC
-2302,0xcf, , 0, 2, -1,enemy, 0x002 //SC_MAELSTROM
+2301,0xce, , 2, 0, -1,enemy, 0x200E //SC_CHAOSPANIC
+2302,0xcf, , 2, 0, -1,all, 0x2002 //SC_MAELSTROM
2303,0xd0, , 3, 0, -1,all, 0x2018 //SC_BLOODYLUST
-2304,0xd1, , 0, 2, -1,enemy, 0x000 //SC_FEINTBOMB
+2304,0xd1, , 0, 2,1000,enemy, 0x018 //SC_FEINTBOMB
2319,0xec, , 0, 3,5000,all, 0x000 //LG_BANDING
-2414,0xda, , 0, 0,1000,enemy, 0x008 //WM_REVERBERATION
+2414,0xda, , 0, 0, -1,enemy, 0x000 //WM_REVERBERATION
2418,0xdb, , 0, 5, 300,enemy, 0x800 //WM_SEVERE_RAINSTORM
2419,0xde, , 0, 1,1000,all, 0x014 //WM_POEMOFNETHERWORLD
-2443,0xdc, , 0, 0,1000,enemy, 0x00A //SO_FIREWALK
+2443,0xdc, , 0, 0,300,enemy, 0x00A //SO_FIREWALK
2444,0xdd, , 0, 0,1000,enemy, 0x00A //SO_ELECTRICWALK
2446,0x86, , 0, 3:3:3:4:4,1000,enemy, 0x018 //SO_EARTHGRAVE
2447,0x86, , 0, 3:3:3:4:4,1000,enemy, 0x018 //SO_DIAMONDDUST
2449,0xdf, , 0, 3:3:4:4:5,500,enemy, 0x018 //SO_PSYCHIC_WAVE
-2450,0xe0, , 0, 3, 500,enemy, 0x010 //SO_CLOUD_KILL
+2450,0xe0, , 3, 0, 500,enemy, 0x010 //SO_CLOUD_KILL
2452,0xe4, , 0, 3,3000,all, 0x010 //SO_WARMER
-2453,0xeb, , 0, 1:1:2:2:3,1000,enemy,0x010 //SO_VACUUM_EXTREME
+2453,0xeb, , 0, 1:1:2:2:3,500,enemy,0x010 //SO_VACUUM_EXTREME
2465,0xf1, , 0, 1,1000,all, 0x010 //SO_FIRE_INSIGNIA
2466,0xf2, , 0, 1,1000,all, 0x010 //SO_WATER_INSIGNIA
2467,0xf3, , 0, 1,1000,all, 0x010 //SO_WIND_INSIGNIA
2468,0xf4, , 0, 1,1000,all, 0x010 //SO_EARTH_INSIGNIA
-2479,0xe5, , 0, 1,1000,enemy, 0x000 //GN_THORNS_TRAP
-2482,0xe6,0x7f, -1, 1, -1,all, 0x000 //GN_WALLOFTHORN
-2484,0x86, , 0, 1, 100,enemy, 0x080 //GN_CRAZYWEED_ATK
-2485,0xe7, , 0, 3,1000,enemy, 0x098 //GN_DEMONIC_FIRE
+2479,0xe5, , 0, 1,1000,enemy, 0x006 //GN_THORNS_TRAP
+2482,0xe6,0x7f, -1, 2, -1,all, 0x000 //GN_WALLOFTHORN
+2485,0xe7, , 0, 3,2000,enemy, 0x098 //GN_DEMONIC_FIRE
2487,0xe8, , 0, 3,1000,enemy, 0x000 //GN_FIRE_EXPANSION_SMOKE_POWDER
2488,0xe9, , 0, 3,1000,enemy, 0x000 //GN_FIRE_EXPANSION_TEAR_GAS
-2490,0xea, , 0, 1,1000,enemy, 0x002 //GN_HELLS_PLANT
+2490,0xea, , 0, 1,1000,all, 0x002 //GN_HELLS_PLANT
2555,0x104, , 0, 1:2:2:3:3,500,enemy,0x006 //RL_B_TRAP
@@ -161,7 +160,8 @@
3010,0xfc, , 0, 0,5000,enemy, 0x018 //KO_MAKIBISHI
5006,0x101, , 0, 3,2000,enemy, 0x018 //NC_MAGMA_ERUPTION
-5010,0xfe, , 0, 2, -1,enemy, 0x000 //SC_SCAPE
+5008,0x7e, , 0, 0, -1,all, 0x003 //SO_ELEMENTAL_SHIELD
+5010,0xfe, , 0, 2, -1,enemy, 0x000 //SC_ESCAPE
8020,0xf5, , 0, 3,2300:2100:1900:1700:1500,enemy, 0x018 //MH_POISON_MIST
8033,0x7e, , 0, 0, -1,all, 0x003 //MH_STEINWAND
@@ -176,11 +176,11 @@
8212,0x97, , 0, 1,1000,enemy, 0x006 //MA_FREEZINGTRAP
8403,0xed, , -1, 1,1000,enemy, 0x018 //EL_FIRE_MANTLE
-8406,0xee, , 0, 1, -1,friend,0x018 //EL_WATER_BARRIER
-8409,0xef, , 0, 1,1000,friend,0x018 //EL_ZEPHYR
-8412,0xf0, , 0, 1, -1,friend,0x018 //EL_POWER_OF_GAIA
-
-10006,0xc1, , 2, 0, -1,sameguild, 0x040 //GD_LEADERSHIP
-10007,0xc2, , 2, 0, -1,sameguild, 0x040 //GD_GLORYWOUNDS
-10008,0xc3, , 2, 0, -1,sameguild, 0x040 //GD_SOULCOLD
-10009,0xc4, , 2, 0, -1,sameguild, 0x040 //GD_HAWKEYES
+8406,0xee, , 0, 1, -1,friend,0x2018 //EL_WATER_BARRIER
+8409,0xef, , 0, 1, -1,friend,0x2018 //EL_ZEPHYR
+8412,0xf0, , 0, 1, -1,friend,0x2018 //EL_POWER_OF_GAIA
+
+10006,0xc1, , 2, 0, -1,sameguild, 0x040 //GD_LEADERSHIP
+10007,0xc2, , 2, 0, -1,sameguild, 0x040 //GD_GLORYWOUNDS
+10008,0xc3, , 2, 0, -1,sameguild, 0x040 //GD_SOULCOLD
+10009,0xc4, , 2, 0, -1,sameguild, 0x040 //GD_HAWKEYES
diff --git a/db/produce_db.txt b/db/produce_db.txt
index 9588edb14..83499bb53 100644
--- a/db/produce_db.txt
+++ b/db/produce_db.txt
@@ -420,8 +420,8 @@
12732,24,2010,3,1035,1,7221,1,7938,1,7939,1
//-- Runstone Hagalas <-- RK_RUNEMASTERY Lv4, 1 Round Shell, 1 Dragon's Skin, 1 Elder Branch
12733,24,2010,4,1096,1,7123,1,7939,1
-//-- Runstone Lux Anima <-- RK_RUNEMASTERY Lv10, 3 Gold, 3 Light Granule
-22540,24,2010,10,969,3,7938,3
+//-- Runstone Lux Anima <-- RK_RUNEMASTERY Lv10, 3 Gold, 3 Light Granule, 1 Elder Branch
+22540,24,2010,10,969,3,7938,3,7939,1
//==============================================
//===== Guillotine Cross Poisons === ItemLv=25 =
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 24638452b..17412756e 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -8314,7 +8314,11 @@ item_db: (
WeaponLv: 4
EquipLv: 95
View: 16
- Script: <" bonus bAspdRate,getrefine(); ">
+ Script: <"
+ bonus bAspdRate,getrefine();
+ bonus4 bSetDefRace,RC_DemiHuman,10000,5000,1;
+ bonus4 bSetMDefRace,RC_DemiHuman,10000,5000,1;
+ ">
},
{
Id: 1294
@@ -8331,7 +8335,7 @@ item_db: (
WeaponLv: 4
EquipLv: 95
View: 16
- Script: <" bonus2 bSPVanishRate,10000,10; ">
+ Script: <" bonus3 bSPVanishRate,10000,10,BF_NORMAL; ">
},
{
Id: 1295
@@ -9737,7 +9741,7 @@ item_db: (
View: 7
Script: <"
bonus bUnbreakableWeapon,0;
- bonus2 bSPVanishRate,10000,10;
+ bonus3 bSPVanishRate,10000,10,BF_NORMAL;
">
},
{
@@ -87834,7 +87838,11 @@ item_db: (
WeaponLv: 4
EquipLv: 95
View: 1
- Script: <" bonus bAspdRate,getrefine(); ">
+ Script: <"
+ bonus bAspdRate,getrefine();
+ bonus4 bSetDefRace,RC_DemiHuman,10000,5000,1;
+ bonus4 bSetMDefRace,RC_DemiHuman,10000,5000,1;
+ ">
},
{
Id: 13073
@@ -107399,6 +107407,8 @@ item_db: (
bonus bUnbreakableWeapon,0;
bonus2 bAddEff,Eff_Stun,1000+getrefine();
bonus bAspdRate,getrefine();
+ bonus4 bSetDefRace,RC_DemiHuman,10000,5000,1;
+ bonus4 bSetMDefRace,RC_DemiHuman,10000,5000,1;
">
},
{
@@ -111241,7 +111251,7 @@ item_db: (
EquipLv: 95
View: 11
Script: <"
- bonus2 bSPVanishRate,10000,4;
+ bonus3 bSPVanishRate,10000,4,BF_NORMAL;
bonus bAspd,-5;
">
},
@@ -117936,7 +117946,7 @@ item_db: (
WeaponLv: 4
EquipLv: 95
View: 3
- Script: <" bonus2 bSPVanishRate,10000,8; ">
+ Script: <" bonus3 bSPVanishRate,10000,8,BF_NORMAL; ">
},
{
Id: 21003
@@ -118079,10 +118089,8 @@ item_db: (
bonus bHit,8;
bonus bCritical,8;
bonus2 bAddRace,RC_DemiHuman,30;
- bonus2 bAddRace,RC_Player,30;
bonus2 bVariableCastrate,"GS_TRACKING",-20;
bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10;
- bonus2 bIgnoreDefRaceRate,RC_Player,10;
bonus bUnbreakableWeapon,0;
">
},
@@ -118104,9 +118112,7 @@ item_db: (
bonus bDex,2;
bonus bSplashRange,1;
bonus2 bAddRace,RC_DemiHuman,30;
- bonus2 bAddRace,RC_Player,30;
bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10;
- bonus2 bIgnoreDefRaceRate,RC_Player,10;
autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,100,1000; }",30,6000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
bonus bUnbreakableWeapon,0;
">
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index fc2ec0aff..b9723a99b 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -71,7 +71,38 @@ zones: (
}
disabled_items: {
-
+ Velum_Jamadhar: true
+ Velum_Scare: true
+ Velum_Buster: true
+ Velum_Guillotine: true
+ Velum_Spear: true
+ Velum_Glaive: true
+ Velum_Bible: true
+ Velum_Encyclopedia: true
+ Velum_Claw: true
+ Velum_Arc_Wand: true
+ Velum_Damascus: true
+ Velum_Stunner: true
+ Velum_Flail: true
+ Velum_Arbalest: true
+ Velum_CrossBow: true
+ Velum_Claymore: true
+ Velum_Katzbalger: true
+ Siege_Arrow_A: true
+ Siege_Arrow_S: true
+ Siege_Greave: true
+ Siege_Boots: true
+ Siege_Shoes: true
+ Siege_Manteau: true
+ Siege_Muffler: true
+ Siege_White_Potion: true
+ Siege_Blue_Potion: true
+ Woe_Violet_Potion: true
+ Woe_White_Potion: true
+ Woe_Blue_Potion: true
+ Siege_Plate: true
+ Siege_Suits: true
+ Siege_Robe: true
}
mapflags: (
)
@@ -214,6 +245,38 @@ zones: (
disabled_items: {
Assumptio_5_Scroll: true
Pty_Assumptio_Scroll: true
+ Velum_Jamadhar: true
+ Velum_Scare: true
+ Velum_Buster: true
+ Velum_Guillotine: true
+ Velum_Spear: true
+ Velum_Glaive: true
+ Velum_Bible: true
+ Velum_Encyclopedia: true
+ Velum_Claw: true
+ Velum_Arc_Wand: true
+ Velum_Damascus: true
+ Velum_Stunner: true
+ Velum_Flail: true
+ Velum_Arbalest: true
+ Velum_CrossBow: true
+ Velum_Claymore: true
+ Velum_Katzbalger: true
+ Siege_Arrow_A: true
+ Siege_Arrow_S: true
+ Siege_Greave: true
+ Siege_Boots: true
+ Siege_Shoes: true
+ Siege_Manteau: true
+ Siege_Muffler: true
+ Siege_White_Potion: true
+ Siege_Blue_Potion: true
+ Woe_Violet_Potion: true
+ Woe_White_Potion: true
+ Woe_Blue_Potion: true
+ Siege_Plate: true
+ Siege_Suits: true
+ Siege_Robe: true
}
/* knockback disabled */
@@ -346,6 +409,38 @@ zones: (
disabled_items: {
Greed_Scroll: true
+ Velum_Jamadhar: true
+ Velum_Scare: true
+ Velum_Buster: true
+ Velum_Guillotine: true
+ Velum_Spear: true
+ Velum_Glaive: true
+ Velum_Bible: true
+ Velum_Encyclopedia: true
+ Velum_Claw: true
+ Velum_Arc_Wand: true
+ Velum_Damascus: true
+ Velum_Stunner: true
+ Velum_Flail: true
+ Velum_Arbalest: true
+ Velum_CrossBow: true
+ Velum_Claymore: true
+ Velum_Katzbalger: true
+ Siege_Arrow_A: true
+ Siege_Arrow_S: true
+ Siege_Greave: true
+ Siege_Boots: true
+ Siege_Shoes: true
+ Siege_Manteau: true
+ Siege_Muffler: true
+ Siege_White_Potion: true
+ Siege_Blue_Potion: true
+ Woe_Violet_Potion: true
+ Woe_White_Potion: true
+ Woe_Blue_Potion: true
+ Siege_Plate: true
+ Siege_Suits: true
+ Siege_Robe: true
}
}
)
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index c19ecb20f..959402d53 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -1279,7 +1279,7 @@
//-- RA_ICEBOUNDTRAP
2254,0,0,0,15000,20000,0,0
//-- RA_UNLIMIT
-5002,0,500,0,60000,0,240000,1000
+5002,0,500,0,60000,0,300000,1000
//==========================================
//===== Mechanic ===========================
@@ -1723,7 +1723,7 @@
//==========================================
//-- ALL_FULL_THROTTLE
-5014,0,0,0,10000:15000:20000:25000:30000,10000,20000:25000:30000:35000:40000,-1
+5014,0,0,0,10000:15000:20000:25000:30000,10000,1800000,-1
//===== Homunculus Skills ==================
//-- HLIF_HEAL
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index c453d4eaf..85da031f9 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -101,12 +101,12 @@
54,9,6,16,6,0x1,0,4,1,yes,0,0,0,magic,0, ALL_RESURRECTION,Resurrection
55,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, KN_SPEARMASTERY,Spear Mastery
56,-2,8,1,-1,0,0,10,3,no,0,0,0,weapon,0, KN_PIERCE,Pierce
-57,-2,6,1,-1,0x1,0,10,1,no,33,0,0,weapon,3, KN_BRANDISHSPEAR,Brandish Spear
+57,-2,6,1,-1,0x1,0,10,1,no,0,0,0,weapon,3, KN_BRANDISHSPEAR,Brandish Spear
58,-4,6,1,-1,0x2,0,10,1,no,0,0,0,weapon,6, KN_SPEARSTAB,Spear Stab
59,3:5:7:9:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0, KN_SPEARBOOMERANG,Spear Boomerang
60,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0, KN_TWOHANDQUICKEN,Twohand Quicken
61,0,6,4,-1,0x20,0,5,1,no,0,0,0,weapon,0, KN_AUTOCOUNTER,Counter Attack
-62,-2,6,1,-1,0x2,1,10,1,no,33,0,0,weapon,1, KN_BOWLINGBASH,Bowling Bash
+62,-2,6,1,-1,0x2,1,10,1,no,0,0,0,weapon,1, KN_BOWLINGBASH,Bowling Bash
63,0,0,0,0,0,0,1,0,no,0,0,0,weapon,0, KN_RIDING,Peco Peco Riding
64,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0, KN_CAVALIERMASTERY,Cavalier Mastery
65,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, PR_MACEMASTERY,Mace Mastery
@@ -179,7 +179,7 @@
133,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0, AS_LEFT,Lefthand Mastery
134,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, AS_KATAR,Katar Mastery
135,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0, AS_CLOAKING,Cloaking
-136,-1,8,1,-1,0,0,10,-8,no,0,0,0,weapon,0, AS_SONICBLOW,Sonic Blow
+136,1,8,1,-1,0,0,10,-8,no,0,0,0,weapon,0, AS_SONICBLOW,Sonic Blow
137,3:4:5:6:7,6,1,-1,0x2,1,5,1,no,0,0,0,weapon,0,AS_GRIMTOOTH,Grimtooth
138,1,6,16,5,0x1,0,10,1,no,0,0x400,0,weapon,0, AS_ENCHANTPOISON,Enchant Poison
139,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0, AS_POISONREACT,Poison React
@@ -382,7 +382,7 @@
336,9,6,4,0,0x1,3,1,1,yes,0,0x4,1,none,0, WE_CALLPARTNER,I miss You
337,9,6,1,-1,0,0,1,1,no,0,0x2,0,weapon,0, ITM_TOMAHAWK,Throw Tomahawk
338,-1,8,1,7,0,0,10,-2,no,0,0x2,0,weapon,0, NPC_DARKCROSS,Cross of Darkness
-339,5,6,4,7,0x48,0,10,1,no,33,0x102,0,magic,0, NPC_GRANDDARKNESS,Grand cross of Darkness
+339,5,6,4,7,0x48,0,10,1,no,0,0x102,0,magic,0, NPC_GRANDDARKNESS,Grand cross of Darkness
340,9,8,1,7,0,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,0x2,0,magic,0, NPC_DARKSTRIKE,Soul Strike of Darkness
341,9,8,1,7,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0x2,0,magic,2:3:3:4:4:5:5:6:6:7, NPC_DARKTHUNDER,Darkness Jupitel
342,9,6,1,0,0x1,0,1,0,no,0,0x2,0,none,0, NPC_STOP,Stop
@@ -449,7 +449,7 @@
403,0,0,4,0,0x1,0,1,1,yes,0,0,0,magic,0, PF_MEMORIZE,Foresight
404,9,6,2,2,0x1,0,5,1,yes,0,0x100,2,magic,0, PF_FOGWALL,Blinding Mist
405,7,6,1,0,0x1,0,1,1,no,0,0,3,magic,0, PF_SPIDERWEB,Fiber Lock
-406,0,6,4,-1,0xA,2,10,1,no,33,0,0,weapon,0, ASC_METEORASSAULT,Meteor Assault
+406,0,6,4,-1,0xA,2,10,1,no,0,0,0,weapon,0, ASC_METEORASSAULT,Meteor Assault
407,0,6,4,0,0x1,0,1,0,no,0,0,0,none,0, ASC_CDP,Create Deadly Poison
408,9,6,4,0,0x1,0,1,1,yes,0,0x4,0,none,0, WE_BABY,Baby
409,9,6,4,0,0x1,3,1,1,yes,0,0x4,1,none,0, WE_CALLPARENT,Call Parent
@@ -1125,7 +1125,6 @@
5017,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, SR_FLASHCOMBO_ATK_STEP3,Flash Combo Attack Step 3
5018,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, SR_FLASHCOMBO_ATK_STEP4,Flash Combo Attack Step 4
-
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
@@ -1173,7 +1172,7 @@
// Mercenary Skill Place holders
8201,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0, MS_BASH,Bash
8202,0,6,4,3,0x2,2,10,1,no,0,0,0,weapon,2, MS_MAGNUM,Magnum_Break
-8203,-2,6,1,-1,0x2,1,10,1,no,33,0,0,weapon,1, MS_BOWLINGBASH,Bowling_Bash
+8203,-2,6,1,-1,0x2,1,10,1,no,0,0,0,weapon,1, MS_BOWLINGBASH,Bowling_Bash
8204,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0, MS_PARRYING,Parry
8205,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0, MS_REFLECTSHIELD,Shield_Reflect
8206,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0, MS_BERSERK,Frenzy
@@ -1187,7 +1186,7 @@
8214,-9,6,1,-1,0x2,0,1,1,no,0,0x1,0,weapon,6, MA_CHARGEARROW,Arrow_Repel
8215,9,8,1,-1,0,2,5,1,yes,0,0,13,weapon,0, MA_SHARPSHOOTING,Focused_Arrow_Strike
8216,-2,8,1,-1,0,0,10,3,no,0,0,0,weapon,0, ML_PIERCE,Pierce
-8217,-2,6,1,-1,0x1,0,10,1,no,33,0,0,weapon,3, ML_BRANDISH,Brandish_Spear
+8217,-2,6,1,-1,0x1,0,10,1,no,0,0,0,weapon,3, ML_BRANDISH,Brandish_Spear
8218,5,8,1,-1,0x20,0,5,5,no,0,0,0,weapon,0, ML_SPIRALPIERCE,Spiral_Pierce
8219,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0, ML_DEFENDER,Defending_Aura
8220,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0, ML_AUTOGUARD,Guard
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-06 12:17:09 +0000