diff options
| -rw-r--r-- | Changelog-Trunk.txt | 11 | ||||
| -rw-r--r-- | db/Changelog.txt | 2 | ||||
| -rw-r--r-- | db/skill_db.txt | 768 | ||||
| -rw-r--r-- | src/map/battle.c | 191 | ||||
| -rw-r--r-- | src/map/skill.c | 2 | ||||
| -rw-r--r-- | src/map/skill.h | 16 |
6 files changed, 460 insertions, 530 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 264f14763..f017bb471 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,17 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/02/24 + * The NK value of the skill_db has been made a hexadecimal value, and + expanded to include more information about a skill's damage properties: 0x8 + ignore caster's cards, 0x10 ignore element adjustments, 0x20 ignore + target's defense, 0x40 ignore target's flee. Note that magic attacks + always ignore flee, and misc attacks always ignore defense. + * Autoguard will no longer work on skills that don't take in card + adjustments + * utsusemi & bunsinjyutsu no longer work on skills that don't take in card + adjustments. + * Corrected damage of the NPC elemental attack skills, Blood Drain and + Energy Drain * Adjusted menu-based skills so you can't reuse the same skill until you've dealt with the menu. * Adjust autospells so that removing an autospell works when the script of diff --git a/db/Changelog.txt b/db/Changelog.txt index 7c4e5d157..554453f33 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -19,6 +19,8 @@ ----- ======================== +02/24 + * Updated skill_db.txt using the new nk values in hexadecimal. [Skotlex] 02/23 * Official Aegis names for cards [Playtester] * Updated Box of thunder to use "agi up" effect for 30 secs instead of NPC diff --git a/db/skill_db.txt b/db/skill_db.txt index db76ee287..acb55d075 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -6,8 +6,14 @@ // 04 inf (0- passive, 1- enemy, 2- place, 4- self, 16- friend, 32- trap) // 05 pl attributes (0- neutral, 1- water, 2- earth, 3- fire, 4- wind, // 5- poison, 6- saint, 7- darkness, 8- sense, 9- immortality) -// 06 nk (0- normal skill, 1-no damage skill, 2-splash damage skill, -// 3-no damage area skill, 4-splash and split damage skill) +// 06 nk ( +// 0x01 - No damage skill +// 0x02 - Has splash area +// 0x04 - Damage should be split among targets +// 0x08 - Skill ignores caster's % damage cards +// 0x10 - Skill ignores elemental adjustments +// 0x20 - Skill ignores target's defense (misc type always ignores) +// 0x40 - Skill ignores target's flee (magic type always ignores) // 07 splash/effect range (-1 for screen-wide) // 08 MaxLv // 09 Number of hits (when positive, damage is increased by hits, @@ -38,80 +44,80 @@ 4,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //SM_RECOVERY#Increase HP Recovery# 5,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0 //SM_BASH#Bash# 6,9,6,1,0,1,0,10,1,no,0,0,0,none,0 //SM_PROVOKE#Provoke# -7,0,6,4,3,2,2,10,1,no,0,0,0,weapon,2 //SM_MAGNUM#Magnum Break# -8,0,6,4,0,1,0,10,1,no,0,0,0,weapon,0 //SM_ENDURE#Endure# +7,0,6,4,3,0x2,2,10,1,no,0,0,0,weapon,2 //SM_MAGNUM#Magnum Break# +8,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0 //SM_ENDURE#Endure# 9,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //MG_SRECOVERY#Increase SP Recovery# -10,0,6,4,3,3,3,1,1,yes,0,0,0,magic,0 //MG_SIGHT#Sight# -11,9,6,1,8,4,1,10,1,yes,0,0,0,magic,0 //MG_NAPALMBEAT#Napalm Beat# -12,9,8,2,8,1,0,10,1,yes,0,0,0,magic,0 //MG_SAFETYWALL#Safety Wall# +10,0,6,4,3,0x3,3,1,1,yes,0,0,0,magic,0 //MG_SIGHT#Sight# +11,9,6,1,8,0x6,1,10,1,yes,0,0,0,magic,0 //MG_NAPALMBEAT#Napalm Beat# +12,9,8,2,8,0x1,0,10,1,yes,0,0,0,magic,0 //MG_SAFETYWALL#Safety Wall# 13,9,8,1,8,0,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,0,0,magic,0 //MG_SOULSTRIKE#Soul Strike# 14,9,8,1,1,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0 //MG_COLDBOLT#Cold Bolt# 15,9,6,1,1,0,0,10,1,yes,0,0,0,magic,0 //MG_FROSTDIVER#Frost Diver# -16,2,6,1,2,1,0,10,1,yes,0,0,0,magic,0 //MG_STONECURSE#Stone Curse# -17,9,6,1,3,2,2,10,1,yes,0,0,0,magic,0 //MG_FIREBALL#Fire Ball# +16,2,6,1,2,0x1,0,10,1,yes,0,0,0,magic,0 //MG_STONECURSE#Stone Curse# +17,9,6,1,3,0x2,2,10,1,yes,0,0,0,magic,0 //MG_FIREBALL#Fire Ball# 18,9,6,2,3,0,0,10,1,yes,0,0,3,magic,1 //MG_FIREWALL#Fire Wall# 19,9,8,1,3,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0 //MG_FIREBOLT#Fire Bolt# 20,9,8,1,4,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0 //MG_LIGHTNINGBOLT#Lightning Bolt# 21,9,8,2,4,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0 //MG_THUNDERSTORM#Thunderstorm# 22,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //AL_DP#Divine protection# 23,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //AL_DEMONBANE#Demon Bane# -24,0,6,4,6,3,2,1,1,yes,0,0,0,magic,0 //AL_RUWACH#Ruwach# -25,9,6,2,0,1,0,1,1,yes,0,0,0,magic,0 //AL_PNEUMA#Pneuma# -26,0,6,4,0,1,0,2,1,yes,0,0,0,magic,0 //AL_TELEPORT#Teleport# -27,9,6,2,0,1,0,4,1,yes,0,0,3,magic,0 //AL_WARP#Warp Portal# -28,9,6,16,6,1,0,10,1,yes,0,0,0,magic,0 //AL_HEAL#Heal# -29,9,6,16,0,1,0,10,1,yes,0,0,0,magic,0 //AL_INCAGI#Increase AGI# -30,9,6,1,0,1,0,10,1,yes,0,0,0,magic,0 //AL_DECAGI#Decrease AGI# -31,0,6,4,0,1,0,1,1,yes,0,0,0,magic,0 //AL_HOLYWATER#Aqua Benedicta# -32,0,6,4,0,3,15,10,1,yes,0,0,0,magic,0 //AL_CRUCIS#Signum Crusis# -33,0,6,4,0,3,-1,10,1,yes,0,0,0,magic,0 //AL_ANGELUS#Angelus# -34,9,6,16,0,1,0,10,1,yes,0,0,0,magic,0 //AL_BLESSING#Blessing# -35,9,6,16,0,1,0,1,1,yes,0,0,0,magic,0 //AL_CURE#Cure# +24,0,6,4,6,0x3,2,1,1,yes,0,0,0,magic,0 //AL_RUWACH#Ruwach# +25,9,6,2,0,0x1,0,1,1,yes,0,0,0,magic,0 //AL_PNEUMA#Pneuma# +26,0,6,4,0,0x1,0,2,1,yes,0,0,0,magic,0 //AL_TELEPORT#Teleport# +27,9,6,2,0,0x1,0,4,1,yes,0,0,3,magic,0 //AL_WARP#Warp Portal# +28,9,6,16,6,0x21,0,10,1,yes,0,0,0,magic,0 //AL_HEAL#Heal# +29,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0 //AL_INCAGI#Increase AGI# +30,9,6,1,0,0x1,0,10,1,yes,0,0,0,magic,0 //AL_DECAGI#Decrease AGI# +31,0,6,4,0,0x1,0,1,1,yes,0,0,0,magic,0 //AL_HOLYWATER#Aqua Benedicta# +32,0,6,4,0,0x3,15,10,1,yes,0,0,0,magic,0 //AL_CRUCIS#Signum Crusis# +33,0,6,4,0,0x3,-1,10,1,yes,0,0,0,magic,0 //AL_ANGELUS#Angelus# +34,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0 //AL_BLESSING#Blessing# +35,9,6,16,0,0x1,0,1,1,yes,0,0,0,magic,0 //AL_CURE#Cure# 36,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //MC_INCCARRY#Enlarge Weight Limit# 37,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //MC_DISCOUNT#Discount# 38,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //MC_OVERCHARGE#Overcharge# 39,1,0,0,0,0,0,10,0,no,0,0,0,none,0 //MC_PUSHCART#Pushcart# -40,1,6,4,0,1,0,1,1,no,0,0,0,none,0 //MC_IDENTIFY#Item Appraisal# -41,1,6,4,0,1,0,10,1,no,0,0,0,none,0 //MC_VENDING#Vending# +40,1,6,4,0,0x1,0,1,1,no,0,0,0,none,0 //MC_IDENTIFY#Item Appraisal# +41,1,6,4,0,0x1,0,10,1,no,0,0,0,none,0 //MC_VENDING#Vending# 42,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0 //MC_MAMMONITE#Mammonite# 43,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //AC_OWL#Owl's Eye# 44,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //AC_VULTURE#Vulture's Eye# -45,0,6,4,0,3,1,10,1,no,0,0,0,weapon,0 //AC_CONCENTRATION#Improve Concentration# +45,0,6,4,0,0x3,1,10,1,no,0,0,0,weapon,0 //AC_CONCENTRATION#Improve Concentration# 46,-9,8,1,-1,0,0,10,2,no,0,0,0,weapon,0 //AC_DOUBLE#Double Strafe# -47,-9,6,2,-1,2,2,10,1,no,0,0,0,weapon,2 //AC_SHOWER#Arrow Shower# +47,-9,6,2,-1,0x2,2,10,1,no,0,0,0,weapon,2 //AC_SHOWER#Arrow Shower# 48,-1,8,0,-1,0,0,10,2,no,0,0,0,weapon,0 //TF_DOUBLE#Double Attack# 49,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //TF_MISS#Improve Dodge# 50,1,6,1,0,1,0,10,1,no,0,0,0,weapon,0 //TF_STEAL#Steal# 51,1,6,4,0,1,0,10,1,no,0,0,0,none,0 //TF_HIDING#Hiding# 52,-2,6,1,5,0,0,10,1,no,0,0,0,weapon,0 //TF_POISON#Envenom# -53,9,6,16,5,1,0,1,1,no,0,0,0,weapon,0 //TF_DETOXIFY#Detoxify# -54,9,6,16,6,1,0,4,1,yes,0,0,0,magic,0 //ALL_RESURRECTION#Resurrection# +53,9,6,16,5,0x1,0,1,1,no,0,0,0,weapon,0 //TF_DETOXIFY#Detoxify# +54,9,6,16,6,0x1,0,4,1,yes,0,0,0,magic,0 //ALL_RESURRECTION#Resurrection# 55,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //KN_SPEARMASTERY#Spear Mastery# 56,-2,8,1,-1,0,0,10,3,no,0,0,0,weapon,0 //KN_PIERCE#Pierce# -57,-2,6,1,-1,1,0,10,1,no,33,0,0,weapon,3 //KN_BRANDISHSPEAR#Brandish Spear# -58,-4,6,1,-1,2,0,10,1,no,0,0,0,weapon,6 //KN_SPEARSTAB#Spear Stab# +57,-2,6,1,-1,0x1,0,10,1,no,33,0,0,weapon,3 //KN_BRANDISHSPEAR#Brandish Spear# +58,-4,6,1,-1,0x2,0,10,1,no,0,0,0,weapon,6 //KN_SPEARSTAB#Spear Stab# 59,3:5:7:9:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0 //KN_SPEARBOOMERANG#Spear Boomerang# -60,0,6,4,0,1,0,10,1,no,0,0,0,weapon,0 //KN_TWOHANDQUICKEN#Twohand Quicken# -61,0,6,4,-1,0,0,5,1,no,0,0,0,weapon,0 //KN_AUTOCOUNTER#Counter Attack# -62,-2,6,1,-1,2,1,10,1,no,33,0,0,weapon,1:1:2:2:3:3:4:4:5:5 //KN_BOWLINGBASH#Bowling Bash# +60,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0 //KN_TWOHANDQUICKEN#Twohand Quicken# +61,0,6,4,-1,0x20,0,5,1,no,0,0,0,weapon,0 //KN_AUTOCOUNTER#Counter Attack# +62,-2,6,1,-1,0x2,1,10,1,no,33,0,0,weapon,1:1:2:2:3:3:4:4:5:5 //KN_BOWLINGBASH#Bowling Bash# 63,0,0,0,0,0,0,1,0,no,0,0,0,weapon,0 //KN_RIDING#Peco Peco Riding# 64,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0 //KN_CAVALIERMASTERY#Cavalier Mastery# 65,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //PR_MACEMASTERY#Mace Mastery# -66,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //PR_IMPOSITIO#Impositio Manus# -67,9,6,16,0,1,0,3,1,yes,0,0x200,0,magic,0 //PR_SUFFRAGIUM#Suffragium# -68,9,6,16,6,1,0,5,1,yes,0,0,0,magic,0 //PR_ASPERSIO#Aspersio# -69,9,6,2,0,3,1,5,1,yes,0,0x40,0,magic,0 //PR_BENEDICTIO#B.S Sacramenti# -70,9,6,2,6,1,0,10,1,yes,0,0,0,magic,1 //PR_SANCTUARY#Sanctuary# -71,9,6,16,0,1,0,4,1,yes,0,0,0,magic,0 //PR_SLOWPOISON#Slow Poison# -72,9,6,16,0,1,0,1,1,yes,0,0,0,magic,0 //PR_STRECOVERY#Status Recovery# -73,9,6,16,0,1,0,10,1,yes,0,0,0,magic,0 //PR_KYRIE#Kyrie Eleison# -74,0,6,4,0,3,-1,5,1,yes,0,0,0,magic,0 //PR_MAGNIFICAT#Magnificat# -75,0,6,4,0,3,-1,5,1,yes,0,0,0,magic,0 //PR_GLORIA#Gloria# -76,5,6,1,0,1,0,10,0,yes,0,0,0,magic,0 //PR_LEXDIVINA#Lex Divina# -77,5,6,1,6,0,0,10,1,yes,0,0,0,magic,0 //PR_TURNUNDEAD#Turn Undead# -78,9,6,1,0,1,0,1,0,yes,0,0,0,magic,0 //PR_LEXAETERNA#Lex Aeterna# +66,9,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0 //PR_IMPOSITIO#Impositio Manus# +67,9,6,16,0,0x1,0,3,1,yes,0,0x200,0,magic,0 //PR_SUFFRAGIUM#Suffragium# +68,9,6,16,6,0x31,0,5,1,yes,0,0,0,magic,0 //PR_ASPERSIO#Aspersio# +69,9,6,2,0,0x23,1,5,1,yes,0,0x40,0,magic,0 //PR_BENEDICTIO#B.S Sacramenti# +70,9,6,2,6,0x21,0,10,1,yes,0,0,0,magic,1 //PR_SANCTUARY#Sanctuary# +71,9,6,16,0,0x1,0,4,1,yes,0,0,0,magic,0 //PR_SLOWPOISON#Slow Poison# +72,9,6,16,0,0x1,0,1,1,yes,0,0,0,magic,0 //PR_STRECOVERY#Status Recovery# +73,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0 //PR_KYRIE#Kyrie Eleison# +74,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0 //PR_MAGNIFICAT#Magnificat# +75,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0 //PR_GLORIA#Gloria# +76,5,6,1,0,0x1,0,10,0,yes,0,0,0,magic,0 //PR_LEXDIVINA#Lex Divina# +77,5,6,1,6,0x28,0,10,1,yes,0,0,0,magic,0 //PR_TURNUNDEAD#Turn Undead# +78,9,6,1,0,0x1,0,1,0,yes,0,0,0,magic,0 //PR_LEXAETERNA#Lex Aeterna# 79,9,8,2,6,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0 //PR_MAGNUS#Magnus Exorcismus# -80,9,8,2,3,0,1:1:1:1:1:2:2:2:2:2:2,10,3:4:5:6:7:8:9:10:11:12:12,yes,0,0,5,magic,0 //WZ_FIREPILLAR#Fire Pillar# +80,9,8,2,3,0x20,1:1:1:1:1:2:2:2:2:2:2,10,3:4:5:6:7:8:9:10:11:12:12,yes,0,0,5,magic,0 //WZ_FIREPILLAR#Fire Pillar# 81,0,6,4,3,0,3,10,1,yes,0,0,0,magic,5 //WZ_SIGHTRASHER#Sightrasher# //82,9,6,2,3,0,0,10,1,yes,0,0,0,magic,0 //WZ_FIREIVY#Fire Ivy# 83,9,8,2,3,0,3:3:3:3:3:3:3:3:3:3:14,10,1:1:2:2:3:3:4:4:5:5:15,yes,0,0,0,magic,0 //WZ_METEOR#Meteor Storm# @@ -119,12 +125,12 @@ 85,9,8,2,4,0,0,10,-10,yes,0,0,0,magic,0 //WZ_VERMILION#Lord of Vermilion# 86,9,8,1,1,0,0,5,1,yes,0,0,0,magic,0 //WZ_WATERBALL#Water Ball# 87,9,6,2,1,0,0,10,1,yes,0,0,0,magic,0 //WZ_ICEWALL#Ice Wall# -88,0,6,4,1,2,2,10,1,yes,0,0,0,magic,0 //WZ_FROSTNOVA#Frost Nova# +88,0,6,4,1,0x2,2,10,1,yes,0,0,0,magic,0 //WZ_FROSTNOVA#Frost Nova# 89,9,6,2,1,0,0,10,1,yes,0,0,0,magic,2 //WZ_STORMGUST#Storm Gust# 90,9,8,1,2,0,0,5,1:2:3:4:5,yes,0,0,0,magic,0 //WZ_EARTHSPIKE#Earth Spike# 91,9,8,2,2,0,0,5,1:2:3:4:5,yes,0,0,0,magic,0 //WZ_HEAVENDRIVE#Heaven's Drive# -92,9,6,2,2,1,0,5,1,yes,0,0,3,magic,0 //WZ_QUAGMIRE#Quagmire# -93,9,6,1,0,1,0,1,1,yes,0,0,0,magic,0 //WZ_ESTIMATION#Sense# +92,9,6,2,2,0x1,0,5,1,yes,0,0,3,magic,0 //WZ_QUAGMIRE#Quagmire# +93,9,6,1,0,0x1,0,1,1,yes,0,0,0,magic,0 //WZ_ESTIMATION#Sense# 94,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0 //BS_IRON#Iron Tempering# 95,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0 //BS_STEEL#Steel Tempering# 96,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0 //BS_ENCHANTEDSTONE#Enchanted Stone Craft# @@ -139,74 +145,74 @@ 105,0,0,0,0,0,0,1,0,no,0,0,0,weapon,0 //BS_HILTBINDING#Hilt Binding# 106,0,0,0,0,0,0,1,0,no,0,0,0,weapon,0 //BS_FINDINGORE#Ore Discovery# 107,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //BS_WEAPONRESEARCH#Weaponry Research# -108,2,6,16,0,1,0,1,1,yes,0,0,0,weapon,0 //BS_REPAIRWEAPON#Weapon Repair# +108,2,6,16,0,0x1,0,1,1,yes,0,0,0,weapon,0 //BS_REPAIRWEAPON#Weapon Repair# 109,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0 //BS_SKINTEMPER#Skin Tempering# -110,1,6,2,0,3,2:2:2:2:2:14,5,1,no,0,0,0,weapon,0 //BS_HAMMERFALL#Hammer Fall# -111,0,6,4,0,3,-1,5,1,no,0,0,0,weapon,0 //BS_ADRENALINE#Adrenaline Rush# -112,0,6,4,0,3,-1,5,1,no,0,0,0,weapon,0 //BS_WEAPONPERFECT#Weapon Perfection# -113,0,6,4,0,3,-1,5,1,no,0,0,0,weapon,0 //BS_OVERTHRUST#Power-Thrust# -114,0,6,4,0,1,0,5,1,no,0,0,0,weapon,0 //BS_MAXIMIZE#Maximize Power# -115,3,6,2,0,1,0,5,1,no,0,0x80,0,misc,6:7:8:9:10 //HT_SKIDTRAP#Skid Trap# -116,3,6,2,2,0,0,5,1,no,0,0x80,0,misc,0 //HT_LANDMINE#Land Mine# -117,3,6,2,0,1,0,5,1,no,0,0x80,0,misc,0 //HT_ANKLESNARE#Ankle Snare# -118,3,6,2,0,2,1,5,1,no,0,0x80,0,misc,0 //HT_SHOCKWAVE#Shockwave Trap# -119,3,6,2,0,3,2,5,1,no,0,0x80,0,misc,0 //HT_SANDMAN#Sandman# -120,3,6,2,0,3,1,5,1,no,0,0x80,0,misc,0 //HT_FLASHER#Flasher# -121,3,6,2,1,2,1,5,1,no,0,0x80,0,misc,0 //HT_FREEZINGTRAP#Freezing Trap# -122,3,6,2,4,2,1,5,1,no,0,0x80,0,misc,0 //HT_BLASTMINE#Blast Mine# -123,3,6,2,3,2,2,5,1,no,0,0x80,0,misc,0 //HT_CLAYMORETRAP#Claymore Trap# -124,2,6,32,0,1,0,1,1,no,0,0,0,misc,0 //HT_REMOVETRAP#Remove Trap# -125,3,6,2,0,1,0,1,1,no,0,0,0,misc,0 //HT_TALKIEBOX#Talkie Box# +110,1,6,2,0,0x3,2:2:2:2:2:14,5,1,no,0,0,0,weapon,0 //BS_HAMMERFALL#Hammer Fall# +111,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0 //BS_ADRENALINE#Adrenaline Rush# +112,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0 //BS_WEAPONPERFECT#Weapon Perfection# +113,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0 //BS_OVERTHRUST#Power-Thrust# +114,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0 //BS_MAXIMIZE#Maximize Power# +115,3,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,6:7:8:9:10 //HT_SKIDTRAP#Skid Trap# +116,3,6,2,2,0x40,0,5,1,no,0,0x80,0,misc,0 //HT_LANDMINE#Land Mine# +117,3,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,0 //HT_ANKLESNARE#Ankle Snare# +118,3,6,2,0,0x2,1,5,1,no,0,0x80,0,misc,0 //HT_SHOCKWAVE#Shockwave Trap# +119,3,6,2,0,0x3,2,5,1,no,0,0x80,0,misc,0 //HT_SANDMAN#Sandman# +120,3,6,2,0,0x3,1,5,1,no,0,0x80,0,misc,0 //HT_FLASHER#Flasher# +121,3,6,2,1,0x42,1,5,1,no,0,0x80,0,misc,0 //HT_FREEZINGTRAP#Freezing Trap# +122,3,6,2,4,0x42,1,5,1,no,0,0x80,0,misc,0 //HT_BLASTMINE#Blast Mine# +123,3,6,2,3,0x42,2,5,1,no,0,0x80,0,misc,0 //HT_CLAYMORETRAP#Claymore Trap# +124,2,6,32,0,0x1,0,1,1,no,0,0,0,misc,0 //HT_REMOVETRAP#Remove Trap# +125,3,6,2,0,0x1,0,1,1,no,0,0,0,misc,0 //HT_TALKIEBOX#Talkie Box# 126,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //HT_BEASTBANE#Beast Bane# 127,0,0,0,0,0,0,1,0,no,0,0,0,misc,0 //HT_FALCON#Falconry Mastery# 128,0,0,0,0,0,0,10,0,no,0,0,0,misc,0 //HT_STEELCROW#Steel Crow# -129,5,8,1,0,2,1,5,1:2:3:4:5,yes,0,0,0,misc,0 //HT_BLITZBEAT#Blitz Beat# -130,3:5:7:9,6,2,0,3,3,4,1,no,0,0,0,misc,0 //HT_DETECTING#Detect# -131,4:5:6:7:8,6,32,0,1,0,5,1,no,0,0,0,misc,0 //HT_SPRINGTRAP#Spring Trap# +129,5,8,1,0,0x42,1,5,1:2:3:4:5,yes,0,0,0,misc,0 //HT_BLITZBEAT#Blitz Beat# +130,3:5:7:9,6,2,0,0x3,3,4,1,no,0,0,0,misc,0 //HT_DETECTING#Detect# +131,4:5:6:7:8,6,32,0,0x1,0,5,1,no,0,0,0,misc,0 //HT_SPRINGTRAP#Spring Trap# 132,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0 //AS_RIGHT#Righthand Mastery# 133,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0 //AS_LEFT#Lefthand Mastery# 134,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //AS_KATAR#Katar Mastery# -135,0,6,4,0,1,0,10,1,no,0,0,0,weapon,0 //AS_CLOAKING#Cloaking# +135,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0 //AS_CLOAKING#Cloaking# 136,-1,8,1,-1,0,0,10,8,no,0,0,0,weapon,0 //AS_SONICBLOW#Sonic Blow# -137,3:4:5:6:7,6,1,-1,2,1,5,1,no,0,0,0,weapon,0 //AS_GRIMTOOTH#Grimtooth# -138,1,6,16,5,1,0,10,1,no,0,0x400,0,weapon,0 //AS_ENCHANTPOISON#Enchant Poison# +137,3:4:5:6:7,6,1,-1,0x2,1,5,1,no,0,0,0,weapon,0 //AS_GRIMTOOTH#Grimtooth# +138,1,6,16,5,0x1,0,10,1,no,0,0x400,0,weapon,0 //AS_ENCHANTPOISON#Enchant Poison# 139,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0 //AS_POISONREACT#Poison React# -140,2,6,2,5,1,0,10,1,no,0,0,0,weapon,0 //AS_VENOMDUST#Venom Dust# -141,1,6,1,-1,1,2,10,1,yes,0,0,0,weapon,0 //AS_SPLASHER#Venom Splasher# -142,0,6,4,0,1,0,1,1,no,0,0x1,0,none,0 //NV_FIRSTAID#First Aid# -143,0,6,4,0,1,0,1,1,no,0,0x1,0,none,0 //NV_TRICKDEAD#Act Dead# +140,2,6,2,5,0x1,0,10,1,no,0,0,0,weapon,0 //AS_VENOMDUST#Venom Dust# +141,1,6,1,-1,0x9,2,10,1,yes,0,0,0,weapon,0 //AS_SPLASHER#Venom Splasher# +142,0,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0 //NV_FIRSTAID#First Aid# +143,0,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0 //NV_TRICKDEAD#Act Dead# 144,0,0,0,0,0,0,1,0,no,0,0x1,0,none,0 //SM_MOVINGRECOVERY#Moving HP-Recovery# 145,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0 //SM_FATALBLOW#Attack Weak Point# -146,0,6,4,0,1,0,1,1,no,0,0x1,0,weapon,0 //SM_AUTOBERSERK#Auto Berserk# -147,0,0,4,0,1,0,1,0,no,0,0x1,0,weapon,0 //AC_MAKINGARROW#Arrow Crafting# -148,-9,6,1,-1,2,0,1,1,no,0,0x1,0,weapon,6 //AC_CHARGEARROW#Arrow Repel# +146,0,6,4,0,0x1,0,1,1,no,0,0x1,0,weapon,0 //SM_AUTOBERSERK#Auto Berserk# +147,0,0,4,0,0x1,0,1,0,no,0,0x1,0,weapon,0 //AC_MAKINGARROW#Arrow Crafting# +148,-9,6,1,-1,0x2,0,1,1,no,0,0x1,0,weapon,6 //AC_CHARGEARROW#Arrow Repel# 149,1,6,1,2,0,0,1,1,no,0,0x1,0,weapon,0 //TF_SPRINKLESAND#Throw Sand# -150,0,6,4,0,1,0,1,1,no,0,0x1,0,weapon,5 //TF_BACKSLIDING#Back Sliding# -151,0,6,4,0,1,0,1,1,no,0,0x1,0,none,0 //TF_PICKSTONE#Find Stone# -152,7,6,1,0,0,0,1,1,no,0,0x1,0,misc,0 //TF_THROWSTONE#Stone Fling# -153,1,6,1,-1,2,1,1,1,no,0,0x1,0,weapon,2 //MC_CARTREVOLUTION#Cart Revolution# -154,0,6,4,0,1,0,1,1,no,0,0x1,0,none,0 //MC_CHANGECART#Change Cart# -155,0,6,4,0,1,0,1,1,no,0,0x1,0,weapon,0 //MC_LOUD#Crazy Uproar# +150,0,6,4,0,0x1,0,1,1,no,0,0x1,0,weapon,5 //TF_BACKSLIDING#Back Sliding# +151,0,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0 //TF_PICKSTONE#Find Stone# +152,7,6,1,0,0x40,0,1,1,no,0,0x1,0,misc,0 //TF_THROWSTONE#Stone Fling# +153,1,6,1,-1,0x2,1,1,1,no,0,0x1,0,weapon,2 //MC_CARTREVOLUTION#Cart Revolution# +154,0,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0 //MC_CHANGECART#Change Cart# +155,0,6,4,0,0x1,0,1,1,no,0,0x1,0,weapon,0 //MC_LOUD#Crazy Uproar# 156,9,6,1,6,0,0,1,1,yes,0,0x1,0,magic,0 //AL_HOLYLIGHT#Holy Light# -157,0,6,4,0,1,0,1,1,yes,0,0x1,0,magic,0 //MG_ENERGYCOAT#Energy Coat# +157,0,6,4,0,0x1,0,1,1,yes,0,0x1,0,magic,0 //MG_ENERGYCOAT#Energy Coat# 158,3,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_PIERCINGATT#Thrusting attack# -159,-1,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_MENTALBREAKER#Spirit Destruction# +159,-1,6,1,-1,0x40,0,5,1,no,0,0x2,0,weapon,0 //NPC_MENTALBREAKER#Spirit Destruction# 160,9,6,1,0,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_RANGEATTACK#Stand off attack# -161,0,0,4,0,1,0,1,1,no,0,0x2,0,magic,0 //NPC_ATTRICHANGE#Run Attribute Change# -162,0,0,4,1,1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEWATER#Water Attribute Change# -163,0,0,4,2,1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEGROUND#Earth Attribute Change# -164,0,0,4,3,1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEFIRE#Fire Attribute Change# -165,0,0,4,4,1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEWIND#Wind Attribute Change# -166,0,0,4,5,1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEPOISON#Poison Attribute Change# -167,0,0,4,6,1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEHOLY#Holy Attribute Change# -168,0,0,4,7,1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEDARKNESS#Shadow Attribute Change# -169,0,0,4,8,1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGETELEKINESIS#Sense Attribute Change# -170,-1,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_CRITICALSLASH#Defense disregard attack# +161,0,0,4,0,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_ATTRICHANGE#Run Attribute Change# +162,0,0,4,1,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEWATER#Water Attribute Change# +163,0,0,4,2,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEGROUND#Earth Attribute Change# +164,0,0,4,3,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEFIRE#Fire Attribute Change# +165,0,0,4,4,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEWIND#Wind Attribute Change# +166,0,0,4,5,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEPOISON#Poison Attribute Change# +167,0,0,4,6,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEHOLY#Holy Attribute Change# +168,0,0,4,7,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEDARKNESS#Shadow Attribute Change# +169,0,0,4,8,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGETELEKINESIS#Sense Attribute Change# +170,-1,6,1,-1,0x20,0,10,1,no,0,0x2,0,weapon,0 //NPC_CRITICALSLASH#Defense disregard attack# 171,-1,8,1,-1,0,0,10,2:3:4:5:6:7:8:9:10:11,no,0,0x2,0,weapon,0 //NPC_COMBOATTACK#Multi-stage Attack# -172,-1,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_GUIDEATTACK#On-target Impact Attack# -173,5,6,4,3,2,5,10,1,no,0,0x2,0,misc,3 //NPC_SELFDESTRUCTION#Suicide bombing# -174,-1,6,1,-1,2,3,1,1,no,0,0x2,0,weapon,0 //NPC_SPLASHATTACK#Splash attack# -175,0,0,4,0,1,0,10,1,no,0,0x2,0,misc,0 //NPC_SUICIDE#Suicide# +172,-1,6,1,-1,0x40,0,10,1,no,0,0x2,0,weapon,0 //NPC_GUIDEATTACK#On-target Impact Attack# +173,5,6,4,3,0x5A,5,10,1,no,0,0x2,0,misc,3 //NPC_SELFDESTRUCTION#Suicide bombing# +174,-1,6,1,-1,0x2,3,1,1,no,0,0x2,0,weapon,0 //NPC_SPLASHATTACK#Splash attack# +175,0,0,4,0,0x41,0,10,1,no,0,0x2,0,misc,0 //NPC_SUICIDE#Suicide# 176,-1,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_POISON#Poison Attack# 177,7,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_BLINDATTACK#Darkness Attack# 178,-1,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_SILENCEATTACK#Silence Attack# @@ -224,248 +230,248 @@ 190,-1,6,1,7,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_DARKNESSATTACK#Shadow Attribute Attack# 191,-1,6,1,8,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_TELEKINESISATTACK#Sense Attribute Attack# 192,-1,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_MAGICALATTACK#Demon Shock Attack# -193,0,0,4,0,1,0,10,1,no,0,0x2,0,none,0 //NPC_METAMORPHOSIS#Metamorphosis# -194,0,0,4,0,1,0,10,1,no,0,0x2,0,none,0 //NPC_PROVOCATION#Provocation# -195,0,6,4,0,0,0,10,1,no,0,0x2,0,misc,0 //NPC_SMOKING#Smoking# -196,0,0,4,0,1,0,10,1,no,0,0x2,0,magic,0 //NPC_SUMMONSLAVE#Follower Summons# -197,0,0,4,0,1,0,10,1,no,0,0x2,0,none,0 //NPC_EMOTION#Emotion# -198,0,0,4,0,1,0,10,1,no,0,0x2,0,magic,0 //NPC_TRANSFORMATION#Transformation# -199,9,6,1,7,0,0,1,1,no,0,0x2,0,weapon,0 //NPC_BLOODDRAIN#Sucking Blood# +193,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_METAMORPHOSIS#Metamorphosis# +194,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_PROVOCATION#Provocation# +195,0,6,4,0,0x58,0,10,1,no,0,0x2,0,misc,0 //NPC_SMOKING#Smoking# +196,0,0,4,0,0x1,0,10,1,no,0,0x2,0,magic,0 //NPC_SUMMONSLAVE#Follower Summons# +197,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_EMOTION#Emotion# +198,0,0,4,0,0x1,0,10,1,no,0,0x2,0,magic,0 //NPC_TRANSFORMATION#Transformation# +199,9,6,1,7,0x40,0,1,1,no,0,0x2,0,weapon,0 //NPC_BLOODDRAIN#Sucking Blood# 200,9,6,1,7,0,0,1,1,no,0,0x2,0,magic,0 //NPC_ENERGYDRAIN#Energy Drain# -201,0,0,4,0,1,0,1,1,no,0,0x2,0,weapon,0 //NPC_KEEPING#Keeping# +201,0,0,4,0,0x1,0,1,1,no,0,0x2,0,weapon,0 //NPC_KEEPING#Keeping# 202,2,6,1,7,0,0,5,1,no,0,0x2,0,misc,0 //NPC_DARKBREATH#Dark Breath# -203,9,6,1,7,1,0,10,1,no,0,0x2,0,magic,0 //NPC_DARKBLESSING#Dark Blessing# -204,0,0,4,0,1,0,1,1,no,0,0x2,0,magic,0 //NPC_BARRIER#Barrier# -205,0,0,4,0,1,0,1,1,no,0,0x2,0,weapon,0 //NPC_DEFENDER#Defender# -206,1,6,1,-1,1,0,5,1,no,0,0x2,0,weapon,0 //NPC_LICK#Lick# -207,9,0,1,0,1,0,10,1,no,0,0x2,0,magic,0 //NPC_HALLUCINATION#Hallucination# -208,0,0,4,0,1,0,1,1,no,0,0x2,0,magic,0 //NPC_REBIRTH#Rebirth# -209,0,0,4,0,1,0,10,1,no,0,0x2,0,magic,0 //NPC_SUMMONMONSTER#Monster Summons# +203,9,6,1,7,0x1,0,10,1,no,0,0x2,0,magic,0 //NPC_DARKBLESSING#Dark Blessing# +204,0,0,4,0,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_BARRIER#Barrier# +205,0,0,4,0,0x1,0,1,1,no,0,0x2,0,weapon,0 //NPC_DEFENDER#Defender# +206,1,6,1,-1,0x1,0,5,1,no,0,0x2,0,weapon,0 //NPC_LICK#Lick# +207,9,0,1,0,0x1,0,10,1,no,0,0x2,0,magic,0 //NPC_HALLUCINATION#Hallucination# +208,0,0,4,0,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_REBIRTH#Rebirth# +209,0,0,4,0,0x1,0,10,1,no,0,0x2,0,magic,0 //NPC_SUMMONMONSTER#Monster Summons# 210,0,0,0,-1,0,0,10,0,no,0,0,0,weapon,0 //RG_SNATCHER#Gank# -211,1,6,1,0,1,0,10,1,no,0,0,0,weapon,0 //RG_STEALCOIN#Mug# -212,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0 //RG_BACKSTAP#Back Stab# +211,1,6,1,0,0x1,0,10,1,no,0,0,0,weapon,0 //RG_STEALCOIN#Mug# +212,-1,6,1,-1,0x40,0,10,1,no,0,0,0,weapon,0 //RG_BACKSTAP#Back Stab# 213,0,0,0,0,0,0,5,0,no,0,0,0,none,0 //RG_TUNNELDRIVE#Stalk# -214,0,6,4,-1,2,1,5,1,no,0,0,0,weapon,0 //RG_RAID#Sightless Raid# -215,1,6,1,0,1,0,5,1,no,0,0,0,weapon,0 //RG_STRIPWEAPON#Divest Weapon# -216,1,6,1,0,1,0,5,1,no,0,0,0,weapon,0 //RG_STRIPSHIELD#Divest Shield# -217,1,6,1,0,1,0,5,1,no,0,0,0,weapon,0 //RG_STRIPARMOR#Divest Armor# -218,1,6,1,0,1,0,5,1,no,0,0,0,weapon,0 //RG_STRIPHELM#Divest Helm# +214,0,6,4,-1,0x2,1,5,1,no,0,0,0,weapon,0 //RG_RAID#Sightless Raid# +215,1,6,1,0,0x1,0,5,1,no,0,0,0,weapon,0 //RG_STRIPWEAPON#Divest Weapon# +216,1,6,1,0,0x1,0,5,1,no,0,0,0,weapon,0 //RG_STRIPSHIELD#Divest Shield# +217,1,6,1,0,0x1,0,5,1,no,0,0,0,weapon,0 //RG_STRIPARMOR#Divest Armor# +218,1,6,1,0,0x1,0,5,1,no,0,0,0,weapon,0 //RG_STRIPHELM#Divest Helm# 219,-1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0 //RG_INTIMIDATE#Snatch# -220,1,6,2,0,1,0,1,1,no,0,0,0,none,0 //RG_GRAFFITI#Scribble# -221,0,6,2,0,1,0,5,1,no,0,0,0,none,0 //RG_FLAGGRAFFITI#Piece# -222,1,6,2,0,3,5,1,1,no,0,0,0,none,0 //RG_CLEANER#Remover# +220,1,6,2,0,0x1,0,1,1,no,0,0,0,none,0 //RG_GRAFFITI#Scribble# +221,0,6,2,0,0x1,0,5,1,no,0,0,0,none,0 //RG_FLAGGRAFFITI#Piece# +222,1,6,2,0,0x3,5,1,1,no,0,0,0,none,0 //RG_CLEANER#Remover# 223,0,0,0,0,0,1,1,0,no,0,0,0,none,0 //RG_GANGSTER#Slyness# 224,0,0,0,0,0,0,5,0,no,0,0,0,none,0 //RG_COMPULSION#Haggle# 225,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //RG_PLAGIARISM#Intimidate# 226,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //AM_AXEMASTERY#Axe Mastery# 227,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //AM_LEARNINGPOTION#Potion Research# -228,0,6,4,0,1,0,10,0,no,0,0,0,none,0 //AM_PHARMACY#Prepare Potion# -229,9,6,2,3,1,0,5,1,yes,0,0,0,weapon,0 //AM_DEMONSTRATION#Bomb# -230,9,6,1,0,0,0,5,1,yes,0,0,0,weapon,0 //AM_ACIDTERROR#Acid Terror# -231,9,6,16,0,1,0,5,1,yes,0,0xC00,0,none,0 //AM_POTIONPITCHER#Aid Potion# -232,4,6,2,0,1,0,5,1,no,0,0,5,none,0 //AM_CANNIBALIZE#Summon Flora# -233,1,6,2,0,1,0,5,1,no,0,0,3,none,0 //AM_SPHEREMINE#Summon Marine Sphere# -234,1,6,16,0,1,0,5,1,yes,0,0,0,weapon,0 //AM_CP_WEAPON#Alchemical Weapon# -235,1,6,16,0,1,0,5,1,yes,0,0,0,weapon,0 //AM_CP_SHIELD#Synthesized Shield# -236,1,6,16,0,1,0,5,1,yes,0,0,0,weapon,0 //AM_CP_ARMOR#Synthetic Armor# -237,1,6,16,0,1,0,5,1,yes,0,0,0,weapon,0 //AM_CP_HELM#Biochemical Helm# +228,0,6,4,0,0x1,0,10,0,no,0,0,0,none,0 //AM_PHARMACY#Prepare Potion# +229,9,6,2,3,0x9,0,5,1,yes,0,0,0,weapon,0 //AM_DEMONSTRATION#Bomb# +230,9,6,1,0,0x48,0,5,1,yes,0,0,0,weapon,0 //AM_ACIDTERROR#Acid Terror# +231,9,6,16,0,0x1,0,5,1,yes,0,0xC00,0,none,0 //AM_POTIONPITCHER#Aid Potion# +232,4,6,2,0,0x1,0,5,1,no,0,0,5,none,0 //AM_CANNIBALIZE#Summon Flora# +233,1,6,2,0,0x1,0,5,1,no,0,0,3,none,0 //AM_SPHEREMINE#Summon Marine Sphere# +234,1,6,16,0,0x1,0,5,1,yes,0,0,0,weapon,0 //AM_CP_WEAPON#Alchemical Weapon# +235,1,6,16,0,0x1,0,5,1,yes,0,0,0,weapon,0 //AM_CP_SHIELD#Synthesized Shield# +236,1,6,16,0,0x1,0,5,1,yes,0,0,0,weapon,0 //AM_CP_ARMOR#Synthetic Armor# +237,1,6,16,0,0x1,0,5,1,yes,0,0,0,weapon,0 //AM_CP_HELM#Biochemical Helm# 238,0,0,0,0,0,0,1,0,no,0,0x1,0,none,0 //AM_BIOETHICS#Basis of Life# //239,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //AM_BIOTECHNOLOGY#Biotechnology# //240,0,0,0,0,0,0,5,0,no,0,0,0,none,0 //AM_CREATECREATURE#Life Creation# //241,0,0,0,0,0,0,5,0,no,0,0,0,none,0 //AM_CULTIVATION#Cultivation# //242,0,0,0,0,0,0,5,0,no,0,0,0,none,0 //AM_FLAMECONTROL#Flame Control# -243,0,0,4,0,1,1,1,0,no,0,0,0,none,0 //AM_CALLHOMUN#Call Homunculus# -244,0,0,4,0,1,0,1,0,no,0,0,0,none,0 //AM_REST#Peaceful Rest# +243,0,0,4,0,0x1,1,1,0,no,0,0,0,none,0 //AM_CALLHOMUN#Call Homunculus# +244,0,0,4,0,0x1,0,1,0,no,0,0,0,none,0 //AM_REST#Peaceful Rest# //245,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //AM_DRILLMASTER#Drillmaster# //246,9,0,0,0,0,0,10,0,no,0,0,0,none,0 //AM_HEALHOMUN#Heal Homunculus# -247,9,6,4,0,1,1,5,0,no,0,0,0,none,0 //AM_RESURRECTHOMUN#Ressurect Homunculus# +247,9,6,4,0,0x1,1,5,0,no,0,0,0,none,0 //AM_RESURRECTHOMUN#Ressurect Homunculus# 248,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //CR_TRUST#Faith# -249,0,6,4,0,1,0,10,1,no,0,0,0,weapon,0 //CR_AUTOGUARD#Guard# +249,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0 //CR_AUTOGUARD#Guard# 250,3,6,1,0,0,0,5,1,no,0,0,0,weapon,5:6:7:8:9 //CR_SHIELDCHARGE#Smite# 251,3:5:7:9:11,6,1,0,0,0,5,1,no,0,0,0,weapon,0 //CR_SHIELDBOOMERANG#Shield Boomerang# 252,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0 //CR_REFLECTSHIELD#Shield Reflect# 253,-2,8,1,6,0,0,10,-2,no,0,0,0,weapon,0 //CR_HOLYCROSS#Holy Cross# -254,5,6,4,6,0,0,10,1,no,33,0x100,0,magic,0 //CR_GRANDCROSS#Grand Cross# -255,7:8:9:10:11,6,16,0,1,0,5,1,yes,0,0x600,0,none,0 //CR_DEVOTION#Sacrifice# -256,9,6,16,0,1,0,5,1,yes,0,0x200,0,none,0 //CR_PROVIDENCE#Resistant Souls# -257,0,6,4,0,1,0,5,1,no,0,0,0,weapon,0 //CR_DEFENDER#Defending Aura# -258,0,6,4,0,1,0,10,1,no,0,0,0,weapon,0 //CR_SPEARQUICKEN#Spear Quicken# +254,5,6,4,6,0x48,0,10,1,no,33,0x100,0,magic,0 //CR_GRANDCROSS#Grand Cross# +255,7:8:9:10:11,6,16,0,0x1,0,5,1,yes,0,0x600,0,none,0 //CR_DEVOTION#Sacrifice# +256,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,none,0 //CR_PROVIDENCE#Resistant Souls# +257,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0 //CR_DEFENDER#Defending Aura# +258,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0 //CR_SPEARQUICKEN#Spear Quicken# 259,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //MO_IRONHAND#Iron Fists# 260,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0 //MO_SPIRITSRECOVERY#Spiritual Cadence# -261,0,6,4,0,1,0,5,1,no,0,0,0,none,0 //MO_CALLSPIRITS#Summon Spirit Sphere# -262,9,6,16,0,1,0,1,1,yes,0,0,0,weapon,0 //MO_ABSORBSPIRITS#Absorb Spirit Sphere# +261,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0 //MO_CALLSPIRITS#Summon Spirit Sphere# +262,9,6,16,0,0x1,0,1,1,yes,0,0,0,weapon,0 //MO_ABSORBSPIRITS#Absorb Spirit Sphere# 263,-1,8,0,-1,0,0,10,-3,no,0,0,0,weapon,0 //MO_TRIPLEATTACK#Raging Triple Blow# -264,18,6,2,0,1,0,1,1,no,0,0,0,none,0 //MO_BODYRELOCATION#Snap# +264,18,6,2,0,0x1,0,1,1,no,0,0,0,none,0 //MO_BODYRELOCATION#Snap# 265,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //MO_DODGE#Dodge# -266,2,6,1,0,0,0,5,1,no,0,0,0,weapon,0 //MO_INVESTIGATE#Occult Impact# +266,2,6,1,0,0x40,0,5,1,no,0,0,0,weapon,0 //MO_INVESTIGATE#Occult Impact# 267,9,8,1,-1,0,0,5,1:2:3:4:5,no,0,0,0,weapon,0 //MO_FINGEROFFENSIVE#Throw Spirit Sphere# -268,0,6,4,0,1,0,5,1,no,0,0,0,weapon,0 //MO_STEELBODY#Mental Strength# -269,0,6,4,0,1,0,5,1,no,0,0,0,weapon,0 //MO_BLADESTOP#Root# -270,0,6,4,0,1,0,5,0,no,0,0,0,weapon,0 //MO_EXPLOSIONSPIRITS#Fury# -271,-2,6,4,0,0,0,5,1,yes,0,0x200,0,weapon,0 //MO_EXTREMITYFIST#Asura Strike# +268,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0 //MO_STEELBODY#Mental Strength# +269,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0 //MO_BLADESTOP#Root# +270,0,6,4,0,0x1,0,5,0,no,0,0,0,weapon,0 //MO_EXPLOSIONSPIRITS#Fury# +271,-2,6,4,0,0x60,0,5,1,yes,0,0x200,0,weapon,0 //MO_EXTREMITYFIST#Asura Strike# 272,-2,8,4,-1,0,0,5,-4,no,0,0x200,0,weapon,0 //MO_CHAINCOMBO#Raging Quadruple Blow# -273,-2,6,4,-1,2,2,5,1,no,0,0x200,0,weapon,0 //MO_COMBOFINISH#Raging Thrust# +273,-2,6,4,-1,0x2,2,5,1,no,0,0x200,0,weapon,0 //MO_COMBOFINISH#Raging Thrust# 274,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //SA_ADVANCEDBOOK#Study# -275,0,6,4,0,1,0,5,1,no,0,0,0,magic,0 //SA_CASTCANCEL#Cast Cancel# -276,0,6,4,0,1,0,5,1,yes,0,0,0,magic,0 //SA_MAGICROD#Magic Rod# -277,9,6,1,0,1,0,5,1,yes,0,0,0,magic,0 //SA_SPELLBREAKER#Spell Break# +275,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0 //SA_CASTCANCEL#Cast Cancel# +276,0,6,4,0,0x1,0,5,1,yes,0,0,0,magic,0 //SA_MAGICROD#Magic Rod# +277,9,6,1,0,0x1,0,5,1,yes,0,0,0,magic,0 //SA_SPELLBREAKER#Spell Break# 278,0,0,0,0,0,0,10,0,no,0,0,0,magic,0 //SA_FREECAST#Free Cast# -279,0,6,4,0,1,0,10,1,yes,0,0,0,magic,0 //SA_AUTOSPELL#Hindsight# -280,9,6,16,3,1,0,5,1,yes,0,0xC00,0,magic,0 //SA_FLAMELAUNCHER#Endow Blaze# -281,9,6,16,1,1,0,5,1,yes,0,0xC00,0,magic,0 //SA_FROSTWEAPON#Endow Tsunami# -282,9,6,16,4,1,0,5,1,yes,0,0xC00,0,magic,0 //SA_LIGHTNINGLOADER#Endow Tornado# -283,9,6,16,2,1,0,5,1,yes,0,0xC00,0,magic,0 //SA_SEISMICWEAPON#Endow Quake# +279,0,6,4,0,0x1,0,10,1,yes,0,0,0,magic,0 //SA_AUTOSPELL#Hindsight# +280,9,6,16,3,0x1,0,5,1,yes,0,0xC00,0,magic,0 //SA_FLAMELAUNCHER#Endow Blaze# +281,9,6,16,1,0x1,0,5,1,yes,0,0xC00,0,magic,0 //SA_FROSTWEAPON#Endow Tsunami# +282,9,6,16,4,0x1,0,5,1,yes,0,0xC00,0,magic,0 //SA_LIGHTNINGLOADER#Endow Tornado# +283,9,6,16,2,0x1,0,5,1,yes,0,0xC00,0,magic,0 //SA_SEISMICWEAPON#Endow Quake# 284,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0 //SA_DRAGONOLOGY#Dragonology# -285,2,6,2,3,1,0,5,1,yes,0,0,0,magic,0 //SA_VOLCANO#Volcano# -286,2,6,2,1,1,0,5,1,yes,0,0,0,magic,0 //SA_DELUGE#Deluge# -287,2,6,2,4,1,0,5,1,yes,0,0,0,magic,0 //SA_VIOLENTGALE#Whirlwind# -288,3,6,2,0,1,0,5,1,yes,0,0,0,magic,0 //SA_LANDPROTECTOR#Magnetic Earth# -289,9,6,1,0,1,0,5,1,yes,0,0x1E00,0,magic,0 //SA_DISPELL#Dispel# -290,0,6,4,0,1,0,10,1,yes,0,0,0,magic,0 //SA_ABRACADABRA#Hocus-pocus# -291,9,6,1,0,1,0,1,1,yes,0,0x2,0,magic,0 //SA_MONOCELL#Monocell# -292,9,6,1,0,1,0,1,1,yes,0,0x2,0,magic,0 //SA_CLASSCHANGE#Class Change# -293,0,6,4,0,1,0,1,1,yes,0,0x2,0,magic,0 //SA_SUMMONMONSTER#Summon Monster# -294,9,6,4,0,1,0,1,1,yes,0,0x2,0,magic,0 //SA_REVERSEORCISH#Orcish Face# -295,9,6,1,0,1,0,1,1,yes,0,0x2,0,magic,0 //SA_DEATH#Death# -296,9,6,1,0,1,0,1,1,yes,0,0x2,0,magic,0 //SA_FORTUNE#Fortune# -297,9,6,1,0,1,0,1,1,yes,0,0x2,0,magic,0 //SA_TAMINGMONSTER#Tame Monster# -298,9,6,4,0,1,0,1,1,yes,0,0x2,0,magic,0 //SA_QUESTION#Question# -299,9,6,4,0,1,0,1,1,yes,0,0x2,0,magic,0 //SA_GRAVITY#Gravity# -300,9,6,4,0,1,0,1,1,yes,0,0x2,0,magic,0 //SA_LEVELUP#Level Up# +285,2,6,2,3,0x1,0,5,1,yes,0,0,0,magic,0 //SA_VOLCANO#Volcano# +286,2,6,2,1,0x1,0,5,1,yes,0,0,0,magic,0 //SA_DELUGE#Deluge# +287,2,6,2,4,0x1,0,5,1,yes,0,0,0,magic,0 //SA_VIOLENTGALE#Whirlwind# +288,3,6,2,0,0x1,0,5,1,yes,0,0,0,magic,0 //SA_LANDPROTECTOR#Magnetic Earth# +289,9,6,1,0,0x1,0,5,1,yes,0,0x1E00,0,magic,0 //SA_DISPELL#Dispel# +290,0,6,4,0,0x1,0,10,1,yes,0,0,0,magic,0 //SA_ABRACADABRA#Hocus-pocus# +291,9,6,1,0,0x1,0,1,1,yes,0,0x2,0,magic,0 //SA_MONOCELL#Monocell# +292,9,6,1,0,0x1,0,1,1,yes,0,0x2,0,magic,0 //SA_CLASSCHANGE#Class Change# +293,0,6,4,0,0x1,0,1,1,yes,0,0x2,0,magic,0 //SA_SUMMONMONSTER#Summon Monster# +294,9,6,4,0,0x1,0,1,1,yes,0,0x2,0,magic,0 //SA_REVERSEORCISH#Orcish Face# +295,9,6,1,0,0x1,0,1,1,yes,0,0x2,0,magic,0 //SA_DEATH#Death# +296,9,6,1,0,0x1,0,1,1,yes,0,0x2,0,magic,0 //SA_FORTUNE#Fortune# +297,9,6,1,0,0x1,0,1,1,yes,0,0x2,0,magic,0 //SA_TAMINGMONSTER#Tame Monster# +298,9,6,4,0,0x1,0,1,1,yes,0,0x2,0,magic,0 //SA_QUESTION#Question# +299,9,6,4,0,0x1,0,1,1,yes,0,0x2,0,magic,0 //SA_GRAVITY#Gravity# +300,9,6,4,0,0x1,0,1,1,yes,0,0x2,0,magic,0 //SA_LEVELUP#Level Up# 301,9,6,4,0,0,0,1,1,yes,0,0x2,0,magic,0 //SA_INSTANTDEATH#Instant Death# -302,9,6,4,0,1,0,1,1,yes,0,0x2,0,magic,0 //SA_FULLRECOVERY#Full Recovery# +302,9,6,4,0,0x1,0,1,1,yes,0,0x2,0,magic,0 //SA_FULLRECOVERY#Full Recovery# 303,9,6,4,0,0,0,1,1,yes,0,0x2,0,magic,0 //SA_COMA#Coma# -304,0,6,4,0,1,0,1,1,no,0,0,0,none,0 //BD_ADAPTATION#Amp# -305,0,6,4,0,1,0,1,1,no,0,0,0,none,0 //BD_ENCORE#Encore# -306,0,6,4,0,1,0,1,1,no,0,0x40,0,misc,0 //BD_LULLABY#Lullaby# -307,0,6,4,0,1,0,5,1,no,0,0x40,0,misc,0 //BD_RICHMANKIM#Mental Sensing# -308,0,6,4,0,1,0,1,1,no,0,0x40,0,misc,0 //BD_ETERNALCHAOS#Down Tempo# -309,0,6,4,0,1,0,5,1,no,0,0x40,0,misc,0 //BD_DRUMBATTLEFIELD#Battle Theme# -310,0,6,4,0,1,0,5,1,no,0,0x40,0,misc,0 //BD_RINGNIBELUNGEN#Harmonic Lick# -311,0,6,4,0,1,0,1,1,no,0,0x40,0,misc,0 //BD_ROKISWEIL#Classical Pluck# -312,0,6,4,0,1,0,1,1,no,0,0x40,0,misc,0 //BD_INTOABYSS#Power Chord# -313,0,6,4,0,1,0,5,1,no,0,0x40,0,misc,0 //BD_SIEGFRIED#Acoustic Rhythm# +304,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0 //BD_ADAPTATION#Amp# +305,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0 //BD_ENCORE#Encore# +306,0,6,4,0,0x1,0,1,1,no,0,0x40,0,misc,0 //BD_LULLABY#Lullaby# +307,0,6,4,0,0x1,0,5,1,no,0,0x40,0,misc,0 //BD_RICHMANKIM#Mental Sensing# +308,0,6,4,0,0x1,0,1,1,no,0,0x40,0,misc,0 //BD_ETERNALCHAOS#Down Tempo# +309,0,6,4,0,0x1,0,5,1,no,0,0x40,0,misc,0 //BD_DRUMBATTLEFIELD#Battle Theme# +310,0,6,4,0,0x1,0,5,1,no,0,0x40,0,misc,0 //BD_RINGNIBELUNGEN#Harmonic Lick# +311,0,6,4,0,0x1,0,1,1,no,0,0x40,0,misc,0 //BD_ROKISWEIL#Classical Pluck# +312,0,6,4,0,0x1,0,1,1,no,0,0x40,0,misc,0 //BD_INTOABYSS#Power Chord# +313,0,6,4,0,0x1,0,5,1,no,0,0x40,0,misc,0 //BD_SIEGFRIED#Acoustic Rhythm# //314,0,0,0,0,0,0,1,1,no,0,0x40,0,misc,0 //BD_RAGNAROK#Ragnarok# 315,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //BA_MUSICALLESSON#Music Lesson# 316,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0 //BA_MUSICALSTRIKE#Melody Strike# -317,0,8,4,0,1,0,5,1,no,0,0x20,0,misc,0 //BA_DISSONANCE#Unchained Serenade# -318,0,6,4,0,3,-1,5,1,no,0,0,0,misc,0 //BA_FROSTJOKE#Unbarring Octave# -319,0,6,4,0,1,0,10,1,no,0,0x20,0,misc,0 //BA_WHISTLE#Perfect Tablature# -320,0,6,4,0,1,0,10,1,no,0,0x20,0,misc,0 //BA_ASSASSINCROSS#Impressive Riff# -321,0,6,4,0,1,0,10,1,no,0,0x20,0,misc,0 //BA_POEMBRAGI#Magic Strings# -322,0,6,4,0,1,0,10,1,no,0,0x20,0,misc,0 //BA_APPLEIDUN#Song of Lutie# +317,0,8,4,0,0x41,0,5,1,no,0,0x20,0,misc,0 //BA_DISSONANCE#Unchained Serenade# +318,0,6,4,0,0x3,-1,5,1,no,0,0,0,misc,0 //BA_FROSTJOKE#Unbarring Octave# +319,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0 //BA_WHISTLE#Perfect Tablature# +320,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0 //BA_ASSASSINCROSS#Impressive Riff# +321,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0 //BA_POEMBRAGI#Magic Strings# +322,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0 //BA_APPLEIDUN#Song of Lutie# 323,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0 //DC_DANCINGLESSON#Dance Lessons# 324,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0 //DC_THROWARROW#Slinging Arrow# -325,0,8,4,0,1,0,5,1,no,0,0x20,0,misc,0 //DC_UGLYDANCE#Hip Shaker# -326,0,6,4,0,3,-1,5,1,no,0,0,0,misc,0 //DC_SCREAM#Dazzler# -327,0,6,4,0,1,0,10,1,no,0,0x20,0,misc,0 //DC_HUMMING#Focus Ballet# -328,0,6,4,0,1,0,10,1,no,0,0x20,0,misc,0 //DC_DONTFORGETME#Slow Grace# -329,0,6,4,0,1,0,10,1,no,0,0x20,0,misc,0 //DC_FORTUNEKISS#Lady Luck# -330,0,6,4,0,1,0,10,1,no,0,0x20,0,misc,0 //DC_SERVICEFORYOU#Gypsy's Kiss# -331,0,6,4,0,1,0,10,0,no,0,0x2,0,none,0 //NPC_RANDOMMOVE -332,0,6,4,0,1,0,10,0,no,0,0x2,0,none,0 //NPC_SPEEDUP -333,0,6,4,0,1,0,1,0,no,0,0x2,0,none,0 //NPC_REVENGE -334,9,6,4,0,1,0,1,1,yes,0,0x4,0,none,0 //WE_MALE#I Will Protect You# -335,9,6,4,0,1,0,1,1,yes,0,0x4,0,none,0 //WE_FEMALE#I Look up to You# -336,9,6,4,0,1,3,1,1,yes,0,0x4,1,none,0 //WE_CALLPARTNER#I miss You# +325,0,8,4,0,0x1,0,5,1,no,0,0x20,0,misc,0 //DC_UGLYDANCE#Hip Shaker# +326,0,6,4,0,0x3,-1,5,1,no,0,0,0,misc,0 //DC_SCREAM#Dazzler# +327,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0 //DC_HUMMING#Focus Ballet# +328,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0 //DC_DONTFORGETME#Slow Grace# +329,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0 //DC_FORTUNEKISS#Lady Luck# +330,0,6,4,0,0x1,0,10,1,no,0,0x20,0,misc,0 //DC_SERVICEFORYOU#Gypsy's Kiss# +331,0,6,4,0,0x1,0,10,0,no,0,0x2,0,none,0 //NPC_RANDOMMOVE +332,0,6,4,0,0x1,0,10,0,no,0,0x2,0,none,0 //NPC_SPEEDUP +333,0,6,4,0,0x1,0,1,0,no,0,0x2,0,none,0 //NPC_REVENGE +334,9,6,4,0,0x1,0,1,1,yes,0,0x4,0,none,0 //WE_MALE#I Will Protect You# +335,9,6,4,0,0x1,0,1,1,yes,0,0x4,0,none,0 //WE_FEMALE#I Look up to You# +336,9,6,4,0,0x1,3,1,1,yes,0,0x4,1,none,0 //WE_CALLPARTNER#I miss You# 337,9,6,1,-1,0,0,1,1,no,0,0x2,0,weapon,0 //ITM_TOMAHAWK#Throw Tomahawk# 338,-1,8,1,7,0,0,0,-2,no,0,0x2,0,weapon,0 //NPC_DARKCROSS#Cross of Darkness# -339,5,6,4,7,0,0,10,1,no,33,0x102,0,magic,0 //NPC_GRANDDARKNESS#Grand cross of Darkness# +339,5,6,4,7,0x48,0,10,1,no,33,0x102,0,magic,0 //NPC_GRANDDARKNESS#Grand cross of Darkness# 340,9,8,1,7,0,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,0x2,0,magic,0 //NPC_DARKSTRIKE#Soul Strike of Darkness# 341,9,8,1,7,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0x2,0,magic,2:3:3:4:4:5:5:6:6:7 //NPC_DARKTHUNDER#Darkness Jupiter# -342,9,6,1,0,1,0,1,0,no,0,0x2,0,none,0 //NPC_STOP +342,9,6,1,0,0x1,0,1,0,no,0,0x2,0,none,0 //NPC_STOP 343,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_BREAKWEAPON#Break weapon# 344,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_BREAKARMOR#Break armor# 345,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_BREAKHELM#Break helm# 346,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_BREAKSHIELD#Break shield# 347,-1,6,1,9,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_UNDEADATTACK -348,9,0,1,9,1,0,10,1,no,0,0x2,0,magic,0 //NPC_CHANGEUNDEAD -349,0,6,4,0,1,0,10,0,no,0,0x2,0,weapon,0 //NPC_POWERUP -350,0,6,4,0,1,0,10,0,no,0,0x2,0,none,0 //NPC_AGIUP -351,0,0,0,0,1,0,0,0,no,0,0x2,0,none,0 //NPC_SIEGEMODE -352,2,0,4,0,1,0,1,0,no,0,0x2,0,none,0 //NPC_CALLSLAVE -353,0,0,0,0,1,0,0,0,no,0,0x2,0,none,0 //NPC_INVISIBLE -354,2,6,4,0,1,0,20,0,no,0,0x2,0,misc,0 //NPC_RUN -355,0,6,4,0,1,0,5,1,no,0,0,0,weapon,0 //LK_AURABLADE#Aura Blade# -356,0,6,4,0,1,0,10,1,no,0,0,0,weapon,0 //LK_PARRYING#Parrying# -357,0,6,4,0,1,0,5,1,no,0,0,0,weapon,0 //LK_CONCENTRATION#Concentration# -358,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //LK_TENSIONRELAX#Relax# -359,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //LK_BERSERK#Frenzy# -//360,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //LK_FURY#Fury# -361,9,6,16,0,3,1,5,1,yes,0,0,0,magic,0 //HP_ASSUMPTIO#Assumptio# -362,4,6,4,0,1,0,5,1,yes,0,0,0,magic,2 //HP_BASILICA#Basilica# +348,9,0,1,9,0x1,0,10,1,no,0,0x2,0,magic,0 //NPC_CHANGEUNDEAD +349,0,6,4,0,0x1,0,10,0,no,0,0x2,0,weapon,0 //NPC_POWERUP +350,0,6,4,0,0x1,0,10,0,no,0,0x2,0,none,0 //NPC_AGIUP +351,0,0,0,0,0x1,0,0,0,no,0,0x2,0,none,0 //NPC_SIEGEMODE +352,2,0,4,0,0x1,0,1,0,no,0,0x2,0,none,0 //NPC_CALLSLAVE +353,0,0,0,0,0x1,0,0,0,no,0,0x2,0,none,0 //NPC_INVISIBLE +354,2,6,4,0,0x1,0,20,0,no,0,0x2,0,misc,0 //NPC_RUN +355,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0 //LK_AURABLADE#Aura Blade# +356,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0 //LK_PARRYING#Parrying# +357,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0 //LK_CONCENTRATION#Concentration# +358,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0 //LK_TENSIONRELAX#Relax# +359,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0 //LK_BERSERK#Frenzy# +//360,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0 //LK_FURY#Fury# +361,9,6,16,0,0x3,1,5,1,yes,0,0,0,magic,0 //HP_ASSUMPTIO#Assumptio# +362,4,6,4,0,0x1,0,5,1,yes,0,0,0,magic,2 //HP_BASILICA#Basilica# 363,0,0,0,0,0,0,10,0,no,0,0,0,magic,0 //HP_MEDITATIO#Meditatio# 364,0,0,0,0,0,0,10,1,no,0,0,0,magic,0 //HW_SOULDRAIN#Soul Drain# 365,9,8,1,-1,0,0,1,1,yes,0,0,0,weapon,0 //HW_MAGICCRASHER#Stave Crasher# -366,0,6,4,0,1,0,10,1,no,0,0,0,magic,0 //HW_MAGICPOWER#Mystical Amplification# -367,9,8,1,0,0,0,5,1,no,0,0,0,misc,0 //PA_PRESSURE#Gloria Domini# -368,0,6,4,0,1,0,5,1,yes,0,0,0,weapon,0 //PA_SACRIFICE# Martyr's Reckoning# -369,0,6,4,0,1,0,10,1,yes,0,0,0,misc,0 //PA_GOSPEL#Battle Chant# +366,0,6,4,0,0x1,0,10,1,no,0,0,0,magic,0 //HW_MAGICPOWER#Mystical Amplification# +367,9,8,1,0,0x58,0,5,1,no,0,0,0,misc,0 //PA_PRESSURE#Gloria Domini# +368,0,6,4,0,0x61,0,5,1,yes,0,0,0,weapon,0 //PA_SACRIFICE# Martyr's Reckoning# +369,0,6,4,0,0x41,0,10,1,yes,0,0,0,misc,0 //PA_GOSPEL#Battle Chant# 370,-2,6,1,-1,0,0,5,1,yes,0,0,0,weapon,3 //CH_PALMSTRIKE#Raging Palm Strike# 371,-2,8,4,-1,0,0,5,1,no,0,0x200,0,weapon,0 //CH_TIGERFIST#Glacier Fist# 372,-2,8,4,-1,0,0,10,-1:-1:-2:-2:-3:-3:-4:-4:-5:-5,no,0,0x200,0,weapon,0 //CH_CHAINCRUSH#Chain Crush Combo# -373,0,6,4,0,1,0,5,1,no,0,0,0,magic,0 //PF_HPCONVERSION#Health Conversion# -374,9,6,16,0,1,0,1,1,yes,0,0x1E00,0,none,0 //PF_SOULCHANGE#Soul Exhale# -375,9,6,1,0,0,0,5,1,yes,0,0,0,magic,0 //PF_SOULBURN#Soul Siphon# -376,0,0,0,0,1,0,5,1,no,0,0,0,weapon,0 //ASC_KATAR#Advanced Katar Mastery# -//377,0,0,4,0,1,0,10,1,no,0,0,0,misc,0 //ASC_HALLUCINATION#Hallucination Walk# -378,0,6,4,5,1,0,5,1,no,0,0,0,weapon,0 //ASC_EDP#Deadly Poison Enchantment# -379,9,6,1,-1,0,0,10,1,yes,0,0,0,weapon,0 //ASC_BREAKER#Soul Destroyer# -380,0,6,4,0,1,0,10,1,no,0,0,0,weapon,0 //SN_SIGHT#Falcon Eyes# -381,5,8,1,0,0,0,5,1,yes,0,0,0,misc,0 //SN_FALCONASSAULT#Falcon Assault# +373,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0 //PF_HPCONVERSION#Health Conversion# +374,9,6,16,0,0x1,0,1,1,yes,0,0x1E00,0,none,0 //PF_SOULCHANGE#Soul Exhale# +375,9,6,1,0,0x18,0,5,1,yes,0,0,0,magic,0 //PF_SOULBURN#Soul Siphon# +376,0,0,0,0,0x1,0,5,1,no,0,0,0,weapon,0 //ASC_KATAR#Advanced Katar Mastery# +//377,0,0,4,0,0x1,0,10,1,no,0,0,0,misc,0 //ASC_HALLUCINATION#Hallucination Walk# +378,0,6,4,5,0x1,0,5,1,no,0,0,0,weapon,0 //ASC_EDP#Deadly Poison Enchantment# +379,9,6,1,-1,0x18,0,10,1,yes,0,0,0,weapon,0 //ASC_BREAKER#Soul Destroyer# +380,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0 //SN_SIGHT#Falcon Eyes# +381,5,8,1,0,0x40,0,5,1,yes,0,0,0,misc,0 //SN_FALCONASSAULT#Falcon Assault# 382,4,8,1,-1,0,2,5,1,yes,0,0,0,weapon,0 //SN_SHARPSHOOTING#Focused Arrow Strike# -383,0,6,4,0,3,-1,10,1,yes,0,0,0,weapon,0 //SN_WINDWALK#Wind Walker# -384,0,0,4,0,1,0,10,1,yes,0,0,0,weapon,0 //WS_MELTDOWN#Shattering Strike# -//385,0,0,4,0,1,0,1,1,yes,0,0,0,none,0 //WS_CREATECOIN#Create Coins# -//386,0,0,4,0,1,0,1,1,yes,0,0,0,none,0 //WS_CREATENUGGET#Create Nuggets# -387,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //WS_CARTBOOST#Cart Boost# -//388,9,6,2,0,1,0,5,1,no,0,0,0,none,0 //WS_SYSTEMCREATE#Auto Attack System# -389,0,6,4,0,1,0,5,1,no,0,0,0,none,0 //ST_CHASEWALK#Stealth# +383,0,6,4,0,0x3,-1,10,1,yes,0,0,0,weapon,0 //SN_WINDWALK#Wind Walker# +384,0,0,4,0,0x1,0,10,1,yes,0,0,0,weapon,0 //WS_MELTDOWN#Shattering Strike# +//385,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0 //WS_CREATECOIN#Create Coins# +//386,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0 //WS_CREATENUGGET#Create Nuggets# +387,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0 //WS_CARTBOOST#Cart Boost# +//388,9,6,2,0,0x1,0,5,1,no,0,0,0,none,0 //WS_SYSTEMCREATE#Auto Attack System# +389,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0 //ST_CHASEWALK#Stealth# 390,0,0,4,0,0,0,5,1,yes,0,0,0,weapon,0 //ST_REJECTSWORD#Counter Instinct# //391,0,0,4,0,1,0,1,1,yes,0,0,0,magic,0 //ST_STEALBACKPACK#Steal Backpack# -392,0,0,4,0,1,0,1,1,yes,0,0,0,none,0 //CR_ALCHEMY#Alchemy# -393,0,0,4,0,1,0,1,1,yes,0,0,0,none,0 //CR_SYNTHESISPOTION#Potion Synthesis# +392,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0 //CR_ALCHEMY#Alchemy# +393,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0 //CR_SYNTHESISPOTION#Potion Synthesis# 394,9,8,1,-1,0,0,10,-9,yes,0,0,0,weapon,0 //CG_ARROWVULCAN#Vulcan Arrow# -395,0,0,4,0,1,3,1,1,yes,0,0x40,0,misc,2 //CG_MOONLIT#Sheltering Bliss# -396,-1,6,16,0,1,0,1,1,yes,0,0x600,0,none,0 //CG_MARIONETTE#Marionette Control# -397,5,8,1,-1,0,0,5,5,no,0,0,0,weapon,0 //LK_SPIRALPIERCE#Spiral Pierce# +395,0,0,4,0,0x1,3,1,1,yes,0,0x40,0,misc,2 //CG_MOONLIT#Sheltering Bliss# +396,-1,6,16,0,0x1,0,1,1,yes,0,0x600,0,none,0 //CG_MARIONETTE#Marionette Control# +397,5,8,1,-1,0x20,0,5,5,no,0,0,0,weapon,0 //LK_SPIRALPIERCE#Spiral Pierce# 398,4,6,1,-1,0,0,5,1,no,0,0,0,weapon,0 //LK_HEADCRUSH#Traumatic Blow# 399,4,6,1,-1,0,0,10,1,no,0,0,0,weapon,0 //LK_JOINTBEAT#Vital Strike# -400,9,8,1,8,4,1,5,1:2:3:4:5,yes,0,0,0,magic,0 //HW_NAPALMVULCAN#Napalm Vulcan# -401,0,6,4,0,1,0,1,1,yes,0,0,0,none,0 //CH_SOULCOLLECT#Zen# -402,9,6,1,0,1,0,5,1,no,0,0,0,none,0 //PF_MINDBREAKER#Mind Breaker# -403,0,0,4,0,1,0,1,1,yes,0,0,0,magic,0 //PF_MEMORIZE#Foresight# -404,9,6,2,2,1,0,5,1,yes,0,0x100,2,magic,0 //PF_FOGWALL#Blinding Mist# -405,7,6,1,0,1,0,1,1,no,0,0,3,magic,0 //PF_SPIDERWEB#Fiber Lock# -406,0,6,4,-1,2,2,10,1,no,33,0,0,weapon,0 //ASC_METEORASSAULT#Meteor Assault# -407,0,6,4,0,1,0,1,0,no,0,0,0,none,0 //ASC_CDP#Create Deadly Poison# -408,9,6,4,0,1,0,1,1,yes,0,0x4,0,none,0 //WE_BABY#Baby# -409,9,6,4,0,1,3,1,1,yes,0,0x4,1,none,0 //WE_CALLPARENT#Call Parent# -410,9,6,4,0,1,3,1,1,yes,0,0x4,1,none,0 //WE_CALLBABY#Call Baby# -411,0,6,4,0,1,0,10,1,yes,0,0,0,misc,4 //TK_RUN#Running# -412,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //TK_READYSTORM#Prepare Whirlwind# -413,-2,8,4,-1,2,2,7,-3,no,0,0x200,0,weapon,0 //TK_STORMKICK#Whirlwind Kick# -414,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //TK_READYDOWN#Prepare Axe Kick# +400,9,8,1,8,0x6,1,5,1:2:3:4:5,yes,0,0,0,magic,0 //HW_NAPALMVULCAN#Napalm Vulcan# +401,0,6,4,0,0x1,0,1,1,yes,0,0,0,none,0 //CH_SOULCOLLECT#Zen# +402,9,6,1,0,0x1,0,5,1,no,0,0,0,none,0 //PF_MINDBREAKER#Mind Breaker# +403,0,0,4,0,0x1,0,1,1,yes,0,0,0,magic,0 //PF_MEMORIZE#Foresight# +404,9,6,2,2,0x1,0,5,1,yes,0,0x100,2,magic,0 //PF_FOGWALL#Blinding Mist# +405,7,6,1,0,0x1,0,1,1,no,0,0,3,magic,0 //PF_SPIDERWEB#Fiber Lock# +406,0,6,4,-1,0xA,2,10,1,no,33,0,0,weapon,0 //ASC_METEORASSAULT#Meteor Assault# +407,0,6,4,0,0x1,0,1,0,no,0,0,0,none,0 //ASC_CDP#Create Deadly Poison# +408,9,6,4,0,0x1,0,1,1,yes,0,0x4,0,none,0 //WE_BABY#Baby# +409,9,6,4,0,0x1,3,1,1,yes,0,0x4,1,none,0 //WE_CALLPARENT#Call Parent# +410,9,6,4,0,0x1,3,1,1,yes,0,0x4,1,none,0 //WE_CALLBABY#Call Baby# +411,0,6,4,0,0x1,0,10,1,yes,0,0,0,misc,4 //TK_RUN#Running# +412,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0 //TK_READYSTORM#Prepare Whirlwind# +413,-2,8,4,-1,0x2,2,7,-3,no,0,0x200,0,weapon,0 //TK_STORMKICK#Whirlwind Kick# +414,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0 //TK_READYDOWN#Prepare Axe Kick# 415,-2,8,4,-1,0,0,7,-3,no,0,0x200,0,weapon,0 //TK_DOWNKICK#Axe Kick# -416,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //TK_READYTURN#Prepare Round Kick# -417,-2,8,4,-1,2,1,7,-3,no,0,0x200,0,weapon,2 //TK_TURNKICK#Round Kick# -418,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //TK_READYCOUNTER#Prepare Counter Kick# -419,-2,8,4,-1,0,0,7,-3,no,0,0x200,0,weapon,0 //TK_COUNTER#Counter Kick# -420,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //TK_DODGE#Break Fall# +416,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0 //TK_READYTURN#Prepare Round Kick# +417,-2,8,4,-1,0x2,1,7,-3,no,0,0x200,0,weapon,2 //TK_TURNKICK#Round Kick# +418,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0 //TK_READYCOUNTER#Prepare Counter Kick# +419,-2,8,4,-1,0x40,0,7,-3,no,0,0x200,0,weapon,0 //TK_COUNTER#Counter Kick# +420,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0 //TK_DODGE#Break Fall# 421,9,8,4,-1,0,0,7,-3,no,0,0x200,0,weapon,0 //TK_JUMPKICK#Flying Side Kick# 422,0,0,0,0,0,1,10,0,no,0,0,0,none,0 //TK_HPTIME#Peaceful Rest# 423,0,0,0,0,0,1,10,0,no,0,0,0,none,0 //TK_SPTIME#Enjoyable Rest# 424,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0 //TK_POWER#Fighting Chant# -425,0,6,4,2:4:1:3:8:7:6,1,0,7,1,no,0,0,0,weapon,0 //TK_SEVENWIND#Mild Wind# -426,0,6,4,0,1,0,5,1,no,0,0,0,weapon,0 //TK_HIGHJUMP#Taekwon Jump# -427,0,6,4,0,1,0,3,1,yes,0,0,0,magic,0 //SG_FEEL#Feeling the Sun, Moon and Stars# -428,1,6,4,-1,2,1,3,1,yes,0,0,0,weapon,2 //SG_SUN_WARM#Warmth of the Sun# -429,1,6,4,-1,2,1,3,1,yes,0,0,0,weapon,2 //SG_MOON_WARM#Warmth of the Moon# -430,1,6,4,-1,2,1,3,1,yes,0,0,0,weapon,2 //SG_STAR_WARM#Warmth of the Star# -431,0,0,4,0,1,0,4,1,yes,0,0,0,magic,0 //SG_SUN_COMFORT#Comfort of the Sun# -432,0,0,4,0,1,0,4,1,yes,0,0,0,magic,0 //SG_MOON_COMFORT#Comfort of the Moon# -433,0,0,4,0,1,0,4,1,yes,0,0,0,magic,0 //SG_STAR_COMFORT#Comfort of the Star# -434,10,6,1,0,1,0,3,1,yes,0,0,0,magic,0 //SG_HATE#Hatred of the Sun, Moon and Stars# +425,0,6,4,2:4:1:3:8:7:6,0x1,0,7,1,no,0,0,0,weapon,0 //TK_SEVENWIND#Mild Wind# +426,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0 //TK_HIGHJUMP#Taekwon Jump# +427,0,6,4,0,0x1,0,3,1,yes,0,0,0,magic,0 //SG_FEEL#Feeling the Sun, Moon and Stars# +428,1,6,4,-1,0x42,1,3,1,yes,0,0,0,weapon,2 //SG_SUN_WARM#Warmth of the Sun# +429,1,6,4,-1,0x42,1,3,1,yes,0,0,0,weapon,2 //SG_MOON_WARM#Warmth of the Moon# +430,1,6,4,-1,0x42,1,3,1,yes,0,0,0,weapon,2 //SG_STAR_WARM#Warmth of the Star# +431,0,0,4,0,0x1,0,4,1,yes,0,0,0,magic,0 //SG_SUN_COMFORT#Comfort of the Sun# +432,0,0,4,0,0x1,0,4,1,yes,0,0,0,magic,0 //SG_MOON_COMFORT#Comfort of the Moon# +433,0,0,4,0,0x1,0,4,1,yes,0,0,0,magic,0 //SG_STAR_COMFORT#Comfort of the Star# +434,10,6,1,0,0x1,0,3,1,yes,0,0,0,magic,0 //SG_HATE#Hatred of the Sun, Moon and Stars# 435,0,0,0,0,0,0,3,0,no,0,0,0,none,0 //SG_SUN_ANGER#Sun's Wrath# 436,0,0,0,0,0,0,3,0,no,0,0,0,none,0 //SG_MOON_ANGER#Moon's Wrath# 437,0,0,0,0,0,0,3,0,no,0,0,0,none,0 //SG_STAR_ANGER#Stars's Wrath# @@ -475,144 +481,144 @@ 441,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //SG_DEVIL#Demon of the Sun, Moon and Stars# 442,0,0,0,0,0,0,3,0,no,0,0,0,none,0 //SG_FRIEND#Friend of the Sun, Moon and Stars# 443,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //SG_KNOWLEDGE#Knowledge of the Sun, Moon and Stars# -444,0,6,4,0,1,0,1,1,no,0,0,0,misc,0 //SG_FUSION#Union of the Sun, Moon and Stars# -445,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_ALCHEMIST#Spirit of the Alchemist# -446,9,6,16,0,1,0,1,1,yes,0,0xC08,0,none,0 //AM_BERSERKPITCHER#Berserk Pitcher# -447,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_MONK#Spirit of the Monk# -448,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_STAR#Spirit of the Star Knight# -449,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_SAGE#Spirit of the Professor# -450,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_CRUSADER#Spirit of the Crusader# -451,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_SUPERNOVICE#Spirit of the Supernovice# -452,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_KNIGHT#Spirit of the Knight# -453,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_WIZARD#Spirit of the Wizard# -454,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_PRIEST#Spirit of the Priest# -455,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_BARDDANCER#Spirit of the Artist# -456,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_ROGUE#Spirit of the Rogue# -457,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_ASSASIN#Spirit of the Assasin# -458,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_BLACKSMITH#Spirit of the Blacksmith# -459,0,6,4,0,3,-1,1,1,no,0,0x8,0,weapon,0 //BS_ADRENALINE2#Full Adrenaline Rush# -460,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_HUNTER#Spirit of the Hunter# -461,9,6,16,0,1,0,5,1,yes,0,0x200,0,magic,0 //SL_SOULLINKER#Spirit of the Soul Linker# -462,9,6,16,0,1,0,7,1,yes,0,0,0,magic,0 //SL_KAIZEL#Kaizel# -463,9,6,16,0,1,0,7,1,yes,0,0,0,magic,0 //SL_KAAHI#Kahai# -464,9,6,16,0,1,0,3,1,yes,0,0,0,magic,0 //SL_KAUPE#Kauf# -465,9,6,16,0,1,0,7,1,yes,0,0,0,magic,0 //SL_KAITE#Kaite# +444,0,6,4,0,0x1,0,1,1,no,0,0,0,misc,0 //SG_FUSION#Union of the Sun, Moon and Stars# +445,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_ALCHEMIST#Spirit of the Alchemist# +446,9,6,16,0,0x1,0,1,1,yes,0,0xC08,0,none,0 //AM_BERSERKPITCHER#Berserk Pitcher# +447,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_MONK#Spirit of the Monk# +448,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_STAR#Spirit of the Star Knight# +449,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_SAGE#Spirit of the Professor# +450,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_CRUSADER#Spirit of the Crusader# +451,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_SUPERNOVICE#Spirit of the Supernovice# +452,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_KNIGHT#Spirit of the Knight# +453,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_WIZARD#Spirit of the Wizard# +454,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_PRIEST#Spirit of the Priest# +455,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_BARDDANCER#Spirit of the Artist# +456,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_ROGUE#Spirit of the Rogue# +457,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_ASSASIN#Spirit of the Assasin# +458,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_BLACKSMITH#Spirit of the Blacksmith# +459,0,6,4,0,0x3,-1,1,1,no,0,0x8,0,weapon,0 //BS_ADRENALINE2#Full Adrenaline Rush# +460,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_HUNTER#Spirit of the Hunter# +461,9,6,16,0,0x1,0,5,1,yes,0,0x200,0,magic,0 //SL_SOULLINKER#Spirit of the Soul Linker# +462,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0 //SL_KAIZEL#Kaizel# +463,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0 //SL_KAAHI#Kahai# +464,9,6,16,0,0x1,0,3,1,yes,0,0,0,magic,0 //SL_KAUPE#Kauf# +465,9,6,16,0,0x1,0,7,1,yes,0,0,0,magic,0 //SL_KAITE#Kaite# 466,0,0,0,0,0,0,7,0,yes,0,0,0,magic,0 //SL_KAINA#Kaina# 467,9,6,1,-2,0,0,7,1,no,0,0,0,magic,2 //SL_STIN#Estin# 468,9,6,1,-2,0,0,7,1,no,0,0,0,magic,0 //SL_STUN#Estern# 469,9,8,1,-2,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0 //SL_SMA#Esma# -470,9,6,1,0,1,0,7,1,no,0,0,0,magic,0 //SL_SWOO#Esu# -471,9,6,1,0,1,0,3,1,no,0,0,0,magic,0 //SL_SKE#Esk# -472,9,6,1,0,1,0,3,1,no,0,0,0,magic,0 //SL_SKA#Eska# +470,9,6,1,0,0x1,0,7,1,no,0,0,0,magic,0 //SL_SWOO#Esu# +471,9,6,1,0,0x1,0,3,1,no,0,0,0,magic,0 //SL_SKE#Esk# +472,9,6,1,0,0x1,0,3,1,no,0,0,0,magic,0 //SL_SKA#Eska# 473,0,0,0,0,0,0,0,0,no,0,0,0,none,0 //SM_SELFPROVOKE## -474,0,0,4,0,1,0,10,1,no,0,0x2,0,none,0 //NPC_EMOTION_ON## -475,0,0,4,0,1,0,1,1,yes,0,0,0,none,0 //ST_PRESERVE#Preserve# -476,1,6,1,0,1,0,5,1,yes,0,0,0,weapon,0 //ST_FULLSTRIP#Divest All# -477,0,6,4,0,1,0,10,1,no,0,0,0,weapon,0 //WS_WEAPONREFINE#Upgrade Weapon# -478,3,6,2,0,3,3,10,1,no,0,0,0,none,0 //CR_SLIMPITCHER#Aid Condensed Potion# -479,1,6,16,0,1,0,5,1,yes,0,0,0,weapon,0 //CR_FULLPROTECTION#Full Protection# +474,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_EMOTION_ON## +475,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0 //ST_PRESERVE#Preserve# +476,1,6,1,0,0x1,0,5,1,yes,0,0,0,weapon,0 //ST_FULLSTRIP#Divest All# +477,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0 //WS_WEAPONREFINE#Upgrade Weapon# +478,3,6,2,0,0x3,3,10,1,no,0,0,0,none,0 //CR_SLIMPITCHER#Aid Condensed Potion# +479,1,6,16,0,0x1,0,5,1,yes,0,0,0,weapon,0 //CR_FULLPROTECTION#Full Protection# 480,4,8,1,0,0,0,5,5,no,0,0,0,weapon,0 //PA_SHIELDCHAIN#Shield Chain# 481,0,0,0,0,0,0,5,0,no,0,0,0,none,0 //HP_MANARECHARGE#Mana Recharge# -482,0,6,4,0,1,0,5,1,no,0,0,0,magic,0 //PF_DOUBLECASTING#Double Casting# -483,9,6,2,0,1,1,1,1,no,0,0,0,none,0 //HW_GANBANTEIN#Ganbantein# -484,9,6,2,2,1,0,5,1,yes,0,0,0,magic,0 //HW_GRAVITATION#Gravity Field# -485,-2,6,1,-1,0,0,10,1,no,0,0,0,weapon,0 //WS_CARTTERMINATION#Cart Termination# -486,0,6,4,0,1,0,5,1,no,0,0,0,weapon,0 //WS_OVERTHRUSTMAX#Maximum Power Thrust# -487,0,6,4,0,1,0,5,1,no,0,0,0,none,0 //CG_LONGINGFREEDOM#Longing for Freedom# -488,0,6,4,0,1,1,5,1,no,0,0x40,0,misc,0 //CG_HERMODE#Wand of Hermod# -489,9,6,1,0,1,0,5,1,no,0,0,0,misc,0 //CG_TAROTCARD#Tarot Card of Fate# -490,9,8,1,0,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,misc,0 //CR_ACIDDEMONSTRATION#Acid Demonstration# -491,1,6,2,0,1,0,2,1,no,0,0,0,none,0 //CR_CULTIVATION#Cultivation# +482,0,6,4,0,0x1,0,5,1,no,0,0,0,magic,0 //PF_DOUBLECASTING#Double Casting# +483,9,6,2,0,0x1,1,1,1,no,0,0,0,none,0 //HW_GANBANTEIN#Ganbantein# +484,9,6,2,2,0x31,0,5,1,yes,0,0,0,magic,0 //HW_GRAVITATION#Gravity Field# +485,-2,6,1,-1,0x8,0,10,1,no,0,0,0,weapon,0 //WS_CARTTERMINATION#Cart Termination# +486,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0 //WS_OVERTHRUSTMAX#Maximum Power Thrust# +487,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0 //CG_LONGINGFREEDOM#Longing for Freedom# +488,0,6,4,0,0x1,1,5,1,no,0,0x40,0,misc,0 //CG_HERMODE#Wand of Hermod# +489,9,6,1,0,0x41,0,5,1,no,0,0,0,misc,0 //CG_TAROTCARD#Tarot Card of Fate# +490,9,8,1,0,0x40,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,misc,0 //CR_ACIDDEMONSTRATION#Acid Demonstration# +491,1,6,2,0,0x1,0,2,1,no,0,0,0,none,0 //CR_CULTIVATION#Cultivation# -493,0,6,4,0,1,0,1,1,no,0,0,0,none,0 //TK_MISSION#Taekwon Mission# -494,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_HIGH#Spirit of Rebirth# -495,0,6,4,0,1,0,1,1,no,0,0x8,0,weapon,0 //KN_ONEHAND#Onehand Quicken# -496,0,6,4,0,1,0,1,0,no,0,0x8,0,none,0 //AM_TWILIGHT1#Twilight Alchemy 1# -497,0,6,4,0,1,0,1,0,no,0,0x8,0,none,0 //AM_TWILIGHT2#Twilight Alchemy 2# -498,0,6,4,0,1,0,1,0,no,0,0x8,0,none,0 //AM_TWILIGHT3#Twilight Alchemy 3# +493,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0 //TK_MISSION#Taekwon Mission# +494,9,6,16,0,0x1,0,5,1,yes,0,0,0,magic,0 //SL_HIGH#Spirit of Rebirth# +495,0,6,4,0,0x1,0,1,1,no,0,0x8,0,weapon,0 //KN_ONEHAND#Onehand Quicken# +496,0,6,4,0,0x1,0,1,0,no,0,0x8,0,none,0 //AM_TWILIGHT1#Twilight Alchemy 1# +497,0,6,4,0,0x1,0,1,0,no,0,0x8,0,none,0 //AM_TWILIGHT2#Twilight Alchemy 2# +498,0,6,4,0,0x1,0,1,0,no,0,0x8,0,none,0 //AM_TWILIGHT3#Twilight Alchemy 3# 499,-9,8,4,-1,0,0,1,2,no,0,0x208,0,weapon,0 //HT_POWER#Beast Strafing# -500,0,6,4,0,0,0,5,1,no,0,0,0,misc,0 //GS_GLITTERING#Flip the Coin# -501,9,6,1,-1,0,0,1,1,no,0,0,0,misc,0 //GS_FLING#Fling# +500,0,6,4,0,0x40,0,5,1,no,0,0,0,misc,0 //GS_GLITTERING#Flip the Coin# +501,9,6,1,-1,0x58,0,1,1,no,0,0,0,misc,0 //GS_FLING#Fling# 502,-9,8,1,-1,0,0,1,3,no,0,0,0,weapon,0 //GS_TRIPLEACTION#Triple Action# -503,-9,6,1,-1,0,0,1,1,no,0,0,0,weapon,0 //GS_BULLSEYE#Bulls Eye# -504,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //GS_MADNESSCANCEL#Madness Canceler# -505,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //GS_ADJUSTMENT#AdJustment# -506,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //GS_INCREASING#Increasing Accuracy# +503,-9,6,1,-1,0x8,0,1,1,no,0,0,0,weapon,0 //GS_BULLSEYE#Bulls Eye# +504,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0 //GS_MADNESSCANCEL#Madness Canceler# +505,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0 //GS_ADJUSTMENT#AdJustment# +506,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0 //GS_INCREASING#Increasing Accuracy# 507,-9,6,1,8,0,0,1,1,no,0,0,0,weapon,0 //GS_MAGICALBULLET#Magical Bullet# -508,-9,6,1,-1,1,0,1,1,no,0,0,0,weapon,0 //GS_CRACKER#Cracker# +508,-9,6,1,-1,0x1,0,1,1,no,0,0,0,weapon,0 //GS_CRACKER#Cracker# 509,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //GS_SINGLEACTION#Single Action# 510,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //GS_SNAKEEYE#Snake Eye# 511,-9,8,0,-1,0,0,10,2,no,0,0,0,weapon,0 //GS_CHAINACTION#Chain Action# 512,-9,6,1,-1,0,0,10,1,no,0,0,0,weapon,0 //GS_TRACKING#Tracking# 513,-9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0 //GS_DISARM#Disarm# -514,-9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0 //GS_PIERCINGSHOT#Piercing Shot# +514,-9,6,1,-1,0x20,0,5,1,no,0,0,0,weapon,0 //GS_PIERCINGSHOT#Piercing Shot# 515,-9,8,1,-1,0,0,10,5,no,0,0,0,weapon,0 //GS_RAPIDSHOWER#Rapid Shower# -516,0,8,4,-1,2,3,10,1,no,0,0,0,weapon,0 //GS_DESPERADO#Desperado# -517,0,6,4,-1,1,0,10,1,no,0,0,0,weapon,0 //GS_GATLINGFEVER#Gatling Fever# +516,0,8,4,-1,0x2,3,10,1,no,0,0,0,weapon,0 //GS_DESPERADO#Desperado# +517,0,6,4,-1,0x1,0,10,1,no,0,0,0,weapon,0 //GS_GATLINGFEVER#Gatling Fever# 518,2,6,1,-1,0,0,10,1,no,0,0,0,weapon,5 //GS_DUST#Dust# 519,-9,6,1,-1,0,0,10,1,yes,0,0,0,weapon,0 //GS_FULLBUSTER#Full Buster# -520,-9,6,1,-1,2,1:1:1:2:2:2:3:3:3:4,10,1,no,0,0,0,weapon,0 //GS_SPREADATTACK#Spread Attack# -521,-9,6,2,-1,0,1,10,1,no,0,0,0,weapon,3 //GS_GROUNDDRIFT#Ground Drift# +520,-9,6,1,-1,0x2,1:1:1:2:2:2:3:3:3:4,10,1,no,0,0,0,weapon,0 //GS_SPREADATTACK#Spread Attack# +521,-9,6,2,-1,0x40,1,10,1,no,0,0,0,weapon,3 //GS_GROUNDDRIFT#Ground Drift# 522,0,0,0,0,0,0,10,1,no,0,0,0,weapon,0 //NJ_TOBIDOUGU#NJ_TOBIDOUGU# -523,9,6,1,-1,0,0,10,1,no,0,0,0,weapon,0 //NJ_SYURIKEN#NJ_SYURIKEN# -524,9,8,1,-1,0,0,5,3,no,0,0,0,weapon,0 //NJ_KUNAI#NJ_KUNAI# -525,9,8,1,-1,4,1,5,-3:-3:-4:-4:-5,yes,0,0,0,weapon,0 //NJ_HUUMA#NJ_HUUMA# -526,9,6,1,0,0,0,10,1,no,0,0,0,misc,0 //NJ_ZENYNAGE#NJ_ZENYNAGE# +523,9,6,1,-1,0x40,0,10,1,no,0,0,0,weapon,0 //NJ_SYURIKEN#NJ_SYURIKEN# +524,9,8,1,-1,0x40,0,5,3,no,0,0,0,weapon,0 //NJ_KUNAI#NJ_KUNAI# +525,9,8,1,-1,0x6,1,5,-3:-3:-4:-4:-5,yes,0,0,0,weapon,0 //NJ_HUUMA#NJ_HUUMA# +526,9,6,1,0,0x58,0,10,1,no,0,0,0,misc,0 //NJ_ZENYNAGE#NJ_ZENYNAGE# 527,0,6,4,-1,0,0,5,1,no,0,0,0,weapon,3 //NJ_TATAMIGAESHI#NJ_TATAMIGAESHI# 528,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0 //NJ_KASUMIKIRI#NJ_KASUMIKIRI# -529,7:9:11:13:15,6,2,0,1,0,5,1,no,0,0,0,none,0 //NJ_SHADOWJUMP#NJ_SHADOWJUMP# +529,7:9:11:13:15,6,2,0,0x1,0,5,1,no,0,0,0,none,0 //NJ_SHADOWJUMP#NJ_SHADOWJUMP# 530,7:9:11:13:15,6,1,-1,0,0,5,1,no,0,0,0,weapon,0 //NJ_KIRIKAGE#NJ_KIRIKAGE# -531,0,6,4,0,1,0,5,1,no,0,0,0,none,7 //NJ_UTSUSEMI#NJ_UTSUSEMI# -532,0,6,4,0,1,0,10,1,yes,0,0,0,magic,0 //NJ_BUNSINJYUTSU#NJ_BUNSINJYUTSU# +531,0,6,4,0,0x1,0,5,1,no,0,0,0,none,7 //NJ_UTSUSEMI#NJ_UTSUSEMI# +532,0,6,4,0,0x1,0,10,1,yes,0,0,0,magic,0 //NJ_BUNSINJYUTSU#NJ_BUNSINJYUTSU# 533,0,0,0,0,0,0,10,0,no,0,0,0,none,0 //NJ_NINPOU#NJ_NINPOU# 534,9,8,1,3,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0 //NJ_KOUENKA#NJ_KOUENKA# 535,0,8,4,3,0,0,10,1,yes,0,0,0,magic,0 //NJ_KAENSIN#NJ_KAENSIN# -536,9,8,1,3,2,2,5,3,yes,0,0,0,magic,0 //NJ_BAKUENRYU#NJ_BAKUENRYU# +536,9,8,1,3,0x2,2,5,3,yes,0,0,0,magic,0 //NJ_BAKUENRYU#NJ_BAKUENRYU# 537,9,8,1,1,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0,0,magic,0 //NJ_HYOUSENSOU#NJ_HYOUSENSOU# -538,9,6,2,0,1,0,10,1,yes,0,0,0,magic,0 //NJ_SUITON#NJ_SUITON# -539,0,6,4,1,2,3,5,1,yes,0,0,0,magic,0 //NJ_HYOUSYOURAKU#NJ_HYOUSYOURAKU# +538,9,6,2,0,0x1,0,10,1,yes,0,0,0,magic,0 //NJ_SUITON#NJ_SUITON# +539,0,6,4,1,0x2,3,5,1,yes,0,0,0,magic,0 //NJ_HYOUSYOURAKU#NJ_HYOUSYOURAKU# 540,9,8,1,4,0,0,10,1:2:2:3:3:4:4:5:5:6,yes,0,0,0,magic,0 //NJ_HUUJIN#NJ_HUUJIN# -541,9,6,4,4,2,2:2:3:3:4,5,1,yes,0,0,0,magic,0 //NJ_RAIGEKISAI#NJ_RAIGEKISAI# +541,9,6,4,4,0x2,2:2:3:3:4,5,1,yes,0,0,0,magic,0 //NJ_RAIGEKISAI#NJ_RAIGEKISAI# 542,5:6:7:8:9,8,1,4,0,1,5,1,yes,0,0,0,magic,0 //NJ_KAMAITACHI#NJ_KAMAITACHI# -543,0,6,4,0,1,0,5,1,yes,0,0,0,none,0 //NJ_NEN#NJ_NEN# -544,-5,6,1,0,0,0,10,1,no,0,0,0,weapon,0 //NJ_ISSEN#NJ_ISSEN# +543,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0 //NJ_NEN#NJ_NEN# +544,-5,6,1,0,0x40,0,10,1,no,0,0,0,weapon,0 //NJ_ISSEN#NJ_ISSEN# 1001,9,6,1,-1,0,0,1,1,no,0,0x1,0,weapon,0 //KN_CHARGEATK#Charge Attack# -1002,0,6,4,0,1,0,1,0,no,0,0x1,0,weapon,2 //CR_SHRINK#Shrink# +1002,0,6,4,0,0x1,0,1,0,no,0,0x1,0,weapon,2 //CR_SHRINK#Shrink# 1003,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0 //AS_SONICACCEL#Sonic Acceleration# -1004,9,8,1,0,0,0,1,1,no,0,0x1,0,weapon,0 //AS_VENOMKNIFE#Throw Venom Knive# -1005,1,6,1,0,1,0,1,1,no,0,0x1,0,weapon,0 //RG_CLOSECONFINE#Close Confine# +1004,9,8,1,0,0x8,0,1,1,no,0,0x1,0,weapon,0 //AS_VENOMKNIFE#Throw Venom Knive# +1005,1,6,1,0,0x1,0,1,1,no,0,0x1,0,weapon,0 //RG_CLOSECONFINE#Close Confine# 1006,0,6,4,3,0,2,1,1,yes,0,0x1,0,magic,3 //WZ_SIGHTBLASTER#Sight Blaster# -1007,0,6,4,0,1,0,10,0,no,0,0x1,0,none,0 //SA_CREATECON#Create Converter# -1008,9,6,1,1,1,0,1,1,yes,0,0x1,0,magic,0 //SA_ELEMENTWATER#Elemental Change Water# +1007,0,6,4,0,0x1,0,10,0,no,0,0x1,0,none,0 //SA_CREATECON#Create Converter# +1008,9,6,1,1,0x1,0,1,1,yes,0,0x1,0,magic,0 //SA_ELEMENTWATER#Elemental Change Water# 1009,-9,6,1,0,0,0,1,1,no,0,0x1,0,weapon,3 //HT_PHANTASMIC#Phantasmic Arrow# -1010,9,6,1,0,1,0,1,0,no,0,0x1,0,misc,0 //BA_PANGVOICE#Pang Voice# -1011,9,6,1,0,1,0,1,0,no,0,0x1,0,misc,0 //DC_WINKCHARM#Wink of Charm# +1010,9,6,1,0,0x1,0,1,0,no,0,0x1,0,misc,0 //BA_PANGVOICE#Pang Voice# +1011,9,6,1,0,0x1,0,1,0,no,0,0x1,0,misc,0 //DC_WINKCHARM#Wink of Charm# 1012,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0 //BS_UNFAIRLYTRICK#Unfair Trick# -1013,0,6,4,0,3,2,1,0,no,0,0x1,0,weapon,0 //BS_GREED#Greed# -1014,0,6,4,6,3,14,1,0,yes,0,0x1,0,magic,0 //PR_REDEMPTIO#Redemptio# -1015,9,6,16,0,1,0,1,1,no,0,0x401,0,weapon,0 //MO_KITRANSLATION#Ki Translation# -1016,-1,6,1,-1,2,1,1,1,no,0,0x1,0,weapon,5 //MO_BALKYOUNG#Ki Explosion# -1017,9,6,1,2,1,0,1,1,yes,0,0x1,0,magic,0 //SA_ELEMENTGROUND#Elemental Change Earth# -1018,9,6,1,3,1,0,1,1,yes,0,0x1,0,magic,0 //SA_ELEMENTFIRE#Elemental Change Fire# -1019,9,6,1,4,1,0,1,1,yes,0,0x1,0,magic,0 //SA_ELEMENTWIND#Elemental Change Wind# +1013,0,6,4,0,0x3,2,1,0,no,0,0x1,0,weapon,0 //BS_GREED#Greed# +1014,0,6,4,6,0x3,14,1,0,yes,0,0x1,0,magic,0 //PR_REDEMPTIO#Redemptio# +1015,9,6,16,0,0x1,0,1,1,no,0,0x401,0,weapon,0 //MO_KITRANSLATION#Ki Translation# +1016,-1,6,1,-1,0x2,1,1,1,no,0,0x1,0,weapon,5 //MO_BALKYOUNG#Ki Explosion# +1017,9,6,1,2,0x1,0,1,1,yes,0,0x1,0,magic,0 //SA_ELEMENTGROUND#Elemental Change Earth# +1018,9,6,1,3,0x1,0,1,1,yes,0,0x1,0,magic,0 //SA_ELEMENTFIRE#Elemental Change Fire# +1019,9,6,1,4,0x1,0,1,1,yes,0,0x1,0,magic,0 //SA_ELEMENTWIND#Elemental Change Wind# -8001,9,6,4,0,1,0,5,1,no,0,0,0,magic,0 //HLIF_HEAL#Healing hand# -8002,0,6,4,0,3,-1,5,1,no,0,0,0,none,0 //HLIF_AVOID +8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0 //HLIF_HEAL#Healing hand# +8002,0,6,4,0,0x3,-1,5,1,no,0,0,0,none,0 //HLIF_AVOID 8003,0,0,0,0,0,1,5,0,no,0,0,0,none,0 //HLIF_BRAIN -8004,0,6,4,0,1,0,3,0,no,0,0,0,none,0 //HLIF_CHANGE -8005,0,6,4,0,1,0,5,0,no,0,0,0,none,0 //HAMI_CASTLE -8006,0,6,4,0,1,0,5,0,no,0,0,0,none,0 //HAMI_DEFENCE -8007,0,0,0,0,1,0,5,0,no,0,0,0,none,0 //HAMI_SKIN -8008,0,6,4,0,1,0,3,0,no,0,0,0,none,0 //HAMI_BLOODLUST +8004,0,6,4,0,0x1,0,3,0,no,0,0,0,none,0 //HLIF_CHANGE +8005,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0 //HAMI_CASTLE +8006,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0 //HAMI_DEFENCE +8007,0,0,0,0,0x1,0,5,0,no,0,0,0,none,0 //HAMI_SKIN +8008,0,6,4,0,0x1,0,3,0,no,0,0,0,none,0 //HAMI_BLOODLUST 8009,1,8,1,0,0,0,5,-1:-2:-2:-2:-3,no,0,0,0,weapon,0 //HFLI_MOON -8010,0,6,4,0,1,0,5,0,no,0,0,0,none,0 //HFLI_FLEET -8011,0,6,4,0,1,0,5,0,yes,0,0,0,misc,0 //HFLI_SPEED +8010,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0 //HFLI_FLEET +8011,0,6,4,0,0x1,0,5,0,yes,0,0,0,misc,0 //HFLI_SPEED 8012,1,6,1,0,0,0,3,0,no,0,0,0,none,0 //HFLI_SBR44 8013,9,6,1,0,0,0,5,1:2:3:4:5,no,0,0,0,magic,0 //HVAN_CAPRICE -8014,0,6,4,0,1,0,5,0,no,0,0,0,none,0 //HVAN_CHAOTIC -8015,0,0,0,0,1,0,5,0,no,0,0,0,none,0 //HVAN_INSTRUCT -8016,4,6,4,-1,2,4,3,1,no,0,0,0,misc,0 //HVAN_EXPLOSION +8014,0,6,4,0,0x1,0,5,0,no,0,0,0,none,0 //HVAN_CHAOTIC +8015,0,0,0,0,0x1,0,5,0,no,0,0,0,none,0 //HVAN_INSTRUCT +8016,4,6,4,-1,0x5A,4,3,1,no,0,0,0,misc,0 //HVAN_EXPLOSION 10000,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0 //GD_APPROVAL#Approval# 10001,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0 //GD_KAFRACONTRACT#Kafra Contract# @@ -624,8 +630,8 @@ 10007,0,0,0,0,0,2,1,0,no,0,0x10,0,none,0 //GD_GLORYWOUNDS#Wounds of Glory# 10008,0,0,0,0,0,2,1,0,no,0,0x10,0,none,0 //GD_SOULCOLD#Cold Soul# 10009,0,0,0,0,0,2,1,0,no,0,0x10,0,none,0 //GD_HAWKEYES#Sharp Eyes# -10010,0,0,4,0,3,15,1,0,yes,0,0x10,0,none,0 //GD_BATTLEORDER#Battle Orders# -10011,0,0,4,0,3,15,3,0,yes,0,0x10,0,none,0 //GD_REGENERATION#Regeneration# -10012,0,0,4,0,3,15,1,0,yes,0,0x10,0,none,0 //GD_RESTORE#Restore# -10013,0,0,4,0,3,0,1,0,yes,0,0x10,0,none,0 //GD_EMERGENCYCALL#Rally Guild# +10010,0,0,4,0,0x3,15,1,0,yes,0,0x10,0,none,0 //GD_BATTLEORDER#Battle Orders# +10011,0,0,4,0,0x3,15,3,0,yes,0,0x10,0,none,0 //GD_REGENERATION#Regeneration# +10012,0,0,4,0,0x3,15,1,0,yes,0,0x10,0,none,0 //GD_RESTORE#Restore# +10013,0,0,4,0,0x3,0,1,0,yes,0,0x10,0,none,0 //GD_EMERGENCYCALL#Rally Guild# 10014,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0 //GD_DEVELOPMENT#Extend Guild# diff --git a/src/map/battle.c b/src/map/battle.c index 6acee440e..5582a8f67 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -307,7 +307,7 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i } if(sc->data[SC_AUTOGUARD].timer != -1 && flag&BF_WEAPON && - skill_num != WS_CARTTERMINATION && // FIXME(?): Quick and dirty check, but HSCR really bypasses Guard [DracoRPG] + !(skill_get_nk(skill_num)&NK_NO_CARDFIX) && rand()%100 < sc->data[SC_AUTOGUARD].val2) { int delay; clif_skill_nodamage(bl,bl,CR_AUTOGUARD,sc->data[SC_AUTOGUARD].val1,1); @@ -363,19 +363,8 @@ int battle_calc_damage(struct block_list *src,struct block_list *bl,int damage,i if ((sc->data[SC_UTSUSEMI].timer != -1 || sc->data[SC_BUNSINJYUTSU].timer != -1) && -// This check used instead, is 'aproximate' to what it can block. - (flag&BF_WEAPON || (flag&(BF_MISC|BF_SHORT)) == (BF_MISC|BF_SHORT)) -/* FIXME: This check is awful, there has to be some kind of logic behind this! - // there is no rule for that, only some exceptions.. which I listed according to many tests and says - && ( - skill_num != ASC_BREAKER && - skill_num != NJ_KUNAI && - skill_num != SN_FALCONASSAULT && - skill_num != MO_BALKYOUNG && - skill_num != HT_BLITZBEAT && - skill_num != NJ_SYURIKEN - ) -*/ + (flag&BF_WEAPON || (flag&(BF_MISC|BF_SHORT)) == (BF_MISC|BF_SHORT)) && + !(skill_get_nk(skill_num)&NK_NO_CARDFIX) ) { if (sc->data[SC_UTSUSEMI].timer != -1) { @@ -831,7 +820,7 @@ static struct Damage battle_calc_weapon_attack( unsigned short skillratio = 100; //Skill dmg modifiers. short skill=0; short s_ele, s_ele_, t_class; - short i; + short i, nk; struct map_session_data *sd, *tsd; struct Damage wd; @@ -851,7 +840,6 @@ static struct Damage battle_calc_weapon_attack( unsigned rh : 1; //Attack considers right hand (wd.damage) unsigned lh : 1; //Attack considers left hand (wd.damage2) unsigned weapon : 1; //It's a weapon attack (consider VVS, and all that) - unsigned cardfix : 1; } flag; memset(&wd,0,sizeof(wd)); @@ -865,7 +853,6 @@ static struct Damage battle_calc_weapon_attack( //Initial flag flag.rh=1; flag.weapon=1; - flag.cardfix=1; flag.infdef=(tstatus->mode&MD_PLANT?1:0); //Initial Values @@ -878,6 +865,9 @@ static struct Damage battle_calc_weapon_attack( wd.blewcount=skill_get_blewcount(skill_num,skill_lv); wd.flag=BF_SHORT|BF_WEAPON|BF_NORMAL; //Initial Flag wd.dmg_lv=ATK_DEF; //This assumption simplifies the assignation later + nk = skill_get_nk(skill_num); + flag.hit = nk&NK_IGNORE_FLEE?1:0; + flag.idef = flag.idef2 = nk&NK_IGNORE_DEF?1:0; if (sc && !sc->count) sc = NULL; //Skip checking as there are no status changes active. @@ -989,6 +979,9 @@ static struct Damage battle_calc_weapon_attack( if (skill_num == GS_GROUNDDRIFT) s_ele = s_ele_ = wflag; //element comes in flag. + if (s_ele != ELE_NEUTRAL && (battle_config.attack_attr_none&src->type)) + nk|=NK_NO_ELEFIX; + if(!skill_num) { //Skills ALWAYS use ONLY your right-hand weapon (tested on Aegis 10.2) if (sd && sd->weapontype1 == 0 && sd->weapontype2 > 0) @@ -1063,26 +1056,6 @@ static struct Damage battle_calc_weapon_attack( case AS_SPLASHER: //Reports say it always hits? if (wflag) //Only if you were the one exploding. break; - case NPC_GUIDEDATTACK: - case RG_BACKSTAP: - case HT_FREEZINGTRAP: - case AM_ACIDTERROR: - case MO_INVESTIGATE: - case MO_EXTREMITYFIST: - case CR_GRANDCROSS: - case NPC_GRANDDARKNESS: - case PA_SACRIFICE: - case TK_COUNTER: - case SG_SUN_WARM: - case SG_MOON_WARM: - case SG_STAR_WARM: - case NPC_BLOODDRAIN: - case NPC_ENERGYDRAIN: - case NPC_MENTALBREAKER: - case GS_GROUNDDRIFT: - case NJ_SYURIKEN: - case NJ_KUNAI: - case NJ_ISSEN: flag.hit = 1; break; case CR_SHIELDBOOMERANG: @@ -1363,11 +1336,6 @@ static struct Damage battle_calc_weapon_attack( case KN_BOWLINGBASH: skillratio+= 40*skill_lv; break; - case KN_AUTOCOUNTER: - case LK_SPIRALPIERCE: - case NPC_CRITICALSLASH: - flag.idef= flag.idef2= 1; - break; case AS_GRIMTOOTH: skillratio += 20*skill_lv; break; @@ -1377,9 +1345,6 @@ static struct Damage battle_calc_weapon_attack( case AS_SONICBLOW: skillratio += -50+5*skill_lv; break; - case AS_VENOMKNIFE: - flag.cardfix = 0; - break; case TF_SPRINKLESAND: skillratio += 30; break; @@ -1402,7 +1367,10 @@ static struct Damage battle_calc_weapon_attack( case NPC_DARKNESSATTACK: case NPC_UNDEADATTACK: case NPC_TELEKINESISATTACK: - skillratio += 25*skill_lv; + skillratio += 100*(skill_lv-1); + break; + case NPC_BLOODDRAIN: + skillratio += 100*skill_lv; break; case RG_BACKSTAP: if(sd && sd->status.weapon == W_BOW && battle_config.backstab_bow_penalty) @@ -1426,17 +1394,11 @@ static struct Damage battle_calc_weapon_attack( case CR_HOLYCROSS: skillratio += 35*skill_lv; break; - case CR_GRANDCROSS: - case NPC_GRANDDARKNESS: - flag.cardfix = 0; - break; case AM_DEMONSTRATION: skillratio += 20*skill_lv; - flag.cardfix = 0; break; case AM_ACIDTERROR: skillratio += 40*skill_lv; - flag.cardfix = 0; break; case MO_FINGEROFFENSIVE: skillratio+= 50 * skill_lv; @@ -1452,7 +1414,6 @@ static struct Damage battle_calc_weapon_attack( if (ratio > 60000) ratio = 60000; //We leave some room here in case skillratio gets further increased. skillratio = (unsigned short)ratio; status_set_sp(src, 0, 0); - flag.idef= flag.idef2= 1; } break; case MO_TRIPLEATTACK: @@ -1488,7 +1449,6 @@ static struct Damage battle_calc_weapon_attack( break; case ASC_METEORASSAULT: skillratio += 40*skill_lv-60; - flag.cardfix = 0; break; case SN_SHARPSHOOTING: skillratio += 50*skill_lv; @@ -1501,16 +1461,13 @@ static struct Damage battle_calc_weapon_attack( if (sd) i += 20*pc_checkskill(sd,AS_POISONREACT); if (wflag>1) i/=wflag; //Splash damage is half. skillratio += i; - flag.cardfix = 0; break; case ASC_BREAKER: skillratio += 100*skill_lv-100; - flag.cardfix = 0; break; case PA_SACRIFICE: //40% less effective on siege maps. [Skotlex] skillratio += 10*skill_lv-10; - flag.idef = flag.idef2 = 1; break; case PA_SHIELDCHAIN: skillratio += 30*skill_lv; @@ -1523,7 +1480,6 @@ static struct Damage battle_calc_weapon_attack( skillratio += sd->cart_weight/i * 80000/sd->cart_max_weight - 100; else if (!sd) skillratio += 80000 / i - 100; - flag.cardfix = 0; break; case TK_DOWNKICK: skillratio += 60 + 20*skill_lv; @@ -1546,19 +1502,16 @@ static struct Damage battle_calc_weapon_attack( skillratio += 50*skill_lv; break; case GS_BULLSEYE: + //Only works well against brute/demihumans non bosses. if((tstatus->race == RC_BRUTE || tstatus->race == RC_DEMIHUMAN) && !(tstatus->mode&MD_BOSS)) - { //Only works well against brute/demihumans non bosses. skillratio += 400; - flag.cardfix = 0; - } break; case GS_TRACKING: skillratio += 100 *(skill_lv+1); break; case GS_PIERCINGSHOT: skillratio += 20*skill_lv; - flag.idef = flag.idef2 = 1; break; case GS_RAPIDSHOWER: skillratio += 10*skill_lv; @@ -1848,7 +1801,7 @@ static struct Damage battle_calc_weapon_attack( if(skill_num==TF_POISON) ATK_ADD(15*skill_lv); - if (s_ele != ELE_NEUTRAL || !(battle_config.attack_attr_none&src->type)) + if (!(nk&NK_NO_ELEFIX)) { //Elemental attribute fix if (wd.damage > 0) { @@ -1869,9 +1822,6 @@ static struct Damage battle_calc_weapon_attack( } } - if ((!flag.rh || !wd.damage) && (!flag.lh || !wd.damage2)) - flag.cardfix = 0; //When the attack does no damage, avoid doing %bonuses - if (sd) { if (skill_num != CR_SHIELDBOOMERANG) //Only Shield boomerang doesn't takes the Star Crumbs bonus. @@ -1883,14 +1833,15 @@ static struct Damage battle_calc_weapon_attack( } //Card Fix, sd side - if (flag.cardfix) + if ((wd.damage || wd.damage2) && !(nk&NK_NO_CARDFIX)) { short cardfix = 1000, cardfix_ = 1000; short t_race2 = status_get_race2(target); if(sd->state.arrow_atk) { cardfix=cardfix*(100+sd->right_weapon.addrace[tstatus->race]+sd->arrow_addrace[tstatus->race])/100; - cardfix=cardfix*(100+sd->right_weapon.addele[tstatus->def_ele]+sd->arrow_addele[tstatus->def_ele])/100; + if (!(nk&NK_NO_ELEFIX)) + cardfix=cardfix*(100+sd->right_weapon.addele[tstatus->def_ele]+sd->arrow_addele[tstatus->def_ele])/100; cardfix=cardfix*(100+sd->right_weapon.addsize[tstatus->size]+sd->arrow_addsize[tstatus->size])/100; cardfix=cardfix*(100+sd->right_weapon.addrace2[t_race2])/100; cardfix=cardfix*(100+sd->right_weapon.addrace[is_boss(target)?RC_BOSS:RC_NONBOSS]+sd->arrow_addrace[is_boss(target)?RC_BOSS:RC_NONBOSS])/100; @@ -1898,7 +1849,8 @@ static struct Damage battle_calc_weapon_attack( if(!battle_config.left_cardfix_to_right) { cardfix=cardfix*(100+sd->right_weapon.addrace[tstatus->race])/100; - cardfix=cardfix*(100+sd->right_weapon.addele[tstatus->def_ele])/100; + if (!(nk&NK_NO_ELEFIX)) + cardfix=cardfix*(100+sd->right_weapon.addele[tstatus->def_ele])/100; cardfix=cardfix*(100+sd->right_weapon.addsize[tstatus->size])/100; cardfix=cardfix*(100+sd->right_weapon.addrace2[t_race2])/100; cardfix=cardfix*(100+sd->right_weapon.addrace[is_boss(target)?RC_BOSS:RC_NONBOSS])/100; @@ -1906,7 +1858,8 @@ static struct Damage battle_calc_weapon_attack( if (flag.lh) { cardfix_=cardfix_*(100+sd->left_weapon.addrace[tstatus->race])/100; - cardfix_=cardfix_*(100+sd->left_weapon.addele[tstatus->def_ele])/100; + if (!(nk&NK_NO_ELEFIX)) + cardfix_=cardfix_*(100+sd->left_weapon.addele[tstatus->def_ele])/100; cardfix_=cardfix_*(100+sd->left_weapon.addsize[tstatus->size])/100; cardfix_=cardfix_*(100+sd->left_weapon.addrace2[t_race2])/100; cardfix_=cardfix_*(100+sd->left_weapon.addrace[is_boss(target)?RC_BOSS:RC_NONBOSS])/100; @@ -2142,7 +2095,7 @@ static struct Damage battle_calc_weapon_attack( struct Damage battle_calc_magic_attack( struct block_list *src,struct block_list *target,int skill_num,int skill_lv,int mflag) { - short i; + short i, nk; short s_ele; unsigned short skillratio = 100; //Skill dmg modifiers. @@ -2153,8 +2106,6 @@ struct Damage battle_calc_magic_attack( struct { unsigned imdef : 1; unsigned infdef : 1; - unsigned elefix : 1; - unsigned cardfix : 1; } flag; memset(&ad,0,sizeof(ad)); @@ -2165,10 +2116,6 @@ struct Damage battle_calc_magic_attack( nullpo_info(NLP_MARK); return ad; } - //Initial flag - flag.elefix=1; - flag.cardfix=1; - //Initial Values ad.damage = 1; ad.div_=skill_get_num(skill_num,skill_lv); @@ -2177,7 +2124,9 @@ struct Damage battle_calc_magic_attack( ad.blewcount = skill_get_blewcount(skill_num,skill_lv); ad.flag=BF_MAGIC|BF_SKILL; ad.dmg_lv=ATK_DEF; - + nk = skill_get_nk(skill_num); + flag.imdef = nk&NK_IGNORE_DEF?1:0; + BL_CAST(BL_PC, src, sd); BL_CAST(BL_PC, target, tsd); @@ -2232,28 +2181,6 @@ struct Damage battle_calc_magic_attack( case PR_SANCTUARY: ad.blewcount|=0x10000; ad.dmotion = 0; //No flinch animation. - case AL_HEAL: - case PR_BENEDICTIO: - case WZ_FIREPILLAR: - flag.imdef = 1; - break; - case HW_GRAVITATION: - flag.imdef = 1; - flag.elefix = 0; - break; - case PR_ASPERSIO: - flag.imdef = 1; - case PF_SOULBURN: //Does not ignores mdef - flag.elefix = 0; - flag.cardfix = 0; - break; - case PR_TURNUNDEAD: - flag.imdef = 1; - flag.cardfix = 0; - break; - case NPC_GRANDDARKNESS: - case CR_GRANDCROSS: - flag.cardfix = 0; break; } @@ -2386,6 +2313,7 @@ struct Damage battle_calc_magic_attack( skillratio += 60 + 40*skill_lv; break; case NJ_KAMAITACHI: + case NPC_ENERGYDRAIN: skillratio += 100*skill_lv; break; } @@ -2439,15 +2367,15 @@ struct Damage battle_calc_magic_attack( if(ad.damage<1) ad.damage=1; - if (flag.elefix) + if (!(nk&NK_NO_ELEFIX)) ad.damage=battle_attr_fix(src, target, ad.damage, s_ele, tstatus->def_ele, tstatus->ele_lv); - if (sd && flag.cardfix) { + if (sd && !(nk&NK_NO_CARDFIX)) { short t_class = status_get_class(target); - short cardfix=100; + short cardfix=1000; cardfix=cardfix*(100+sd->magic_addrace[tstatus->race])/100; - if (flag.elefix) + if (!(nk&NK_NO_ELEFIX)) cardfix=cardfix*(100+sd->magic_addele[tstatus->def_ele])/100; cardfix=cardfix*(100+sd->magic_addsize[tstatus->size])/100; cardfix=cardfix*(100+sd->magic_addrace[is_boss(target)?RC_BOSS:RC_NONBOSS])/100; @@ -2457,17 +2385,17 @@ struct Damage battle_calc_magic_attack( continue; } } - - MATK_RATE(cardfix); + if (cardfix != 1000) + MATK_RATE(cardfix/10); } if (tsd && skill_num != HW_GRAVITATION && skill_num != PF_SOULBURN) { //Card fixes always apply on the target side. [Skotlex] short s_race2=status_get_race2(src); short s_class= status_get_class(src); - short cardfix=100; + short cardfix=1000; - if (flag.elefix) + if (!(nk&NK_NO_ELEFIX)) cardfix=cardfix*(100-tsd->subele[s_ele])/100; cardfix=cardfix*(100-tsd->subsize[sstatus->size])/100; cardfix=cardfix*(100-tsd->subrace2[s_race2])/100; @@ -2487,7 +2415,8 @@ struct Damage battle_calc_magic_attack( cardfix=cardfix*(100-tsd->magic_def_rate)/100; - MATK_RATE(cardfix); + if (cardfix != 1000) + MATK_RATE(cardfix/10); } } @@ -2510,22 +2439,15 @@ struct Damage battle_calc_misc_attack( struct block_list *src,struct block_list *target,int skill_num,int skill_lv,int mflag) { int skill; - short i; + short i, nk; short s_ele; struct map_session_data *sd, *tsd; struct Damage md; //DO NOT CONFUSE with md of mob_data! struct status_data *sstatus = status_get_status_data(src); struct status_data *tstatus = status_get_status_data(target); - struct { - unsigned hit : 1; - unsigned idef : 1; - unsigned elefix : 1; - unsigned cardfix : 1; - } flag; memset(&md,0,sizeof(md)); - memset(&flag,0,sizeof(flag)); if( src == NULL || target == NULL ){ nullpo_info(NLP_MARK); @@ -2540,7 +2462,7 @@ struct Damage battle_calc_misc_attack( md.dmg_lv=ATK_DEF; md.flag=BF_MISC|BF_SKILL; - flag.cardfix = flag.elefix = flag.hit = 1; + nk = skill_get_nk(skill_num); BL_CAST(BL_PC, src, sd); BL_CAST(BL_PC, target, tsd); @@ -2559,24 +2481,6 @@ struct Damage battle_calc_misc_attack( if (s_ele < 0) //Attack that takes weapon's element for misc attacks? Make it neutral [Skotlex] s_ele = ELE_NEUTRAL; - //Misc Settings - switch(skill_num){ - case ASC_BREAKER: - flag.elefix = 0; - break; - case PA_PRESSURE: - case GS_FLING: - case NJ_ZENYNAGE: - case HVAN_EXPLOSION: - case NPC_SELFDESTRUCTION: - case NPC_SMOKING: - flag.elefix = flag.cardfix = 0; - break; - case NPC_DARKBREATH: - flag.hit = 0; - break; - } - //Skill Range Criteria if (battle_config.skillrange_by_distance && (src->type&battle_config.skillrange_by_distance) @@ -2674,11 +2578,12 @@ struct Damage battle_calc_misc_attack( damage_div_fix(md.damage, md.div_); - if (!flag.hit) + if (!(nk&NK_IGNORE_FLEE)) { + i = 0; //Temp for "hit or no hit" struct status_change *sc = status_get_sc(target); if(sc && sc->opt1 && sc->opt1 != OPT1_STONEWAIT) - flag.hit = 1; + i = 1; else { short flee = tstatus->flee, @@ -2707,18 +2612,18 @@ struct Damage battle_calc_misc_attack( hitrate = battle_config.min_hitrate; if(rand()%100 >= hitrate) - flag.hit = 1; + i = 1; } - if (!flag.hit) { + if (!i) { md.damage = 0; md.dmg_lv=ATK_FLEE; } } - if(md.damage && flag.cardfix && tsd){ + if(md.damage && tsd && !(nk&NK_NO_CARDFIX)){ int cardfix = 10000; int race2 = status_get_race2(src); - if (flag.elefix) + if (!(nk&NK_NO_ELEFIX)) cardfix=cardfix*(100-tsd->subele[s_ele])/100; cardfix=cardfix*(100-tsd->subsize[sstatus->size])/100; cardfix=cardfix*(100-tsd->subrace2[race2])/100; @@ -2745,7 +2650,7 @@ struct Damage battle_calc_misc_attack( else if(md.damage && tstatus->mode&MD_PLANT && skill_num != PA_PRESSURE) //Pressure can vaporize plants md.damage = 1; - if(flag.elefix) + if(!(nk&NK_NO_ELEFIX)) md.damage=battle_attr_fix(src, target, md.damage, s_ele, tstatus->def_ele, tstatus->ele_lv); md.damage=battle_calc_damage(src,target,md.damage,md.div_,skill_num,skill_lv,md.flag); diff --git a/src/map/skill.c b/src/map/skill.c index 8a46abe2a..264a5b4a0 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -11195,7 +11195,7 @@ int skill_readdb (void) skill_db[i].hit=atoi(split[2]); skill_db[i].inf=atoi(split[3]); skill_db[i].pl=atoi(split[4]); - skill_db[i].nk=atoi(split[5]); + skill_db[i].nk=(int)strtol(split[5], NULL, 0); skill_split_atoi(split[6],skill_db[i].splash); skill_db[i].max=atoi(split[7]); skill_split_atoi(split[8],skill_db[i].num); diff --git a/src/map/skill.h b/src/map/skill.h index cab8039c0..dc1bcbe23 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -20,11 +20,17 @@ #define INF_SUPPORT_SKILL 16 #define INF_TARGET_TRAP 32 -//Constants to identify a skill's nk value. -//The NK value applies only to non INF_GROUND_SKILL skills. -#define NK_NO_DAMAGE 0x1 -#define NK_SPLASH (0x2|0x4) // 0x4 = splash & split -#define NK_SPLASHSPLIT 0x4 +//Constants to identify a skill's nk value (damage properties) +//The NK value applies only to non INF_GROUND_SKILL skills +//when determining skill castend function to invoke. +#define NK_NO_DAMAGE 0x01 +#define NK_SPLASH (0x02|0x04) // 0x4 = splash & split +#define NK_SPLASHSPLIT 0x04 +#define NK_NO_CARDFIX 0x08 +#define NK_NO_ELEFIX 0x10 +#define NK_IGNORE_DEF 0x20 +#define NK_IGNORE_FLEE 0x40 + //A skill with 3 would be no damage + splash: area of effect. //Constants to identify a skill's inf2 value. #define INF2_QUEST_SKILL 1 |