From 85f9311720a161dfb1f4582fb39b9665636a68cf Mon Sep 17 00:00:00 2001 From: MELERIX <MELERIX@users.noreply.github.com> Date: Thu, 31 May 2012 11:52:12 +0000 Subject: [PATCH] BETA: Fixing some triggered skills due it require support for conditions in effects (added TODO notes). --- .../game/data/stats/skills/00200-00299.xml | 72 ++++++++++++------- .../game/data/stats/skills/00700-00799.xml | 28 ++++++-- .../game/data/stats/skills/00900-00999.xml | 50 ++++++++----- 3 files changed, 103 insertions(+), 47 deletions(-) diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml index 03372d2661..42f9551d39 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd"> <skill id="205" levels="45" name="Sword/Blunt Weapon Mastery" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1"> - <!-- Confirmed CT2.5 --> + <!-- Confirmed CT2.5 and Updated to H5 --> <table name="#pAtk"> 4.5 7.3 8.9 10.7 12.8 15.1 17.7 20.5 23.7 25.4 27.1 29 30.9 32.9 35 37.1 39.4 41.7 44.1 46.6 49.2 51.9 54.6 57.5 60.4 63.3 66.4 69.5 72.7 76 79.3 82.7 86.1 89.6 93.1 96.6 100.2 103.8 107.5 111.1 114.8 118.4 122.1 125.7 129.3 </table> <table name="#magicLvl"> 20 24 26 28 30 32 34 36 38 39 40 41 42 43 44 54 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 </table> <table name="#triggeredId"> 0 0 0 0 0 0 0 0 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 5604 </table> @@ -9,19 +9,27 @@ <table name="#ench1runSpd"> 1 2 2 3 4 4 5 6 6 7 7 8 9 9 10 11 11 12 13 13 14 14 15 16 16 17 18 18 19 20 </table> <table name="#ench2cAtkAdd"> 65 81 96 112 127 143 158 174 189 205 220 236 251 267 282 298 313 329 344 360 375 391 406 422 437 453 468 484 499 515 </table> <table name="#ench3pAtkSpd"> 1 1 1 1 1 1 1 2 2 2 2 2 2 2 3 3 3 3 3 3 3 3 4 4 4 4 4 4 4 5 </table> + <set name="activationChance" val="50" /> <!-- TODO: Remove when support for effects using conditions is done --> + <set name="chanceType" val="ON_HIT" /> <!-- TODO: Remove when support for effects using conditions is done --> <set name="magicLvl" val="#magicLvl" /> <set name="operateType" val="P" /> <set name="target" val="TARGET_SELF" /> + <set name="triggeredId" val="#triggeredId" /> <!-- TODO: Remove when support for effects using conditions is done --> <enchant1 name="magicLvl" val="#enchantMagicLvl" /> <enchant2 name="magicLvl" val="#enchantMagicLvl" /> <enchant3 name="magicLvl" val="#enchantMagicLvl" /> + <!-- TODO: Remove when support for effects using conditions is done --> + <cond> + <using kind="Sword,Big Sword,Blunt,Big Blunt" /> + </cond> <for> <add order="0x40" stat="pAtk" val="#pAtk"> <using kind="Sword,Big Sword,Blunt,Big Blunt" /> </add> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="50" chanceType="ON_HIT" triggeredId="#triggeredId"> - <using kind="Sword,Big Sword,Blunt,Big Blunt" /> - </effect> + <!-- TODO: Require support for effects using conditions --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="50" chanceType="ON_HIT" triggeredId="#triggeredId"> --> + <!-- <using kind="Sword,Big Sword,Blunt,Big Blunt" /> --> + <!-- </effect> --> </for> <enchant1for> <add order="0x40" stat="pAtk" val="129.3"> @@ -30,9 +38,10 @@ <add order="0x40" stat="runSpd" val="#ench1runSpd"> <using kind="Sword,Big Sword,Blunt,Big Blunt" /> </add> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="50" chanceType="ON_HIT" triggeredId="5604"> - <using kind="Sword,Big Sword,Blunt,Big Blunt" /> - </effect> + <!-- TODO: Require support for effects using conditions --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="50" chanceType="ON_HIT" triggeredId="5604"> --> + <!-- <using kind="Sword,Big Sword,Blunt,Big Blunt" /> --> + <!-- </effect> --> </enchant1for> <enchant2for> <add order="0x40" stat="pAtk" val="129.3"> @@ -41,9 +50,10 @@ <add order="0x40" stat="cAtkAdd" val="#ench2cAtkAdd"> <using kind="Sword,Big Sword,Blunt,Big Blunt" /> </add> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="50" chanceType="ON_HIT" triggeredId="5604"> - <using kind="Sword,Big Sword,Blunt,Big Blunt" /> - </effect> + <!-- TODO: Require support for effects using conditions --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="50" chanceType="ON_HIT" triggeredId="5604"> --> + <!-- <using kind="Sword,Big Sword,Blunt,Big Blunt" /> --> + <!-- </effect> --> </enchant2for> <enchant3for> <add order="0x40" stat="pAtk" val="129.3"> @@ -52,9 +62,10 @@ <add order="0x40" stat="pAtkSpd" val="#ench3pAtkSpd"> <using kind="Sword,Big Sword,Blunt,Big Blunt" /> </add> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="50" chanceType="ON_HIT" triggeredId="5604"> - <using kind="Sword,Big Sword,Blunt,Big Blunt" /> - </effect> + <!-- TODO: Require support for effects using conditions --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="50" chanceType="ON_HIT" triggeredId="5604"> --> + <!-- <using kind="Sword,Big Sword,Blunt,Big Blunt" /> --> + <!-- </effect> --> </enchant3for> </skill> <skill id="208" levels="52" name="Bow Mastery" enchantGroup1="1" enchantGroup2="1"> @@ -94,27 +105,36 @@ <table name="#ench1pAtk"> 116.84 117.78 118.72 119.66 120.6 121.54 122.48 123.42 124.36 125.3 126.24 127.18 128.12 129.06 130 130.94 131.88 132.82 133.76 134.7 135.64 136.58 137.52 138.46 139.4 140.34 141.28 142.22 143.16 144.1 </table> <table name="#ench2rCrit"> 0.0019 0.0029 0.0039 0.0048 0.0058 0.0068 0.0077 0.0087 0.0097 0.0106 0.0116 0.0126 0.0135 0.0145 0.0155 0.0164 0.0174 0.0184 0.0193 0.0203 0.0213 0.0222 0.0232 0.0242 0.0251 0.0261 0.0271 0.028 0.029 0.03 </table> <table name="#ench3cAtk"> 1.0019 1.0029 1.0039 1.0048 1.0058 1.0068 1.0077 1.0087 1.0097 1.0106 1.0116 1.0126 1.0135 1.0145 1.0155 1.0164 1.0174 1.0184 1.0193 1.0203 1.0213 1.0222 1.0232 1.0242 1.0251 1.0261 1.0271 1.028 1.029 1.03 </table> + <set name="activationChance" val="33" /> <!-- TODO: Remove when support for effects using conditions is done --> + <set name="chanceType" val="ON_HIT" /> <!-- TODO: Remove when support for effects using conditions is done --> <set name="magicLvl" val="#magicLvl" /> <set name="operateType" val="P" /> <set name="target" val="TARGET_SELF" /> + <set name="triggeredId" val="#triggeredId" /> <!-- TODO: Remove when support for effects using conditions is done --> <enchant1 name="magicLvl" val="#enchantMagicLvl" /> <enchant2 name="magicLvl" val="#enchantMagicLvl" /> <enchant3 name="magicLvl" val="#enchantMagicLvl" /> + <!-- TODO: Remove when support for effects using conditions is done --> + <cond> + <using kind="Dagger,Dual Dagger" /> + </cond> <for> <add order="0x40" stat="pAtk" val="#pAtk"> <using kind="Dagger,Dual Dagger" /> </add> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="33" chanceType="ON_HIT" triggeredId="#triggeredId"> - <using kind="Dagger,Dual Dagger" /> - </effect> + <!-- TODO: Require support for effects using conditions --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="33" chanceType="ON_HIT" triggeredId="#triggeredId"> --> + <!-- <using kind="Dagger,Dual Dagger" /> --> + <!-- </effect> --> </for> <enchant1for> <add order="0x40" stat="pAtk" val="#ench1pAtk"> <using kind="Dagger,Dual Dagger" /> </add> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="33" chanceType="ON_HIT" triggeredId="5603"> - <using kind="Dagger,Dual Dagger" /> - </effect> + <!-- TODO: Require support for effects using conditions --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="33" chanceType="ON_HIT" triggeredId="5603"> --> + <!-- <using kind="Dagger,Dual Dagger" /> --> + <!-- </effect> --> </enchant1for> <enchant2for> <add order="0x40" stat="pAtk" val="112.8"> @@ -123,9 +143,10 @@ <basemul order="0x30" stat="rCrit" val="#ench2rCrit"> <using kind="Dagger,Dual Dagger" /> </basemul> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="33" chanceType="ON_HIT" triggeredId="5603"> - <using kind="Dagger,Dual Dagger" /> - </effect> + <!-- TODO: Require support for effects using conditions --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="33" chanceType="ON_HIT" triggeredId="5603"> --> + <!-- <using kind="Dagger,Dual Dagger" /> --> + <!-- </effect> --> </enchant2for> <enchant3for> <add order="0x40" stat="pAtk" val="112.8"> @@ -134,9 +155,10 @@ <mul order="0x30" stat="cAtk" val="#ench3cAtk"> <using kind="Dagger,Dual Dagger" /> </mul> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="33" chanceType="ON_HIT" triggeredId="5603"> - <using kind="Dagger,Dual Dagger" /> - </effect> + <!-- TODO: Require support for effects using conditions --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="33" chanceType="ON_HIT" triggeredId="5603"> --> + <!-- <using kind="Dagger,Dual Dagger" /> --> + <!-- </effect> --> </enchant3for> </skill> <skill id="210" levels="45" name="Fist Weapon Mastery" enchantGroup1="1" enchantGroup2="1"> diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml index 024f8a77e7..1761bad899 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml @@ -1134,9 +1134,16 @@ </skill> <skill id="758" levels="1" name="Fighter's Will"> <!-- Confirmed CT2.5 --> + <set name="activationChance" val="3" /> <!-- TODO: Remove when support for effects using conditions is done --> + <set name="chanceType" val="ON_HIT" /> <!-- TODO: Remove when support for effects using conditions is done --> <set name="magicLvl" val="81" /> <set name="operateType" val="P" /> <set name="target" val="TARGET_SELF" /> + <set name="triggeredId" val="5559" /> <!-- TODO: Remove when support for effects using conditions is done --> + <!-- TODO: Remove when support for effects using conditions is done --> + <cond> + <using kind="Sword,Big Sword,Blunt,Big Blunt,Dual Sword,Dual Fist,Dagger,Dual Dagger,Pole,Ancient,Rapier" /> + </cond> <for> <add order="0x40" stat="pAtk" val="100"> <using kind="Sword,Big Sword,Blunt,Big Blunt,Dual Sword,Dual Fist,Dagger,Dual Dagger,Pole,Ancient,Rapier" /> @@ -1144,16 +1151,24 @@ <mul order="0x30" stat="pAtkSpd" val="1.1"> <using kind="Sword,Big Sword,Blunt,Big Blunt,Dual Sword,Dual Fist,Dagger,Dual Dagger,Pole,Ancient,Rapier" /> </mul> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="3" chanceType="ON_HIT" triggeredId="5559"> - <using kind="Sword,Big Sword,Blunt,Big Blunt,Dual Sword,Dual Fist,Dagger,Dual Dagger,Pole,Ancient,Rapier" /> - </effect> + <!-- TODO: Require support for effects using conditions --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="3" chanceType="ON_HIT" triggeredId="5559"> --> + <!-- <using kind="Sword,Big Sword,Blunt,Big Blunt,Dual Sword,Dual Fist,Dagger,Dual Dagger,Pole,Ancient,Rapier" /> --> + <!-- </effect> --> </for> </skill> <skill id="759" levels="1" name="Archer's Will"> <!-- Confirmed CT2.5 --> + <set name="activationChance" val="3" /> <!-- TODO: Remove when support for effects using conditions is done --> + <set name="chanceType" val="ON_HIT" /> <!-- TODO: Remove when support for effects using conditions is done --> <set name="magicLvl" val="81" /> <set name="operateType" val="P" /> <set name="target" val="TARGET_SELF" /> + <set name="triggeredId" val="5559" /> <!-- TODO: Remove when support for effects using conditions is done --> + <!-- TODO: Remove when support for effects using conditions is done --> + <cond> + <using kind="Bow,Crossbow" /> + </cond> <for> <add order="0x40" stat="accCombat" val="8"> <using kind="Crossbow,Bow" /> @@ -1161,9 +1176,10 @@ <add order="0x40" stat="pAtkRange" val="50"> <using kind="Crossbow,Bow" /> </add> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="3" chanceType="ON_HIT" triggeredId="5559"> - <using kind="Crossbow,Bow" /> - </effect> + <!-- TODO: Require support for effects using conditions --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="3" chanceType="ON_HIT" triggeredId="5559"> --> + <!-- <using kind="Crossbow,Bow" /> --> + <!-- </effect> --> </for> </skill> <skill id="760" levels="1" name="Anti Magic Armor"> diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml index f717659e08..0949ec8a11 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml @@ -1762,33 +1762,51 @@ <!-- High Five Skill --> <table name="#magicLvl"> 40 43 49 55 60 66 70 79 </table> <table name="#triggeredLevel"> 1 2 3 4 5 6 7 8 </table> + <set name="activationChance" val="15" /> <!-- TODO: Remove when support for effects using conditions is done --> + <set name="chanceType" val="ON_HIT" /> <!-- TODO: Remove when support for effects using conditions is done --> <set name="magicLvl" val="#magicLvl" /> <set name="operateType" val="P" /> <set name="target" val="TARGET_SELF" /> - <for> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="15" chanceType="ON_HIT" triggeredId="6813" triggeredLevel="#triggeredLevel"> - <using kind="Dual Sword,Sword,Big Sword,Blunt,Big Blunt" /> - </effect> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="30" chanceType="ON_CRIT" triggeredId="6813" triggeredLevel="#triggeredLevel"> - <using kind="Dual Sword,Sword,Big Sword,Blunt,Big Blunt" /> - </effect> - </for> + <set name="triggeredId" val="6813" /> <!-- TODO: Remove when support for effects using conditions is done --> + <set name="triggeredLevel" val="#triggeredLevel" /> <!-- TODO: Remove when support for effects using conditions is done --> + <!-- TODO: Remove when support for effects using conditions is done --> + <cond> + <using kind="Dual Sword,Sword,Big Sword,Blunt,Big Blunt" /> + </cond> + <!-- TODO: Require support for effects using conditions --> + <!-- <for> --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="15" chanceType="ON_HIT" triggeredId="6813" triggeredLevel="#triggeredLevel"> --> + <!-- <using kind="Dual Sword,Sword,Big Sword,Blunt,Big Blunt" /> --> + <!-- </effect> --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="30" chanceType="ON_CRIT" triggeredId="6813" triggeredLevel="#triggeredLevel"> --> + <!-- <using kind="Dual Sword,Sword,Big Sword,Blunt,Big Blunt" /> --> + <!-- </effect> --> + <!-- </for> --> </skill> <skill id="993" levels="8" name="Force Mastery"> <!-- High Five Skill --> <table name="#magicLvl"> 24 32 40 52 60 66 72 79 </table> <table name="#triggeredLevel"> 1 2 3 4 5 6 7 8 </table> + <set name="activationChance" val="15" /> <!-- TODO: Remove when support for effects using conditions is done --> + <set name="chanceType" val="ON_HIT" /> <!-- TODO: Remove when support for effects using conditions is done --> <set name="magicLvl" val="#magicLvl" /> <set name="operateType" val="P" /> <set name="target" val="TARGET_SELF" /> - <for> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="15" chanceType="ON_HIT" triggeredId="6814" triggeredLevel="#triggeredLevel"> - <using kind="Dual Fist" /> - </effect> - <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="30" chanceType="ON_CRIT" triggeredId="6814" triggeredLevel="#triggeredLevel"> - <using kind="Dual Fist" /> - </effect> - </for> + <set name="triggeredId" val="6814" /> <!-- TODO: Remove when support for effects using conditions is done --> + <set name="triggeredLevel" val="#triggeredLevel" /> <!-- TODO: Remove when support for effects using conditions is done --> + <!-- TODO: Remove when support for effects using conditions is done --> + <cond> + <using kind="Dual Fist" /> + </cond> + <!-- TODO: Require support for effects using conditions --> + <!-- <for> --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="15" chanceType="ON_HIT" triggeredId="6814" triggeredLevel="#triggeredLevel"> --> + <!-- <using kind="Dual Fist" /> --> + <!-- </effect> --> + <!-- <effect passive="1" name="ChanceSkillTrigger" abnormalTime="-1" val="0" activationChance="30" chanceType="ON_CRIT" triggeredId="6814" triggeredLevel="#triggeredLevel"> --> + <!-- <using kind="Dual Fist" /> --> + <!-- </effect> --> + <!-- </for> --> </skill> <skill id="994" levels="1" name="Rush"> <!-- High Five Skill --> -- GitLab