diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt index 8da2d52e8ae..9548ebe4ca9 100644 --- a/db/re/skill_cast_db.txt +++ b/db/re/skill_cast_db.txt @@ -1147,7 +1147,7 @@ //-- GC_POISONINGWEAPON 2027,0,1000,0,60000:120000:180000:240000:300000,300000,0,-1 //-- GC_WEAPONBLOCKING -2028,0,2000,0,180000,2000,0,-1 +2028,0,2000,0,180000,10000,0,-1 //-- GC_COUNTERSLASH 2029,0,2000,0,0,0,0,-1 //-- GC_WEAPONCRUSH @@ -1194,7 +1194,7 @@ //-- AB_LAUDARAMUS 2048,1000,0,0,60000,0,3000,-1 //-- AB_RENOVATIO -2050,3000,0,0,90000,0,0,2000 +2050,3000,0,0,90000:120000:150000:180000,0,0,2000 //-- AB_HIGHNESSHEAL 2051,1000,1000,0,0,0,3000,-1 //-- AB_CLEARANCE @@ -1264,7 +1264,7 @@ //-- RA_FEARBREEZE 2234,0,0,0,60000:90000:120000:150000:180000,0,0,2000 //-- RA_AIMEDBOLT -2236,4000,1000,0,0,0,0,500 +2236,4000,500,0,0,0,1000,1000 //-- RA_DETONATOR 2237,0,0,0,1000,0,0,-1 //-- RA_ELECTRICSHOCKER @@ -1339,7 +1339,7 @@ //-- NC_AXEBOOMERANG 2278,0,0,0,0,0,5000:4500:4000:3500:3000,-1 //-- NC_POWERSWING -2279,0,1000,0,2000,0,0,-1 +2279,0,1000:1000:1000:1000:1000:500:500:500:500:500,0,2000,0,0,-1 //-- NC_AXETORNADO 2280,0,500,0,0,0,4000:3500:3000:2500:2000,-1 //-- NC_SILVERSNIPER @@ -1405,7 +1405,7 @@ //-- LG_TRAMPLE 2309,0,1000,0,0,0,0,-1 //-- LG_SHIELDPRESS -2310,0,0,0,5500:6000:6500:7000:7500,0,2000,-1 +2310,0,0,0,0,0,2000,-1 //-- LG_REFLECTDAMAGE 2311,0,0,0,300000,0,0,-1 //-- LG_PINPOINTATTACK @@ -1427,7 +1427,7 @@ //-- LG_MOONSLASHER 2320,1000,1000,0,1000,0,6000:5000:4000:3000:2000,-1 //-- LG_RAYOFGENESIS -2321,2000:2500:3000:3500:4000,2000,0,10000,0,5000,500 +2321,1000:1500:2000:2500:3000:3500:4000:4500:5000:5500,2000,0,10000,0,3500,500 // !TODO: Confirm cast delay and cooldown //-- LG_PIETY 2322,3000:2500:2000:1500:1000,0,0,60000:80000:100000:120000:140000,0,0,-1 //-- LG_EARTHDRIVE @@ -1448,7 +1448,7 @@ //-- SR_EARTHSHAKER 2328,0,0,0,1000:2000:2000:3000:3000,0,3000,-1 //-- SR_FALLENEMPIRE -2329,0,0,0,500:1000:1500:2000:2500,0,0,-1 +2329,0,0,0,500:500:1000:1000:1500:1500:2000:2000:2500:2500,0,0,-1 //-- SR_TIGERCANNON 2330,1100:1200:1300:1400:1500:1600:1700:1800:1900:2000,1000,0,0,0,5000,-1 //-- SR_RAMPAGEBLASTER @@ -1505,7 +1505,7 @@ //==== Minstrel/Wanderer skills ============ //-- WM_METALICSOUND -2413,1000:1500:2000:2500:3000,1000,0,0,0,2000:2500:3000:3500:4000,-1 +2413,1000:1500:2000:2500:3000:3500:4000:4500:5000:5500,1000,0,0,0,1000:1500:2000:2500:3000:3500:4000:4500:5000:5500,-1 // !TODO: Confirm all times //-- WM_REVERBERATION 2414,1100:1200:1300:1400:1500,1000,0,9000:10000:11000:12000:13000,0,0,-1 //-- WM_DOMINION_IMPULSE @@ -1554,7 +1554,7 @@ //-- SO_ELECTRICWALK 2444,1000,1000,0,30000,12000,0,-1 //-- SO_SPELLFIST -2445,0,1000,0,20000:25000:30000:35000:40000,0,0,0 +2445,0,1000,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0,0,0 //-- SO_EARTHGRAVE 2446,2200:2400:2600:2800:3000,1000,0,500,8000:11000:14000:17000:20000,5000,1800:1600:1400:1200:1000 //-- SO_DIAMONDDUST @@ -1572,7 +1572,7 @@ //-- SO_VACUUM_EXTREME 2453,1000:1500:2000:2500:3000,1000,0,4000:6000:8000:10000:12000,2000,5000,-1 //-- SO_VARETYR_SPEAR -2454,2200:2400:2600:2800:3000,1000,0,2200:2400:2600:2800:3000,0,2000,1800:1600:1400:1200:1000 +2454,1800:2000:2200:2400:2600:2800:3000:3200:3400:3600,1000,0,1800:2000:2200:2400:2600:2800:3000:3200:3400:3600,0,2000,2000:1800:1600:1400:1200:1000:800:600:400:200 // !TODO: Confirm all times //-- SO_ARRULLO 2455,2200:2400:2600:2800:3000,1000,0,8000:10000:12000:14000:16000,0,5000:6000:7000:8000:9000,800:600:400:200:-1 //-- SO_EL_CONTROL @@ -1603,7 +1603,7 @@ //==== Genetic skills ====================== //-- GN_CART_TORNADO -2476,0,500,0,5000,0,0:500:1000:1500:2000,-1 +2476,0,1000,0,5000,0,2000,-1 //-- GN_CARTCANNON 2477,1000:1500:2000:2500:3000,500,0,0,0,0,-1 //-- GN_CARTBOOST @@ -1613,7 +1613,7 @@ //-- GN_BLOOD_SUCKER 2480,1500,500,0,20000:22000:24000:26000:28000,0,0,-1 //-- GN_SPORE_EXPLOSION -2481,1500,500,0,2000:2000:3000:3000:4000,0,5000,-1 +2481,1500,500,0,2000,0,5000,-1 //-- GN_WALLOFTHORN 2482,1500,500,0,10000:11000:12000:13000:14000,0,5000,-1 //-- GN_CRAZYWEED diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index ddfc0721383..64b97fdcc84 100644 --- a/db/re/skill_db.txt +++ b/db/re/skill_db.txt @@ -927,8 +927,8 @@ //**** // RK Rune Knight -2001,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,0x0, RK_ENCHANTBLADE,Enchant Blade -2002,7:8:9:10:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, RK_SONICWAVE,Sonic Wave +2001,1,6,4,0,0x1,0,10,1,yes,0,0,0,none,0,0x0, RK_ENCHANTBLADE,Enchant Blade +2002,7:7:8:8:9:9:10:10:11:11,6,1,-1,0,0,10,3,no,0,0,0,weapon,0,0x0, RK_SONICWAVE,Sonic Wave 2003,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,3,0x0, RK_DEATHBOUND,Death Bound 2004,5,8,1,-1,0,0,10,-5,no,0,0,0,weapon,0,0x20000, RK_HUNDREDSPEAR,Hundred Spear 2005,1,6,2,4,0x2,2,5,1,no,0,0,0,weapon,3,0x0, RK_WINDCUTTER,Wind Cutter @@ -966,7 +966,7 @@ 2214,11,6,1,0,0x1,0,5,1,yes,0,0,0,magic,0,0x400, WL_CHAINLIGHTNING,Chain Lightning 2215,11,6,1,4,0,0,5,1,no,0,0,0,magic,0,0x0, WL_CHAINLIGHTNING_ATK,Chain Lightning Attack 2216,6,8,2,2,0,0,5,-6:-7:-8:-9:-10,yes,0,0,0,magic,0,0x10000, WL_EARTHSTRAIN,Earth Strain -2217,11,6,1,0,0,0,5,1,yes,0,0,0,magic,0,0x400, WL_TETRAVORTEX,Tetra Vortex +2217,11,6,1,0,0,0:0:0:0:0:1:1:2:2:3,10,1,yes,0,0,0,magic,0,0x400, WL_TETRAVORTEX,Tetra Vortex 2218,11,6,1,3,0,0,5,1,no,0,0,0,magic,0,0x0, WL_TETRAVORTEX_FIRE,Tetra Vortex Fire 2219,11,6,1,1,0,0,5,1,no,0,0,0,magic,0,0x0, WL_TETRAVORTEX_WATER,Tetra Vortex Water 2220,11,6,1,4,0,0,5,1,no,0,0,0,magic,0,0x0, WL_TETRAVORTEX_WIND,Tetra Vortex Wind @@ -981,7 +981,7 @@ 2229,0,6,4,2,0x1,0,5,1,yes,0,0,0,magic,0,0x0, WL_SUMMONSTONE,Summon Stone 2230,11,8,1,0,0,0,2,1,yes,0,0,0,magic,0,0x400, WL_RELEASE,Release //CHECK Should it be left to do multi hit or single hit? 2231,0,6,4,0,0x1,0,1,1,yes,0,0,0,magic,0,0x0, WL_READING_SB,Reading Spellbook -2232,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0, WL_FREEZE_SP,Freeze Spell +2232,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, WL_FREEZE_SP,Freeze Spell //**** @@ -994,7 +994,7 @@ 2026,5,6,16,0,0x1,0,1,1,no,0,0,0,none,0,0x0, GC_ANTIDOTE,Antidote 2027,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, GC_POISONINGWEAPON,Poisoning Weapon 2028,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, GC_WEAPONBLOCKING,Weapon Blocking -2029,0,6,4,-1,0x22,1,5,1,no,0,0,0,weapon,3,0x0, GC_COUNTERSLASH,Counter Slash +2029,0,6,4,-1,0x22,1:1:1:1:1:2:2:2:2:2,10,1,no,0,0,0,weapon,3,0x0, GC_COUNTERSLASH,Counter Slash 2030,-2,6,4,-1,0,0,5,1,no,0,0x200,0,weapon,0,0x0, GC_WEAPONCRUSH,Weapon Crush 2031,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, GC_VENOMPRESSURE,Venom Pressure 2032,5,6,2,0,0x1,0,5,1,yes,0,0,1,none,0,0x0, GC_POISONSMOKE,Poison Smoke @@ -1006,7 +1006,7 @@ //**** // AB Arch Bishop -2038,11,8,1,6,0x2,1,5,-3,yes,0,0,0,magic,0,0x0, AB_JUDEX,Judex +2038,11,8,1,6,0x2,1,10,-3,yes,0,0,0,magic,0,0x0, AB_JUDEX,Judex 2039,0,6,4,0,0x1,0,1,1,yes,0,0,0,magic,0,0x0, AB_ANCILLA,Ancilla 2040,11,8,1,6,0x2,1:1:1:1:1:1:2:2:2:2,10,-10,yes,0,0,0,magic,0,0x0, AB_ADORAMUS,Adoramus 2041,0,6,4,0,0x3,3:7:15,3,1,yes,0,0,0,magic,0,0x0, AB_CLEMENTIA,Crementia @@ -1018,7 +1018,7 @@ 2047,0,6,4,6,0x3,15,4,1,yes,0,0,0,magic,0,0x0, AB_LAUDAAGNUS,Lauda Agnus 2048,0,6,4,6,0x3,15,4,1,yes,0,0,0,magic,0,0x0, AB_LAUDARAMUS,Lauda Ramus 2049,0,0,0,0,0,0,0,0,no,0,0,0,none,0,0x0, AB_EUCHARISTICA,Eucharistica // Removed on kRO -2050,11,6,4,6,0x1,15,1,1,yes,0,0,0,magic,0,0x0, AB_RENOVATIO,Renovatio +2050,11,6,4,6,0x1,15,4,1,yes,0,0,0,magic,0,0x0, AB_RENOVATIO,Renovatio 2051,11,6,16,6,0x21,0,5,1,yes,0,0,0,magic,0,0x0, AB_HIGHNESSHEAL,Highness Heal 2052,11,6,1,0,0x1,0,5,1,yes,0,0x400,0,magic,0,0x10020, AB_CLEARANCE,Clearance 2053,11,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0,0x0, AB_EXPIATIO,Expiatio @@ -1046,7 +1046,7 @@ 2245,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, RA_TOOTHOFWUG,Tooth of Warg 2246,0,6,4,0,0x2,3:4:5:6:7,5,1,no,0,0x40000,0,weapon,0,0x0, RA_SENSITIVEKEEN,Sensitive Keen 2247,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x80040, RA_CAMOUFLAGE,Camouflage -2248,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0, RA_RESEARCHTRAP,Research Trap +2248,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, RA_RESEARCHTRAP,Research Trap 2249,3,6,2,3,0x43,2,1,1,no,0,0x80,1,misc,0,0x2000, RA_MAGENTATRAP,Magenta Trap 2250,3,6,2,1,0x43,2,1,1,no,0,0x80,1,misc,0,0x2000, RA_COBALTTRAP,Cobalt Trap 2251,3,6,2,2,0x43,2,1,1,no,0,0x80,1,misc,0,0x2000, RA_MAIZETRAP,Maize Trap @@ -1062,7 +1062,7 @@ 2258,13,6,1,-1,0x2,1,3,1,no,0,0x40000,0,weapon,0,0x4000, NC_VULCANARM,Vulcan Arm 2259,5,6,1,3,0,1,3,1,no,0,0,5,weapon,0,0x4000, NC_FLAMELAUNCHER,Flame Launcher 2260,7,6,2,1,0x2,2:3:4,3,1,no,0,0x40000,0,weapon,0,0x4000, NC_COLDSLOWER,Cold Slower -2261,9:11:13,6,1,-1,0x42,3:2:1,3,1,no,0,0,0,weapon,0,0x4000, NC_ARMSCANNON,Arm Cannon +2261,9:9:11:11:13,6,1,-1,0x42,1:1:2:2:3,5,1,no,0,0,0,weapon,0,0x4000, NC_ARMSCANNON,Arm Cannon 2262,0,6,4,0,0x1,0,3,1,no,0,0,0,none,0,0x4000, NC_ACCELERATION,Acceleration 2263,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,0x4000, NC_HOVERING,Hovering 2264,0,6,4,0,0x1,0,1,1,no,0,0,0,none,7,0x4000, NC_F_SIDESLIDE,Front-Side Slide @@ -1080,7 +1080,7 @@ 2276,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, NC_TRAININGAXE,Axe Training 2277,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0, NC_RESEARCHFE,Research Fire/Earth 2278,5:6:7:8:9,6,1,-1,0,0,5,1,no,0,0,0,weapon,2:3:4:5:6,0x4000, NC_AXEBOOMERANG,Axe Boomerang -2279,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x4000, NC_POWERSWING,Power Swing +2279,1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0x4000, NC_POWERSWING,Power Swing 2280,0,8,4,-1,0x2,2:2:3:3:3,5,-6,no,0,0x40000,0,weapon,0,0x4000, NC_AXETORNADO,Axe Tornado 2281,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0,0x4000, NC_SILVERSNIPER,FAW - Silver Sniper 2282,2,6,2,0,0x1,0,5,1,yes,0,0,2,none,0,0x4000, NC_MAGICDECOY,FAW - Magic Decoy @@ -1088,7 +1088,7 @@ //**** // SC Shadow Chaser -2284,1,6,1,-1,0x2,1,5,1,no,0,0,0,weapon,0,0x0, SC_FATALMENACE,Fatal Menace +2284,1,6,1,-1,0x2,1:1:1:1:1:2:2:2:2:2,10,1,no,0,0,0,weapon,0,0x0, SC_FATALMENACE,Fatal Menace 2285,0,6,4,0,0x1,0,10,1,no,0,0,0,none,0,0x0, SC_REPRODUCE,Reproduce 2286,0,6,4,0,0x1,0,10,1,yes,0,0,0,none,0,0x0, SC_AUTOSHADOWSPELL,Auto Shadow Spell 2287,5,6,1,0,0x1,0,5,1,no,0,0,0,none,0,0x8040, SC_SHADOWFORM,Shadow Form @@ -1108,14 +1108,14 @@ 2301,7,6,2,0,0x1,0,3,1,yes,0,0x20000,0,magic,0,0x0, SC_CHAOSPANIC,Chaos Panic 2302,7,6,2,0,0x1,0,3,1,yes,0,0x20000,1,magic,0,0x0, SC_MAELSTROM,Maelstrom 2303,7,6,2,0,0x1,0,3,1,yes,0,0,0,none,0,0x0, SC_BLOODYLUST,Bloody Lust -2304,0,6,4,-1,0,0,3,1,no,0,0x40000,0,weapon,3:6:9,0x0, SC_FEINTBOMB,Feint Bomb +2304,0,6,4,-1,0,0,10,1,no,0,0x40000,0,weapon,1:2:3:4:5:6:7:8:9:10,0x0, SC_FEINTBOMB,Feint Bomb //**** // LG Royal Guard 2307,11,8,1,-1,0,1,5,1,no,0,0,11,weapon,0,0x0, LG_CANNONSPEAR,Cannon Spear 2308,7,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,0x0, LG_BANISHINGPOINT,Banishing Point 2309,0,6,4,0,0x3,2,3,1,no,0,0,0,none,0,0x0, LG_TRAMPLE,Trample -2310,1,6,1,0,0,0,5,1,no,0,0,0,weapon,0,0x20000, LG_SHIELDPRESS,Shield Press +2310,1,6,1,0,0,0,10,5,no,0,0,0,weapon,0,0x20000, LG_SHIELDPRESS,Shield Press 2311,0,6,4,0,0x3,3,5,1,no,0,0,0,none,0,0x0, LG_REFLECTDAMAGE,Reflect Damage 2312,5,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,0x0, LG_PINPOINTATTACK,Pinpoint Attack 2313,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,0x0, LG_FORCEOFVANGUARD,Force of Vanguard @@ -1126,7 +1126,7 @@ 2318,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,0x0, LG_PRESTIGE,Prestige 2319,0,6,4,0,0x3,3,5,1,no,0,0,0,weapon,0,0x0, LG_BANDING,Banding 2320,0,6,4,-1,0x2,3,5,1,yes,0,0,0,weapon,0,0x1000, LG_MOONSLASHER,Moon Slasher -2321,1,8,2,6,0x2,5,5,-7,yes,0,0,0,weapon,0,0x0, LG_RAYOFGENESIS,Ray of Genesis +2321,1,8,2,6,0x2,5,10,-7,yes,0,0,0,magic,0,0x0, LG_RAYOFGENESIS,Ray of Genesis 2322,0,6,16,0,0x3,1,5,1,yes,0,0,0,none,0,0x0, LG_PIETY,Piety 2323,0,8,4,2,0x2,1:1:2:2:3,5,-5,yes,0,0,0,weapon,0,0x10000, LG_EARTHDRIVE,Earth Drive 2324,3,8,1,-1,0,0,5,3,yes,0,0,0,weapon,0,0x0, LG_HESPERUSLIT,Hesperus Lit @@ -1139,14 +1139,14 @@ 2326,1,8,1,-1,0,0,10,-2,no,0,0,0,weapon,0,0x0, SR_DRAGONCOMBO,Dragon Combo 2327,0,8,4,-1,0x2,2,5,-3,no,0,0x40000,0,weapon,3,0x0, SR_SKYNETBLOW,Sky Net Blow 2328,0,6,4,-1,0x2,1:2:3:4:5,5,1,no,0,0x40000,0,weapon,0,0x0, SR_EARTHSHAKER,Earth Shaker -2329,1,8,4,-1,0,0,5,-2,no,0,0x200,0,weapon,0,0x0, SR_FALLENEMPIRE,Fallen Empire +2329,1,8,4,-1,0,0,10,-2,no,0,0x200,0,weapon,0,0x0, SR_FALLENEMPIRE,Fallen Empire 2330,1,6,1,-1,0x42,1:1:1:1:1:2:2:2:2:2,10,1,yes,0,0x40000,0,weapon,0,0x0, SR_TIGERCANNON,Tiger Cannon 2331,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, SR_HELLGATE,Hell Gate 2332,0,6,4,-1,0x2,3,5,1,no,0,0x40000,0,weapon,0,0x0, SR_RAMPAGEBLASTER,Rampage Blaster 2333,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SR_CRESCENTELBOW,Crescent Elbow 2334,0,6,4,0,0x3,1:1:2:2:3,5,1,no,0,0,0,none,0,0x0, SR_CURSEDCIRCLE,Cursed Circle 2335,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, 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,0x0, SR_KNUCKLEARROW,Knuckle Arrow +2336,7:7:8:8:9:9:10:10:11:11,6,1,-1,0,0,10,1,no,0,0,0,weapon,2:2:3:3:4:4:5:5:6:6,0x0, SR_KNUCKLEARROW,Knuckle Arrow 2337,0,6,4,-1,0x2,2,1,1,yes,0,0,0,weapon,0,0x1000, SR_WINDMILL,Windmill 2338,0,6,4,0,0x1,0,10,1,no,0,0,0,none,0,0x0, SR_RAISINGDRAGON,Raising Dragon 2339,0,0,0,0,0,0,5,1,no,0,0,0,none,0,0x0, SR_GENTLETOUCH,Gentle Touch @@ -1178,7 +1178,7 @@ //**** // WM Wanderer/Minstrel 2412,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, WM_LESSON,Lesson -2413,9,8,1,-1,0,0,5,-2:-2:-3:-3:-4,yes,0,0,0,magic,0,0x0, WM_METALICSOUND,Metallic Sound +2413,9,8,1,-1,0,0,10,2,yes,0,0,0,magic,0,0x0, WM_METALICSOUND,Metallic Sound 2414,9,6,2,0,0x3,2,5,1,yes,0,0x80,0,none,0,0x0, WM_REVERBERATION,Reverberation 2415,0,6,1,-1,0x6,2,5,1,no,0,0,0,weapon,0,0x0, WM_REVERBERATION_MELEE,Reverberation Melee 2416,0,6,1,0,0x6,2,5,1,no,0,0,0,magic,0,0x0, WM_REVERBERATION_MAGIC,Reverberation Magic @@ -1206,7 +1206,7 @@ // SO Sorcerer (statis blocking need to be confirmed) 2443,0,6,4,3,0,0,5,1,yes,0,0,8:10:12:14:16,magic,0,0x1000, SO_FIREWALK,Fire Walk //CHECK Video and data shows each cell only hits once. 2444,0,6,4,4,0,0,5,1,yes,0,0,8:10:12:14:16,magic,0,0x1000, SO_ELECTRICWALK,Electric Walk -2445,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,0x0, SO_SPELLFIST,Spell Fist +2445,1,6,4,0,0x1,0,10,1,no,0,0,0,none,0,0x0, SO_SPELLFIST,Spell Fist 2446,9,6,2,2,0,0,5,-3,yes,0,0,0,magic,0,0x10000, SO_EARTHGRAVE,Earth Grave 2447,9,6,2,1,0,0,5,-5,yes,0,0,0,magic,0,0x0, SO_DIAMONDDUST,Diamond Dust 2448,9,6,1,5,0x2,1:1:1:1:2,5,1,yes,0,0,0,magic,0,0x0, SO_POISON_BUSTER,Poison Buster @@ -1215,7 +1215,7 @@ 2451,9,6,16,0,0x1,0,5,1,yes,0,0,0,none,0,0x0, SO_STRIKING,Striking 2452,9,6,2,3,0x1,0,5,1,yes,0,0,0,magic,0,0x0, SO_WARMER,Warmer 2453,9,6,2,0,0x1,0,5,1,yes,0,0,0,magic,0,0x1000, SO_VACUUM_EXTREME,Vacuum Extreme -2454,9,6,1,4,0x2,1:1:2:2:3,5,1,yes,0,0,0,magic,0,0x0, SO_VARETYR_SPEAR,Varetyr Spear +2454,9,6,1,4,0x2,1:1:1:2:2:2:3:3:3:4,10,3,yes,0,0,0,magic,0,0x0, SO_VARETYR_SPEAR,Varetyr Spear 2455,7:7:7:7:9,6,2,0,0x3,1:1:2:2:3,5,1,yes,0,0,0,magic,0,0x0, SO_ARRULLO,Arrullo 2456,0,6,4,0,0x1,0,4,1,yes,0,0,0,none,0,0x0, SO_EL_CONTROL,Spirit Control 2457,0,6,4,3,0x1,0,3,1,yes,0,0,0,none,0,0x0, SO_SUMMON_AGNI,Summon Fire Spirit Agni @@ -1235,12 +1235,12 @@ // GN Genetic 2474,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0, GN_TRAINING_SWORD,Sword Training 2475,0,0,0,0,0,0,5,0,no,0,0,0,none,0,0x0, GN_REMODELING_CART,Cart Remodeling -2476,0,6,4,-1,0x2,2,5,1,no,0,0,0,weapon,2,0x0, GN_CART_TORNADO,Cart Tornado +2476,1,6,4,-1,0x2,2,10,3,no,0,0,0,weapon,0,0x0, GN_CART_TORNADO,Cart Tornado 2477,7:8:9:10:11,6,1,-1,0x42,1:1:2:2:3,5,1,yes,0,0,0,weapon,0,0x0, GN_CARTCANNON,Cart Cannon 2478,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,0x0, GN_CARTBOOST,Cart Boost 2479,9,6,2,0,0,0,5,1,yes,0,0x80,3,misc,0,0x0, GN_THORNS_TRAP,Thorn Trap 2480,11,6,1,0,0x1,0,5,1,yes,0,0,3,misc,0,0x0, 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,0x0, GN_SPORE_EXPLOSION,Spore Explosion //CHECK Data says its element is set to neutral. Need to confirm. +2481,11,6,1,-1,0x2,1:1:2:2:3:3:4:4:5:5,10,1,yes,0,0,0,weapon,0,0x0, GN_SPORE_EXPLOSION,Spore Explosion //CHECK Data says its element is set to neutral. Need to confirm. 2482,11,6,2,0,0x8,0,5,1,yes,0,0,1,weapon,2,0x300000, GN_WALLOFTHORN,Wall of Thorns 2483,11,6,2,0,0x3,4,10,1,yes,0,0x0,0,weapon,0,0x1, GN_CRAZYWEED,Crazy Weed 2484,0,6,2,2,0x2,2,10,1,no,0,0x40000,0,weapon,0,0x1, GN_CRAZYWEED_ATK,Crazy Weed Attack diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt index 48b0aad97b0..1aef5740636 100644 --- a/db/re/skill_require_db.txt +++ b/db/re/skill_require_db.txt @@ -552,8 +552,8 @@ //***** // RK Rune Knight -2001,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,0,0 //RK_ENCHANTBLADE -2002,0,0,30:35:40:45:50,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,0,0 //RK_SONICWAVE +2001,0,0,34:38:42:46:50:54:58:62:66: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,0,0 //RK_ENCHANTBLADE +2002,0,0,33:36:39:42:45:48:51:54:57: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,0,0 //RK_SONICWAVE 2003,0,0,50:60:65:70:75:80:85:90:95: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,0,0 //RK_DEATHBOUND 2004,0,0,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,0,0 //RK_HUNDREDSPEAR 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,0,0 //RK_WINDCUTTER @@ -581,7 +581,7 @@ 2026,0,0,10,0,0,0,99,0,0,none,0,0,6128,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_ANTIDOTE 2027,0,0,20:24:28:32:36,0,0,0,1: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,0,0 //GC_POISONINGWEAPON 2028,0,0,40:36:32:28:24,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,0,0 //GC_WEAPONBLOCKING -2029,0,0,5:8:11:14:17,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,0,0 //GC_COUNTERSLASH +2029,0,0,5:8:11:14:17:19:21:23:25:27,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,0,0 //GC_COUNTERSLASH 2030,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,0,0 //GC_WEAPONCRUSH 2031,0,0,30:40:50:60:70,0,0,0,99,0,0,none,SC_POISONINGWEAPON,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_VENOMPRESSURE 2032,0,0,40,0,0,0,99,0,0,none,SC_POISONINGWEAPON,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_POISONSMOKE @@ -609,7 +609,7 @@ 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,0,0 //WL_CHAINLIGHTNING 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,0,0 //WL_CHAINLIGHTNING_ATK 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,0,0 //WL_EARTHSTRAIN -2217,0,0,120:150:180:210: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,0,0 //WL_TETRAVORTEX +2217,0,0,120:150:180:210:240:200:240: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,0,0 //WL_TETRAVORTEX 2218,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,0,0 //WL_TETRAVORTEX_FIRE 2219,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,0,0 //WL_TETRAVORTEX_WATER 2220,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,0,0 //WL_TETRAVORTEX_WIND @@ -628,7 +628,7 @@ //**** // AB Arch Bishop -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,0,0 //AB_JUDEX +2038,0,0,20:23:26:29:32:34:36:38:40:42,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,0,0 //AB_JUDEX 2039,0,0,30,0,-10,0,99,0,0,none,0,0,717,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_ANCILLA 2040,0,0,22:28:34:40:46:52:58:64:70:76,0,0,0,99,0,0,none,0,0,717,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_ADORAMUS 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,0,0 //AB_CLEMENTIA @@ -640,7 +640,7 @@ 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,0,0 //AB_LAUDAAGNUS 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,0,0 //AB_LAUDARAMUS -2050,0,0,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,0,0 //AB_RENOVATIO +2050,0,0,240: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,0,0 //AB_RENOVATIO 2051,0,0,70:100:130:160: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,0,0 //AB_HIGHNESSHEAL 2052,0,0,54:60:66:72:78,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,0,0 //AB_CLEARANCE 2053,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,0,0 //AB_EXPIATIO @@ -656,7 +656,7 @@ 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,0,0 //RA_ARROWSTORM 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,0,0 //RA_FEARBREEZE -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,0,0 //RA_AIMEDBOLT //How many arrows does it require??? +2236,0,0,40,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,0,0 //RA_AIMEDBOLT //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,0,0 //RA_DETONATOR 2238,0,0,35,0,0,0,99,0,0,none,0,0,7940,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_ELECTRICSHOCKER 2239,0,0,20,0,0,0,99,0,0,none,0,0,7940,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RA_CLUSTERBOMB @@ -683,7 +683,7 @@ 2258,0,0,2:4:6,0,0,0,99,0,0,mado,0,0,6145,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_VULCANARM 2259,0,0,20,0,0,0,99,0,0,mado,0,0,2139,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER 2260,0,0,20,0,0,0,99,0,0,mado,0,0,6146,1,6147,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_COLDSLOWER -2261,0,0,30:45:60,0,0,0,99,8,1,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_ARMSCANNON +2261,0,0,40:45:50:55:60,0,0,0,99,8,1,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_ARMSCANNON 2262,0,0,20:40:60,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2800 //NC_ACCELERATION 2263,0,0,25,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2801 //NC_HOVERING 2264,0,0,5,0,0,0,99,0,0,mado,0,0,6146,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_F_SIDESLIDE @@ -700,7 +700,7 @@ 2275,0,0,25:30:35:40:45,0,0,0,99,0,0,mado,0,0,12392,1,12392,1,12393,1,12393,1,12394,1,0,0,0,0,0,0,0,0,2807,0,0 //NC_REPAIR 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,0,0 //NC_AXEBOOMERANG -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,0,0 //NC_POWERSWING +2279,0,0,20:22:24:26:28:30:32:34:36:38,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,0,0 //NC_POWERSWING 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,0,0 //NC_AXETORNADO 2281,0,0,25:30:35:40:45,0,0,0,99,0,0,none,0,0,612,0,615,0,998,1,999,2,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER 2282,0,0,40:45:50:55:60,0,0,0,99,0,0,none,0,0,612,0,615,0,998,2,7054,1,0,0,0,0,0,0,0,0,0,0,0,0,0 //NC_MAGICDECOY @@ -708,7 +708,7 @@ //**** // 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,0,0 //SC_FATALMENACE +2284,0,0,10:14:18:22:26:30:34:38:42:46,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,0,0 //SC_FATALMENACE 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,0,0 //SC_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,0,0 //SC_AUTOSHADOWSPELL 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,0,0 //SC_SHADOWFORM @@ -728,14 +728,14 @@ 2301,0,0,30:36:42,0,0,0,99,0,0,none,0,0,6122,0,6123,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SC_CHAOSPANIC 2302,0,0,50:55:60,0,0,0,99,0,0,none,0,0,6122,0,6123,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SC_MAELSTROM 2303,0,0,60:70:80,0,0,0,99,0,0,none,0,0,6122,0,6123,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SC_BLOODYLUST -2304,0,0,24:28:32,0,0,0,99,0,0,none,0,0,6122,0,6123,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SC_FEINTBOMB +2304,0,0,24:28:32:36:40:44:48:52:56:60,0,0,0,99,0,0,none,0,0,6122,0,6123,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SC_FEINTBOMB //**** // LG Royal Guard 2307,0,0,12:16:20:24:28,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,0,0 //LG_CANNONSPEAR 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,0,0 //LG_BANISHINGPOINT 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,0,0 //LG_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,0,0 //LG_SHIELDPRESS +2310,0,0,10:12:14:16:18:20:22:24:26:28,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,0,0 //LG_SHIELDPRESS 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,0,0 //LG_REFLECTDAMAGE 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,0,0 //LG_PINPOINTATTACK 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,0,0 //LG_FORCEOFVANGUARD @@ -746,7 +746,7 @@ 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,0,0 //LG_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,0,0 //LG_BANDING 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,0,0 //LG_MOONSLASHER -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,0,0 //LG_RAYOFGENESIS +2321,0,0,45:50:55:60:65:70:75:80:85:90,-3:-3:-6:-6:-9:-9:-12:-12:-15:-15,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,0,0 //LG_RAYOFGENESIS 2322,0,0,40:45:50:55:60,0,0,0,99,0,0,none,0,0,523,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_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,0,0 //LG_EARTHDRIVE 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,0,0 //LG_HESPERUSLIT @@ -757,14 +757,14 @@ 2326,0,0,3:4:5:6:7:8:9:10:11:12,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,0,0 //SR_DRAGONCOMBO 2327,0,0,8:9:10:11:12,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,0,0 //SR_SKYNETBLOW 2328,0,0,36:40:44:48:52,0,0,0,99,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_EARTHSHAKER -2329,0,0,20:30:40:50:60,0,0,0,99,0,0,none,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE +2329,0,0,18:21:24:27:30:33:36:39:42:45,0,0,0,99,0,0,none,0,2:2:2:2:2:1:1:1:1:1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE 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,none,SC_EXPLOSIONSPIRITS,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_TIGERCANNON 2331,0,0,1,0,-11:-12:-13:-14:-15:-16:-17:-18:-19:-20,0,99,0,0,none,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_HELLGATE 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,0,0 //SR_RAMPAGEBLASTER 2333,0,0,80,0,0,0,99,0,0,none,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_CRESCENTELBOW 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,0,0 //SR_CURSEDCIRCLE -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,0,0 //SR_LIGHTNINGWALK -2336,0,0,10:15:20:25:30,0,0,0,99,0,0,none,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_KNUCKLEARROW +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,0,0 //SR_LIGHTNINGWALK +2336,0,0,12:14:16:18:20:22:24:26:28:30,0,0,0,99,0,0,none,0,1:1:1:1:1:0:0:0:0:0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_KNUCKLEARROW 2337,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,0,0 //SR_WINDMILL 2338,0,0,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,0,0 //SR_RAISINGDRAGON 2339,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,0,0 //SR_GENTLETOUCH @@ -795,12 +795,12 @@ //**** // WM Wanderer/Minstrel -2413,0,0,64:68:72:76: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,0,0 //WM_METALICSOUND +2413,0,0,62:64:66:68:70:72:74:76:78: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,0,0 //WM_METALICSOUND 2414,0,0,28:32:38:42: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,0,0 //WM_REVERBERATION 2415,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,0,0 //WM_REVERBERATION_MELEE 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,0,0 //WM_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,0,0 //WM_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,0,0 //WM_SEVERE_RAINSTORM +2418,0,0,80:90:100:110:120,0,0,0,11:13:14,1,20,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_SEVERE_RAINSTORM 2419,0,0,12:16:20:24:28,0,0,0,13:14,0,0,none,0,0,11513,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_POEMOFNETHERWORLD 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,0,0 //WM_VOICEOFSIREN 2421,0,0,50:53:56:59:62,0,0,0,13:14,0,0,none,0,0,6144,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_DEADHILLHERE @@ -822,7 +822,7 @@ // SO Sorcerer 2443,0,0,30:34:38:42:46,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,0,0 //SO_FIREWALK 2444,0,0,30:34:38:42:46,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,0,0 //SO_ELECTRICWALK -2445,0,0,40:44:48:52:56,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_SPELLFIST +2445,0,0,40:44:48:52:56:60:64:68:72:76,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,0,0 //SO_SPELLFIST 2446,0,0,62:70:78:86:94,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,0,0 //SO_EARTHGRAVE 2447,0,0,50:56:62:68:74,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,0,0 //SO_DIAMONDDUST 2448,0,0,70:90:110:130: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,0,0 //SO_POISON_BUSTER @@ -831,7 +831,7 @@ 2451,0,0,50:55:60:65: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,0,0 //SO_STRIKING 2452,0,0,40:52:64:76:88,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,0,0 //SO_WARMER 2453,0,0,34:42:50:58:66,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,0,0 //SO_VACUUM_EXTREME -2454,0,0,55:62:69:76:83,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,0,0 //SO_VARETYR_SPEAR +2454,0,0,65:70:75:80:85:90:95:100:105:110,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,0,0 //SO_VARETYR_SPEAR 2455,0,0,30:35:40:45:50,0,0,0,99,0,0,none,0,0,715,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_ARRULLO 2456,0,0,10,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,0,0 //SO_EL_CONTROL 2457,0,0,100:150:200,0,0,0,99,0,0,none,0,0,990,3,990,6,994,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_SUMMON_AGNI @@ -853,7 +853,7 @@ 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,0,0 //GN_CARTBOOST 2479,0,0,22:26:30:34:38,0,0,0,99,0,0,none,0,0,6210,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_THORNS_TRAP 2480,0,0,30:35:40:45:50,0,0,0,99,0,0,none,0,0,6211,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_BLOOD_SUCKER -2481,0,0,55:60:65:70:75,0,0,0,99,0,0,none,0,0,6212,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_SPORE_EXPLOSION +2481,0,0,48:52:56:60:64:68:72:76:80:84,0,0,0,99,0,0,none,0,0,6212,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_SPORE_EXPLOSION 2482,0,0,40:50:60:70:80,0,0,0,99,0,0,none,0,0,6210,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_WALLOFTHORN 2483,0,0,24:28:32:36:40:44:48:52:56:60,0,0,0,99,0,0,none,0,0,6210,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GN_CRAZYWEED 2484,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,0,0 //GN_CRAZYWEED_ATK diff --git a/db/re/skill_tree.txt b/db/re/skill_tree.txt index 8208bd9333e..54037b2f01e 100644 --- a/db/re/skill_tree.txt +++ b/db/re/skill_tree.txt @@ -2429,8 +2429,8 @@ 4054,1001,1,0,0,0,0,0,0,0,0,0,0 //KN_CHARGEATK#Charge Attack# 4054,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby# 4054,495,1,60,10,0,0,0,0,0,0,0,0 //KN_ONEHAND#Onehand Quicken# -4054,2001,5,2010,2,0,0,0,0,0,0,0,0 //RK_ENCHANTBLADE#Enchant Blade# -4054,2002,5,2001,3,0,0,0,0,0,0,0,0 //RK_SONICWAVE#Sonic Wave# +4054,2001,10,2010,2,0,0,0,0,0,0,0,0 //RK_ENCHANTBLADE#Enchant Blade# +4054,2002,10,2001,3,0,0,0,0,0,0,0,0 //RK_SONICWAVE#Sonic Wave# 4054,2003,10,61,1,2001,2,0,0,0,0,0,0 //RK_DEATHBOUND#Death Bound# 4054,2004,10,2020,3,0,0,0,0,0,0,0,0 //RK_HUNDREDSPEAR#Hundred Spear# 4054,2005,5,2001,5,0,0,0,0,0,0,0,0 //RK_WINDCUTTER#Wind Cutter# @@ -2489,14 +2489,14 @@ 4055,2213,5,2212,3,0,0,0,0,0,0,0,0 //WL_COMET#Comet# 4055,2214,5,2223,1,0,0,0,0,0,0,0,0 //WL_CHAINLIGHTNING#Chain Lightning# 4055,2216,5,2207,2,0,0,0,0,0,0,0,0 //WL_EARTHSTRAIN#Earth Strain# -4055,2217,5,2204,5,2212,5,2214,5,2216,5,0,0 //WL_TETRAVORTEX#Tetra Vortex# +4055,2217,10,2204,5,2212,5,2214,5,2216,5,0,0 //WL_TETRAVORTEX#Tetra Vortex# 4055,2222,5,83,1,0,0,0,0,0,0,0,0 //WL_SUMMONFB#Summon Fire Ball# 4055,2223,5,85,1,0,0,0,0,0,0,0,0 //WL_SUMMONBL#Summon Lightning Ball# 4055,2224,5,89,1,0,0,0,0,0,0,0,0 //WL_SUMMONWB#Summon Water Ball# 4055,2229,5,91,1,0,0,0,0,0,0,0,0 //WL_SUMMONSTONE#Summon Stone# 4055,2230,2,0,0,0,0,0,0,0,0,0,0 //WL_RELEASE#Release# 4055,2231,1,0,0,0,0,0,0,0,0,0,0 //WL_READING_SB#Reading Spellbook# -4055,2232,5,0,0,0,0,0,0,0,0,0,0 //WL_FREEZE_SP#Freeze Spell# +4055,2232,10,0,0,0,0,0,0,0,0,0,0 //WL_FREEZE_SP#Freeze Spell# 4055,5012,5,2202,5,0,0,0,0,0,0,0,0 //WL_TELEKINESIS_INTENSE#Intense Telekinesis# 4055,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# //Ranger (Regular) @@ -2544,7 +2544,7 @@ 4056,2245,10,2240,1,0,0,0,0,0,0,0,0 //RA_TOOTHOFWUG#Tooth Of Warg# 4056,2246,5,2245,3,0,0,0,0,0,0,0,0 //RA_SENSITIVEKEEN#Sensitive Keen# 4056,2247,5,2235,1,0,0,0,0,0,0,0,0 //RA_CAMOUFLAGE#Camouflage# -4056,2248,5,123,1,124,1,0,0,0,0,0,0 //RA_RESEARCHTRAP#Research Trap# +4056,2248,10,123,1,124,1,0,0,0,0,0,0 //RA_RESEARCHTRAP#Research Trap# 4056,2249,1,2248,1,0,0,0,0,0,0,0,0 //RA_MAGENTATRAP#Magenta Trap# 4056,2250,1,2248,1,0,0,0,0,0,0,0,0 //RA_COBALTTRAP#Cobalt Trap# 4056,2251,1,2248,1,0,0,0,0,0,0,0,0 //RA_MAIZETRAP#Maize Trap# @@ -2591,7 +2591,7 @@ 4057,79,10,12,1,78,1,77,3,0,0,0,0 //PR_MAGNUS#Magnus Exorcismus# 4057,1014,1,0,0,0,0,0,0,0,0,0,0 //PR_REDEMPTIO#Redemptio# 4057,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby# -4057,2038,5,77,1,0,0,0,0,0,0,0,0 //AB_JUDEX#Judex# +4057,2038,10,77,1,0,0,0,0,0,0,0,0 //AB_JUDEX#Judex# 4057,2039,1,2041,3,0,0,0,0,0,0,0,0 //AB_ANCILLA#Ancilla# 4057,2040,10,79,1,2038,5,2039,1,0,0,0,0 //AB_ADORAMUS#Adoramus# 4057,2041,3,34,1,0,0,0,0,0,0,0,0 //AB_CLEMENTIA#Crementia# @@ -2602,7 +2602,7 @@ 4057,2046,10,2045,5,0,0,0,0,0,0,0,0 //AB_ORATIO#Oratio# 4057,2047,4,72,1,0,0,0,0,0,0,0,0 //AB_LAUDAAGNUS#Lauda Agnus# 4057,2048,4,2047,2,0,0,0,0,0,0,0,0 //AB_LAUDARAMUS#Lauda Ramus# -4057,2050,1,2043,3,0,0,0,0,0,0,0,0 //AB_RENOVATIO#Renovatio# +4057,2050,4,2043,3,0,0,0,0,0,0,0,0 //AB_RENOVATIO#Renovatio# 4057,2051,5,2050,1,0,0,0,0,0,0,0,0 //AB_HIGHNESSHEAL#Highness Heal# 4057,2052,5,2048,2,0,0,0,0,0,0,0,0 //AB_CLEARANCE#Clearance# 4057,2053,5,2046,5,2054,5,0,0,0,0,0,0 //AB_EXPIATIO#Expiatio# @@ -2657,7 +2657,7 @@ 4058,2258,3,2256,2,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm# 4058,2259,3,2258,1,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher# 4058,2260,3,2258,3,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower# -4058,2261,3,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon# +4058,2261,5,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon# 4058,2262,3,2255,1,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration# 4058,2263,1,2262,1,0,0,0,0,0,0,0,0 //NC_HOVERING#Hovering# 4058,2264,1,2263,1,0,0,0,0,0,0,0,0 //NC_F_SIDESLIDE#Front-Side Slide# @@ -2675,7 +2675,7 @@ 4058,2276,10,0,0,0,0,0,0,0,0,0,0 //NC_TRAININGAXE#Axe Training# 4058,2277,5,0,0,0,0,0,0,0,0,0,0 //NC_RESEARCHFE#Research Fire/Earth# 4058,2278,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG#Axe Boomerang# -4058,2279,5,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing# +4058,2279,10,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing# 4058,2280,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado# 4058,2281,5,2277,2,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper# 4058,2282,5,2281,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy# @@ -2718,7 +2718,7 @@ 4059,2026,1,2024,5,0,0,0,0,0,0,0,0 //GC_ANTIDOTE#Antidote# 4059,2027,5,2025,1,0,0,0,0,0,0,0,0 //GC_POISONINGWEAPON#Poisoning Weapon# 4059,2028,5,133,5,0,0,0,0,0,0,0,0 //GC_WEAPONBLOCKING#Weapon Blocking# -4059,2029,5,2028,1,0,0,0,0,0,0,0,0 //GC_COUNTERSLASH#Counter Slash# +4059,2029,10,2028,1,0,0,0,0,0,0,0,0 //GC_COUNTERSLASH#Counter Slash# 4059,2030,5,2028,1,0,0,0,0,0,0,0,0 //GC_WEAPONCRUSH#Weapon Crush# 4059,2031,5,2027,3,2028,1,0,0,0,0,0,0 //GC_VENOMPRESSURE#Venom Pressure# 4059,2032,5,2027,5,2031,5,0,0,0,0,0,0 //GC_POISONSMOKE#Poison Smoke# @@ -2763,8 +2763,8 @@ 4060,399,10,64,3,398,3,0,0,0,0,0,0 //LK_JOINTBEAT#Vital Strike# 4060,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby# 4060,495,1,60,10,0,0,0,0,0,0,0,0 //KN_ONEHAND#Onehand Quicken# -4060,2001,5,2010,2,0,0,0,0,0,0,0,0 //RK_ENCHANTBLADE#Enchant Blade# -4060,2002,5,2001,3,0,0,0,0,0,0,0,0 //RK_SONICWAVE#Sonic Wave# +4060,2001,10,2010,2,0,0,0,0,0,0,0,0 //RK_ENCHANTBLADE#Enchant Blade# +4060,2002,10,2001,3,0,0,0,0,0,0,0,0 //RK_SONICWAVE#Sonic Wave# 4060,2003,10,61,1,2001,2,0,0,0,0,0,0 //RK_DEATHBOUND#Death Bound# 4060,2004,10,2020,3,0,0,0,0,0,0,0,0 //RK_HUNDREDSPEAR#Hundred Spear# 4060,2005,5,2001,5,0,0,0,0,0,0,0,0 //RK_WINDCUTTER#Wind Cutter# @@ -2829,14 +2829,14 @@ 4061,2213,5,2212,3,0,0,0,0,0,0,0,0 //WL_COMET#Comet# 4061,2214,5,2223,1,0,0,0,0,0,0,0,0 //WL_CHAINLIGHTNING#Chain Lightning# 4061,2216,5,2207,2,0,0,0,0,0,0,0,0 //WL_EARTHSTRAIN#Earth Strain# -4061,2217,5,2204,5,2212,5,2214,5,2216,5,0,0 //WL_TETRAVORTEX#Tetra Vortex# +4061,2217,10,2204,5,2212,5,2214,5,2216,5,0,0 //WL_TETRAVORTEX#Tetra Vortex# 4061,2222,5,83,1,0,0,0,0,0,0,0,0 //WL_SUMMONFB#Summon Fire Ball# 4061,2223,5,85,1,0,0,0,0,0,0,0,0 //WL_SUMMONBL#Summon Lightning Ball# 4061,2224,5,89,1,0,0,0,0,0,0,0,0 //WL_SUMMONWB#Summon Water Ball# 4061,2229,5,91,1,0,0,0,0,0,0,0,0 //WL_SUMMONSTONE#Summon Stone# 4061,2230,2,0,0,0,0,0,0,0,0,0,0 //WL_RELEASE#Release# 4061,2231,1,0,0,0,0,0,0,0,0,0,0 //WL_READING_SB#Reading Spellbook# -4061,2232,5,0,0,0,0,0,0,0,0,0,0 //WL_FREEZE_SP#Freeze Spell# +4061,2232,10,0,0,0,0,0,0,0,0,0,0 //WL_FREEZE_SP#Freeze Spell# 4061,5012,5,2202,5,0,0,0,0,0,0,0,0 //WL_TELEKINESIS_INTENSE#Intense Telekinesis# 4061,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# //Ranger (Trans) @@ -2888,7 +2888,7 @@ 4062,2245,10,2240,1,0,0,0,0,0,0,0,0 //RA_TOOTHOFWUG#Tooth Of Warg# 4062,2246,5,2245,3,0,0,0,0,0,0,0,0 //RA_SENSITIVEKEEN#Sensitive Keen# 4062,2247,5,2235,1,0,0,0,0,0,0,0,0 //RA_CAMOUFLAGE#Camouflage# -4062,2248,5,123,1,124,1,0,0,0,0,0,0 //RA_RESEARCHTRAP#Research Trap# +4062,2248,10,123,1,124,1,0,0,0,0,0,0 //RA_RESEARCHTRAP#Research Trap# 4062,2249,1,2248,1,0,0,0,0,0,0,0,0 //RA_MAGENTATRAP#Magenta Trap# 4062,2250,1,2248,1,0,0,0,0,0,0,0,0 //RA_COBALTTRAP#Cobalt Trap# 4062,2251,1,2248,1,0,0,0,0,0,0,0,0 //RA_MAIZETRAP#Maize Trap# @@ -2939,7 +2939,7 @@ 4063,363,10,68,3,9,5,76,5,0,0,0,0 //HP_MEDITATIO#Meditatio# 4063,481,5,65,10,23,10,0,0,0,0,0,0 //HP_MANARECHARGE#Mana Recharge# 4063,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby# -4063,2038,5,77,1,0,0,0,0,0,0,0,0 //AB_JUDEX#Judex# +4063,2038,10,77,1,0,0,0,0,0,0,0,0 //AB_JUDEX#Judex# 4063,2039,1,2041,3,0,0,0,0,0,0,0,0 //AB_ANCILLA#Ancilla# 4063,2040,10,79,1,2038,5,2039,1,0,0,0,0 //AB_ADORAMUS#Adoramus# 4063,2041,3,34,1,0,0,0,0,0,0,0,0 //AB_CLEMENTIA#Crementia# @@ -2950,7 +2950,7 @@ 4063,2046,10,2045,5,0,0,0,0,0,0,0,0 //AB_ORATIO#Oratio# 4063,2047,4,72,1,0,0,0,0,0,0,0,0 //AB_LAUDAAGNUS#Lauda Agnus# 4063,2048,4,2047,2,0,0,0,0,0,0,0,0 //AB_LAUDARAMUS#Lauda Ramus# -4063,2050,1,2043,3,0,0,0,0,0,0,0,0 //AB_RENOVATIO#Renovatio# +4063,2050,4,2043,3,0,0,0,0,0,0,0,0 //AB_RENOVATIO#Renovatio# 4063,2051,5,2050,1,0,0,0,0,0,0,0,0 //AB_HIGHNESSHEAL#Highness Heal# 4063,2052,5,2048,2,0,0,0,0,0,0,0,0 //AB_CLEARANCE#Clearance# 4063,2053,5,2046,5,2054,5,0,0,0,0,0,0 //AB_EXPIATIO#Expiatio# @@ -3010,7 +3010,7 @@ 4064,2258,3,2256,2,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm# 4064,2259,3,2258,1,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher# 4064,2260,3,2258,3,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower# -4064,2261,3,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon# +4064,2261,5,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon# 4064,2262,3,2255,1,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration# 4064,2263,1,2262,1,0,0,0,0,0,0,0,0 //NC_HOVERING#Hovering# 4064,2264,1,2263,1,0,0,0,0,0,0,0,0 //NC_F_SIDESLIDE#Front-Side Slide# @@ -3028,7 +3028,7 @@ 4064,2276,10,0,0,0,0,0,0,0,0,0,0 //NC_TRAININGAXE#Axe Training# 4064,2277,5,0,0,0,0,0,0,0,0,0,0 //NC_RESEARCHFE#Research Fire/Earth# 4064,2278,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG#Axe Boomerang# -4064,2279,5,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing# +4064,2279,10,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing# 4064,2280,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado# 4064,2281,5,2277,2,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper# 4064,2282,5,2281,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy# @@ -3076,7 +3076,7 @@ 4065,2026,1,2024,5,0,0,0,0,0,0,0,0 //GC_ANTIDOTE#Antidote# 4065,2027,5,2025,1,0,0,0,0,0,0,0,0 //GC_POISONINGWEAPON#Poisoning Weapon# 4065,2028,5,133,5,0,0,0,0,0,0,0,0 //GC_WEAPONBLOCKING#Weapon Blocking# -4065,2029,5,2028,1,0,0,0,0,0,0,0,0 //GC_COUNTERSLASH#Counter Slash# +4065,2029,10,2028,1,0,0,0,0,0,0,0,0 //GC_COUNTERSLASH#Counter Slash# 4065,2030,5,2028,1,0,0,0,0,0,0,0,0 //GC_WEAPONCRUSH#Weapon Crush# 4065,2031,5,2027,3,2028,1,0,0,0,0,0,0 //GC_VENOMPRESSURE#Venom Pressure# 4065,2032,5,2027,5,2031,5,0,0,0,0,0,0 //GC_POISONSMOKE#Poison Smoke# @@ -3123,7 +3123,7 @@ 4066,2307,5,2312,1,0,0,0,0,0,0,0,0 //LG_CANNONSPEAR#Cannon Spear# 4066,2308,10,55,1,0,0,0,0,0,0,0,0 //LG_BANISHINGPOINT#Banishing Point# 4066,2309,3,0,0,0,0,0,0,0,0,0,0 //LG_TRAMPLE#Trample# -4066,2310,5,250,3,0,0,0,0,0,0,0,0 //LG_SHIELDPRESS#Shield Press# +4066,2310,10,250,3,0,0,0,0,0,0,0,0 //LG_SHIELDPRESS#Shield Press# 4066,2311,5,252,5,0,0,0,0,0,0,0,0 //LG_REFLECTDAMAGE#Reflect Damage# 4066,2312,5,2308,5,0,0,0,0,0,0,0,0 //LG_PINPOINTATTACK#Pinpoint Attack# 4066,2313,5,0,0,0,0,0,0,0,0,0,0 //LG_FORCEOFVANGUARD#Force of Vanguard# @@ -3134,7 +3134,7 @@ 4066,2318,5,2309,3,0,0,0,0,0,0,0,0 //LG_PRESTIGE#Prestige# 4066,2319,5,2312,3,2314,1,0,0,0,0,0,0 //LG_BANDING#Banding# 4066,2320,5,55,1,0,0,0,0,0,0,0,0 //LG_MOONSLASHER#Moon Slasher# -4066,2321,5,254,5,0,0,0,0,0,0,0,0 //LG_RAYOFGENESIS#Ray of Genesis# +4066,2321,10,254,5,0,0,0,0,0,0,0,0 //LG_RAYOFGENESIS#Ray of Genesis# 4066,2322,5,248,3,0,0,0,0,0,0,0,0 //LG_PIETY#Piety# 4066,2323,5,2311,3,0,0,0,0,0,0,0,0 //LG_EARTHDRIVE#Earth Drive# 4066,2324,5,2318,3,2319,3,0,0,0,0,0,0 //LG_HESPERUSLIT#Hesperus Lit# @@ -3186,7 +3186,7 @@ 4067,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby# 4067,2443,5,285,1,0,0,0,0,0,0,0,0 //SO_FIREWALK#Fire Walk# 4067,2444,5,287,1,0,0,0,0,0,0,0,0 //SO_ELECTRICWALK#Electric Walk# -4067,2445,5,279,4,0,0,0,0,0,0,0,0 //SO_SPELLFIST#Spell Fist# +4067,2445,10,279,4,0,0,0,0,0,0,0,0 //SO_SPELLFIST#Spell Fist# 4067,2446,5,90,5,0,0,0,0,0,0,0,0 //SO_EARTHGRAVE#Earth Grave# 4067,2447,5,286,3,0,0,0,0,0,0,0,0 //SO_DIAMONDDUST#Diamond Dust# 4067,2448,5,2450,2,0,0,0,0,0,0,0,0 //SO_POISON_BUSTER#Poison Buster# @@ -3195,7 +3195,7 @@ 4067,2451,5,280,1,281,1,282,1,283,1,0,0 //SO_STRIKING#Striking# 4067,2452,5,285,1,287,1,0,0,0,0,0,0 //SO_WARMER#Warmer# 4067,2453,5,288,2,0,0,0,0,0,0,0,0 //SO_VACUUM_EXTREME#Vacuum Extreme# -4067,2454,5,283,1,287,4,0,0,0,0,0,0 //SO_VARETYR_SPEAR#Varetyr Spear# +4067,2454,10,283,1,287,4,0,0,0,0,0,0 //SO_VARETYR_SPEAR#Varetyr Spear# 4067,2455,5,2452,2,0,0,0,0,0,0,0,0 //SO_ARRULLO#Arrullo# 4067,2456,4,2462,1,0,0,0,0,0,0,0,0 //SO_EL_CONTROL#Spirit Control# 4067,2457,3,2452,3,2456,1,0,0,0,0,0,0 //SO_SUMMON_AGNI#Summon Fire Spirit Agni# @@ -3246,7 +3246,7 @@ 4068,2382,5,2422,1,0,0,0,0,0,0,0,0 //MI_ECHOSONG#Echo Song# 4068,2383,5,2422,1,0,0,0,0,0,0,0,0 //MI_HARMONIZE#Harmonize# 4068,2412,10,0,0,0,0,0,0,0,0,0,0 //WM_LESSON#Lesson# -4068,2413,5,2417,1,0,0,0,0,0,0,0,0 //WM_METALICSOUND#Metallic Sound# +4068,2413,10,2417,1,0,0,0,0,0,0,0,0 //WM_METALICSOUND#Metallic Sound# 4068,2414,5,317,5,0,0,0,0,0,0,0,0 //WM_REVERBERATION#Reverberation# 4068,2417,1,2414,1,0,0,0,0,0,0,0,0 //WM_DOMINION_IMPULSE#Dominion Impulse# 4068,2418,5,316,5,0,0,0,0,0,0,0,0 //WM_SEVERE_RAINSTORM#Severe Rainstorm# @@ -3302,7 +3302,7 @@ 4069,2351,5,2422,1,0,0,0,0,0,0,0,0 //WA_SYMPHONY_OF_LOVER#Symphony of Lovers# 4069,2352,5,2422,1,0,0,0,0,0,0,0,0 //WA_MOONLIT_SERENADE#Moonlit Serenade# 4069,2412,10,0,0,0,0,0,0,0,0,0,0 //WM_LESSON#Lesson# -4069,2413,5,2417,1,0,0,0,0,0,0,0,0 //WM_METALICSOUND#Metallic Sound# +4069,2413,10,2417,1,0,0,0,0,0,0,0,0 //WM_METALICSOUND#Metallic Sound# 4069,2414,5,325,5,0,0,0,0,0,0,0,0 //WM_REVERBERATION#Reverberation# 4069,2417,1,2414,1,0,0,0,0,0,0,0,0 //WM_DOMINION_IMPULSE#Dominion Impulse# 4069,2418,5,324,5,0,0,0,0,0,0,0,0 //WM_SEVERE_RAINSTORM#Severe Rainstorm# @@ -3363,13 +3363,13 @@ 4070,2326,10,263,5,0,0,0,0,0,0,0,0 //SR_DRAGONCOMBO#Dragon Combo# 4070,2327,5,2326,3,0,0,0,0,0,0,0,0 //SR_SKYNETBLOW#Sky Net Blow# 4070,2328,5,2326,1,2334,1,0,0,0,0,0,0 //SR_EARTHSHAKER#Earth Shaker# -4070,2329,5,2326,1,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE#Fallen Empire# +4070,2329,10,2326,1,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE#Fallen Empire# 4070,2330,10,2329,3,0,0,0,0,0,0,0,0 //SR_TIGERCANNON#Tiger Cannon# 4070,2332,5,2328,2,0,0,0,0,0,0,0,0 //SR_RAMPAGEBLASTER#Rampage Blaster# 4070,2333,5,2327,1,0,0,0,0,0,0,0,0 //SR_CRESCENTELBOW#Crescent Elbow# 4070,2334,5,269,2,2344,2,0,0,0,0,0,0 //SR_CURSEDCIRCLE#Cursed Circle# 4070,2335,5,2337,1,0,0,0,0,0,0,0,0 //SR_LIGHTNINGWALK#Lightning Walk# -4070,2336,5,2332,3,2335,3,0,0,0,0,0,0 //SR_KNUCKLEARROW#Knuckle Arrow# +4070,2336,10,2332,3,2335,3,0,0,0,0,0,0 //SR_KNUCKLEARROW#Knuckle Arrow# 4070,2337,1,2334,1,0,0,0,0,0,0,0,0 //SR_WINDMILL#Windmill# 4070,2338,10,2332,3,2346,3,0,0,0,0,0,0 //SR_RAISINGDRAGON#Raising Dragon# 4070,2340,1,262,1,2341,1,0,0,0,0,0,0 //SR_ASSIMILATEPOWER#Assimilate Power# @@ -3420,12 +3420,12 @@ 4071,498,1,228,10,0,0,0,0,0,0,0,0 //AM_TWILIGHT3#Twilight Alchemy 3# 4071,2474,5,0,0,0,0,0,0,0,0,0,0 //GN_TRAINING_SWORD#Sword Training# 4071,2475,5,0,0,0,0,0,0,0,0,0,0 //GN_REMODELING_CART#Cart Remodeling# -4071,2476,5,2475,1,0,0,0,0,0,0,0,0 //GN_CART_TORNADO#Cart Tornado# +4071,2476,10,2475,1,0,0,0,0,0,0,0,0 //GN_CART_TORNADO#Cart Tornado# 4071,2477,5,2475,2,0,0,0,0,0,0,0,0 //GN_CARTCANNON#Cart Cannon# 4071,2478,5,2475,3,0,0,0,0,0,0,0,0 //GN_CARTBOOST#Cart Boost# 4071,2479,5,2497,2,0,0,0,0,0,0,0,0 //GN_THORNS_TRAP#Thorn Trap# 4071,2480,5,2497,3,0,0,0,0,0,0,0,0 //GN_BLOOD_SUCKER#Blood Sucker# -4071,2481,5,2497,4,0,0,0,0,0,0,0,0 //GN_SPORE_EXPLOSION#Spore Explosion# +4071,2481,10,2497,4,0,0,0,0,0,0,0,0 //GN_SPORE_EXPLOSION#Spore Explosion# 4071,2482,5,2479,3,0,0,0,0,0,0,0,0 //GN_WALLOFTHORN#Wall of Thorns# 4071,2483,10,2482,3,0,0,0,0,0,0,0,0 //GN_CRAZYWEED#Crazy Weed# 4071,2485,5,2481,3,0,0,0,0,0,0,0,0 //GN_DEMONIC_FIRE#Demonic Fire# @@ -3476,7 +3476,7 @@ 4072,225,10,219,5,0,0,0,0,0,0,0,0 //RG_PLAGIARISM#Intimidate# 4072,1005,1,0,0,0,0,0,0,0,0,0,0 //RG_CLOSECONFINE#Close Confine# 4072,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby# -4072,2284,5,219,5,0,0,0,0,0,0,0,0 //SC_FATALMMENACE#Fatal Menace# +4072,2284,10,219,5,0,0,0,0,0,0,0,0 //SC_FATALMMENACE#Fatal Menace# 4072,2285,10,225,5,0,0,0,0,0,0,0,0 //SC_REPRODUCE#Reproduce# 4072,2286,10,2285,5,0,0,0,0,0,0,0,0 //SC_AUTOSHADOWSPELL#Auto Shadow Spell# 4072,2287,5,213,3,0,0,0,0,0,0,0,0 //SC_SHADOWFORM#Shadow Form# @@ -3496,7 +3496,7 @@ 4072,2301,3,2299,1,0,0,0,0,0,0,0,0 //SC_CHAOSPANIC#Chaos Panic# 4072,2302,3,2296,3,2301,3,0,0,0,0,0,0 //SC_MAELSTROM#Maelstrom# 4072,2303,3,2300,3,0,0,0,0,0,0,0,0 //SC_BLOODYLUST#Bloody Lust# -4072,2304,3,2300,3,0,0,0,0,0,0,0,0 //SC_FEINTBOMB#Feint Bomb# +4072,2304,10,2300,3,0,0,0,0,0,0,0,0 //SC_FEINTBOMB#Feint Bomb# 4072,5010,5,2288,2,0,0,0,0,0,0,0,0 //SC_ESCAPE#Emergency Escape# 4072,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# //Royal Guard (Trans) @@ -3539,7 +3539,7 @@ 4073,2307,5,2312,1,0,0,0,0,0,0,0,0 //LG_CANNONSPEAR#Cannon Spear# 4073,2308,10,55,1,0,0,0,0,0,0,0,0 //LG_BANISHINGPOINT#Banishing Point# 4073,2309,3,0,0,0,0,0,0,0,0,0,0 //LG_TRAMPLE#Trample# -4073,2310,5,250,3,0,0,0,0,0,0,0,0 //LG_SHIELDPRESS#Shield Press# +4073,2310,10,250,3,0,0,0,0,0,0,0,0 //LG_SHIELDPRESS#Shield Press# 4073,2311,5,252,5,0,0,0,0,0,0,0,0 //LG_REFLECTDAMAGE#Reflect Damage# 4073,2312,5,2308,5,0,0,0,0,0,0,0,0 //LG_PINPOINTATTACK#Pinpoint Attack# 4073,2313,5,0,0,0,0,0,0,0,0,0,0 //LG_FORCEOFVANGUARD#Force of Vanguard# @@ -3550,7 +3550,7 @@ 4073,2318,5,2309,3,0,0,0,0,0,0,0,0 //LG_PRESTIGE#Prestige# 4073,2319,5,2312,3,2314,1,0,0,0,0,0,0 //LG_BANDING#Banding# 4073,2320,5,55,1,0,0,0,0,0,0,0,0 //LG_MOONSLASHER#Moon Slasher# -4073,2321,5,254,5,0,0,0,0,0,0,0,0 //LG_RAYOFGENESIS#Ray of Genesis# +4073,2321,10,254,5,0,0,0,0,0,0,0,0 //LG_RAYOFGENESIS#Ray of Genesis# 4073,2322,5,248,3,0,0,0,0,0,0,0,0 //LG_PIETY#Piety# 4073,2323,5,2311,3,0,0,0,0,0,0,0,0 //LG_EARTHDRIVE#Earth Drive# 4073,2324,5,2318,3,2319,3,0,0,0,0,0,0 //LG_HESPERUSLIT#Hesperus Lit# @@ -3610,7 +3610,7 @@ 4074,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby# 4074,2443,5,285,1,0,0,0,0,0,0,0,0 //SO_FIREWALK#Fire Walk# 4074,2444,5,287,1,0,0,0,0,0,0,0,0 //SO_ELECTRICWALK#Electric Walk# -4074,2445,5,279,4,0,0,0,0,0,0,0,0 //SO_SPELLFIST#Spell Fist# +4074,2445,10,279,4,0,0,0,0,0,0,0,0 //SO_SPELLFIST#Spell Fist# 4074,2446,5,90,5,0,0,0,0,0,0,0,0 //SO_EARTHGRAVE#Earth Grave# 4074,2447,5,286,3,0,0,0,0,0,0,0,0 //SO_DIAMONDDUST#Diamond Dust# 4074,2448,5,2450,2,0,0,0,0,0,0,0,0 //SO_POISON_BUSTER#Poison Buster# @@ -3619,7 +3619,7 @@ 4074,2451,5,280,1,281,1,282,1,283,1,0,0 //SO_STRIKING#Striking# 4074,2452,5,285,1,287,1,0,0,0,0,0,0 //SO_WARMER#Warmer# 4074,2453,5,288,2,0,0,0,0,0,0,0,0 //SO_VACUUM_EXTREME#Vacuum Extreme# -4074,2454,5,283,1,287,4,0,0,0,0,0,0 //SO_VARETYR_SPEAR#Varetyr Spear# +4074,2454,10,283,1,287,4,0,0,0,0,0,0 //SO_VARETYR_SPEAR#Varetyr Spear# 4074,2455,5,2452,2,0,0,0,0,0,0,0,0 //SO_ARRULLO#Arrullo# 4074,2456,4,2462,1,0,0,0,0,0,0,0,0 //SO_EL_CONTROL#Spirit Control# 4074,2457,3,2452,3,2456,1,0,0,0,0,0,0 //SO_SUMMON_AGNI#Summon Fire Spirit Agni# @@ -3676,7 +3676,7 @@ 4075,2382,5,2422,1,0,0,0,0,0,0,0,0 //MI_ECHOSONG#Echo Song# 4075,2383,5,2422,1,0,0,0,0,0,0,0,0 //MI_HARMONIZE#Harmonize# 4075,2412,10,0,0,0,0,0,0,0,0,0,0 //WM_LESSON#Lesson# -4075,2413,5,2417,1,0,0,0,0,0,0,0,0 //WM_METALICSOUND#Metallic Sound# +4075,2413,10,2417,1,0,0,0,0,0,0,0,0 //WM_METALICSOUND#Metallic Sound# 4075,2414,5,317,5,0,0,0,0,0,0,0,0 //WM_REVERBERATION#Reverberation# 4075,2417,1,2414,1,0,0,0,0,0,0,0,0 //WM_DOMINION_IMPULSE#Dominion Impulse# 4075,2418,5,316,5,0,0,0,0,0,0,0,0 //WM_SEVERE_RAINSTORM#Severe Rainstorm# @@ -3738,7 +3738,7 @@ 4076,2351,5,2422,1,0,0,0,0,0,0,0,0 //WA_SYMPHONY_OF_LOVER#Symphony of Lovers# 4076,2352,5,2422,1,0,0,0,0,0,0,0,0 //WA_MOONLIT_SERENADE#Moonlit Serenade# 4076,2412,10,0,0,0,0,0,0,0,0,0,0 //WM_LESSON#Lesson# -4076,2413,5,2417,1,0,0,0,0,0,0,0,0 //WM_METALICSOUND#Metallic Sound# +4076,2413,10,2417,1,0,0,0,0,0,0,0,0 //WM_METALICSOUND#Metallic Sound# 4076,2414,5,325,5,0,0,0,0,0,0,0,0 //WM_REVERBERATION#Reverberation# 4076,2417,1,2414,1,0,0,0,0,0,0,0,0 //WM_DOMINION_IMPULSE#Dominion Impulse# 4076,2418,5,324,5,0,0,0,0,0,0,0,0 //WM_SEVERE_RAINSTORM#Severe Rainstorm# @@ -3803,13 +3803,13 @@ 4077,2326,10,263,5,0,0,0,0,0,0,0,0 //SR_DRAGONCOMBO#Dragon Combo# 4077,2327,5,2326,3,0,0,0,0,0,0,0,0 //SR_SKYNETBLOW#Sky Net Blow# 4077,2328,5,2326,1,2334,1,0,0,0,0,0,0 //SR_EARTHSHAKER#Earth Shaker# -4077,2329,5,2326,1,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE#Fallen Empire# +4077,2329,10,2326,1,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE#Fallen Empire# 4077,2330,10,2329,3,0,0,0,0,0,0,0,0 //SR_TIGERCANNON#Tiger Cannon# 4077,2332,5,2328,2,0,0,0,0,0,0,0,0 //SR_RAMPAGEBLASTER#Rampage Blaster# 4077,2333,5,2327,1,0,0,0,0,0,0,0,0 //SR_CRESCENTELBOW#Crescent Elbow# 4077,2334,5,269,2,2344,2,0,0,0,0,0,0 //SR_CURSEDCIRCLE#Cursed Circle# 4077,2335,5,2337,1,0,0,0,0,0,0,0,0 //SR_LIGHTNINGWALK#Lightning Walk# -4077,2336,5,2332,3,2335,3,0,0,0,0,0,0 //SR_KNUCKLEARROW#Knuckle Arrow# +4077,2336,10,2332,3,2335,3,0,0,0,0,0,0 //SR_KNUCKLEARROW#Knuckle Arrow# 4077,2337,1,2334,1,0,0,0,0,0,0,0,0 //SR_WINDMILL#Windmill# 4077,2338,10,2332,3,2346,3,0,0,0,0,0,0 //SR_RAISINGDRAGON#Raising Dragon# 4077,2340,1,262,1,2341,1,0,0,0,0,0,0 //SR_ASSIMILATEPOWER#Assimilate Power# @@ -3864,12 +3864,12 @@ 4078,498,1,228,10,0,0,0,0,0,0,0,0 //AM_TWILIGHT3#Twilight Alchemy 3# 4078,2474,5,0,0,0,0,0,0,0,0,0,0 //GN_TRAINING_SWORD#Sword Training# 4078,2475,5,0,0,0,0,0,0,0,0,0,0 //GN_REMODELING_CART#Cart Remodeling# -4078,2476,5,2475,1,0,0,0,0,0,0,0,0 //GN_CART_TORNADO#Cart Tornado# +4078,2476,10,2475,1,0,0,0,0,0,0,0,0 //GN_CART_TORNADO#Cart Tornado# 4078,2477,5,2475,2,0,0,0,0,0,0,0,0 //GN_CARTCANNON#Cart Cannon# 4078,2478,5,2475,3,0,0,0,0,0,0,0,0 //GN_CARTBOOST#Cart Boost# 4078,2479,5,2497,2,0,0,0,0,0,0,0,0 //GN_THORNS_TRAP#Thorn Trap# 4078,2480,5,2497,3,0,0,0,0,0,0,0,0 //GN_BLOOD_SUCKER#Blood Sucker# -4078,2481,5,2497,4,0,0,0,0,0,0,0,0 //GN_SPORE_EXPLOSION#Spore Explosion# +4078,2481,10,2497,4,0,0,0,0,0,0,0,0 //GN_SPORE_EXPLOSION#Spore Explosion# 4078,2482,5,2479,3,0,0,0,0,0,0,0,0 //GN_WALLOFTHORN#Wall of Thorns# 4078,2483,10,2482,3,0,0,0,0,0,0,0,0 //GN_CRAZYWEED#Crazy Weed# 4078,2485,5,2481,3,0,0,0,0,0,0,0,0 //GN_DEMONIC_FIRE#Demonic Fire# @@ -3924,7 +3924,7 @@ 4079,475,1,225,10,0,0,0,0,0,0,0,0 //ST_PRESERVE#Preserve# 4079,476,5,215,5,216,5,217,5,218,5,0,0 //ST_FULLSTRIP#Divest All# 4079,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby# -4079,2284,5,219,5,0,0,0,0,0,0,0,0 //SC_FATALMMENACE#Fatal Menace# +4079,2284,10,219,5,0,0,0,0,0,0,0,0 //SC_FATALMMENACE#Fatal Menace# 4079,2285,10,225,5,0,0,0,0,0,0,0,0 //SC_REPRODUCE#Reproduce# 4079,2286,10,2285,5,0,0,0,0,0,0,0,0 //SC_AUTOSHADOWSPELL#Auto Shadow Spell# 4079,2287,5,213,3,0,0,0,0,0,0,0,0 //SC_SHADOWFORM#Shadow Form# @@ -3944,7 +3944,7 @@ 4079,2301,3,2299,1,0,0,0,0,0,0,0,0 //SC_CHAOSPANIC#Chaos Panic# 4079,2302,3,2296,3,2301,3,0,0,0,0,0,0 //SC_MAELSTROM#Maelstrom# 4079,2303,3,2300,3,0,0,0,0,0,0,0,0 //SC_BLOODYLUST#Bloody Lust# -4079,2304,3,2300,3,0,0,0,0,0,0,0,0 //SC_FEINTBOMB#Feint Bomb# +4079,2304,10,2300,3,0,0,0,0,0,0,0,0 //SC_FEINTBOMB#Feint Bomb# 4079,5010,5,2288,2,0,0,0,0,0,0,0,0 //SC_ESCAPE#Emergency Escape# 4079,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# //Rune Knight (Dragon) (Regular) @@ -3973,8 +3973,8 @@ 4080,1001,1,0,0,0,0,0,0,0,0,0,0 //KN_CHARGEATK#Charge Attack# 4080,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby# 4080,495,1,60,10,0,0,0,0,0,0,0,0 //KN_ONEHAND#Onehand Quicken# -4080,2001,5,2010,2,0,0,0,0,0,0,0,0 //RK_ENCHANTBLADE#Enchant Blade# -4080,2002,5,2001,3,0,0,0,0,0,0,0,0 //RK_SONICWAVE#Sonic Wave# +4080,2001,10,2010,2,0,0,0,0,0,0,0,0 //RK_ENCHANTBLADE#Enchant Blade# +4080,2002,10,2001,3,0,0,0,0,0,0,0,0 //RK_SONICWAVE#Sonic Wave# 4080,2003,10,61,1,2001,2,0,0,0,0,0,0 //RK_DEATHBOUND#Death Bound# 4080,2004,10,2020,3,0,0,0,0,0,0,0,0 //RK_HUNDREDSPEAR#Hundred Spear# 4080,2005,5,2001,5,0,0,0,0,0,0,0,0 //RK_WINDCUTTER#Wind Cutter# @@ -4020,8 +4020,8 @@ 4081,399,10,64,3,398,3,0,0,0,0,0,0 //LK_JOINTBEAT#Vital Strike# 4081,410,1,0,0,0,0,0,0,0,0,0,0 //WE_CALLBABY#Call Baby# 4081,495,1,60,10,0,0,0,0,0,0,0,0 //KN_ONEHAND#Onehand Quicken# -4081,2001,5,2010,2,0,0,0,0,0,0,0,0 //RK_ENCHANTBLADE#Enchant Blade# -4081,2002,5,2001,3,0,0,0,0,0,0,0,0 //RK_SONICWAVE#Sonic Wave# +4081,2001,10,2010,2,0,0,0,0,0,0,0,0 //RK_ENCHANTBLADE#Enchant Blade# +4081,2002,10,2001,3,0,0,0,0,0,0,0,0 //RK_SONICWAVE#Sonic Wave# 4081,2003,10,61,1,2001,2,0,0,0,0,0,0 //RK_DEATHBOUND#Death Bound# 4081,2004,10,2020,3,0,0,0,0,0,0,0,0 //RK_HUNDREDSPEAR#Hundred Spear# 4081,2005,5,2001,5,0,0,0,0,0,0,0,0 //RK_WINDCUTTER#Wind Cutter# @@ -4069,7 +4069,7 @@ 4082,2307,5,2312,1,0,0,0,0,0,0,0,0 //LG_CANNONSPEAR#Cannon Spear# 4082,2308,10,55,1,0,0,0,0,0,0,0,0 //LG_BANISHINGPOINT#Banishing Point# 4082,2309,3,0,0,0,0,0,0,0,0,0,0 //LG_TRAMPLE#Trample# -4082,2310,5,250,3,0,0,0,0,0,0,0,0 //LG_SHIELDPRESS#Shield Press# +4082,2310,10,250,3,0,0,0,0,0,0,0,0 //LG_SHIELDPRESS#Shield Press# 4082,2311,5,252,5,0,0,0,0,0,0,0,0 //LG_REFLECTDAMAGE#Reflect Damage# 4082,2312,5,2308,5,0,0,0,0,0,0,0,0 //LG_PINPOINTATTACK#Pinpoint Attack# 4082,2313,5,0,0,0,0,0,0,0,0,0,0 //LG_FORCEOFVANGUARD#Force of Vanguard# @@ -4080,7 +4080,7 @@ 4082,2318,5,2309,3,0,0,0,0,0,0,0,0 //LG_PRESTIGE#Prestige# 4082,2319,5,2312,3,2314,1,0,0,0,0,0,0 //LG_BANDING#Banding# 4082,2320,5,55,1,0,0,0,0,0,0,0,0 //LG_MOONSLASHER#Moon Slasher# -4082,2321,5,254,5,0,0,0,0,0,0,0,0 //LG_RAYOFGENESIS#Ray of Genesis# +4082,2321,10,254,5,0,0,0,0,0,0,0,0 //LG_RAYOFGENESIS#Ray of Genesis# 4082,2322,5,248,3,0,0,0,0,0,0,0,0 //LG_PIETY#Piety# 4082,2323,5,2311,3,0,0,0,0,0,0,0,0 //LG_EARTHDRIVE#Earth Drive# 4082,2324,5,2318,3,2319,3,0,0,0,0,0,0 //LG_HESPERUSLIT#Hesperus Lit# @@ -4127,7 +4127,7 @@ 4083,2307,5,2312,1,0,0,0,0,0,0,0,0 //LG_CANNONSPEAR#Cannon Spear# 4083,2308,10,55,1,0,0,0,0,0,0,0,0 //LG_BANISHINGPOINT#Banishing Point# 4083,2309,3,0,0,0,0,0,0,0,0,0,0 //LG_TRAMPLE#Trample# -4083,2310,5,250,3,0,0,0,0,0,0,0,0 //LG_SHIELDPRESS#Shield Press# +4083,2310,10,250,3,0,0,0,0,0,0,0,0 //LG_SHIELDPRESS#Shield Press# 4083,2311,5,252,5,0,0,0,0,0,0,0,0 //LG_REFLECTDAMAGE#Reflect Damage# 4083,2312,5,2308,5,0,0,0,0,0,0,0,0 //LG_PINPOINTATTACK#Pinpoint Attack# 4083,2313,5,0,0,0,0,0,0,0,0,0,0 //LG_FORCEOFVANGUARD#Force of Vanguard# @@ -4138,7 +4138,7 @@ 4083,2318,5,2309,3,0,0,0,0,0,0,0,0 //LG_PRESTIGE#Prestige# 4083,2319,5,2312,3,2314,1,0,0,0,0,0,0 //LG_BANDING#Banding# 4083,2320,5,55,1,0,0,0,0,0,0,0,0 //LG_MOONSLASHER#Moon Slasher# -4083,2321,5,254,5,0,0,0,0,0,0,0,0 //LG_RAYOFGENESIS#Ray of Genesis# +4083,2321,10,254,5,0,0,0,0,0,0,0,0 //LG_RAYOFGENESIS#Ray of Genesis# 4083,2322,5,248,3,0,0,0,0,0,0,0,0 //LG_PIETY#Piety# 4083,2323,5,2311,3,0,0,0,0,0,0,0,0 //LG_EARTHDRIVE#Earth Drive# 4083,2324,5,2318,3,2319,3,0,0,0,0,0,0 //LG_HESPERUSLIT#Hesperus Lit# @@ -4190,7 +4190,7 @@ 4084,2245,10,2240,1,0,0,0,0,0,0,0,0 //RA_TOOTHOFWUG#Tooth Of Warg# 4084,2246,5,2245,3,0,0,0,0,0,0,0,0 //RA_SENSITIVEKEEN#Sensitive Keen# 4084,2247,5,2235,1,0,0,0,0,0,0,0,0 //RA_CAMOUFLAGE#Camouflage# -4084,2248,5,123,1,124,1,0,0,0,0,0,0 //RA_RESEARCHTRAP#Research Trap# +4084,2248,10,123,1,124,1,0,0,0,0,0,0 //RA_RESEARCHTRAP#Research Trap# 4084,2249,1,2248,1,0,0,0,0,0,0,0,0 //RA_MAGENTATRAP#Magenta Trap# 4084,2250,1,2248,1,0,0,0,0,0,0,0,0 //RA_COBALTTRAP#Cobalt Trap# 4084,2251,1,2248,1,0,0,0,0,0,0,0,0 //RA_MAIZETRAP#Maize Trap# @@ -4248,7 +4248,7 @@ 4085,2245,10,2240,1,0,0,0,0,0,0,0,0 //RA_TOOTHOFWUG#Tooth Of Warg# 4085,2246,5,2245,3,0,0,0,0,0,0,0,0 //RA_SENSITIVEKEEN#Sensitive Keen# 4085,2247,5,2235,1,0,0,0,0,0,0,0,0 //RA_CAMOUFLAGE#Camouflage# -4085,2248,5,123,1,124,1,0,0,0,0,0,0 //RA_RESEARCHTRAP#Research Trap# +4085,2248,10,123,1,124,1,0,0,0,0,0,0 //RA_RESEARCHTRAP#Research Trap# 4085,2249,1,2248,1,0,0,0,0,0,0,0,0 //RA_MAGENTATRAP#Magenta Trap# 4085,2250,1,2248,1,0,0,0,0,0,0,0,0 //RA_COBALTTRAP#Cobalt Trap# 4085,2251,1,2248,1,0,0,0,0,0,0,0,0 //RA_MAIZETRAP#Maize Trap# @@ -4301,7 +4301,7 @@ 4086,2258,3,2256,2,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm# 4086,2259,3,2258,1,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher# 4086,2260,3,2258,3,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower# -4086,2261,3,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon# +4086,2261,5,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon# 4086,2262,3,2255,1,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration# 4086,2263,1,2262,1,0,0,0,0,0,0,0,0 //NC_HOVERING#Hovering# 4086,2264,1,2263,1,0,0,0,0,0,0,0,0 //NC_F_SIDESLIDE#Front-Side Slide# @@ -4319,7 +4319,7 @@ 4086,2276,10,0,0,0,0,0,0,0,0,0,0 //NC_TRAININGAXE#Axe Training# 4086,2277,5,0,0,0,0,0,0,0,0,0,0 //NC_RESEARCHFE#Research Fire/Earth# 4086,2278,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG#Axe Boomerang# -4086,2279,5,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing# +4086,2279,10,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing# 4086,2280,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado# 4086,2281,5,2277,2,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper# 4086,2282,5,2281,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy# @@ -4377,7 +4377,7 @@ 4087,2258,3,2256,2,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm# 4087,2259,3,2258,1,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher# 4087,2260,3,2258,3,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower# -4087,2261,3,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon# +4087,2261,5,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon# 4087,2262,3,2255,1,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration# 4087,2263,1,2262,1,0,0,0,0,0,0,0,0 //NC_HOVERING#Hovering# 4087,2264,1,2263,1,0,0,0,0,0,0,0,0 //NC_F_SIDESLIDE#Front-Side Slide# @@ -4395,7 +4395,7 @@ 4087,2276,10,0,0,0,0,0,0,0,0,0,0 //NC_TRAININGAXE#Axe Training# 4087,2277,5,0,0,0,0,0,0,0,0,0,0 //NC_RESEARCHFE#Research Fire/Earth# 4087,2278,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG#Axe Boomerang# -4087,2279,5,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing# +4087,2279,10,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing# 4087,2280,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado# 4087,2281,5,2277,2,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper# 4087,2282,5,2281,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy# @@ -4431,8 +4431,8 @@ 4096,64,5,63,1,0,0,0,0,0,0,0,0 //KN_CAVALIERMASTERY#Cavalier Mastery# 4096,1001,1,0,0,0,0,0,0,0,0,0,0 //KN_CHARGEATK#Charge Attack# 4096,495,1,60,10,0,0,0,0,0,0,0,0 //KN_ONEHAND#Onehand Quicken# -4096,2001,5,2010,2,0,0,0,0,0,0,0,0 //RK_ENCHANTBLADE#Enchant Blade# -4096,2002,5,2001,3,0,0,0,0,0,0,0,0 //RK_SONICWAVE#Sonic Wave# +4096,2001,10,2010,2,0,0,0,0,0,0,0,0 //RK_ENCHANTBLADE#Enchant Blade# +4096,2002,10,2001,3,0,0,0,0,0,0,0,0 //RK_SONICWAVE#Sonic Wave# 4096,2003,10,61,1,2001,2,0,0,0,0,0,0 //RK_DEATHBOUND#Death Bound# 4096,2004,10,2020,3,0,0,0,0,0,0,0,0 //RK_HUNDREDSPEAR#Hundred Spear# 4096,2005,5,2001,5,0,0,0,0,0,0,0,0 //RK_WINDCUTTER#Wind Cutter# @@ -4493,14 +4493,14 @@ 4097,2213,5,2212,3,0,0,0,0,0,0,0,0 //WL_COMET#Comet# 4097,2214,5,2223,1,0,0,0,0,0,0,0,0 //WL_CHAINLIGHTNING#Chain Lightning# 4097,2216,5,2207,2,0,0,0,0,0,0,0,0 //WL_EARTHSTRAIN#Earth Strain# -4097,2217,5,2204,5,2212,5,2214,5,2216,5,0,0 //WL_TETRAVORTEX#Tetra Vortex# +4097,2217,10,2204,5,2212,5,2214,5,2216,5,0,0 //WL_TETRAVORTEX#Tetra Vortex# 4097,2222,5,83,1,0,0,0,0,0,0,0,0 //WL_SUMMONFB#Summon Fire Ball# 4097,2223,5,85,1,0,0,0,0,0,0,0,0 //WL_SUMMONBL#Summon Lightning Ball# 4097,2224,5,89,1,0,0,0,0,0,0,0,0 //WL_SUMMONWB#Summon Water Ball# 4097,2229,5,91,1,0,0,0,0,0,0,0,0 //WL_SUMMONSTONE#Summon Stone# 4097,2230,2,0,0,0,0,0,0,0,0,0,0 //WL_RELEASE#Release# 4097,2231,1,0,0,0,0,0,0,0,0,0,0 //WL_READING_SB#Reading Spellbook# -4097,2232,5,0,0,0,0,0,0,0,0,0,0 //WL_FREEZE_SP#Freeze Spell# +4097,2232,10,0,0,0,0,0,0,0,0,0,0 //WL_FREEZE_SP#Freeze Spell# 4097,5012,5,2202,5,0,0,0,0,0,0,0,0 //WL_TELEKINESIS_INTENSE#Intense Telekinesis# 4097,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# 4097,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# @@ -4550,7 +4550,7 @@ 4098,2245,10,2240,1,0,0,0,0,0,0,0,0 //RA_TOOTHOFWUG#Tooth Of Warg# 4098,2246,5,2245,3,0,0,0,0,0,0,0,0 //RA_SENSITIVEKEEN#Sensitive Keen# 4098,2247,5,2235,1,0,0,0,0,0,0,0,0 //RA_CAMOUFLAGE#Camouflage# -4098,2248,5,123,1,124,1,0,0,0,0,0,0 //RA_RESEARCHTRAP#Research Trap# +4098,2248,10,123,1,124,1,0,0,0,0,0,0 //RA_RESEARCHTRAP#Research Trap# 4098,2249,1,2248,1,0,0,0,0,0,0,0,0 //RA_MAGENTATRAP#Magenta Trap# 4098,2250,1,2248,1,0,0,0,0,0,0,0,0 //RA_COBALTTRAP#Cobalt Trap# 4098,2251,1,2248,1,0,0,0,0,0,0,0,0 //RA_MAIZETRAP#Maize Trap# @@ -4599,7 +4599,7 @@ 4099,78,1,76,5,0,0,0,0,0,0,0,0 //PR_LEXAETERNA#Lex Aeterna# 4099,79,10,12,1,78,1,77,3,0,0,0,0 //PR_MAGNUS#Magnus Exorcismus# 4099,1014,1,0,0,0,0,0,0,0,0,0,0 //PR_REDEMPTIO#Redemptio# -4099,2038,5,77,1,0,0,0,0,0,0,0,0 //AB_JUDEX#Judex# +4099,2038,10,77,1,0,0,0,0,0,0,0,0 //AB_JUDEX#Judex# 4099,2039,1,2041,3,0,0,0,0,0,0,0,0 //AB_ANCILLA#Ancilla# 4099,2040,10,79,1,2038,5,2039,1,0,0,0,0 //AB_ADORAMUS#Adoramus# 4099,2041,3,34,1,0,0,0,0,0,0,0,0 //AB_CLEMENTIA#Crementia# @@ -4610,7 +4610,7 @@ 4099,2046,10,2045,5,0,0,0,0,0,0,0,0 //AB_ORATIO#Oratio# 4099,2047,4,72,1,0,0,0,0,0,0,0,0 //AB_LAUDAAGNUS#Lauda Agnus# 4099,2048,4,2047,2,0,0,0,0,0,0,0,0 //AB_LAUDARAMUS#Lauda Ramus# -4099,2050,1,2043,3,0,0,0,0,0,0,0,0 //AB_RENOVATIO#Renovatio# +4099,2050,4,2043,3,0,0,0,0,0,0,0,0 //AB_RENOVATIO#Renovatio# 4099,2051,5,2050,1,0,0,0,0,0,0,0,0 //AB_HIGHNESSHEAL#Highness Heal# 4099,2052,5,2048,2,0,0,0,0,0,0,0,0 //AB_CLEARANCE#Clearance# 4099,2053,5,2046,5,2054,5,0,0,0,0,0,0 //AB_EXPIATIO#Expiatio# @@ -4667,7 +4667,7 @@ 4100,2258,3,2256,2,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm# 4100,2259,3,2258,1,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher# 4100,2260,3,2258,3,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower# -4100,2261,3,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon# +4100,2261,5,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon# 4100,2262,3,2255,1,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration# 4100,2263,1,2262,1,0,0,0,0,0,0,0,0 //NC_HOVERING#Hovering# 4100,2264,1,2263,1,0,0,0,0,0,0,0,0 //NC_F_SIDESLIDE#Front-Side Slide# @@ -4685,7 +4685,7 @@ 4100,2276,10,0,0,0,0,0,0,0,0,0,0 //NC_TRAININGAXE#Axe Training# 4100,2277,5,0,0,0,0,0,0,0,0,0,0 //NC_RESEARCHFE#Research Fire/Earth# 4100,2278,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG#Axe Boomerang# -4100,2279,5,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing# +4100,2279,10,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing# 4100,2280,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado# 4100,2281,5,2277,2,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper# 4100,2282,5,2281,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy# @@ -4730,7 +4730,7 @@ 4101,2026,1,2024,5,0,0,0,0,0,0,0,0 //GC_ANTIDOTE#Antidote# 4101,2027,5,2025,1,0,0,0,0,0,0,0,0 //GC_POISONINGWEAPON#Poisoning Weapon# 4101,2028,5,133,5,0,0,0,0,0,0,0,0 //GC_WEAPONBLOCKING#Weapon Blocking# -4101,2029,5,2028,1,0,0,0,0,0,0,0,0 //GC_COUNTERSLASH#Counter Slash# +4101,2029,10,2028,1,0,0,0,0,0,0,0,0 //GC_COUNTERSLASH#Counter Slash# 4101,2030,5,2028,1,0,0,0,0,0,0,0,0 //GC_WEAPONCRUSH#Weapon Crush# 4101,2031,5,2027,3,2028,1,0,0,0,0,0,0 //GC_VENOMPRESSURE#Venom Pressure# 4101,2032,5,2027,5,2031,5,0,0,0,0,0,0 //GC_POISONSMOKE#Poison Smoke# @@ -4779,7 +4779,7 @@ 4102,2307,5,2312,1,0,0,0,0,0,0,0,0 //LG_CANNONSPEAR#Cannon Spear# 4102,2308,10,55,1,0,0,0,0,0,0,0,0 //LG_BANISHINGPOINT#Banishing Point# 4102,2309,3,0,0,0,0,0,0,0,0,0,0 //LG_TRAMPLE#Trample# -4102,2310,5,250,3,0,0,0,0,0,0,0,0 //LG_SHIELDPRESS#Shield Press# +4102,2310,10,250,3,0,0,0,0,0,0,0,0 //LG_SHIELDPRESS#Shield Press# 4102,2311,5,252,5,0,0,0,0,0,0,0,0 //LG_REFLECTDAMAGE#Reflect Damage# 4102,2312,5,2308,5,0,0,0,0,0,0,0,0 //LG_PINPOINTATTACK#Pinpoint Attack# 4102,2313,5,0,0,0,0,0,0,0,0,0,0 //LG_FORCEOFVANGUARD#Force of Vanguard# @@ -4790,7 +4790,7 @@ 4102,2318,5,2309,3,0,0,0,0,0,0,0,0 //LG_PRESTIGE#Prestige# 4102,2319,5,2312,3,2314,1,0,0,0,0,0,0 //LG_BANDING#Banding# 4102,2320,5,55,1,0,0,0,0,0,0,0,0 //LG_MOONSLASHER#Moon Slasher# -4102,2321,5,254,5,0,0,0,0,0,0,0,0 //LG_RAYOFGENESIS#Ray of Genesis# +4102,2321,10,254,5,0,0,0,0,0,0,0,0 //LG_RAYOFGENESIS#Ray of Genesis# 4102,2322,5,248,3,0,0,0,0,0,0,0,0 //LG_PIETY#Piety# 4102,2323,5,2311,3,0,0,0,0,0,0,0,0 //LG_EARTHDRIVE#Earth Drive# 4102,2324,5,2318,3,2319,3,0,0,0,0,0,0 //LG_HESPERUSLIT#Hesperus Lit# @@ -4844,7 +4844,7 @@ 4103,1019,1,0,0,0,0,0,0,0,0,0,0 //SA_ELEMENTWIND#Elemental Change Wind# 4103,2443,5,285,1,0,0,0,0,0,0,0,0 //SO_FIREWALK#Fire Walk# 4103,2444,5,287,1,0,0,0,0,0,0,0,0 //SO_ELECTRICWALK#Electric Walk# -4103,2445,5,279,4,0,0,0,0,0,0,0,0 //SO_SPELLFIST#Spell Fist# +4103,2445,10,279,4,0,0,0,0,0,0,0,0 //SO_SPELLFIST#Spell Fist# 4103,2446,5,90,5,0,0,0,0,0,0,0,0 //SO_EARTHGRAVE#Earth Grave# 4103,2447,5,286,3,0,0,0,0,0,0,0,0 //SO_DIAMONDDUST#Diamond Dust# 4103,2448,5,2450,2,0,0,0,0,0,0,0,0 //SO_POISON_BUSTER#Poison Buster# @@ -4853,7 +4853,7 @@ 4103,2451,5,280,1,281,1,282,1,283,1,0,0 //SO_STRIKING#Striking# 4103,2452,5,285,1,287,1,0,0,0,0,0,0 //SO_WARMER#Warmer# 4103,2453,5,288,2,0,0,0,0,0,0,0,0 //SO_VACUUM_EXTREME#Vacuum Extreme# -4103,2454,5,283,1,287,4,0,0,0,0,0,0 //SO_VARETYR_SPEAR#Varetyr Spear# +4103,2454,10,283,1,287,4,0,0,0,0,0,0 //SO_VARETYR_SPEAR#Varetyr Spear# 4103,2455,5,2452,2,0,0,0,0,0,0,0,0 //SO_ARRULLO#Arrullo# 4103,2456,4,2462,1,0,0,0,0,0,0,0,0 //SO_EL_CONTROL#Spirit Control# 4103,2457,3,2452,3,2456,1,0,0,0,0,0,0 //SO_SUMMON_AGNI#Summon Fire Spirit Agni# @@ -4906,7 +4906,7 @@ 4104,2382,5,2422,1,0,0,0,0,0,0,0,0 //MI_ECHOSONG#Echo Song# 4104,2383,5,2422,1,0,0,0,0,0,0,0,0 //MI_HARMONIZE#Harmonize# 4104,2412,10,0,0,0,0,0,0,0,0,0,0 //WM_LESSON#Lesson# -4104,2413,5,2417,1,0,0,0,0,0,0,0,0 //WM_METALICSOUND#Metallic Sound# +4104,2413,10,2417,1,0,0,0,0,0,0,0,0 //WM_METALICSOUND#Metallic Sound# 4104,2414,5,317,5,0,0,0,0,0,0,0,0 //WM_REVERBERATION#Reverberation# 4104,2417,1,2414,1,0,0,0,0,0,0,0,0 //WM_DOMINION_IMPULSE#Dominion Impulse# 4104,2418,5,316,5,0,0,0,0,0,0,0,0 //WM_SEVERE_RAINSTORM#Severe Rainstorm# @@ -4964,7 +4964,7 @@ 4105,2351,5,2422,1,0,0,0,0,0,0,0,0 //WA_SYMPHONY_OF_LOVER#Symphony of Lovers# 4105,2352,5,2422,1,0,0,0,0,0,0,0,0 //WA_MOONLIT_SERENADE#Moonlit Serenade# 4105,2412,10,0,0,0,0,0,0,0,0,0,0 //WM_LESSON#Lesson# -4105,2413,5,2417,1,0,0,0,0,0,0,0,0 //WM_METALICSOUND#Metallic Sound# +4105,2413,10,2417,1,0,0,0,0,0,0,0,0 //WM_METALICSOUND#Metallic Sound# 4105,2414,5,325,5,0,0,0,0,0,0,0,0 //WM_REVERBERATION#Reverberation# 4105,2417,1,2414,1,0,0,0,0,0,0,0,0 //WM_DOMINION_IMPULSE#Dominion Impulse# 4105,2418,5,324,5,0,0,0,0,0,0,0,0 //WM_SEVERE_RAINSTORM#Severe Rainstorm# @@ -5027,13 +5027,13 @@ 4106,2326,10,263,5,0,0,0,0,0,0,0,0 //SR_DRAGONCOMBO#Dragon Combo# 4106,2327,5,2326,3,0,0,0,0,0,0,0,0 //SR_SKYNETBLOW#Sky Net Blow# 4106,2328,5,2326,1,2334,1,0,0,0,0,0,0 //SR_EARTHSHAKER#Earth Shaker# -4106,2329,5,2326,1,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE#Fallen Empire# +4106,2329,10,2326,1,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE#Fallen Empire# 4106,2330,10,2329,3,0,0,0,0,0,0,0,0 //SR_TIGERCANNON#Tiger Cannon# 4106,2332,5,2328,2,0,0,0,0,0,0,0,0 //SR_RAMPAGEBLASTER#Rampage Blaster# 4106,2333,5,2327,1,0,0,0,0,0,0,0,0 //SR_CRESCENTELBOW#Crescent Elbow# 4106,2334,5,269,2,2344,2,0,0,0,0,0,0 //SR_CURSEDCIRCLE#Cursed Circle# 4106,2335,5,2337,1,0,0,0,0,0,0,0,0 //SR_LIGHTNINGWALK#Lightning Walk# -4106,2336,5,2332,3,2335,3,0,0,0,0,0,0 //SR_KNUCKLEARROW#Knuckle Arrow# +4106,2336,10,2332,3,2335,3,0,0,0,0,0,0 //SR_KNUCKLEARROW#Knuckle Arrow# 4106,2337,1,2334,1,0,0,0,0,0,0,0,0 //SR_WINDMILL#Windmill# 4106,2338,10,2332,3,2346,3,0,0,0,0,0,0 //SR_RAISINGDRAGON#Raising Dragon# 4106,2340,1,262,1,2341,1,0,0,0,0,0,0 //SR_ASSIMILATEPOWER#Assimilate Power# @@ -5086,12 +5086,12 @@ 4107,498,1,228,10,0,0,0,0,0,0,0,0 //AM_TWILIGHT3#Twilight Alchemy 3# 4107,2474,5,0,0,0,0,0,0,0,0,0,0 //GN_TRAINING_SWORD#Sword Training# 4107,2475,5,0,0,0,0,0,0,0,0,0,0 //GN_REMODELING_CART#Cart Remodeling# -4107,2476,5,2475,1,0,0,0,0,0,0,0,0 //GN_CART_TORNADO#Cart Tornado# +4107,2476,10,2475,1,0,0,0,0,0,0,0,0 //GN_CART_TORNADO#Cart Tornado# 4107,2477,5,2475,2,0,0,0,0,0,0,0,0 //GN_CARTCANNON#Cart Cannon# 4107,2478,5,2475,3,0,0,0,0,0,0,0,0 //GN_CARTBOOST#Cart Boost# 4107,2479,5,2497,2,0,0,0,0,0,0,0,0 //GN_THORNS_TRAP#Thorn Trap# 4107,2480,5,2497,3,0,0,0,0,0,0,0,0 //GN_BLOOD_SUCKER#Blood Sucker# -4107,2481,5,2497,4,0,0,0,0,0,0,0,0 //GN_SPORE_EXPLOSION#Spore Explosion# +4107,2481,10,2497,4,0,0,0,0,0,0,0,0 //GN_SPORE_EXPLOSION#Spore Explosion# 4107,2482,5,2479,3,0,0,0,0,0,0,0,0 //GN_WALLOFTHORN#Wall of Thorns# 4107,2483,10,2482,3,0,0,0,0,0,0,0,0 //GN_CRAZYWEED#Crazy Weed# 4107,2485,5,2481,3,0,0,0,0,0,0,0,0 //GN_DEMONIC_FIRE#Demonic Fire# @@ -5144,7 +5144,7 @@ 4108,224,5,223,1,0,0,0,0,0,0,0,0 //RG_COMPULSION#Haggle# 4108,225,10,219,5,0,0,0,0,0,0,0,0 //RG_PLAGIARISM#Intimidate# 4108,1005,1,0,0,0,0,0,0,0,0,0,0 //RG_CLOSECONFINE#Close Confine# -4108,2284,5,219,5,0,0,0,0,0,0,0,0 //SC_FATALMMENACE#Fatal Menace# +4108,2284,10,219,5,0,0,0,0,0,0,0,0 //SC_FATALMMENACE#Fatal Menace# 4108,2285,10,225,5,0,0,0,0,0,0,0,0 //SC_REPRODUCE#Reproduce# 4108,2286,10,2285,5,0,0,0,0,0,0,0,0 //SC_AUTOSHADOWSPELL#Auto Shadow Spell# 4108,2287,5,213,3,0,0,0,0,0,0,0,0 //SC_SHADOWFORM#Shadow Form# @@ -5164,7 +5164,7 @@ 4108,2301,3,2299,1,0,0,0,0,0,0,0,0 //SC_CHAOSPANIC#Chaos Panic# 4108,2302,3,2296,3,2301,3,0,0,0,0,0,0 //SC_MAELSTROM#Maelstrom# 4108,2303,3,2300,3,0,0,0,0,0,0,0,0 //SC_BLOODYLUST#Bloody Lust# -4108,2304,3,2300,3,0,0,0,0,0,0,0,0 //SC_FEINTBOMB#Feint Bomb# +4108,2304,10,2300,3,0,0,0,0,0,0,0,0 //SC_FEINTBOMB#Feint Bomb# 4108,5010,5,2288,2,0,0,0,0,0,0,0,0 //SC_ESCAPE#Emergency Escape# 4108,5014,5,0,0,0,0,0,0,0,0,0,0 //ALL_FULL_THROTTLE#Full Throttle# 4108,5065,1,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP#Cheer Up# @@ -5195,8 +5195,8 @@ 4109,64,5,63,1,0,0,0,0,0,0,0,0 //KN_CAVALIERMASTERY#Cavalier Mastery# 4109,1001,1,0,0,0,0,0,0,0,0,0,0 //KN_CHARGEATK#Charge Attack# 4109,495,1,60,10,0,0,0,0,0,0,0,0 //KN_ONEHAND#Onehand Quicken# -4109,2001,5,2010,2,0,0,0,0,0,0,0,0 //RK_ENCHANTBLADE#Enchant Blade# -4109,2002,5,2001,3,0,0,0,0,0,0,0,0 //RK_SONICWAVE#Sonic Wave# +4109,2001,10,2010,2,0,0,0,0,0,0,0,0 //RK_ENCHANTBLADE#Enchant Blade# +4109,2002,10,2001,3,0,0,0,0,0,0,0,0 //RK_SONICWAVE#Sonic Wave# 4109,2003,10,61,1,2001,2,0,0,0,0,0,0 //RK_DEATHBOUND#Death Bound# 4109,2004,10,2020,3,0,0,0,0,0,0,0,0 //RK_HUNDREDSPEAR#Hundred Spear# 4109,2005,5,2001,5,0,0,0,0,0,0,0,0 //RK_WINDCUTTER#Wind Cutter# @@ -5246,7 +5246,7 @@ 4110,2307,5,2312,1,0,0,0,0,0,0,0,0 //LG_CANNONSPEAR#Cannon Spear# 4110,2308,10,55,1,0,0,0,0,0,0,0,0 //LG_BANISHINGPOINT#Banishing Point# 4110,2309,3,0,0,0,0,0,0,0,0,0,0 //LG_TRAMPLE#Trample# -4110,2310,5,250,3,0,0,0,0,0,0,0,0 //LG_SHIELDPRESS#Shield Press# +4110,2310,10,250,3,0,0,0,0,0,0,0,0 //LG_SHIELDPRESS#Shield Press# 4110,2311,5,252,5,0,0,0,0,0,0,0,0 //LG_REFLECTDAMAGE#Reflect Damage# 4110,2312,5,2308,5,0,0,0,0,0,0,0,0 //LG_PINPOINTATTACK#Pinpoint Attack# 4110,2313,5,0,0,0,0,0,0,0,0,0,0 //LG_FORCEOFVANGUARD#Force of Vanguard# @@ -5257,7 +5257,7 @@ 4110,2318,5,2309,3,0,0,0,0,0,0,0,0 //LG_PRESTIGE#Prestige# 4110,2319,5,2312,3,2314,1,0,0,0,0,0,0 //LG_BANDING#Banding# 4110,2320,5,55,1,0,0,0,0,0,0,0,0 //LG_MOONSLASHER#Moon Slasher# -4110,2321,5,254,5,0,0,0,0,0,0,0,0 //LG_RAYOFGENESIS#Ray of Genesis# +4110,2321,10,254,5,0,0,0,0,0,0,0,0 //LG_RAYOFGENESIS#Ray of Genesis# 4110,2322,5,248,3,0,0,0,0,0,0,0,0 //LG_PIETY#Piety# 4110,2323,5,2311,3,0,0,0,0,0,0,0,0 //LG_EARTHDRIVE#Earth Drive# 4110,2324,5,2318,3,2319,3,0,0,0,0,0,0 //LG_HESPERUSLIT#Hesperus Lit# @@ -5311,7 +5311,7 @@ 4111,2245,10,2240,1,0,0,0,0,0,0,0,0 //RA_TOOTHOFWUG#Tooth Of Warg# 4111,2246,5,2245,3,0,0,0,0,0,0,0,0 //RA_SENSITIVEKEEN#Sensitive Keen# 4111,2247,5,2235,1,0,0,0,0,0,0,0,0 //RA_CAMOUFLAGE#Camouflage# -4111,2248,5,123,1,124,1,0,0,0,0,0,0 //RA_RESEARCHTRAP#Research Trap# +4111,2248,10,123,1,124,1,0,0,0,0,0,0 //RA_RESEARCHTRAP#Research Trap# 4111,2249,1,2248,1,0,0,0,0,0,0,0,0 //RA_MAGENTATRAP#Magenta Trap# 4111,2250,1,2248,1,0,0,0,0,0,0,0,0 //RA_COBALTTRAP#Cobalt Trap# 4111,2251,1,2248,1,0,0,0,0,0,0,0,0 //RA_MAIZETRAP#Maize Trap# @@ -5366,7 +5366,7 @@ 4112,2258,3,2256,2,0,0,0,0,0,0,0,0 //NC_VULCANARM#Vulcan Arm# 4112,2259,3,2258,1,0,0,0,0,0,0,0,0 //NC_FLAMELAUNCHER#Flame Launcher# 4112,2260,3,2258,3,0,0,0,0,0,0,0,0 //NC_COLDSLOWER#Cold Slower# -4112,2261,3,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon# +4112,2261,5,2259,2,2260,2,0,0,0,0,0,0 //NC_ARMSCANNON#Arm Cannon# 4112,2262,3,2255,1,0,0,0,0,0,0,0,0 //NC_ACCELERATION#Acceleration# 4112,2263,1,2262,1,0,0,0,0,0,0,0,0 //NC_HOVERING#Hovering# 4112,2264,1,2263,1,0,0,0,0,0,0,0,0 //NC_F_SIDESLIDE#Front-Side Slide# @@ -5384,7 +5384,7 @@ 4112,2276,10,0,0,0,0,0,0,0,0,0,0 //NC_TRAININGAXE#Axe Training# 4112,2277,5,0,0,0,0,0,0,0,0,0,0 //NC_RESEARCHFE#Research Fire/Earth# 4112,2278,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXEBOOMERANG#Axe Boomerang# -4112,2279,5,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing# +4112,2279,10,2278,3,0,0,0,0,0,0,0,0 //NC_POWERSWING#Power Swing# 4112,2280,5,2276,1,0,0,0,0,0,0,0,0 //NC_AXETORNADO#Axe Tornado# 4112,2281,5,2277,2,0,0,0,0,0,0,0,0 //NC_SILVERSNIPER#FAW - Silver Sniper# 4112,2282,5,2281,2,0,0,0,0,0,0,0,0 //NC_MAGICDECOY#FAW - Magic Decoy# diff --git a/src/map/battle.cpp b/src/map/battle.cpp index af556b8dc52..3a021e792de 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -2625,6 +2625,9 @@ static bool is_attack_hitting(struct Damage* wd, struct block_list *src, struct if(sd && pc_checkskill(sd,AS_SONICACCEL) > 0) hitrate += hitrate * 50 / 100; break; + case RK_SONICWAVE: + hitrate += hitrate * 3 * skill_lv / 100; // !TODO: Confirm the hitrate bonus + break; case MC_CARTREVOLUTION: case GN_CART_TORNADO: case GN_CARTCANNON: @@ -2638,7 +2641,10 @@ static bool is_attack_hitting(struct Damage* wd, struct block_list *src, struct hitrate += 10 + 4 * skill_lv; break; case SC_FATALMENACE: - hitrate -= 35 - 5 * skill_lv; + if (skill_lv < 6) + hitrate -= 35 - 5 * skill_lv; + else if (skill_lv > 6) + hitrate += 5 * skill_lv - 30; break; case RL_SLUGSHOT: { @@ -3802,7 +3808,7 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list * skillratio += ((skill_lv - 1) % 5 + 1) * 100; break; case RK_SONICWAVE: - skillratio += -100 + (skill_lv + 5) * 100; // ATK = {((Skill Level + 5) x 100) x (1 + [(Caster's Base Level - 100) / 200])} % + skillratio += -100 + (skill_lv + 7) * 100; // ATK = {((Skill Level + 7) x 100) x (1 + [(Caster's Base Level - 100) / 200])} % skillratio = skillratio * (100 + (status_get_lv(src) - 100) / 2) / 100; break; case RK_HUNDREDSPEAR: @@ -3848,8 +3854,8 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list * RE_LVL_DMOD(120); break; case GC_COUNTERSLASH: - //ATK [{(Skill Level x 100) + 300} x Caster's Base Level / 120]% + ATK [(AGI x 2) + (Caster's Job Level x 4)]% - skillratio += 200 + (100 * skill_lv); + //ATK [{(Skill Level x 150) + 300} x Caster's Base Level / 120]% + ATK [(AGI x 2) + (Caster's Job Level x 4)]% + skillratio += -100 + 300 + 150 * skill_lv; RE_LVL_DMOD(120); break; case GC_VENOMPRESSURE: @@ -3880,7 +3886,7 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list * RE_LVL_DMOD(100); break; case RA_AIMEDBOLT: - skillratio += 400 + 50 * skill_lv; + skillratio += 100 + 20 * skill_lv + 500; RE_LVL_DMOD(100); break; case RA_CLUSTERBOMB: @@ -3971,7 +3977,7 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list * RE_LVL_DMOD(100); break; case LG_SHIELDPRESS: - skillratio += -100 + 150 * skill_lv + status_get_str(src); + skillratio += -100 + 100 * skill_lv + sstatus->str + sstatus->vit; // !TODO: Confirm stat inclusion into bonus if (sd) { short index = sd->equip_index[EQI_HAND_L]; @@ -4016,10 +4022,6 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list * case LG_OVERBRAND_PLUSATK: // Only Piercing and Swing damage get RE_LVL_DMOD bonus damage skillratio += -100 + 200 * skill_lv + rnd()%90 + 10; break; - case LG_RAYOFGENESIS: - skillratio += 200 + 300 * skill_lv; - RE_LVL_DMOD(100); - break; case LG_EARTHDRIVE: if (sd) { short index = sd->equip_index[EQI_HAND_L]; @@ -4059,8 +4061,8 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list * RE_LVL_DMOD(100); break; case SR_FALLENEMPIRE: - // ATK [(Skill Level x 150 + 100) x Caster Base Level / 150] % - skillratio += 150 * skill_lv; + // ATK [(Skill Level x 250 + 100) x Caster Base Level / 150] % + skillratio += -100 + 250 * skill_lv + 100; RE_LVL_DMOD(150); break; case SR_TIGERCANNON: @@ -4103,7 +4105,7 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list * skillratio += 100 * tsd->weight / tsd->max_weight; RE_LVL_DMOD(150); } else { // ATK [(Skill Level x 100 + 500) x Caster Base Level / 100] % - skillratio += 400 + 100 * skill_lv; + skillratio += -100 + 100 * skill_lv + 500; RE_LVL_DMOD(100); } break; @@ -4140,6 +4142,8 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list * case WM_SEVERE_RAINSTORM_MELEE: //ATK [{(Caster DEX + AGI) x (Skill Level / 5)} x Caster Base Level / 100] % skillratio = (status_get_dex(src) + status_get_agi(src)) * skill_lv / 5; + if (wd->miscflag&4) // Whip/Instrument equipped + skillratio += 100; // !TODO: What's the weapon bonus? RE_LVL_DMOD(100); break; case WM_GREAT_ECHO: @@ -4153,8 +4157,8 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list * } RE_LVL_DMOD(100); break; - case GN_CART_TORNADO: { // ATK [( Skill Level x 50 ) + ( Cart Weight / ( 150 - Caster Base STR ))] + ( Cart Remodeling Skill Level x 50 )] % - skillratio += -100 + 50 * skill_lv; + case GN_CART_TORNADO: { // ATK [( Skill Level x 100 ) + ( Cart Weight / ( 150 - Caster Base STR ))] + ( Cart Remodeling Skill Level x 50 )] % + skillratio += -100 + 100 * skill_lv; if(sd && sd->cart_weight) skillratio += sd->cart_weight / 10 / (150 - min(sd->status.str,120)) + pc_checkskill(sd,GN_REMODELING_CART) * 50; } @@ -4164,7 +4168,7 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list * skillratio += -100 + 60 * skill_lv + ((sd) ? pc_checkskill(sd, GN_REMODELING_CART) : 1) * 50 * status_get_int(src) / 40; break; case GN_SPORE_EXPLOSION: - skillratio += 100 + status_get_int(src) + 100 * skill_lv; + skillratio += -100 + 150 * skill_lv + 200 + status_get_int(src); RE_LVL_DMOD(100); break; case GN_WALLOFTHORN: @@ -4202,12 +4206,6 @@ static int battle_calc_attack_skill_ratio(struct Damage* wd, struct block_list * RE_LVL_DMOD(100); } break; - case SO_VARETYR_SPEAR://ATK [{( Striking Level x 50 ) + ( Varetyr Spear Skill Level x 50 )} x Caster Base Level / 100 ] % - skillratio += -100 + 50 * skill_lv + ((sd) ? pc_checkskill(sd, SO_STRIKING) * 50 : 0); - RE_LVL_DMOD(100); - if (sc && sc->data[SC_BLAST_OPTION]) - skillratio += (sd ? sd->status.job_level * 5 : 0); - break; // Physical Elemantal Spirits Attack Skills case EL_CIRCLE_OF_FIRE: case EL_FIRE_BOMB_ATK: @@ -5146,22 +5144,14 @@ static void battle_calc_weapon_final_atk_modifiers(struct Damage* wd, struct blo if (skill_id != SN_SHARPSHOOTING && skill_id != RA_ARROWSTORM) status_change_end(src, SC_CAMOUFLAGE, INVALID_TIMER); } - switch (skill_id) { - case LG_RAYOFGENESIS: - { - struct Damage md = battle_calc_magic_attack(src, target, skill_id, skill_lv, wd->miscflag); - wd->damage += md.damage; - } - break; + #ifndef RENEWAL - case ASC_BREAKER: - { //Breaker's int-based damage (a misc attack?) - struct Damage md = battle_calc_misc_attack(src, target, skill_id, skill_lv, wd->miscflag); - wd->damage += md.damage; - } - break; -#endif + if (skill_id == ASC_BREAKER) { //Breaker's int-based damage (a misc attack?) + struct Damage md = battle_calc_misc_attack(src, target, skill_id, skill_lv, wd->miscflag); + + wd->damage += md.damage; } +#endif // Skill damage adjustment if ((skill_damage = battle_skill_damage(src, target, skill_id)) != 0) @@ -5549,8 +5539,6 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl case CR_ACIDDEMONSTRATION: case GN_FIRE_EXPANSION_ACID: #endif - case SO_VARETYR_SPEAR: - break; //These skills will do a card fix later default: wd.damage += battle_calc_cardfix(BF_WEAPON, src, target, battle_skill_get_damage_properties(skill_id, wd.miscflag), right_element, left_element, wd.damage, 0, wd.flag); if(is_attack_left_handed(src, skill_id)) @@ -5630,8 +5618,6 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl case CR_ACIDDEMONSTRATION: case GN_FIRE_EXPANSION_ACID: #endif - case SO_VARETYR_SPEAR: - return wd; //These skills will do a GVG fix later default: battle_calc_attack_gvg_bg(&wd, src, target, skill_id, skill_lv); break; @@ -5976,9 +5962,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list break; #endif case AB_JUDEX: - skillratio += 200 + 20 * skill_lv; - if (skill_lv == 5) - skillratio += 170; + skillratio += -100 + 300 + 40 * skill_lv; RE_LVL_DMOD(100); break; case AB_ADORAMUS: @@ -6065,7 +6049,9 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list case WL_TETRAVORTEX_WATER: case WL_TETRAVORTEX_WIND: case WL_TETRAVORTEX_GROUND: - skillratio += 400 + 500 * skill_lv; + skillratio += 100 + 500 + 500 * skill_lv; + if (skill_lv > 5) + skillratio += 200 * (skill_lv - 5); break; case WL_SUMMON_ATK_FIRE: case WL_SUMMON_ATK_WATER: @@ -6075,13 +6061,10 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list RE_LVL_DMOD(100); break; case LG_RAYOFGENESIS: - if(sc) { - if(sc->data[SC_INSPIRATION]) - skillratio += 1400; - if(sc->data[SC_BANDING]) - skillratio += -100 + 300 * skill_lv + 200 * sc->data[SC_BANDING]->val2; - skillratio = skillratio * ((sd) ? sd->status.job_level / 25 : 1); - } + skillratio += -100 + 200 * skill_lv; + if(sc && sc->data[SC_INSPIRATION]) + skillratio += 1400; + RE_LVL_DMOD(100); break; case LG_SHIELDSPELL: // [(Casters Base Level x 4) + (Shield MDEF x 100) + (Casters INT x 2)] % if (sd && skill_lv == 2) @@ -6354,12 +6337,6 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list } } break; - case SO_VARETYR_SPEAR: { - struct Damage wd = battle_calc_weapon_attack(src, target, skill_id, skill_lv, mflag); - - ad.damage += wd.damage; - } - break; } #ifndef RENEWAL diff --git a/src/map/skill.cpp b/src/map/skill.cpp index 3a78bb0bb36..596dd552472 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -373,7 +373,11 @@ int skill_get_range2(struct block_list *bl, uint16 skill_id, uint16 skill_lv, bo if( bl->type == BL_PC ) { if(inf3&INF3_EFF_SHADOWJUMP) range = skill_get_range(NJ_SHADOWJUMP,pc_checkskill((TBL_PC*)bl,NJ_SHADOWJUMP)); if(inf3&INF3_EFF_RADIUS) range += pc_checkskill((TBL_PC*)bl, WL_RADIUS); - if(inf3&INF3_EFF_RESEARCHTRAP) range += (1 + pc_checkskill((TBL_PC*)bl, RA_RESEARCHTRAP))/2; + if(inf3&INF3_EFF_RESEARCHTRAP) { + int rt_range[11] = { 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5 }; + + range += rt_range[pc_checkskill((TBL_PC*)bl, RA_RESEARCHTRAP)]; + } } } @@ -725,7 +729,6 @@ bool skill_isNotOk(uint16 skill_id, struct map_session_data *sd) } return false; case AL_TELEPORT: - case SC_FATALMENACE: case SC_DIMENSIONDOOR: case ALL_ODINS_RECALL: case WE_CALLALLFAMILY: @@ -1622,9 +1625,6 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1 case GC_WEAPONCRUSH: skill_castend_nodamage_id(src,bl,skill_id,skill_lv,tick,BCT_ENEMY); break; - case LG_SHIELDPRESS: - sc_start(src,bl, SC_STUN, 30 + 8 * skill_lv + (status_get_dex(src) / 10) + (status_get_lv(src) / 4), skill_lv, skill_get_time(skill_id,skill_lv)); - break; case LG_PINPOINTATTACK: rate = 30 + 5 * ((sd) ? pc_checkskill(sd,LG_PINPOINTATTACK) : skill_lv) + (status_get_agi(src) + status_get_lv(src)) / 10; switch( skill_lv ) { @@ -3677,11 +3677,6 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list * rate = rate + (status_get_lv(src) - status_get_lv(bl)); if(rnd()%100 < rate) skill_addtimerskill(src,tick + 800,bl->id,0,0,skill_id,skill_lv,0,flag); - } else if( skill_id == SC_FATALMENACE ) { - int16 x = skill_area_temp[4], y = skill_area_temp[5]; - - map_search_freecell(NULL, bl->m, &x, &y, 2, 2, 1); - skill_addtimerskill(bl,tick + 800,bl->id,x,y,skill_id,skill_lv,0,flag); } } @@ -3708,9 +3703,6 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list * } } break; - case WM_METALICSOUND: - status_zap(bl, 0, damage*100/(100*(110-((sd) ? pc_checkskill(sd,WM_LESSON) : skill_get_max(WM_LESSON))*10))); - break; case SR_TIGERCANNON: status_zap(bl, 0, damage * 10 / 100); break; @@ -4103,7 +4095,7 @@ static TIMER_FUNC(skill_timerskill){ break; // Source not on Map if(skl->target_id) { target = map_id2bl(skl->target_id); - if( ( skl->skill_id == RG_INTIMIDATE || skl->skill_id == SC_FATALMENACE ) && (!target || target->prev == NULL || !check_distance_bl(src,target,AREA_SIZE)) ) + if( ( skl->skill_id == RG_INTIMIDATE ) && (!target || target->prev == NULL || !check_distance_bl(src,target,AREA_SIZE)) ) target = src; //Required since it has to warp. if (skl->skill_id == SR_SKYNETBLOW) { @@ -4235,7 +4227,7 @@ static TIMER_FUNC(skill_timerskill){ case WL_TETRAVORTEX_WIND: case WL_TETRAVORTEX_GROUND: clif_skill_nodamage(src,target,skl->skill_id,skl->skill_lv,1); - skill_attack(BF_MAGIC,src,src,target,skl->skill_id,skl->skill_lv,tick,skl->flag|SD_ANIMATION); + skill_attack(BF_MAGIC,src,src,target,skl->skill_id,skl->skill_lv,tick,skl->flag|SD_LEVEL|SD_ANIMATION); if (skl->type >= 3) { // Final Hit if (!status_isdead(target)) { // Final Status Effect int effects[4] = { SC_BURNING, SC_FREEZING, SC_BLEEDING, SC_STUN }, @@ -4263,9 +4255,6 @@ static TIMER_FUNC(skill_timerskill){ case WM_REVERBERATION_MAGIC: skill_castend_damage_id(src,target,skl->skill_id,skl->skill_lv,tick,skl->flag|SD_LEVEL|SD_ANIMATION); break; - case SC_FATALMENACE: - unit_warp(src, -1, skl->x, skl->y, CLR_TELEPORT); - break; case LG_MOONSLASHER: case SR_WINDMILL: if( target->type == BL_PC ) { @@ -4766,7 +4755,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint case LG_BANISHINGPOINT: case LG_SHIELDPRESS: case LG_RAGEBURST: - case LG_RAYOFGENESIS: case LG_HESPERUSLIT: case LG_OVERBRAND: case LG_OVERBRAND_BRANDISH: @@ -5307,6 +5295,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint case NJ_HUUJIN: case AB_HIGHNESSHEAL: case AB_DUPLELIGHT_MAGIC: + case LG_RAYOFGENESIS: case WM_METALICSOUND: case KO_KAIHOU: case MH_ERASER_CUTTER: @@ -5570,8 +5559,15 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint } break; + case WL_TETRAVORTEX_FIRE: + case WL_TETRAVORTEX_WATER: + case WL_TETRAVORTEX_WIND: + case WL_TETRAVORTEX_GROUND: + skill_addtimerskill(src, tick + skill_area_temp[0] * 200, bl->id, skill_area_temp[1], 0, skill_id, skill_lv, 0, flag); + break; + case WL_TETRAVORTEX: - if( sd && sc ) { // No SC? No spheres + if( sc ) { // No SC? No spheres int spheres[5] = { 0, 0, 0, 0, 0 }, positions[5] = {-1,-1,-1,-1,-1 }, i, j = 0, k, subskill = 0; @@ -5604,8 +5600,13 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint case WLS_WATER: subskill = WL_TETRAVORTEX_WATER; k |= 2; break; case WLS_STONE: subskill = WL_TETRAVORTEX_GROUND; k |= 8; break; } - skill_addtimerskill(src, tick + i * 200, bl->id, k, 0, subskill, skill_lv, i, flag); - clif_skill_nodamage(src, bl, subskill, skill_lv, 1); + + if (skill_lv > 5) { + skill_area_temp[0] = i; + skill_area_temp[1] = k; + map_foreachinallrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), BL_CHAR, src, subskill, skill_lv, tick, flag | BCT_ENEMY, skill_castend_damage_id); + } else + skill_addtimerskill(src, tick + i * 200, bl->id, k, 0, subskill, skill_lv, i, flag); status_change_end(src, static_cast(spheres[i]), INVALID_TIMER); } } @@ -5792,15 +5793,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint case SC_FATALMENACE: if( flag&1 ) skill_attack(BF_WEAPON,src,src,bl,skill_id,skill_lv,tick,flag); - else - { - short x, y; - map_search_freecell(src, 0, &x, &y, -1, -1, 0); - // Destination area - skill_area_temp[4] = x; - skill_area_temp[5] = y; + else { map_foreachinrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), splash_target(src), src, skill_id, skill_lv, tick, flag|BCT_ENEMY|1, skill_castend_damage_id); - skill_addtimerskill(src,tick + 800,src->id,x,y,skill_id,skill_lv,0,flag); // To teleport Self clif_skill_damage(src,src,tick,status_get_amotion(src),0,-30000,1,skill_id,skill_lv,DMG_SKILL); } break; @@ -8065,7 +8059,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui if(sd) { int sp = skill_get_sp(sd->skill_id_old,sd->skill_lv_old); if( skill_id == SO_SPELLFIST ){ - sc_start4(src,src,type,100,skill_lv+1,skill_lv,sd->skill_id_old,sd->skill_lv_old,skill_get_time(skill_id,skill_lv)); + sc_start4(src,src,type,100,skill_lv * 3,skill_lv,sd->skill_id_old,sd->skill_lv_old,skill_get_time(skill_id,skill_lv)); sd->skill_id_old = sd->skill_lv_old = 0; break; } @@ -12299,12 +12293,8 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui break; case LG_RAYOFGENESIS: - if( status_charge(src,status_get_max_hp(src)*3*skill_lv / 100,0) ) { - i = skill_get_splash(skill_id,skill_lv); - map_foreachinarea(skill_area_sub,src->m,x-i,y-i,x+i,y+i,BL_CHAR|BL_SKILL, - src,skill_id,skill_lv,tick,flag|BCT_ENEMY|1,skill_castend_damage_id); - } else if( sd ) - clif_skill_fail(sd,skill_id,USESKILL_FAIL,0); + i = skill_get_splash(skill_id,skill_lv); + map_foreachinarea(skill_area_sub,src->m,x-i,y-i,x+i,y+i,BL_CHAR|BL_SKILL,src,skill_id,skill_lv,tick,flag|BCT_ENEMY|1,skill_castend_damage_id); break; case WM_DOMINION_IMPULSE: @@ -14195,8 +14185,14 @@ int skill_unit_onplace_timer(struct skill_unit *unit, struct block_list *bl, uns break; case UNT_SEVERE_RAINSTORM: - if( battle_check_target(&unit->bl, bl, BCT_ENEMY) > 0 ) - skill_attack(BF_WEAPON,ss,&unit->bl,bl,WM_SEVERE_RAINSTORM_MELEE,sg->skill_lv,tick,0); + if( battle_check_target(&unit->bl, bl, BCT_ENEMY) > 0 ) { + struct map_session_data *sd = BL_CAST(BL_PC, ss); + int weapon_flag = 0; + + if (sd && (sd->status.weapon == W_MUSICAL || sd->status.weapon == W_WHIP)) + weapon_flag = 4; + skill_attack(BF_WEAPON,ss,&unit->bl,bl,WM_SEVERE_RAINSTORM_MELEE,sg->skill_lv,tick,weapon_flag); + } break; case UNT_NETHERWORLD: if (!status_bl_has_mode(bl,MD_STATUS_IMMUNE) || (!map_flag_gvg2(ss->m) && battle_check_target(&unit->bl,bl,BCT_PARTY) < 0)) { @@ -14910,7 +14906,12 @@ static bool skill_check_condition_sc_required(struct map_session_data *sd, unsig return false; } break; - + case GC_COUNTERSLASH: + if (!sc->data[SC_WEAPONBLOCKING]) { + clif_skill_fail(sd, skill_id, USESKILL_FAIL_GC_WEAPONBLOCKING, 0); + return false; + } + break; default: if (!sc->data[req_sc]) { clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0); @@ -15454,7 +15455,6 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i return false; } break; - case GC_COUNTERSLASH: case GC_WEAPONCRUSH: if( !(sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == GC_WEAPONBLOCKING) ) { clif_skill_fail(sd, skill_id, USESKILL_FAIL_GC_WEAPONBLOCKING, 0); @@ -15535,7 +15535,6 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i } } break; - case LG_RAYOFGENESIS: case LG_HESPERUSLIT: if (sc && sc->data[SC_INSPIRATION]) return true; // Don't check for partner. @@ -15543,9 +15542,13 @@ bool skill_check_condition_castbegin(struct map_session_data* sd, uint16 skill_i clif_skill_fail(sd,skill_id,USESKILL_FAIL,0); return false; } - if (sc->data[SC_BANDING] && sc->data[SC_BANDING]->val2 < (skill_id == LG_RAYOFGENESIS ? 2 : 3)) + if (sc->data[SC_BANDING] && sc->data[SC_BANDING]->val2 < 3) return false; // Just fails, no msg here. break; + case LG_RAYOFGENESIS: + if (sc && sc->data[SC_INSPIRATION]) + return true; // Don't check for partner. + break; case SR_FALLENEMPIRE: if( !(sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == SR_DRAGONCOMBO) ) return false; diff --git a/src/map/status.cpp b/src/map/status.cpp index b247b5e29e0..3054101ddbc 100644 --- a/src/map/status.cpp +++ b/src/map/status.cpp @@ -13237,7 +13237,7 @@ TIMER_FUNC(status_change_timer){ case SC_RENOVATIO: if( --(sce->val4) >= 0 ) { - int heal = status->max_hp * 5 / 100; + int heal = status->max_hp * (sce->val1 + 4) / 100; if( sc && sc->data[SC_AKAITSUKI] && heal ) heal = ~heal + 1; status_heal(bl, heal, 0, 3);