From 62f1f330761c7c30f681c697cdf0b6ceb0459cfb Mon Sep 17 00:00:00 2001 From: MELERIX <MELERIX@users.noreply.github.com> Date: Tue, 15 Nov 2011 21:31:45 +0000 Subject: [PATCH] BETA: Updating MANA_BY_LEVEL skills, to use effects. --- .../dist/game/data/stats/skills/01000-01099.xml | 15 ++++++++++----- .../dist/game/data/stats/skills/01100-01199.xml | 15 ++++++++++----- .../dist/game/data/stats/skills/01400-01499.xml | 6 ++++-- .../dist/game/data/stats/skills/03100-03199.xml | 9 ++++++--- .../dist/game/data/stats/skills/04000-04099.xml | 9 ++++++--- .../dist/game/data/stats/skills/05100-05199.xml | 8 +++++--- .../dist/game/data/stats/skills/05200-05299.xml | 9 ++++++--- .../dist/game/data/stats/skills/05400-05499.xml | 6 ++++-- .../dist/game/data/stats/skills/05500-05599.xml | 11 +++++++---- 9 files changed, 58 insertions(+), 30 deletions(-) diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml index d507308ce9..e0e7a8a044 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml @@ -381,25 +381,24 @@ <table name="#enchantMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table> <table name="#ench2mpConsume"> 108 107 106 105 104 103 102 100 99 98 97 96 95 94 93 92 91 90 89 88 87 86 85 84 83 82 81 80 79 78 </table> <table name="#ench2mpInitialConsume"> 27 26 26 26 26 25 25 25 24 24 24 24 23 23 23 23 22 22 22 22 21 21 21 21 20 20 20 20 19 19 </table> - <table name="#ench1power"> 137 137 138 139 139 140 141 141 142 143 143 144 145 146 146 147 148 148 149 150 150 151 152 152 153 154 154 155 156 156 </table> + <table name="#ench1amount"> 137 137 138 139 139 140 141 141 142 143 143 144 145 146 146 147 148 148 149 150 150 151 152 152 153 154 154 155 156 156 </table> <table name="#mpInitialConsume"> 10 11 12 12 14 14 15 16 17 18 18 19 20 21 21 22 22 22 23 23 24 24 24 25 25 26 26 26 27 27 27 28 </table> <table name="#mpConsume"> 39 42 45 48 53 56 59 62 65 69 72 75 78 82 83 85 87 88 90 92 93 95 96 98 99 101 102 104 105 106 108 109 </table> - <table name="#power"> 49 52 57 60 66 70 73 77 81 86 90 94 98 102 104 106 108 110 113 115 116 118 120 122 124 126 128 129 131 133 134 136 </table> + <table name="#amount"> 49 52 57 60 66 70 73 77 81 86 90 94 98 102 104 106 108 110 113 115 116 118 120 122 124 126 128 129 131 133 134 136 </table> <table name="#aggro"> 268 285 313 331 360 379 399 418 438 457 477 495 514 532 541 549 558 566 574 582 590 597 604 611 617 624 630 635 641 646 650 655 </table> <set name="magicLvl" val="#magicLvl" /> <set name="mpInitialConsume" val="#mpInitialConsume" /> <set name="mpConsume" val="#mpConsume" /> - <set name="power" val="#power" /> <set name="target" val="TARGET_ONE" /> <set name="reuseDelay" val="3000" /> <set name="hitTime" val="6000" /> - <set name="skillType" val="MANA_BY_LEVEL" /> + <set name="skillType" val="DUMMY" /> <set name="isMagic" val="true" /> + <set name="neutral" val="true" /> <set name="operateType" val="OP_ACTIVE" /> <set name="castRange" val="400" /> <set name="effectRange" val="900" /> <set name="aggroPoints" val="#aggro" /> - <enchant1 name="power" val="#ench1power" /> <enchant1 name="magicLvl" val="#enchantMagicLvl" /> <enchant2 name="magicLvl" val="#enchantMagicLvl" /> <enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" /> @@ -409,6 +408,12 @@ <target active_skill_id="1013" /> <!-- Cannot be used to classes that has Recharge skill --> </not> </cond> + <for> + <effect name="ManaHealByLevel" noicon="1" val="#amount" /> + </for> + <enchant1for> + <effect name="ManaHealByLevel" noicon="1" val="#ench1amount" /> + </enchant1for> </skill> <skill id="1015" levels="15" name="Battle Heal"> <table name="#mpInitialConsume"> 5 6 7 7 8 9 10 11 11 13 13 14 15 15 16 </table> diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml index a9b1ec81ad..2512bc1f44 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml @@ -234,27 +234,32 @@ <table name="#ench2mpInitialConsume"> 27 26 26 26 26 25 25 25 24 24 24 24 23 23 23 23 22 22 22 22 21 21 21 21 20 20 20 20 19 19 </table> <table name="#mpInitialConsume"> 9 9 10 11 12 12 14 14 15 16 17 18 18 19 20 21 21 22 22 22 23 23 24 24 24 25 25 26 26 26 27 27 27 28 </table> <table name="#mpConsume"> 33 35 39 42 45 48 53 56 59 62 65 69 72 75 78 82 83 85 87 88 90 92 93 95 96 98 99 101 102 104 105 106 108 109 </table> - <table name="#power"> 41 44 49 52 57 60 66 70 73 77 81 86 90 94 98 102 104 106 108 110 113 115 116 118 120 122 124 126 128 129 131 133 134 136 </table> - <table name="#ench1Power"> 137 137 138 139 139 140 141 141 142 143 143 144 145 146 146 147 148 148 149 150 150 151 152 152 153 154 154 155 156 156 </table> + <table name="#amount"> 41 44 49 52 57 60 66 70 73 77 81 86 90 94 98 102 104 106 108 110 113 115 116 118 120 122 124 126 128 129 131 133 134 136 </table> + <table name="#ench1amount"> 137 137 138 139 139 140 141 141 142 143 143 144 145 146 146 147 148 148 149 150 150 151 152 152 153 154 154 155 156 156 </table> <table name="#aggroPoints"> 227 243 268 285 313 331 360 379 399 418 438 457 477 495 514 532 541 549 558 566 574 582 590 597 604 611 617 624 630 635 641 646 650 655 </table> <set name="magicLvl" val="#magicLvl" /> <set name="mpInitialConsume" val="#mpInitialConsume" /> <set name="mpConsume" val="#mpConsume" /> - <set name="power" val="#power" /> <set name="target" val="TARGET_PET" /> <set name="reuseDelay" val="3000" /> <set name="hitTime" val="4000" /> - <set name="skillType" val="MANA_BY_LEVEL" /> + <set name="skillType" val="DUMMY" /> <set name="isMagic" val="true" /> + <set name="neutral" val="true" /> <set name="operateType" val="OP_ACTIVE" /> <set name="castRange" val="400" /> <set name="effectRange" val="900" /> <set name="aggroPoints" val="#aggroPoints" /> <enchant1 name="magicLvl" val="#enchantMagicLvl" /> - <enchant1 name="power" val="#ench1Power" /> <enchant2 name="magicLvl" val="#enchantMagicLvl" /> <enchant2 name="mpConsume" val="#ench2mpConsume" /> <enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" /> + <for> + <effect name="ManaHealByLevel" noicon="1" val="#amount" /> + </for> + <enchant1for> + <effect name="ManaHealByLevel" noicon="1" val="#ench1amount" /> + </enchant1for> </skill> <skill id="1127" levels="45" name="Servitor Heal" enchantGroup1="2" enchantGroup2="2"> <!-- Confirmed CT2.5 --> diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml index c40569e282..216db66aec 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml @@ -788,9 +788,8 @@ <set name="magicLvl" val="80" /> <set name="target" val="TARGET_PARTY" /> <set name="staticReuse" val="true" /> - <set name="power" val="1500" /> <set name="skillRadius" val="1000" /> - <set name="skillType" val="MANA_BY_LEVEL" /> + <set name="skillType" val="DUMMY" /> <set name="hitTime" val="5000" /> <set name="reuseDelay" val="3600000" /> <set name="isMagic" val="true" /> @@ -798,6 +797,9 @@ <cond msgId="1509"> <player olympiad="false" /> </cond> + <for> + <effect name="ManaHealByLevel" noicon="1" val="1500" /> + </for> </skill> <skill id="1429" levels="1" name="Gate Chant"> <set name="hitTime" val="15000" /> diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml index 9ae93b5ffb..7dc2eba2e5 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml @@ -427,21 +427,24 @@ <skill id="3127" levels="10" name="Item Skill: Recharge"> <table name="#mpInitialConsume"> 10 11 11 12 13 13 14 15 16 17 </table> <table name="#mpConsume"> 38 42 44 47 51 52 55 58 61 65 </table> - <table name="#power"> 41 44 47 50 53 57 59 62 65 69 </table> + <table name="#amount"> 41 44 47 50 53 57 59 62 65 69 </table> <table name="#magicLvl"> 46 49 52 55 58 61 64 67 70 75 </table> <set name="magicLvl" val="#magicLvl" /> <set name="mpInitialConsume" val="#mpInitialConsume" /> <set name="mpConsume" val="#mpConsume" /> - <set name="power" val="#power" /> <set name="target" val="TARGET_ONE" /> <set name="reuseDelay" val="30000" /> <set name="staticReuse" val="true" /> <set name="hitTime" val="6000" /> - <set name="skillType" val="MANA_BY_LEVEL" /> + <set name="skillType" val="DUMMY" /> + <set name="neutral" val="true" /> <set name="operateType" val="OP_ACTIVE" /> <set name="castRange" val="400" /> <set name="effectRange" val="900" /> <set name="staticHitTime" val="true" /> + <for> + <effect name="ManaHealByLevel" noicon="1" val="#amount" /> + </for> </skill> <skill id="3128" levels="10" name="Item Skill: Blessed Soul"> <table name="#mpInitialConsume"> 10 11 11 12 13 13 14 15 16 17 </table> diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml index 1e1bfe9d43..371b0fd120 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml @@ -275,22 +275,25 @@ </skill> <skill id="4025" levels="12" name="Master Recharge"> <!-- Freya retail confirmed --> - <table name="#power"> 23 38 52 70 90 110 129 138 144 149 153 155 </table> + <table name="#amount"> 23 38 52 70 90 110 129 138 144 149 153 155 </table> <table name="#aggro"> 138 204 285 379 477 566 635 659 676 689 700 709 </table> <table name="#magicLvl"> 17 27 37 47 57 67 77 82 87 92 97 102 </table> - <set name="power" val="#power" /> <set name="target" val="TARGET_ONE" /> <set name="reuseDelay" val="8000" /> <set name="hitTime" val="2500" /> - <set name="skillType" val="MANA_BY_LEVEL" /> + <set name="skillType" val="DUMMY" /> <set name="isMagic" val="true" /> <set name="magicLvl" val="#magicLvl" /> + <set name="neutral" val="true" /> <set name="operateType" val="OP_ACTIVE" /> <set name="castRange" val="400" /> <set name="effectRange" val="900" /> <set name="aggroPoints" val="#aggro" /> <table name="#mpConsume"> 24 39 53 70 90 110 130 138 145 150 153 155 </table> <set name="mpConsume" val="#mpConsume" /> + <for> + <effect name="ManaHealByLevel" noicon="1" val="#amount" /> + </for> </skill> <skill id="4026" levels="1" name="Gludio Flame"> <!-- Freya retail confirmed --> diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml index db68fabdad..27301d1916 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05100-05199.xml @@ -668,17 +668,19 @@ </for> </skill> <skill id="5149" levels="10" name="Recharge"> - <table name="#power"> 33 35 38 40 43 45 48 50 52 55 </table> + <table name="#amount"> 33 35 38 40 43 45 48 50 52 55 </table> <table name="#magicLvl"> 46 49 52 55 58 61 64 67 70 75 </table> <set name="isTriggeredSkill" val="true" /> <set name="magicLvl" val="#magicLvl" /> - <set name="power" val="#power" /> <set name="reuseDelay" val="300000" /> <set name="target" val="TARGET_SELF" /> - <set name="skillType" val="MANA_BY_LEVEL" /> + <set name="skillType" val="DUMMY" /> <set name="operateType" val="OP_ACTIVE" /> <set name="hitTime" val="6000" /> <set name="staticHitTime" val="true" /> + <for> + <effect name="ManaHealByLevel" noicon="1" val="#amount" /> + </for> </skill> <skill id="5150" levels="10" name="Blessed Soul"> <table name="#maxMp"> 16 32 48 68 80 96 112 128 144 160 </table> diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05200-05299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05200-05299.xml index e81b4fbd9a..f3f89240b0 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05200-05299.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05200-05299.xml @@ -6,7 +6,7 @@ <table name="#aggroPoints"> 268 285 313 331 360 379 399 418 </table> <table name="#mpInitialConsume"> 24 25 26 28 29 30 31 31 </table> <table name="#mpConsume"> 96 99 102 110 116 120 122 124 </table> - <table name="#power"> 120 124 128 138 144 149 153 155 </table> + <table name="#amount"> 120 124 128 138 144 149 153 155 </table> <set name="mpInitialConsume" val="#mpInitialConsume" /> <set name="mpConsume" val="#mpConsume" /> <set name="magicLvl" val="#magicLvl" /> @@ -15,11 +15,14 @@ <set name="effectRange" val="900" /> <set name="hitTime" val="6000" /> <set name="isMagic" val="true" /> + <set name="neutral" val="true" /> <set name="operateType" val="OP_ACTIVE" /> - <set name="power" val="#power" /> <set name="reuseDelay" val="12000" /> - <set name="skillType" val="MANA_BY_LEVEL" /> + <set name="skillType" val="DUMMY" /> <set name="target" val="TARGET_OWNER_PET" /> + <for> + <effect name="ManaHealByLevel" noicon="1" val="#amount" /> + </for> </skill> <skill id="5201" levels="6" name="Pet Concentration"> <!-- CT2.5 retail confirmed --> diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05400-05499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05400-05499.xml index 60073118c8..8615a851de 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05400-05499.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05400-05499.xml @@ -318,10 +318,12 @@ <set name="isTriggeredSkill" val="true" /> <set name="magicLvl" val="79" /> <set name="operateType" val="OP_ACTIVE" /> - <set name="power" val="49" /> <set name="reuseDelay" val="10000" /> - <set name="skillType" val="MANA_BY_LEVEL" /> + <set name="skillType" val="DUMMY" /> <set name="target" val="TARGET_SELF" /> + <for> + <effect name="ManaHealByLevel" noicon="1" val="49" /> + </for> </skill> <skill id="5430" levels="1" name="Spoil Bomb"> <!-- Confirmed CT2.5 --> diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml index 3a9ebd7456..5a42a55f46 100644 --- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml +++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05500-05599.xml @@ -975,12 +975,13 @@ <set name="effectRange" val="900" /> <set name="isTriggeredSkill" val="true" /> <set name="magicLvl" val="81" /> + <set name="neutral" val="true" /> <set name="operateType" val="OP_ACTIVE" /> - <set name="skillType" val="BUFF" /> + <set name="skillType" val="DUMMY" /> <set name="target" val="TARGET_SUMMON" /> <for> <effect name="Heal" noicon="1" val="418" /> - <effect name="ManaHealOverTime" noicon="1" val="73" /> <!-- FIXME: it shoul be ManaHealByLevel --> + <effect name="ManaHealByLevel" noicon="1" val="73" /> </for> </skill> <skill id="5572" levels="1" name="Warrior Ability - Haste"> @@ -1041,10 +1042,12 @@ <set name="isTriggeredSkill" val="true" /> <set name="magicLvl" val="80" /> <set name="operateType" val="OP_ACTIVE" /> - <set name="power" val="10" /> <set name="reuseDelay" val="10000" /> - <set name="skillType" val="MANA_BY_LEVEL" /> + <set name="skillType" val="DUMMY" /> <set name="target" val="TARGET_SELF" /> + <for> + <effect name="ManaHealByLevel" noicon="1" val="10" /> + </for> </skill> <skill id="5576" levels="1" name="Enchanter Ability - Barrier"> <!-- CT2.5 retail confirmed --> -- GitLab