From e6a6c0533cf8a232a890e85d702417d3463c0dd1 Mon Sep 17 00:00:00 2001 From: Aleos Date: Fri, 7 Feb 2020 10:39:35 -0500 Subject: [PATCH] Updated 3rd class from RO 16th Anniversary Patch (#3659) * Fixes #3602 and fixes #3653. * Updated the 3rd class skills according to the RO 16th Anniversary Patch. * Complete changelog here: http://ro.gnjoy.com/news/devnote/View.asp?category=1&seq=3890090&curpage=1 Thanks to @Badarosk0, @OptimusM, @Victor214, @Rytech2 and @laziem! --- db/pre-re/skill_db.yml | 725 ++++++++++++++++++++++++-------- db/pre-re/skill_tree.txt | 174 ++++---- db/re/skill_db.yml | 784 ++++++++++++++++++++++++++--------- db/re/skill_tree.txt | 174 ++++---- src/map/battle.cpp | 103 ++--- src/map/script_constants.hpp | 1 + src/map/skill.cpp | 120 +++--- src/map/status.cpp | 6 +- src/map/status.hpp | 2 + 9 files changed, 1409 insertions(+), 680 deletions(-) diff --git a/db/pre-re/skill_db.yml b/db/pre-re/skill_db.yml index 4bba92a81a..140d55e17f 100644 --- a/db/pre-re/skill_db.yml +++ b/db/pre-re/skill_db.yml @@ -16773,10 +16773,11 @@ Body: - Id: 2001 Name: RK_ENCHANTBLADE Description: Enchant Blade - MaxLevel: 5 + MaxLevel: 10 TargetType: Self DamageFlags: NoDamage: true + Range: 1 Hit: Single HitCount: 1 CastCancel: true @@ -16785,34 +16786,54 @@ Body: Requires: SpCost: - Level: 1 - Amount: 40 + Amount: 34 - Level: 2 - Amount: 45 + Amount: 38 - Level: 3 - Amount: 50 + Amount: 42 - Level: 4 - Amount: 55 + Amount: 46 - Level: 5 - Amount: 60 + Amount: 50 + - Level: 6 + Amount: 54 + - Level: 7 + Amount: 58 + - Level: 8 + Amount: 62 + - Level: 9 + Amount: 66 + - Level: 10 + Amount: 70 - Id: 2002 Name: RK_SONICWAVE Description: Sonic Wave - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Attack Range: - Level: 1 Size: 7 - Level: 2 - Size: 8 + Size: 7 - Level: 3 - Size: 9 + Size: 8 - Level: 4 - Size: 10 + Size: 8 - Level: 5 + Size: 9 + - Level: 6 + Size: 9 + - Level: 7 + Size: 10 + - Level: 8 + Size: 10 + - Level: 9 + Size: 11 + - Level: 10 Size: 11 Hit: Single - HitCount: 1 + HitCount: 3 Element: Weapon CopyFlags: Skill: @@ -16822,15 +16843,25 @@ Body: Requires: SpCost: - Level: 1 - Amount: 30 + Amount: 33 - Level: 2 - Amount: 35 + Amount: 36 - Level: 3 - Amount: 40 + Amount: 39 - Level: 4 - Amount: 45 + Amount: 42 - Level: 5 - Amount: 50 + Amount: 45 + - Level: 6 + Amount: 48 + - Level: 7 + Amount: 51 + - Level: 8 + Amount: 54 + - Level: 9 + Amount: 57 + - Level: 10 + Amount: 60 - Id: 2003 Name: RK_DEATHBOUND Description: Death Bound @@ -17947,7 +17978,7 @@ Body: - Id: 2217 Name: WL_TETRAVORTEX Description: Tetra Vortex - MaxLevel: 5 + MaxLevel: 10 Type: Magic TargetType: Attack Flags: @@ -17984,6 +18015,16 @@ Body: Amount: 210 - Level: 5 Amount: 240 + - Level: 6 + Amount: 200 + - Level: 7 + Amount: 240 + - Level: 8 + Amount: 280 + - Level: 9 + Amount: 320 + - Level: 10 + Amount: 360 - Id: 2218 Name: WL_TETRAVORTEX_FIRE Description: Tetra Vortex Fire @@ -18301,7 +18342,7 @@ Body: - Id: 2232 Name: WL_FREEZE_SP Description: Freeze Spell - MaxLevel: 5 + MaxLevel: 10 - Id: 2021 Name: GC_VENOMIMPRESS Description: Venom Impress @@ -18480,7 +18521,7 @@ Body: HitCount: 1 AfterCastActDelay: 2000 Duration1: 180000 - Duration2: 2000 + Duration2: 10000 Requires: SpCost: - Level: 1 @@ -18496,7 +18537,7 @@ Body: - Id: 2029 Name: GC_COUNTERSLASH Description: Counter Slash - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Self DamageFlags: @@ -18505,7 +18546,27 @@ Body: Hit: Single HitCount: 1 Element: Weapon - SplashArea: 1 + SplashArea: + - Level: 1 + Area: 1 + - Level: 2 + Area: 1 + - Level: 3 + Area: 1 + - Level: 4 + Area: 1 + - Level: 5 + Area: 1 + - Level: 6 + Area: 2 + - Level: 7 + Area: 2 + - Level: 8 + Area: 2 + - Level: 9 + Area: 2 + - Level: 10 + Area: 2 Knockback: 3 AfterCastActDelay: 2000 Requires: @@ -18520,6 +18581,18 @@ Body: Amount: 14 - Level: 5 Amount: 17 + - Level: 6 + Amount: 19 + - Level: 7 + Amount: 21 + - Level: 8 + Amount: 23 + - Level: 9 + Amount: 25 + - Level: 10 + Amount: 27 + Status: + Weaponblock_On: true - Id: 2030 Name: GC_WEAPONCRUSH Description: Weapon Crush @@ -18729,7 +18802,7 @@ Body: - Id: 2038 Name: AB_JUDEX Description: Judex - MaxLevel: 5 + MaxLevel: 10 Type: Magic TargetType: Attack DamageFlags: @@ -18757,6 +18830,16 @@ Body: Amount: 29 - Level: 5 Amount: 32 + - Level: 6 + Amount: 34 + - Level: 7 + Amount: 36 + - Level: 8 + Amount: 38 + - Level: 9 + Amount: 40 + - Level: 10 + Amount: 42 - Id: 2039 Name: AB_ANCILLA Description: Ancilla @@ -19194,7 +19277,7 @@ Body: - Id: 2050 Name: AB_RENOVATIO Description: Renovatio - MaxLevel: 1 + MaxLevel: 4 Type: Magic TargetType: Self DamageFlags: @@ -19209,9 +19292,25 @@ Body: Reproduce: true CastCancel: true CastTime: 3000 - Duration1: 90000 + Duration1: + - Level: 1 + Time: 90000 + - Level: 2 + Time: 120000 + - Level: 3 + Time: 150000 + - Level: 4 + Time: 180000 Requires: - SpCost: 70 + SpCost: + - Level: 1 + Amount: 240 + - Level: 2 + Amount: 280 + - Level: 3 + Amount: 320 + - Level: 4 + Amount: 360 - Id: 2051 Name: AB_HIGHNESSHEAL Description: Highness Heal @@ -19651,29 +19750,10 @@ Body: Reproduce: true CastCancel: true CastTime: 4000 - AfterCastActDelay: 1000 + AfterCastActDelay: 500 + Cooldown: 1000 Requires: - SpCost: - - Level: 1 - Amount: 30 - - Level: 2 - Amount: 32 - - Level: 3 - Amount: 34 - - Level: 4 - Amount: 36 - - Level: 5 - Amount: 38 - - Level: 6 - Amount: 40 - - Level: 7 - Amount: 42 - - Level: 8 - Amount: 44 - - Level: 9 - Amount: 46 - - Level: 10 - Amount: 48 + SpCost: 40 Weapon: Bow: true Ammo: @@ -19954,7 +20034,7 @@ Body: - Id: 2248 Name: RA_RESEARCHTRAP Description: Research Trap - MaxLevel: 5 + MaxLevel: 10 - Id: 2249 Name: RA_MAGENTATRAP Description: Magenta Trap @@ -20368,7 +20448,7 @@ Body: - Id: 2261 Name: NC_ARMSCANNON Description: Arm Cannon - MaxLevel: 3 + MaxLevel: 5 Type: Weapon TargetType: Attack DamageFlags: @@ -20380,19 +20460,27 @@ Body: - Level: 1 Size: 9 - Level: 2 - Size: 11 + Size: 9 - Level: 3 + Size: 11 + - Level: 4 + Size: 11 + - Level: 5 Size: 13 Hit: Single HitCount: 1 Element: Weapon SplashArea: - Level: 1 - Area: 3 - - Level: 2 - Area: 2 - - Level: 3 Area: 1 + - Level: 2 + Area: 1 + - Level: 3 + Area: 2 + - Level: 4 + Area: 2 + - Level: 5 + Area: 3 CastTime: - Level: 1 Time: 1400 @@ -20410,10 +20498,14 @@ Body: Requires: SpCost: - Level: 1 - Amount: 30 + Amount: 40 - Level: 2 Amount: 45 - Level: 3 + Amount: 50 + - Level: 4 + Amount: 55 + - Level: 5 Amount: 60 Ammo: Cannonball: true @@ -20919,7 +21011,7 @@ Body: - Id: 2279 Name: NC_POWERSWING Description: Power Swing - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Attack Flags: @@ -20928,7 +21020,27 @@ Body: Hit: Single HitCount: 1 Element: Weapon - AfterCastActDelay: 1000 + AfterCastActDelay: + - Level: 1 + Time: 1000 + - Level: 2 + Time: 1000 + - Level: 3 + Time: 1000 + - Level: 4 + Time: 1000 + - Level: 5 + Time: 1000 + - Level: 6 + Time: 500 + - Level: 7 + Time: 500 + - Level: 8 + Time: 500 + - Level: 9 + Time: 500 + - Level: 10 + Time: 500 Duration1: 2000 Requires: SpCost: @@ -20942,6 +21054,16 @@ Body: Amount: 26 - Level: 5 Amount: 28 + - Level: 6 + Amount: 30 + - Level: 7 + Amount: 32 + - Level: 8 + Amount: 34 + - Level: 9 + Amount: 36 + - Level: 10 + Amount: 38 - Id: 2280 Name: NC_AXETORNADO Description: Axe Tornado @@ -21126,7 +21248,7 @@ Body: - Id: 2284 Name: SC_FATALMENACE Description: Fatal Menace - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Attack DamageFlags: @@ -21135,7 +21257,27 @@ Body: Hit: Single HitCount: 1 Element: Weapon - SplashArea: 1 + SplashArea: + - Level: 1 + Area: 11 + - Level: 2 + Area: 1 + - Level: 3 + Area: 1 + - Level: 4 + Area: 1 + - Level: 5 + Area: 1 + - Level: 6 + Area: 2 + - Level: 7 + Area: 2 + - Level: 8 + Area: 2 + - Level: 9 + Area: 2 + - Level: 10 + Area: 2 CopyFlags: Skill: Reproduce: true @@ -21143,15 +21285,25 @@ Body: Requires: SpCost: - Level: 1 - Amount: 40 + Amount: 10 - Level: 2 - Amount: 45 + Amount: 14 - Level: 3 - Amount: 50 + Amount: 18 - Level: 4 - Amount: 55 + Amount: 22 - Level: 5 - Amount: 60 + Amount: 26 + - Level: 6 + Amount: 30 + - Level: 7 + Amount: 34 + - Level: 8 + Amount: 38 + - Level: 9 + Amount: 42 + - Level: 10 + Amount: 46 - Id: 2285 Name: SC_REPRODUCE Description: Reproduce @@ -21944,7 +22096,7 @@ Body: - Id: 2304 Name: SC_FEINTBOMB Description: Feint Bomb - MaxLevel: 3 + MaxLevel: 10 Type: Weapon TargetType: Self Flags: @@ -21973,6 +22125,20 @@ Body: Amount: 28 - Level: 3 Amount: 32 + - Level: 4 + Amount: 36 + - Level: 5 + Amount: 40 + - Level: 6 + Amount: 44 + - Level: 7 + Amount: 48 + - Level: 8 + Amount: 52 + - Level: 9 + Amount: 56 + - Level: 10 + Amount: 60 ItemCost: - Item: Paint_Brush Amount: 0 @@ -22072,26 +22238,15 @@ Body: - Id: 2310 Name: LG_SHIELDPRESS Description: Shield Press - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Attack Range: 1 Hit: Single - HitCount: 1 + HitCount: 5 CopyFlags: Skill: Reproduce: true - Duration1: - - Level: 1 - Time: 5500 - - Level: 2 - Time: 6000 - - Level: 3 - Time: 6500 - - Level: 4 - Time: 7000 - - Level: 5 - Time: 7500 Cooldown: 2000 Requires: SpCost: @@ -22105,6 +22260,16 @@ Body: Amount: 16 - Level: 5 Amount: 18 + - Level: 6 + Amount: 20 + - Level: 7 + Amount: 22 + - Level: 8 + Amount: 24 + - Level: 9 + Amount: 26 + - Level: 10 + Amount: 28 State: Shield - Id: 2311 Name: LG_REFLECTDAMAGE @@ -22412,8 +22577,8 @@ Body: - Id: 2321 Name: LG_RAYOFGENESIS Description: Ray of Genesis - MaxLevel: 5 - Type: Weapon + MaxLevel: 10 + Type: Magic TargetType: Ground DamageFlags: Splash: true @@ -22425,30 +22590,71 @@ Body: CastCancel: true CastTime: - Level: 1 - Time: 2000 + Time: 1000 - Level: 2 - Time: 2500 + Time: 1500 - Level: 3 - Time: 3000 + Time: 2000 - Level: 4 - Time: 3500 + Time: 2500 - Level: 5 + Time: 3000 + - Level: 6 + Time: 3500 + - Level: 7 Time: 4000 + - Level: 8 + Time: 4500 + - Level: 9 + Time: 5000 + - Level: 10 + Time: 5500 AfterCastActDelay: 2000 Duration1: 10000 - Cooldown: 5000 + Cooldown: 3500 Requires: SpCost: - Level: 1 - Amount: 60 + Amount: 45 - Level: 2 - Amount: 65 + Amount: 50 - Level: 3 - Amount: 70 + Amount: 55 - Level: 4 - Amount: 75 + Amount: 60 - Level: 5 + Amount: 65 + - Level: 6 + Amount: 70 + - Level: 7 + Amount: 75 + - Level: 8 Amount: 80 + - Level: 9 + Amount: 85 + - Level: 10 + Amount: 90 + HpRateCost: + - Level: 1 + Amount: -3 + - Level: 2 + Amount: -3 + - Level: 3 + Amount: -6 + - Level: 4 + Amount: -6 + - Level: 5 + Amount: -9 + - Level: 6 + Amount: -9 + - Level: 7 + Amount: -12 + - Level: 8 + Amount: -12 + - Level: 9 + Amount: -15 + - Level: 10 + Amount: -15 - Id: 2322 Name: LG_PIETY Description: Piety @@ -22802,7 +23008,7 @@ Body: - Id: 2329 Name: SR_FALLENEMPIRE Description: Fallen Empire - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Self Flags: @@ -22815,26 +23021,66 @@ Body: - Level: 1 Time: 500 - Level: 2 - Time: 1000 + Time: 500 - Level: 3 - Time: 1500 + Time: 1000 - Level: 4 - Time: 2000 + Time: 1000 - Level: 5 + Time: 1500 + - Level: 6 + Time: 1500 + - Level: 7 + Time: 2000 + - Level: 8 + Time: 2000 + - Level: 9 + Time: 2500 + - Level: 10 Time: 2500 Requires: SpCost: - Level: 1 - Amount: 20 + Amount: 18 - Level: 2 - Amount: 30 + Amount: 21 - Level: 3 - Amount: 40 + Amount: 24 - Level: 4 - Amount: 50 + Amount: 27 - Level: 5 - Amount: 60 - SpiritSphereCost: 2 + Amount: 30 + - Level: 6 + Amount: 33 + - Level: 7 + Amount: 36 + - Level: 8 + Amount: 39 + - Level: 9 + Amount: 42 + - Level: 10 + Amount: 45 + SpiritSphereCost: + - Level: 1 + Amount: 2 + - Level: 2 + Amount: 2 + - Level: 3 + Amount: 2 + - Level: 4 + Amount: 2 + - Level: 5 + Amount: 2 + - Level: 6 + Amount: 1 + - Level: 7 + Amount: 1 + - Level: 8 + Amount: 1 + - Level: 9 + Amount: 1 + - Level: 10 + Amount: 1 - Id: 2330 Name: SR_TIGERCANNON Description: Tiger Cannon @@ -23109,17 +23355,29 @@ Body: - Id: 2336 Name: SR_KNUCKLEARROW Description: Knuckle Arrow - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Attack Range: - Level: 1 - Size: 8 + Size: 7 - Level: 2 - Size: 9 + Size: 7 - Level: 3 - Size: 10 + Size: 8 - Level: 4 + Size: 8 + - Level: 5 + Size: 9 + - Level: 6 + Size: 9 + - Level: 7 + Size: 10 + - Level: 8 + Size: 10 + - Level: 9 + Size: 11 + - Level: 10 Size: 11 Hit: Single HitCount: 1 @@ -23142,16 +23400,36 @@ Body: Requires: SpCost: - Level: 1 - Amount: 10 + Amount: 12 - Level: 2 - Amount: 15 + Amount: 14 - Level: 3 - Amount: 20 + Amount: 16 - Level: 4 - Amount: 25 + Amount: 18 - Level: 5 + Amount: 20 + - Level: 6 + Amount: 22 + - Level: 7 + Amount: 24 + - Level: 8 + Amount: 26 + - Level: 9 + Amount: 28 + - Level: 10 Amount: 30 - SpiritSphereCost: 1 + SpiritSphereCost: + - Level: 1 + Amount: 1 + - Level: 2 + Amount: 1 + - Level: 3 + Amount: 1 + - Level: 4 + Amount: 1 + - Level: 5 + Amount: 1 - Id: 2337 Name: SR_WINDMILL Description: Windmill @@ -23874,22 +24152,12 @@ Body: - Id: 2413 Name: WM_METALICSOUND Description: Metallic Sound - MaxLevel: 5 + MaxLevel: 10 Type: Magic TargetType: Attack Range: 9 Hit: Multi_Hit - HitCount: - - Level: 1 - Count: -2 - - Level: 2 - Count: -2 - - Level: 3 - Count: -3 - - Level: 4 - Count: -3 - - Level: 5 - Count: -4 + HitCount: 2 Element: Weapon CopyFlags: Skill: @@ -23906,29 +24174,59 @@ Body: Time: 2500 - Level: 5 Time: 3000 + - Level: 6 + Time: 3500 + - Level: 7 + Time: 4000 + - Level: 8 + Time: 4500 + - Level: 9 + Time: 5000 + - Level: 10 + Time: 5500 AfterCastActDelay: 1000 Cooldown: - Level: 1 - Time: 2000 + Time: 1000 - Level: 2 - Time: 2500 + Time: 1500 - Level: 3 - Time: 3000 + Time: 2000 - Level: 4 - Time: 3500 + Time: 2500 - Level: 5 + Time: 3000 + - Level: 6 + Time: 3500 + - Level: 7 Time: 4000 + - Level: 8 + Time: 4500 + - Level: 9 + Time: 5000 + - Level: 10 + Time: 5500 Requires: SpCost: - Level: 1 - Amount: 64 + Amount: 62 - Level: 2 - Amount: 68 + Amount: 64 - Level: 3 - Amount: 72 + Amount: 66 - Level: 4 - Amount: 76 + Amount: 68 - Level: 5 + Amount: 70 + - Level: 6 + Amount: 72 + - Level: 7 + Amount: 74 + - Level: 8 + Amount: 76 + - Level: 9 + Amount: 78 + - Level: 10 Amount: 80 - Id: 2414 Name: WM_REVERBERATION @@ -24091,6 +24389,8 @@ Body: Amount: 120 Weapon: Bow: true + Musical: true + Whip: true Ammo: Arrow: true AmmoAmount: 20 @@ -25072,24 +25372,35 @@ Body: - Id: 2445 Name: SO_SPELLFIST Description: Spell Fist - MaxLevel: 5 + MaxLevel: 10 TargetType: Self DamageFlags: NoDamage: true + Range: 1 Hit: Single HitCount: 1 AfterCastActDelay: 1000 Duration1: - Level: 1 - Time: 20000 + Time: 15000 - Level: 2 - Time: 25000 + Time: 20000 - Level: 3 - Time: 30000 + Time: 25000 - Level: 4 - Time: 35000 + Time: 30000 - Level: 5 + Time: 35000 + - Level: 6 Time: 40000 + - Level: 7 + Time: 45000 + - Level: 8 + Time: 50000 + - Level: 9 + Time: 55000 + - Level: 10 + Time: 60000 Requires: SpCost: - Level: 1 @@ -25102,6 +25413,16 @@ Body: Amount: 52 - Level: 5 Amount: 56 + - Level: 6 + Amount: 60 + - Level: 7 + Amount: 64 + - Level: 8 + Amount: 68 + - Level: 9 + Amount: 72 + - Level: 10 + Amount: 76 - Id: 2446 Name: SO_EARTHGRAVE Description: Earth Grave @@ -25663,14 +25984,14 @@ Body: - Id: 2454 Name: SO_VARETYR_SPEAR Description: Varetyr Spear - MaxLevel: 5 + MaxLevel: 10 Type: Magic TargetType: Attack DamageFlags: Splash: true Range: 9 Hit: Single - HitCount: 1 + HitCount: 3 Element: Wind SplashArea: - Level: 1 @@ -25678,51 +25999,91 @@ Body: - Level: 2 Area: 1 - Level: 3 - Area: 2 + Area: 1 - Level: 4 Area: 2 - Level: 5 + Area: 2 + - Level: 6 + Area: 2 + - Level: 7 Area: 3 + - Level: 8 + Area: 3 + - Level: 9 + Area: 3 + - Level: 10 + Area: 4 CopyFlags: Skill: Reproduce: true CastCancel: true CastTime: - Level: 1 - Time: 2200 + Time: 1800 - Level: 2 - Time: 2400 + Time: 2000 - Level: 3 - Time: 2600 + Time: 2200 - Level: 4 - Time: 2800 + Time: 2400 - Level: 5 + Time: 2600 + - Level: 6 + Time: 2800 + - Level: 7 Time: 3000 + - Level: 8 + Time: 3200 + - Level: 9 + Time: 3400 + - Level: 10 + Time: 3600 AfterCastActDelay: 1000 Duration1: - Level: 1 - Time: 2200 + Time: 1800 - Level: 2 - Time: 2400 + Time: 2000 - Level: 3 - Time: 2600 + Time: 2200 - Level: 4 - Time: 2800 + Time: 2400 - Level: 5 + Time: 2600 + - Level: 6 + Time: 2800 + - Level: 7 Time: 3000 + - Level: 8 + Time: 3200 + - Level: 9 + Time: 3400 + - Level: 10 + Time: 3600 Cooldown: 2000 Requires: SpCost: - Level: 1 - Amount: 55 + Amount: 65 - Level: 2 - Amount: 62 + Amount: 70 - Level: 3 - Amount: 69 + Amount: 75 - Level: 4 - Amount: 76 + Amount: 80 - Level: 5 - Amount: 83 + Amount: 85 + - Level: 6 + Amount: 90 + - Level: 7 + Amount: 95 + - Level: 8 + Amount: 100 + - Level: 9 + Amount: 105 + - Level: 10 + Amount: 110 - Id: 2455 Name: SO_ARRULLO Description: Arrullo @@ -26205,27 +26566,20 @@ Body: - Id: 2476 Name: GN_CART_TORNADO Description: Cart Tornado - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Self DamageFlags: Splash: true + Range: 1 Hit: Single - HitCount: 1 + HitCount: 3 Element: Weapon SplashArea: 2 Knockback: 2 AfterCastActDelay: 500 Duration1: 5000 - Cooldown: - - Level: 2 - Time: 500 - - Level: 3 - Time: 1000 - - Level: 4 - Time: 1500 - - Level: 5 - Time: 2000 + Cooldown: 2000 Requires: SpCost: 30 State: Cart @@ -26419,25 +26773,35 @@ Body: - Id: 2481 Name: GN_SPORE_EXPLOSION Description: Spore Explosion - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Attack DamageFlags: Splash: true Range: 11 Hit: Single - HitCount: 1 + HitCount: 3 Element: Weapon SplashArea: - Level: 1 Area: 1 - Level: 2 - Area: 2 + Area: 1 - Level: 3 - Area: 3 + Area: 2 - Level: 4 - Area: 4 + Area: 2 - Level: 5 + Area: 3 + - Level: 6 + Area: 3 + - Level: 7 + Area: 4 + - Level: 8 + Area: 4 + - Level: 9 + Area: 5 + - Level: 10 Area: 5 CopyFlags: Skill: @@ -26445,30 +26809,29 @@ Body: CastCancel: true CastTime: 1500 AfterCastActDelay: 500 - Duration1: - - Level: 1 - Time: 2000 - - Level: 2 - Time: 2000 - - Level: 3 - Time: 3000 - - Level: 4 - Time: 3000 - - Level: 5 - Time: 4000 Cooldown: 5000 Requires: SpCost: - Level: 1 - Amount: 55 + Amount: 48 - Level: 2 - Amount: 60 + Amount: 52 - Level: 3 - Amount: 65 + Amount: 56 - Level: 4 - Amount: 70 + Amount: 60 - Level: 5 - Amount: 75 + Amount: 64 + - Level: 6 + Amount: 68 + - Level: 7 + Amount: 72 + - Level: 8 + Amount: 76 + - Level: 9 + Amount: 80 + - Level: 10 + Amount: 84 ItemCost: - Item: Bomb_Mushroom_Spore Amount: 1 diff --git a/db/pre-re/skill_tree.txt b/db/pre-re/skill_tree.txt index 3c0d3f0b33..d55daacf14 100644 --- a/db/pre-re/skill_tree.txt +++ b/db/pre-re/skill_tree.txt @@ -2404,8 +2404,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# @@ -2464,14 +2464,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) @@ -2519,7 +2519,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# @@ -2566,7 +2566,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# @@ -2577,7 +2577,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# @@ -2630,7 +2630,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# @@ -2648,7 +2648,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# @@ -2691,7 +2691,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# @@ -2736,8 +2736,8 @@ 4060,399,10,55,9,64,3,398,3,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# @@ -2802,14 +2802,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) @@ -2861,7 +2861,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# @@ -2912,7 +2912,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# @@ -2923,7 +2923,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# @@ -2981,7 +2981,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# @@ -2999,7 +2999,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# @@ -3047,7 +3047,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# @@ -3094,7 +3094,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# @@ -3105,7 +3105,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# @@ -3157,7 +3157,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# @@ -3166,7 +3166,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# @@ -3217,7 +3217,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# @@ -3273,7 +3273,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# @@ -3334,13 +3334,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,3,0,0,0,0,0,0,0,0 //SR_EARTHSHAKER#Earth Shaker# -4070,2329,5,2326,3,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE#Fallen Empire# +4070,2329,10,2326,3,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,2337,1,0,0,0,0,0,0,0,0 //SR_CRESCENTELBOW#Crescent Elbow# 4070,2334,5,269,2,0,0,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,2335,1,0,0,0,0,0,0,0,0 //SR_KNUCKLEARROW#Knuckle Arrow# +4070,2336,10,2335,1,0,0,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,2341,1,0,0,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# @@ -3391,12 +3391,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# @@ -3447,7 +3447,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# @@ -3467,7 +3467,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) @@ -3510,7 +3510,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# @@ -3521,7 +3521,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# @@ -3581,7 +3581,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# @@ -3590,7 +3590,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# @@ -3647,7 +3647,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# @@ -3709,7 +3709,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# @@ -3774,13 +3774,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,3,0,0,0,0,0,0,0,0 //SR_EARTHSHAKER#Earth Shaker# -4077,2329,5,2326,3,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE#Fallen Empire# +4077,2329,10,2326,3,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,2337,1,0,0,0,0,0,0,0,0 //SR_CRESCENTELBOW#Crescent Elbow# 4077,2334,5,269,2,0,0,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,2335,1,0,0,0,0,0,0,0,0 //SR_KNUCKLEARROW#Knuckle Arrow# +4077,2336,10,2335,1,0,0,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,2341,1,0,0,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# @@ -3835,12 +3835,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# @@ -3895,7 +3895,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# @@ -3915,7 +3915,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) @@ -3944,8 +3944,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# @@ -3991,8 +3991,8 @@ 4081,399,10,55,9,64,3,398,3,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# @@ -4040,7 +4040,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# @@ -4051,7 +4051,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# @@ -4098,7 +4098,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# @@ -4109,7 +4109,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# @@ -4161,7 +4161,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# @@ -4219,7 +4219,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# @@ -4272,7 +4272,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# @@ -4290,7 +4290,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# @@ -4348,7 +4348,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# @@ -4366,7 +4366,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# @@ -4402,8 +4402,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# @@ -4463,14 +4463,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# //Baby Ranger @@ -4519,7 +4519,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# @@ -4567,7 +4567,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# @@ -4578,7 +4578,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# @@ -4632,7 +4632,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# @@ -4650,7 +4650,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# @@ -4694,7 +4694,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# @@ -4742,7 +4742,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# @@ -4753,7 +4753,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# @@ -4806,7 +4806,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# @@ -4815,7 +4815,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# @@ -4867,7 +4867,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# @@ -4924,7 +4924,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# @@ -4986,13 +4986,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,3,0,0,0,0,0,0,0,0 //SR_EARTHSHAKER#Earth Shaker# -4106,2329,5,2326,3,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE#Fallen Empire# +4106,2329,10,2326,3,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,2337,1,0,0,0,0,0,0,0,0 //SR_CRESCENTELBOW#Crescent Elbow# 4106,2334,5,269,2,0,0,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,2335,1,0,0,0,0,0,0,0,0 //SR_KNUCKLEARROW#Knuckle Arrow# +4106,2336,10,2335,1,0,0,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,2341,1,0,0,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# @@ -5044,12 +5044,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# @@ -5101,7 +5101,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# @@ -5121,7 +5121,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# //Baby Rune Knight (Dragon) @@ -5151,8 +5151,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# @@ -5201,7 +5201,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# @@ -5212,7 +5212,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# @@ -5265,7 +5265,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# @@ -5319,7 +5319,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# @@ -5337,7 +5337,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/db/re/skill_db.yml b/db/re/skill_db.yml index 34cdbb8e7a..f08a5dbcdd 100644 --- a/db/re/skill_db.yml +++ b/db/re/skill_db.yml @@ -17697,10 +17697,11 @@ Body: - Id: 2001 Name: RK_ENCHANTBLADE Description: Enchant Blade - MaxLevel: 5 + MaxLevel: 10 TargetType: Self DamageFlags: NoDamage: true + Range: 1 Hit: Single HitCount: 1 CastCancel: true @@ -17710,34 +17711,54 @@ Body: Requires: SpCost: - Level: 1 - Amount: 40 + Amount: 34 - Level: 2 - Amount: 45 + Amount: 38 - Level: 3 - Amount: 50 + Amount: 42 - Level: 4 - Amount: 55 + Amount: 46 - Level: 5 - Amount: 60 + Amount: 50 + - Level: 6 + Amount: 54 + - Level: 7 + Amount: 58 + - Level: 8 + Amount: 62 + - Level: 9 + Amount: 66 + - Level: 10 + Amount: 70 - Id: 2002 Name: RK_SONICWAVE Description: Sonic Wave - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Attack Range: - Level: 1 Size: 7 - Level: 2 - Size: 8 + Size: 7 - Level: 3 - Size: 9 + Size: 8 - Level: 4 - Size: 10 + Size: 8 - Level: 5 + Size: 9 + - Level: 6 + Size: 9 + - Level: 7 + Size: 10 + - Level: 8 + Size: 10 + - Level: 9 + Size: 11 + - Level: 10 Size: 11 Hit: Single - HitCount: 1 + HitCount: 3 Element: Weapon CopyFlags: Skill: @@ -17748,15 +17769,25 @@ Body: Requires: SpCost: - Level: 1 - Amount: 30 + Amount: 33 - Level: 2 - Amount: 35 + Amount: 36 - Level: 3 - Amount: 40 + Amount: 39 - Level: 4 - Amount: 45 + Amount: 42 - Level: 5 - Amount: 50 + Amount: 45 + - Level: 6 + Amount: 48 + - Level: 7 + Amount: 51 + - Level: 8 + Amount: 54 + - Level: 9 + Amount: 57 + - Level: 10 + Amount: 60 - Id: 2003 Name: RK_DEATHBOUND Description: Death Bound @@ -18912,7 +18943,7 @@ Body: - Id: 2217 Name: WL_TETRAVORTEX Description: Tetra Vortex - MaxLevel: 5 + MaxLevel: 10 Type: Magic TargetType: Attack Flags: @@ -18950,6 +18981,16 @@ Body: Amount: 210 - Level: 5 Amount: 240 + - Level: 6 + Amount: 200 + - Level: 7 + Amount: 240 + - Level: 8 + Amount: 280 + - Level: 9 + Amount: 320 + - Level: 10 + Amount: 360 - Id: 2218 Name: WL_TETRAVORTEX_FIRE Description: Tetra Vortex Fire @@ -19272,7 +19313,7 @@ Body: - Id: 2232 Name: WL_FREEZE_SP Description: Freeze Spell - MaxLevel: 5 + MaxLevel: 10 - Id: 2021 Name: GC_VENOMIMPRESS Description: Venom Impress @@ -19456,7 +19497,7 @@ Body: HitCount: 1 AfterCastActDelay: 2000 Duration1: 180000 - Duration2: 2000 + Duration2: 10000 FixedCastTime: -1 Requires: SpCost: @@ -19473,7 +19514,7 @@ Body: - Id: 2029 Name: GC_COUNTERSLASH Description: Counter Slash - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Self DamageFlags: @@ -19482,7 +19523,27 @@ Body: Hit: Single HitCount: 1 Element: Weapon - SplashArea: 1 + SplashArea: + - Level: 1 + Area: 1 + - Level: 2 + Area: 1 + - Level: 3 + Area: 1 + - Level: 4 + Area: 1 + - Level: 5 + Area: 1 + - Level: 6 + Area: 2 + - Level: 7 + Area: 2 + - Level: 8 + Area: 2 + - Level: 9 + Area: 2 + - Level: 10 + Area: 2 Knockback: 3 AfterCastActDelay: 2000 FixedCastTime: -1 @@ -19498,6 +19559,18 @@ Body: Amount: 14 - Level: 5 Amount: 17 + - Level: 6 + Amount: 19 + - Level: 7 + Amount: 21 + - Level: 8 + Amount: 23 + - Level: 9 + Amount: 25 + - Level: 10 + Amount: 27 + Status: + Weaponblock_On: true - Id: 2030 Name: GC_WEAPONCRUSH Description: Weapon Crush @@ -19715,7 +19788,7 @@ Body: - Id: 2038 Name: AB_JUDEX Description: Judex - MaxLevel: 5 + MaxLevel: 10 Type: Magic TargetType: Attack DamageFlags: @@ -19744,6 +19817,16 @@ Body: Amount: 29 - Level: 5 Amount: 32 + - Level: 6 + Amount: 34 + - Level: 7 + Amount: 36 + - Level: 8 + Amount: 38 + - Level: 9 + Amount: 40 + - Level: 10 + Amount: 42 - Id: 2039 Name: AB_ANCILLA Description: Ancilla @@ -20197,7 +20280,7 @@ Body: - Id: 2050 Name: AB_RENOVATIO Description: Renovatio - MaxLevel: 1 + MaxLevel: 4 Type: Magic TargetType: Self DamageFlags: @@ -20212,10 +20295,26 @@ Body: Reproduce: true CastCancel: true CastTime: 3000 - Duration1: 90000 + Duration1: + - Level: 1 + Time: 90000 + - Level: 2 + Time: 120000 + - Level: 3 + Time: 150000 + - Level: 4 + Time: 180000 FixedCastTime: 2000 Requires: - SpCost: 70 + SpCost: + - Level: 1 + Amount: 240 + - Level: 2 + Amount: 280 + - Level: 3 + Amount: 320 + - Level: 4 + Amount: 360 - Id: 2051 Name: AB_HIGHNESSHEAL Description: Highness Heal @@ -20664,30 +20763,11 @@ Body: Reproduce: true CastCancel: true CastTime: 4000 - AfterCastActDelay: 1000 - FixedCastTime: 500 + AfterCastActDelay: 500 + Cooldown: 1000 + FixedCastTime: 1000 Requires: - SpCost: - - Level: 1 - Amount: 30 - - Level: 2 - Amount: 32 - - Level: 3 - Amount: 34 - - Level: 4 - Amount: 36 - - Level: 5 - Amount: 38 - - Level: 6 - Amount: 40 - - Level: 7 - Amount: 42 - - Level: 8 - Amount: 44 - - Level: 9 - Amount: 46 - - Level: 10 - Amount: 48 + SpCost: 40 Weapon: Bow: true Ammo: @@ -20975,7 +21055,7 @@ Body: - Id: 2248 Name: RA_RESEARCHTRAP Description: Research Trap - MaxLevel: 5 + MaxLevel: 10 - Id: 2249 Name: RA_MAGENTATRAP Description: Magenta Trap @@ -21400,7 +21480,7 @@ Body: - Id: 2261 Name: NC_ARMSCANNON Description: Arm Cannon - MaxLevel: 3 + MaxLevel: 5 Type: Weapon TargetType: Attack DamageFlags: @@ -21412,19 +21492,27 @@ Body: - Level: 1 Size: 9 - Level: 2 - Size: 11 + Size: 9 - Level: 3 + Size: 11 + - Level: 4 + Size: 11 + - Level: 5 Size: 13 Hit: Single HitCount: 1 Element: Weapon SplashArea: - Level: 1 - Area: 3 - - Level: 2 - Area: 2 - - Level: 3 Area: 1 + - Level: 2 + Area: 1 + - Level: 3 + Area: 2 + - Level: 4 + Area: 2 + - Level: 5 + Area: 3 CastTime: - Level: 1 Time: 1400 @@ -21449,10 +21537,14 @@ Body: Requires: SpCost: - Level: 1 - Amount: 30 + Amount: 40 - Level: 2 Amount: 45 - Level: 3 + Amount: 50 + - Level: 4 + Amount: 55 + - Level: 5 Amount: 60 Ammo: Cannonball: true @@ -21972,7 +22064,7 @@ Body: - Id: 2279 Name: NC_POWERSWING Description: Power Swing - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Attack Flags: @@ -21981,7 +22073,27 @@ Body: Hit: Single HitCount: 1 Element: Weapon - AfterCastActDelay: 1000 + AfterCastActDelay: + - Level: 1 + Time: 1000 + - Level: 2 + Time: 1000 + - Level: 3 + Time: 1000 + - Level: 4 + Time: 1000 + - Level: 5 + Time: 1000 + - Level: 6 + Time: 500 + - Level: 7 + Time: 500 + - Level: 8 + Time: 500 + - Level: 9 + Time: 500 + - Level: 10 + Time: 500 Duration1: 2000 FixedCastTime: -1 Requires: @@ -21996,6 +22108,16 @@ Body: Amount: 26 - Level: 5 Amount: 28 + - Level: 6 + Amount: 30 + - Level: 7 + Amount: 32 + - Level: 8 + Amount: 34 + - Level: 9 + Amount: 36 + - Level: 10 + Amount: 38 - Id: 2280 Name: NC_AXETORNADO Description: Axe Tornado @@ -22204,7 +22326,7 @@ Body: - Id: 2284 Name: SC_FATALMENACE Description: Fatal Menace - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Attack DamageFlags: @@ -22213,7 +22335,27 @@ Body: Hit: Single HitCount: 1 Element: Weapon - SplashArea: 1 + SplashArea: + - Level: 1 + Area: 1 + - Level: 2 + Area: 1 + - Level: 3 + Area: 1 + - Level: 4 + Area: 1 + - Level: 5 + Area: 1 + - Level: 6 + Area: 2 + - Level: 7 + Area: 2 + - Level: 8 + Area: 2 + - Level: 9 + Area: 2 + - Level: 10 + Area: 2 CopyFlags: Skill: Reproduce: true @@ -22222,15 +22364,25 @@ Body: Requires: SpCost: - Level: 1 - Amount: 40 + Amount: 10 - Level: 2 - Amount: 45 + Amount: 14 - Level: 3 - Amount: 50 + Amount: 18 - Level: 4 - Amount: 55 + Amount: 22 - Level: 5 - Amount: 60 + Amount: 26 + - Level: 6 + Amount: 30 + - Level: 7 + Amount: 34 + - Level: 8 + Amount: 38 + - Level: 9 + Amount: 42 + - Level: 10 + Amount: 46 - Id: 2285 Name: SC_REPRODUCE Description: Reproduce @@ -23042,7 +23194,7 @@ Body: - Id: 2304 Name: SC_FEINTBOMB Description: Feint Bomb - MaxLevel: 3 + MaxLevel: 10 Type: Weapon TargetType: Self Flags: @@ -23072,6 +23224,20 @@ Body: Amount: 28 - Level: 3 Amount: 32 + - Level: 4 + Amount: 36 + - Level: 5 + Amount: 40 + - Level: 6 + Amount: 44 + - Level: 7 + Amount: 48 + - Level: 8 + Amount: 52 + - Level: 9 + Amount: 56 + - Level: 10 + Amount: 60 ItemCost: - Item: Paint_Brush Amount: 0 @@ -23173,28 +23339,17 @@ Body: - Id: 2310 Name: LG_SHIELDPRESS Description: Shield Press - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Attack Flags: IncreaseGloomyDayDamage: true Range: 1 Hit: Single - HitCount: 1 + HitCount: 5 CopyFlags: Skill: Reproduce: true - Duration1: - - Level: 1 - Time: 5500 - - Level: 2 - Time: 6000 - - Level: 3 - Time: 6500 - - Level: 4 - Time: 7000 - - Level: 5 - Time: 7500 Cooldown: 2000 FixedCastTime: -1 Requires: @@ -23209,6 +23364,16 @@ Body: Amount: 16 - Level: 5 Amount: 18 + - Level: 6 + Amount: 20 + - Level: 7 + Amount: 22 + - Level: 8 + Amount: 24 + - Level: 9 + Amount: 26 + - Level: 10 + Amount: 28 State: Shield - Id: 2311 Name: LG_REFLECTDAMAGE @@ -23528,8 +23693,8 @@ Body: - Id: 2321 Name: LG_RAYOFGENESIS Description: Ray of Genesis - MaxLevel: 5 - Type: Weapon + MaxLevel: 10 + Type: Magic TargetType: Ground DamageFlags: Splash: true @@ -23539,33 +23704,74 @@ Body: Element: Holy SplashArea: 5 CastCancel: true - CastTime: + CastTime: # !TODO: Confirm cast delay and cooldown - Level: 1 - Time: 2000 + Time: 1000 - Level: 2 - Time: 2500 + Time: 1500 - Level: 3 - Time: 3000 + Time: 2000 - Level: 4 - Time: 3500 + Time: 2500 - Level: 5 + Time: 3000 + - Level: 6 + Time: 3500 + - Level: 7 Time: 4000 + - Level: 8 + Time: 4500 + - Level: 9 + Time: 5000 + - Level: 10 + Time: 5500 AfterCastActDelay: 2000 Duration1: 10000 - Cooldown: 5000 + Cooldown: 3500 FixedCastTime: 500 Requires: SpCost: - Level: 1 - Amount: 60 + Amount: 45 - Level: 2 - Amount: 65 + Amount: 50 - Level: 3 - Amount: 70 + Amount: 55 - Level: 4 - Amount: 75 + Amount: 60 - Level: 5 + Amount: 65 + - Level: 6 + Amount: 70 + - Level: 7 + Amount: 75 + - Level: 8 Amount: 80 + - Level: 9 + Amount: 85 + - Level: 10 + Amount: 90 + HpRateCost: + - Level: 1 + Amount: -3 + - Level: 2 + Amount: -3 + - Level: 3 + Amount: -6 + - Level: 4 + Amount: -6 + - Level: 5 + Amount: -9 + - Level: 6 + Amount: -9 + - Level: 7 + Amount: -12 + - Level: 8 + Amount: -12 + - Level: 9 + Amount: -15 + - Level: 10 + Amount: -15 - Id: 2322 Name: LG_PIETY Description: Piety @@ -23927,7 +24133,7 @@ Body: - Id: 2329 Name: SR_FALLENEMPIRE Description: Fallen Empire - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Self Flags: @@ -23940,27 +24146,67 @@ Body: - Level: 1 Time: 500 - Level: 2 - Time: 1000 + Time: 500 - Level: 3 - Time: 1500 + Time: 1000 - Level: 4 - Time: 2000 + Time: 1000 - Level: 5 + Time: 1500 + - Level: 6 + Time: 1500 + - Level: 7 + Time: 2000 + - Level: 8 + Time: 2000 + - Level: 9 + Time: 2500 + - Level: 10 Time: 2500 FixedCastTime: -1 Requires: SpCost: - Level: 1 - Amount: 20 + Amount: 18 - Level: 2 - Amount: 30 + Amount: 21 - Level: 3 - Amount: 40 + Amount: 24 - Level: 4 - Amount: 50 + Amount: 27 - Level: 5 - Amount: 60 - SpiritSphereCost: 2 + Amount: 30 + - Level: 6 + Amount: 33 + - Level: 7 + Amount: 36 + - Level: 8 + Amount: 39 + - Level: 9 + Amount: 42 + - Level: 10 + Amount: 45 + SpiritSphereCost: + - Level: 1 + Amount: 2 + - Level: 2 + Amount: 2 + - Level: 3 + Amount: 2 + - Level: 4 + Amount: 2 + - Level: 5 + Amount: 2 + - Level: 6 + Amount: 1 + - Level: 7 + Amount: 1 + - Level: 8 + Amount: 1 + - Level: 9 + Amount: 1 + - Level: 10 + Amount: 1 - Id: 2330 Name: SR_TIGERCANNON Description: Tiger Cannon @@ -24240,17 +24486,29 @@ Body: - Id: 2336 Name: SR_KNUCKLEARROW Description: Knuckle Arrow - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Attack Range: - Level: 1 - Size: 8 + Size: 7 - Level: 2 - Size: 9 + Size: 7 - Level: 3 - Size: 10 + Size: 8 - Level: 4 + Size: 8 + - Level: 5 + Size: 9 + - Level: 6 + Size: 9 + - Level: 7 + Size: 10 + - Level: 8 + Size: 10 + - Level: 9 + Size: 11 + - Level: 10 Size: 11 Hit: Single HitCount: 1 @@ -24274,16 +24532,36 @@ Body: Requires: SpCost: - Level: 1 - Amount: 10 + Amount: 12 - Level: 2 - Amount: 15 + Amount: 14 - Level: 3 - Amount: 20 + Amount: 16 - Level: 4 - Amount: 25 + Amount: 18 - Level: 5 + Amount: 20 + - Level: 6 + Amount: 22 + - Level: 7 + Amount: 24 + - Level: 8 + Amount: 26 + - Level: 9 + Amount: 28 + - Level: 10 Amount: 30 - SpiritSphereCost: 1 + SpiritSphereCost: + - Level: 1 + Amount: 1 + - Level: 2 + Amount: 1 + - Level: 3 + Amount: 1 + - Level: 4 + Amount: 1 + - Level: 5 + Amount: 1 - Id: 2337 Name: SR_WINDMILL Description: Windmill @@ -25034,28 +25312,18 @@ Body: - Id: 2413 Name: WM_METALICSOUND Description: Metallic Sound - MaxLevel: 5 + MaxLevel: 10 Type: Magic TargetType: Attack Range: 9 Hit: Multi_Hit - HitCount: - - Level: 1 - Count: -2 - - Level: 2 - Count: -2 - - Level: 3 - Count: -3 - - Level: 4 - Count: -3 - - Level: 5 - Count: -4 + HitCount: 2 Element: Weapon CopyFlags: Skill: Reproduce: true CastCancel: true - CastTime: + CastTime: # !TODO: Confirm all times - Level: 1 Time: 1000 - Level: 2 @@ -25066,30 +25334,60 @@ Body: Time: 2500 - Level: 5 Time: 3000 + - Level: 6 + Time: 3500 + - Level: 7 + Time: 4000 + - Level: 8 + Time: 4500 + - Level: 9 + Time: 5000 + - Level: 10 + Time: 5500 AfterCastActDelay: 1000 Cooldown: - Level: 1 - Time: 2000 + Time: 1000 - Level: 2 - Time: 2500 + Time: 1500 - Level: 3 - Time: 3000 + Time: 2000 - Level: 4 - Time: 3500 + Time: 2500 - Level: 5 + Time: 3000 + - Level: 6 + Time: 3500 + - Level: 7 Time: 4000 + - Level: 8 + Time: 4500 + - Level: 9 + Time: 5000 + - Level: 10 + Time: 5500 FixedCastTime: -1 Requires: SpCost: - Level: 1 - Amount: 64 + Amount: 62 - Level: 2 - Amount: 68 + Amount: 64 - Level: 3 - Amount: 72 + Amount: 66 - Level: 4 - Amount: 76 + Amount: 68 - Level: 5 + Amount: 70 + - Level: 6 + Amount: 72 + - Level: 7 + Amount: 74 + - Level: 8 + Amount: 76 + - Level: 9 + Amount: 78 + - Level: 10 Amount: 80 - Id: 2414 Name: WM_REVERBERATION @@ -25255,6 +25553,8 @@ Body: Amount: 120 Weapon: Bow: true + Musical: true + Whip: true Ammo: Arrow: true AmmoAmount: 20 @@ -26256,24 +26556,35 @@ Body: - Id: 2445 Name: SO_SPELLFIST Description: Spell Fist - MaxLevel: 5 + MaxLevel: 10 TargetType: Self DamageFlags: NoDamage: true + Range: 1 Hit: Single HitCount: 1 AfterCastActDelay: 1000 Duration1: - Level: 1 - Time: 20000 + Time: 15000 - Level: 2 - Time: 25000 + Time: 20000 - Level: 3 - Time: 30000 + Time: 25000 - Level: 4 - Time: 35000 + Time: 30000 - Level: 5 + Time: 35000 + - Level: 6 Time: 40000 + - Level: 7 + Time: 45000 + - Level: 8 + Time: 50000 + - Level: 9 + Time: 55000 + - Level: 10 + Time: 60000 Requires: SpCost: - Level: 1 @@ -26286,6 +26597,16 @@ Body: Amount: 52 - Level: 5 Amount: 56 + - Level: 6 + Amount: 60 + - Level: 7 + Amount: 64 + - Level: 8 + Amount: 68 + - Level: 9 + Amount: 72 + - Level: 10 + Amount: 76 - Id: 2446 Name: SO_EARTHGRAVE Description: Earth Grave @@ -26915,14 +27236,14 @@ Body: - Id: 2454 Name: SO_VARETYR_SPEAR Description: Varetyr Spear - MaxLevel: 5 + MaxLevel: 10 Type: Magic TargetType: Attack DamageFlags: Splash: true Range: 9 Hit: Single - HitCount: 1 + HitCount: 3 Element: Wind SplashArea: - Level: 1 @@ -26930,62 +27251,112 @@ Body: - Level: 2 Area: 1 - Level: 3 - Area: 2 + Area: 1 - Level: 4 Area: 2 - Level: 5 + Area: 2 + - Level: 6 + Area: 2 + - Level: 7 Area: 3 + - Level: 8 + Area: 3 + - Level: 9 + Area: 3 + - Level: 10 + Area: 4 CopyFlags: Skill: Reproduce: true CastCancel: true - CastTime: - - Level: 1 - Time: 2200 - - Level: 2 - Time: 2400 - - Level: 3 - Time: 2600 - - Level: 4 - Time: 2800 - - Level: 5 - Time: 3000 - AfterCastActDelay: 1000 - Duration1: - - Level: 1 - Time: 2200 - - Level: 2 - Time: 2400 - - Level: 3 - Time: 2600 - - Level: 4 - Time: 2800 - - Level: 5 - Time: 3000 - Cooldown: 2000 - FixedCastTime: + CastTime: # !TODO: Confirm all times - Level: 1 Time: 1800 - Level: 2 - Time: 1600 + Time: 2000 - Level: 3 - Time: 1400 + Time: 2200 - Level: 4 - Time: 1200 + Time: 2400 - Level: 5 + Time: 2600 + - Level: 6 + Time: 2800 + - Level: 7 + Time: 3000 + - Level: 8 + Time: 3200 + - Level: 9 + Time: 3400 + - Level: 10 + Time: 3600 + AfterCastActDelay: 1000 + Duration1: + - Level: 1 + Time: 1800 + - Level: 2 + Time: 2000 + - Level: 3 + Time: 2200 + - Level: 4 + Time: 2400 + - Level: 5 + Time: 2600 + - Level: 6 + Time: 2800 + - Level: 7 + Time: 3000 + - Level: 8 + Time: 3200 + - Level: 9 + Time: 3400 + - Level: 10 + Time: 3600 + Cooldown: 2000 + FixedCastTime: + - Level: 1 + Time: 2000 + - Level: 2 + Time: 1800 + - Level: 3 + Time: 1600 + - Level: 4 + Time: 1400 + - Level: 5 + Time: 1200 + - Level: 6 Time: 1000 + - Level: 7 + Time: 800 + - Level: 8 + Time: 600 + - Level: 9 + Time: 400 + - Level: 10 + Time: 200 Requires: SpCost: - Level: 1 - Amount: 55 + Amount: 65 - Level: 2 - Amount: 62 + Amount: 70 - Level: 3 - Amount: 69 + Amount: 75 - Level: 4 - Amount: 76 + Amount: 80 - Level: 5 - Amount: 83 + Amount: 85 + - Level: 6 + Amount: 90 + - Level: 7 + Amount: 95 + - Level: 8 + Amount: 100 + - Level: 9 + Amount: 105 + - Level: 10 + Amount: 110 - Id: 2455 Name: SO_ARRULLO Description: Arrullo @@ -27489,27 +27860,20 @@ Body: - Id: 2476 Name: GN_CART_TORNADO Description: Cart Tornado - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Self DamageFlags: Splash: true + Range: 1 Hit: Single - HitCount: 1 + HitCount: 3 Element: Weapon SplashArea: 2 Knockback: 2 - AfterCastActDelay: 500 + AfterCastActDelay: 1000 Duration1: 5000 - Cooldown: - - Level: 2 - Time: 500 - - Level: 3 - Time: 1000 - - Level: 4 - Time: 1500 - - Level: 5 - Time: 2000 + Cooldown: 2000 FixedCastTime: -1 Requires: SpCost: 30 @@ -27708,25 +28072,35 @@ Body: - Id: 2481 Name: GN_SPORE_EXPLOSION Description: Spore Explosion - MaxLevel: 5 + MaxLevel: 10 Type: Weapon TargetType: Attack DamageFlags: Splash: true Range: 11 Hit: Single - HitCount: 1 + HitCount: 3 Element: Weapon SplashArea: - Level: 1 Area: 1 - Level: 2 - Area: 2 + Area: 1 - Level: 3 - Area: 3 + Area: 2 - Level: 4 - Area: 4 + Area: 2 - Level: 5 + Area: 3 + - Level: 6 + Area: 3 + - Level: 7 + Area: 4 + - Level: 8 + Area: 4 + - Level: 9 + Area: 5 + - Level: 10 Area: 5 CopyFlags: Skill: @@ -27734,31 +28108,31 @@ Body: CastCancel: true CastTime: 1500 AfterCastActDelay: 500 - Duration1: - - Level: 1 - Time: 2000 - - Level: 2 - Time: 2000 - - Level: 3 - Time: 3000 - - Level: 4 - Time: 3000 - - Level: 5 - Time: 4000 + Duration1: 2000 Cooldown: 5000 FixedCastTime: -1 Requires: SpCost: - Level: 1 - Amount: 55 + Amount: 48 - Level: 2 - Amount: 60 + Amount: 52 - Level: 3 - Amount: 65 + Amount: 56 - Level: 4 - Amount: 70 + Amount: 60 - Level: 5 - Amount: 75 + Amount: 64 + - Level: 6 + Amount: 68 + - Level: 7 + Amount: 72 + - Level: 8 + Amount: 76 + - Level: 9 + Amount: 80 + - Level: 10 + Amount: 84 ItemCost: - Item: Bomb_Mushroom_Spore Amount: 1 diff --git a/db/re/skill_tree.txt b/db/re/skill_tree.txt index 97808c1be2..aed125a33d 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,3,0,0,0,0,0,0,0,0 //SR_EARTHSHAKER#Earth Shaker# -4070,2329,5,2326,3,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE#Fallen Empire# +4070,2329,10,2326,3,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,2337,1,0,0,0,0,0,0,0,0 //SR_CRESCENTELBOW#Crescent Elbow# 4070,2334,5,269,2,0,0,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,2335,1,0,0,0,0,0,0,0,0 //SR_KNUCKLEARROW#Knuckle Arrow# +4070,2336,10,2335,1,0,0,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,2341,1,0,0,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,3,0,0,0,0,0,0,0,0 //SR_EARTHSHAKER#Earth Shaker# -4077,2329,5,2326,3,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE#Fallen Empire# +4077,2329,10,2326,3,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,2337,1,0,0,0,0,0,0,0,0 //SR_CRESCENTELBOW#Crescent Elbow# 4077,2334,5,269,2,0,0,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,2335,1,0,0,0,0,0,0,0,0 //SR_KNUCKLEARROW#Knuckle Arrow# +4077,2336,10,2335,1,0,0,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,2341,1,0,0,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,3,0,0,0,0,0,0,0,0 //SR_EARTHSHAKER#Earth Shaker# -4106,2329,5,2326,3,0,0,0,0,0,0,0,0 //SR_FALLENEMPIRE#Fallen Empire# +4106,2329,10,2326,3,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,2337,1,0,0,0,0,0,0,0,0 //SR_CRESCENTELBOW#Crescent Elbow# 4106,2334,5,269,2,0,0,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,2335,1,0,0,0,0,0,0,0,0 //SR_KNUCKLEARROW#Knuckle Arrow# +4106,2336,10,2335,1,0,0,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,2341,1,0,0,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 e7c97d6f7f..d5dedb1787 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -1130,7 +1130,7 @@ int64 battle_calc_damage(struct block_list *src,struct block_list *bl,struct Dam if( sc->data[SC_WEAPONBLOCKING] && flag&(BF_SHORT|BF_WEAPON) && rnd()%100 < sc->data[SC_WEAPONBLOCKING]->val2 ) { clif_skill_nodamage(bl,src,GC_WEAPONBLOCKING,sc->data[SC_WEAPONBLOCKING]->val1,1); - sc_start2(src,bl,SC_COMBO,100,GC_WEAPONBLOCKING,src->id,skill_get_time2(GC_WEAPONBLOCKING,sc->data[SC_WEAPONBLOCKING]->val1)); + sc_start(src, bl, SC_WEAPONBLOCK_ON, 100, 0, skill_get_time2(GC_WEAPONBLOCKING, 1)); d->dmg_lv = ATK_BLOCK; return 0; } @@ -2541,7 +2541,7 @@ static bool is_attack_hitting(struct Damage* wd, struct block_list *src, struct return true; else if (sc && sc->data[SC_FUSION]) return true; - else if (skill_id == AS_SPLASHER && !wd->miscflag) + else if ((skill_id == AS_SPLASHER || skill_id == GN_SPORE_EXPLOSION) && !wd->miscflag) return true; else if (skill_id == CR_SHIELDBOOMERANG && sc && sc->data[SC_SPIRIT] && sc->data[SC_SPIRIT]->val2 == SL_CRUSADER ) return true; @@ -2627,6 +2627,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: @@ -2640,7 +2643,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: { @@ -3380,8 +3386,11 @@ static void battle_calc_multi_attack(struct Damage* wd, struct block_list *src,s switch (skill_id) { case RA_AIMEDBOLT: - if( tsc && (tsc->data[SC_BITE] || tsc->data[SC_ANKLE] || tsc->data[SC_ELECTRICSHOCKER]) ) - wd->div_ = tstatus->size + 2 + ( (rnd()%100 < 50-tstatus->size*10) ? 1 : 0 ); + wd->div_ = 2 + tstatus->size + rnd()%2; + break; + case SC_FATALMENACE: + if (sd && sd->weapontype1 == W_DAGGER) + wd->div_++; break; case SR_RIDEINLIGHTNING: wd->div_ = (sd ? max(1, sd->spiritball_old) : 1); @@ -3834,7 +3843,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: @@ -3880,8 +3889,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: @@ -3912,7 +3921,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: @@ -4002,7 +4011,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 + 200 * skill_lv + sstatus->str; if (sd) { short index = sd->equip_index[EQI_HAND_L]; @@ -4047,10 +4056,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]; @@ -4090,8 +4095,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: @@ -4178,6 +4183,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: @@ -4191,8 +4198,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; } @@ -4202,7 +4209,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: @@ -4240,12 +4247,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: @@ -5180,22 +5181,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) @@ -5586,9 +5579,8 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl case ASC_BREAKER: case CR_ACIDDEMONSTRATION: case GN_FIRE_EXPANSION_ACID: -#endif - case SO_VARETYR_SPEAR: break; //These skills will do a card fix later +#endif 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)) @@ -5668,9 +5660,8 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl case ASC_BREAKER: case CR_ACIDDEMONSTRATION: case GN_FIRE_EXPANSION_ACID: -#endif - case SO_VARETYR_SPEAR: return wd; //These skills will do a GVG fix later +#endif default: battle_calc_attack_gvg_bg(&wd, src, target, skill_id, skill_lv); break; @@ -6025,9 +6016,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: @@ -6114,7 +6103,10 @@ 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; + if (skill_lv < 6) + skillratio += -100 + 500 + 500 * skill_lv; + else + skillratio += -100 + 3000 + 200 * (skill_lv - 5); break; case WL_SUMMON_ATK_FIRE: case WL_SUMMON_ATK_WATER: @@ -6124,13 +6116,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) @@ -6404,12 +6393,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/script_constants.hpp b/src/map/script_constants.hpp index 9dd1305558..db9f419645 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -1541,6 +1541,7 @@ export_constant(SC_LHZ_DUN_N4); export_constant(SC_ANCILLA); export_constant(SC_EARTHSHAKER); + export_constant(SC_WEAPONBLOCK_ON); #ifdef RENEWAL export_constant(SC_EXTREMITYFIST2); #endif diff --git a/src/map/skill.cpp b/src/map/skill.cpp index 855991d97c..2b0aa4e6b8 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -394,7 +394,11 @@ int skill_get_range2(struct block_list *bl, uint16 skill_id, uint16 skill_lv, bo if( bl->type == BL_PC ) { if(inf2[INF2_ALTERRANGESHADOWJUMP]) range = skill_get_range(NJ_SHADOWJUMP,pc_checkskill((TBL_PC*)bl,NJ_SHADOWJUMP)); if(inf2[INF2_ALTERRANGERADIUS]) range += pc_checkskill((TBL_PC*)bl, WL_RADIUS); - if(inf2[INF2_ALTERRANGERESEARCHTRAP]) range += (1 + pc_checkskill((TBL_PC*)bl, RA_RESEARCHTRAP))/2; + if(inf2[INF2_ALTERRANGERESEARCHTRAP]) { + 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)]; + } } } @@ -842,7 +846,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: @@ -1720,9 +1723,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 ) { @@ -2002,6 +2002,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1 case SC_STRANGELIGHTS: case SC_DECORATION_OF_MUSIC: case SC_GN_CARTBOOST: case SC_RECOGNIZEDSPELL: case SC_CHASEWALK2: case SC_BITE: case SC_ACTIVE_MONSTER_TRANSFORM: case SC_DORAM_BUF_01: case SC_DORAM_BUF_02: + case SC_SPORE_EXPLOSION: #ifdef RENEWAL case SC_EXTREMITYFIST2: #endif @@ -2917,7 +2918,6 @@ int skill_is_combo(uint16 skill_id) { case TK_COUNTER: case TK_JUMPKICK: case HT_POWER: - case GC_COUNTERSLASH: case GC_WEAPONCRUSH: case SR_DRAGONCOMBO: return 1; @@ -3510,7 +3510,10 @@ int64 skill_attack (int attack_type, struct block_list* src, struct block_list * dmg.dmotion = clif_skill_damage(dsrc,bl,tick, dmg.amotion, dmg.dmotion, damage, dmg.div_, skill_id, -2, DMG_SPLASH); // needs -2(!) as skill level break; case GN_SPORE_EXPLOSION: - dmg.dmotion = clif_skill_damage(dsrc, bl, tick, dmg.amotion, dmg.dmotion, damage, dmg.div_, skill_id, -1, DMG_SPLASH); + if (flag&SD_ANIMATION) + dmg.dmotion = clif_skill_damage(dsrc, bl, tick, dmg.amotion, dmg.dmotion, damage, dmg.div_, NV_BASIC, -1, DMG_SPLASH); + else + dmg.dmotion = clif_skill_damage(dsrc, bl, tick, dmg.amotion, dmg.dmotion, damage, dmg.div_, skill_id, -2, DMG_SPLASH); break; case WL_HELLINFERNO: case SR_EARTHSHAKER: @@ -3717,11 +3720,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); } } @@ -3748,8 +3746,8 @@ 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))); + case SR_TIGERCANNON: + status_zap(bl, 0, damage * 10 / 100); break; } if( sd ) @@ -4142,7 +4140,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) { @@ -4274,7 +4272,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 }, @@ -4303,9 +4301,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 ) { @@ -4320,11 +4315,6 @@ static TIMER_FUNC(skill_timerskill){ case SR_KNUCKLEARROW: skill_attack(BF_WEAPON, src, src, target, skl->skill_id, skl->skill_lv, tick, skl->flag|SD_LEVEL); break; - case GN_SPORE_EXPLOSION: - clif_skill_damage(src, target, tick, status_get_amotion(src), 0, -30000, 1, skl->skill_id, skl->skill_lv, DMG_SINGLE); - map_foreachinrange(skill_area_sub, target, skill_get_splash(skl->skill_id, skl->skill_lv), BL_CHAR, - src, skl->skill_id, skl->skill_lv, tick, skl->flag|1|BCT_ENEMY, skill_castend_damage_id); - break; case CH_PALMSTRIKE: { struct status_change* tsc = status_get_sc(target); @@ -4806,7 +4796,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: @@ -5072,6 +5061,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint case SO_VARETYR_SPEAR: case GN_CART_TORNADO: case GN_CARTCANNON: + case GN_SPORE_EXPLOSION: case GN_DEMONIC_FIRE: case GN_FIRE_EXPANSION_ACID: case KO_HAPPOKUNAI: @@ -5152,7 +5142,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint //SD_LEVEL -> Forced splash damage for Auto Blitz-Beat -> count targets //special case: Venom Splasher uses a different range for searching than for splashing if( flag&SD_LEVEL || skill_get_nk(skill_id, NK_SPLASHSPLIT) ) - skill_area_temp[0] = map_foreachinallrange(skill_area_sub, bl, (skill_id == AS_SPLASHER)?1:skill_get_splash(skill_id, skill_lv), BL_CHAR, src, skill_id, skill_lv, tick, BCT_ENEMY, skill_area_sub_count); + skill_area_temp[0] = map_foreachinallrange(skill_area_sub, bl, (skill_id == AS_SPLASHER || skill_id == GN_SPORE_EXPLOSION)?1:skill_get_splash(skill_id, skill_lv), BL_CHAR, src, skill_id, skill_lv, tick, BCT_ENEMY, skill_area_sub_count); // recursive invocation of skill_castend_damage_id() with flag|1 map_foreachinrange(skill_area_sub, bl, skill_get_splash(skill_id, skill_lv), starget, src, skill_id, skill_lv, tick, flag|BCT_ENEMY|SD_SPLASH|1, skill_castend_damage_id); @@ -5336,6 +5326,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: @@ -5599,8 +5590,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; @@ -5633,8 +5631,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); } } @@ -5821,15 +5824,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_SINGLE); } break; @@ -5917,15 +5913,6 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, uint clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0); break; - case GN_SPORE_EXPLOSION: - if( flag&1 ) - skill_attack(skill_get_type(skill_id), src, src, bl, skill_id, skill_lv, tick, flag); - else { - clif_skill_nodamage(src, bl, skill_id, skill_lv, 1); - skill_addtimerskill(src, gettick() + skill_get_time(skill_id, skill_lv), bl->id, 0, 0, skill_id, skill_lv, 0, 0); - } - break; - case KO_JYUMONJIKIRI: { short x, y; short dir = map_calc_dir(src,bl->x,bl->y); @@ -7989,6 +7976,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui case SC_B_TRAP: case SC_H_MINE: case SC_STRANGELIGHTS: case SC_DECORATION_OF_MUSIC: case SC_GN_CARTBOOST: case SC_CHASEWALK2: case SC_ACTIVE_MONSTER_TRANSFORM: case SC_DORAM_BUF_01: case SC_DORAM_BUF_02: + case SC_SPORE_EXPLOSION: #ifdef RENEWAL case SC_EXTREMITYFIST2: #endif @@ -8090,7 +8078,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; } @@ -9441,6 +9429,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui case SC_C_MARKER: case SC_B_TRAP: case SC_H_MINE: case SC_STRANGELIGHTS: case SC_DECORATION_OF_MUSIC: case SC_GN_CARTBOOST: case SC_RECOGNIZEDSPELL: case SC_CHASEWALK2: case SC_ACTIVE_MONSTER_TRANSFORM: + case SC_SPORE_EXPLOSION: #ifdef RENEWAL case SC_EXTREMITYFIST2: #endif @@ -10494,6 +10483,10 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, ui } } break; + case GN_SPORE_EXPLOSION: + clif_skill_nodamage(src, bl, skill_id, skill_lv, 1); + sc_start4(src, bl, type, 100, skill_lv, skill_id, src->id, skill_get_time(skill_id, skill_lv), skill_get_time(skill_id, skill_lv)); + break; case GN_MANDRAGORA: if( flag&1 ) { int rate = 25 + (10 * skill_lv) - (tstatus->vit + tstatus->luk) / 5; @@ -12349,12 +12342,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: @@ -14223,8 +14212,14 @@ int skill_unit_onplace_timer(struct skill_unit *unit, struct block_list *bl, t_t 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)) { @@ -14941,7 +14936,12 @@ static bool skill_check_condition_sc_required(struct map_session_data *sd, unsig return false; } break; - + case GC_COUNTERSLASH: + if (!sc->data[SC_WEAPONBLOCK_ON]) { + clif_skill_fail(sd, skill_id, USESKILL_FAIL_GC_WEAPONBLOCKING, 0); + return false; + } + break; default: if (!sc->data[reqStatus]) { clif_skill_fail(sd, skill_id, USESKILL_FAIL_LEVEL, 0); @@ -15482,7 +15482,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); @@ -15563,7 +15562,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. @@ -15571,9 +15569,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 e25106171f..a9c63ff05d 100644 --- a/src/map/status.cpp +++ b/src/map/status.cpp @@ -796,6 +796,7 @@ void initChangeTables(void) set_sc( GN_CARTBOOST , SC_GN_CARTBOOST , EFST_GN_CARTBOOST , SCB_SPEED ); set_sc( GN_THORNS_TRAP , SC_THORNSTRAP , EFST_THORNS_TRAP, SCB_NONE ); set_sc_with_vfx( GN_BLOOD_SUCKER , SC_BLOODSUCKER , EFST_BLOOD_SUCKER, SCB_NONE ); + set_sc( GN_SPORE_EXPLOSION , SC_SPORE_EXPLOSION , EFST_SPORE_EXPLOSION, SCB_NONE ); set_sc( GN_FIRE_EXPANSION_SMOKE_POWDER , SC_SMOKEPOWDER , EFST_FIRE_EXPANSION_SMOKE_POWDER, SCB_FLEE ); set_sc( GN_FIRE_EXPANSION_TEAR_GAS , SC_TEARGAS , EFST_FIRE_EXPANSION_TEAR_GAS , SCB_HIT|SCB_FLEE ); set_sc( GN_MANDRAGORA , SC_MANDRAGORA , EFST_MANDRAGORA , SCB_INT ); @@ -1176,6 +1177,7 @@ void initChangeTables(void) StatusIconChangeTable[SC_LHZ_DUN_N4] = EFST_LHZ_DUN_N4; StatusIconChangeTable[SC_ANCILLA] = EFST_ANCILLA; + StatusIconChangeTable[SC_WEAPONBLOCK_ON] = EFST_WEAPONBLOCK_ON; /* Other SC which are not necessarily associated to skills */ StatusChangeFlagTable[SC_ASPDPOTION0] |= SCB_ASPD; @@ -12342,6 +12344,7 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const } break; case SC_SPLASHER: + case SC_SPORE_EXPLOSION: { struct block_list *src=map_id2bl(sce->val3); if(src && tid != INVALID_TIMER) @@ -13249,6 +13252,7 @@ TIMER_FUNC(status_change_timer){ break; case SC_SPLASHER: + case SC_SPORE_EXPLOSION: // Custom Venom Splasher countdown timer // if (sce->val4 % 1000 == 0) { // char timer[10]; @@ -13329,7 +13333,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); diff --git a/src/map/status.hpp b/src/map/status.hpp index 852b0d8c02..6bfdcd767a 100644 --- a/src/map/status.hpp +++ b/src/map/status.hpp @@ -861,6 +861,8 @@ enum sc_type : int16 { SC_ANCILLA, SC_EARTHSHAKER, + SC_WEAPONBLOCK_ON, + SC_SPORE_EXPLOSION, #ifdef RENEWAL SC_EXTREMITYFIST2, //! NOTE: This SC should be right before SC_MAX, so it doesn't disturb if RENEWAL is disabled