From 9aff89d5c56bbec7ae9146030a1ae89015a2a480 Mon Sep 17 00:00:00 2001 From: Zoey76 <zoey_76@msn.com> Date: Wed, 6 Oct 2021 00:51:34 -0300 Subject: [PATCH] Skills fixed and updated to High Five Attack Aura (77) Defense Aura (91) Rapid Shot (99) Stun Shot (101) Rapid Shot (873) Rapid Shot (5968) Reported-by: wadsok --- .../service/discord/commands/TopCommand.java | 29 ++++----- .../data/stats/skills/00000-00099.xml | 65 ++++++++++--------- .../data/stats/skills/00100-00199.xml | 43 ++++++------ .../data/stats/skills/00800-00899.xml | 4 +- .../data/stats/skills/05900-05999.xml | 4 +- 5 files changed, 78 insertions(+), 67 deletions(-) diff --git a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/TopCommand.java b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/TopCommand.java index e7ca68bec1..740112820f 100644 --- a/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/TopCommand.java +++ b/src/main/java/com/l2jserver/datapack/custom/service/discord/commands/TopCommand.java @@ -18,32 +18,31 @@ */ package com.l2jserver.datapack.custom.service.discord.commands; -import com.l2jserver.commons.database.ConnectionFactory; -import com.l2jserver.datapack.custom.service.discord.AbstractCommand; -import com.l2jserver.gameserver.data.sql.impl.ClanTable; -import com.l2jserver.gameserver.instancemanager.CastleManager; -import com.l2jserver.gameserver.model.L2Clan; -import com.l2jserver.gameserver.model.L2World; -import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; -import com.l2jserver.gameserver.model.entity.Castle; -import java.awt.*; +import static com.l2jserver.gameserver.config.Configuration.discord; + +import java.awt.Color; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; import java.util.List; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; + +import com.l2jserver.commons.database.ConnectionFactory; +import com.l2jserver.datapack.custom.service.discord.AbstractCommand; +import com.l2jserver.gameserver.data.sql.impl.ClanTable; +import com.l2jserver.gameserver.instancemanager.CastleManager; +import com.l2jserver.gameserver.model.L2Clan; +import com.l2jserver.gameserver.model.entity.Castle; + import net.dv8tion.jda.api.EmbedBuilder; -import net.dv8tion.jda.api.entities.Guild; -import net.dv8tion.jda.api.events.ReadyEvent; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import static com.l2jserver.gameserver.config.Configuration.discord; - /** * Top Command. * @author Stalitsa diff --git a/src/main/resources/data/stats/skills/00000-00099.xml b/src/main/resources/data/stats/skills/00000-00099.xml index c2e345a205..31cf3e2f66 100644 --- a/src/main/resources/data/stats/skills/00000-00099.xml +++ b/src/main/resources/data/stats/skills/00000-00099.xml @@ -2195,29 +2195,32 @@ </effects> </skill> <skill id="77" levels="2" name="Attack Aura"> - <table name="#abnormalLvls"> 1 2 </table> - <table name="#effectPoints"> 138 268 </table> + <!-- High Five Confirmed --> + <table name="#abnormalLvl"> 1 2 </table> + <table name="#effectPoint"> 138 268 </table> <table name="#magicLvl"> 10 28 </table> - <table name="#mpConsume2"> 5 10 </table> <table name="#mpConsume1"> 2 3 </table> - <table name="#rate"> 1.08 1.12 </table> - <set name="abnormalLvl" val="#abnormalLvls" /> + <table name="#mpConsume2"> 5 10 </table> + <table name="#pAtk"> 1.08 1.12 </table> + <set name="abnormalLvl" val="#abnormalLvl" /> <set name="abnormalTime" val="1200" /> <set name="abnormalType" val="PA_UP" /> - <set name="effectPoint" val="#effectPoints" /> + <set name="affectScope" val="SINGLE" /> + <set name="effectPoint" val="#effectPoint" /> + <set name="hitCancelTime" val="500" /> <set name="hitTime" val="4000" /> <set name="icon" val="icon.skill0077" /> <set name="isMagic" val="1" /> <set name="magicLvl" val="#magicLvl" /> - <set name="mpConsume2" val="#mpConsume2" /> <set name="mpConsume1" val="#mpConsume1" /> + <set name="mpConsume2" val="#mpConsume2" /> <set name="operateType" val="A2" /> <set name="reuseDelay" val="2000" /> <set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" /> <set name="targetType" val="SELF" /> <effects> <effect name="Buff"> - <mul stat="pAtk" val="#rate" /> + <mul stat="pAtk" val="#pAtk" /> </effect> </effects> </skill> @@ -2517,29 +2520,32 @@ </effects> </skill> <skill id="91" levels="2" name="Defense Aura"> - <table name="#abnormalLvls"> 1 2 </table> - <table name="#effectPoints"> 111 204 </table> + <!-- High Five Confirmed --> + <table name="#abnormalLvl"> 1 2 </table> + <table name="#effectPoint"> 111 204 </table> <table name="#magicLvl"> 5 20 </table> - <table name="#mpConsume2"> 4 8 </table> <table name="#mpConsume1"> 1 2 </table> - <table name="#rate"> 1.08 1.12 </table> - <set name="abnormalLvl" val="#abnormalLvls" /> + <table name="#mpConsume2"> 4 8 </table> + <table name="#pDef"> 1.08 1.12 </table> + <set name="abnormalLvl" val="#abnormalLvl" /> <set name="abnormalTime" val="1200" /> <set name="abnormalType" val="PD_UP" /> - <set name="effectPoint" val="#effectPoints" /> + <set name="affectScope" val="SINGLE" /> + <set name="effectPoint" val="#effectPoint" /> + <set name="hitCancelTime" val="500" /> <set name="hitTime" val="4000" /> <set name="icon" val="icon.skill0091" /> <set name="isMagic" val="1" /> <set name="magicLvl" val="#magicLvl" /> - <set name="mpConsume2" val="#mpConsume2" /> <set name="mpConsume1" val="#mpConsume1" /> + <set name="mpConsume2" val="#mpConsume2" /> <set name="operateType" val="A2" /> <set name="reuseDelay" val="2000" /> <set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" /> <set name="targetType" val="SELF" /> <effects> <effect name="Buff"> - <mul stat="pDef" val="#rate" /> + <mul stat="pDef" val="#pDef" /> </effect> </effects> </skill> @@ -2912,37 +2918,36 @@ </effects> </skill> <skill id="99" levels="2" name="Rapid Shot" enchantGroup1="1" enchantGroup2="1"> - <table name="#abnormalLvls"> 1 2 </table> - <table name="#effectPoints"> 303 549 </table> + <!-- High Five Confirmed --> + <table name="#abnormalLvl"> 1 2 </table> + <table name="#effectPoint"> 303 549 </table> <table name="#magicLvl"> 32 55 </table> - <table name="#mpConsume2"> 10 20 </table> - <table name="#mpConsume1"> 4 5 </table> - <table name="#rate"> 1.08 1.12 </table> - <table name="#ench1AbnormalTimes"> 1240 1280 1320 1360 1400 1440 1480 1520 1560 1600 1640 1680 1720 1760 1800 1840 1880 1920 1960 2000 2040 2080 2120 2160 2200 2240 2280 2320 2360 2400 </table> - <table name="#ench2MpConsume2"> 20 20 19 19 19 18 18 18 17 17 17 16 16 16 15 15 15 14 14 14 13 13 12 12 12 11 11 11 10 10 </table> - <table name="#ench2MpConsume1"> 5 5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 3 3 3 3 3 3 3 3 3 3 </table> + <table name="#mpConsume2"> 14 25 </table> + <table name="#pAtkSpd"> 1.08 1.12 </table> <table name="#enchMagicLvl"> 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> - <set name="abnormalLvl" val="#abnormalLvls" /> + <table name="#ench1AbnormalTime"> 1240 1280 1320 1360 1400 1440 1480 1520 1560 1600 1640 1680 1720 1760 1800 1840 1880 1920 1960 2000 2040 2080 2120 2160 2200 2240 2280 2320 2360 2400 </table> + <table name="#ench2MpConsume2"> 24 24 23 23 22 22 22 21 21 20 20 20 19 19 18 18 17 17 17 16 16 15 15 15 14 14 13 13 12 12 </table> + <set name="abnormalLvl" val="#abnormalLvl" /> <set name="abnormalTime" val="1200" /> <set name="abnormalType" val="ATTACK_SPEED_UP_BOW" /> - <set name="effectPoint" val="#effectPoints" /> + <set name="affectScope" val="SINGLE" /> + <set name="effectPoint" val="#effectPoint" /> + <set name="hitCancelTime" val="500" /> <set name="hitTime" val="1500" /> <set name="icon" val="icon.skill0099" /> <set name="magicLvl" val="#magicLvl" /> <set name="mpConsume2" val="#mpConsume2" /> - <set name="mpConsume1" val="#mpConsume1" /> <set name="operateType" val="A2" /> <set name="reuseDelay" val="3000" /> <set name="rideState" val="NONE" /> <set name="targetType" val="SELF" /> - <enchant1 name="abnormalTime" val="#ench1AbnormalTimes" /> + <enchant1 name="abnormalTime" val="#ench1AbnormalTime" /> <enchant1 name="magicLvl" val="#enchMagicLvl" /> <enchant2 name="magicLvl" val="#enchMagicLvl" /> <enchant2 name="mpConsume2" val="#ench2MpConsume2" /> - <enchant2 name="mpConsume1" val="#ench2MpConsume1" /> <effects> <effect name="Buff"> - <mul stat="pAtkSpd" val="#rate"> + <mul stat="pAtkSpd" val="#pAtkSpd"> <using kind="BOW" /> </mul> </effect> diff --git a/src/main/resources/data/stats/skills/00100-00199.xml b/src/main/resources/data/stats/skills/00100-00199.xml index c2b194cfa7..027c5f1093 100644 --- a/src/main/resources/data/stats/skills/00100-00199.xml +++ b/src/main/resources/data/stats/skills/00100-00199.xml @@ -51,26 +51,29 @@ </enchant1Effects> </skill> <skill id="101" levels="40" name="Stun Shot" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2"> - <!-- Confirmed CT2.5 --> - <table name="#effectPoints"> -327 -337 -346 -366 -375 -385 -395 -405 -415 -425 -435 -445 -455 -465 -474 -484 -494 -503 -513 -522 -532 -541 -550 -558 -567 -575 -583 -591 -599 -607 -614 -621 -627 -634 -640 -646 -651 -656 -661 -665 </table> + <!-- High Five Confirmed --> + <table name="#effectPoint"> -327 -337 -346 -366 -375 -385 -395 -405 -415 -425 -435 -445 -455 -465 -474 -484 -494 -503 -513 -522 -532 -541 -550 -558 -567 -575 -583 -591 -599 -607 -614 -621 -627 -634 -640 -646 -651 -656 -661 -665 </table> <table name="#magicLvl"> 34 35 36 38 39 40 41 42 43 44 45 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="#mpConsume2"> 46 48 49 52 54 56 56 58 59 61 63 65 66 68 70 72 72 74 76 78 80 81 83 85 87 88 89 91 92 94 96 97 99 100 102 103 105 106 108 109 </table> - <table name="#power"> 344 367 391 443 471 500 530 562 595 630 666 703 742 782 823 866 910 955 1002 1050 1100 1150 1202 1255 1309 1364 1420 1476 1534 1592 1651 1710 1770 1830 1891 1951 2012 2072 2132 2192 </table> - <table name="#ench1ActivateRates"> 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 </table> + <table name="#physicalAttackPower"> 344 367 391 443 471 500 530 562 595 630 666 703 742 782 823 866 910 955 1002 1050 1100 1150 1202 1255 1309 1364 1420 1476 1534 1592 1651 1710 1770 1830 1891 1951 2012 2072 2132 2192 </table> + <table name="#enchMagicLvl"> 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="#ench1ActivateRate"> 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 </table> <table name="#ench2MpConsume2"> 107 106 104 103 101 100 98 97 96 94 93 91 90 88 87 85 84 83 81 80 78 77 75 74 73 71 70 68 67 65 </table> <table name="#ench2Power"> 2211 2231 2251 2270 2290 2310 2330 2349 2369 2389 2409 2428 2448 2468 2488 2507 2527 2547 2566 2586 2606 2626 2645 2665 2685 2705 2724 2744 2764 2784 </table> - <table name="#ench34pmDef"> 0.99 0.98 0.97 0.96 0.95 0.94 0.93 0.92 0.91 0.9 0.89 0.88 0.87 0.86 0.85 0.84 0.83 0.82 0.81 0.8 0.79 0.78 0.77 0.76 0.75 0.73 0.73 0.72 0.71 0.7 </table> - <table name="#enchMagicLvl"> 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="#ench3mDef"> 0.99 0.98 0.97 0.96 0.95 0.94 0.93 0.92 0.91 0.9 0.89 0.88 0.87 0.86 0.85 0.84 0.83 0.82 0.81 0.8 0.79 0.78 0.77 0.76 0.75 0.74 0.73 0.72 0.71 0.7 </table> + <table name="#ench4pDef"> 0.99 0.98 0.97 0.96 0.95 0.94 0.93 0.92 0.91 0.9 0.89 0.88 0.87 0.86 0.85 0.84 0.83 0.82 0.81 0.8 0.79 0.78 0.77 0.76 0.75 0.74 0.73 0.72 0.71 0.7 </table> <set name="abnormalLvl" val="1" /> <set name="abnormalTime" val="9" /> <set name="abnormalType" val="STUN" /> <set name="abnormalVisualEffect" val="STUN" /> <set name="activateRate" val="50" /> + <set name="affectScope" val="SINGLE" /> <set name="basicProperty" val="CON" /> <set name="castRange" val="900" /> <set name="coolTime" val="1000" /> - <set name="effectPoint" val="#effectPoints" /> + <set name="effectPoint" val="#effectPoint" /> <set name="effectRange" val="1400" /> + <set name="hitCancelTime" val="500" /> <set name="hitTime" val="3000" /> <set name="icon" val="icon.skill0101" /> <set name="isDebuff" val="true" /> @@ -81,9 +84,9 @@ <set name="overHit" val="true" /> <set name="reuseDelay" val="3000" /> <set name="rideState" val="NONE" /> - <set name="targetType" val="ONE" /> + <set name="targetType" val="ENEMY" /> <set name="trait" val="SHOCK" /> - <enchant1 name="activateRate" val="#ench1ActivateRates" /> + <enchant1 name="activateRate" val="#ench1ActivateRate" /> <enchant1 name="magicLvl" val="#enchMagicLvl" /> <enchant2 name="magicLvl" val="#enchMagicLvl" /> <enchant2 name="mpConsume2" val="#ench2MpConsume2" /> @@ -94,52 +97,54 @@ </cond> <effects> <effect name="PhysicalAttack"> - <param power="#power" /> + <param power="#physicalAttackPower" /> </effect> - <effect name="Stun" /> <effect name="TargetCancel"> <param chance="40" /> </effect> + <effect name="Stun" /> </effects> <enchant1Effects> <effect name="PhysicalAttack"> <param power="2192" /> </effect> - <effect name="Stun" /> <effect name="TargetCancel"> <param chance="40" /> </effect> + <effect name="Stun" /> </enchant1Effects> <enchant2Effects> <effect name="PhysicalAttack"> <param power="#ench2Power" /> </effect> - <effect name="Stun" /> <effect name="TargetCancel"> <param chance="40" /> </effect> + <effect name="Stun" /> </enchant2Effects> <enchant3Effects> <effect name="PhysicalAttack"> <param power="2192" /> </effect> - <effect name="Stun"> - <mul stat="pDef" val="#ench34pmDef" /> - </effect> <effect name="TargetCancel"> <param chance="40" /> </effect> + <effect name="Stun" /> + <effect name="Debuff"> + <mul stat="pDef" val="#ench3mDef" /> + </effect> </enchant3Effects> <enchant4Effects> <effect name="PhysicalAttack"> <param power="2192" /> </effect> - <effect name="Stun"> - <mul stat="mDef" val="#ench34pmDef" /> - </effect> <effect name="TargetCancel"> <param chance="40" /> </effect> + <effect name="Stun" /> + <effect name="Debuff"> + <mul stat="mDef" val="#ench4pDef" /> + </effect> </enchant4Effects> </skill> <skill id="102" levels="16" name="Entangle" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1"> diff --git a/src/main/resources/data/stats/skills/00800-00899.xml b/src/main/resources/data/stats/skills/00800-00899.xml index ce4664e904..d4369b7a64 100644 --- a/src/main/resources/data/stats/skills/00800-00899.xml +++ b/src/main/resources/data/stats/skills/00800-00899.xml @@ -1683,11 +1683,13 @@ </effects> </skill> <skill id="873" levels="1" name="Rapid Shot"> - <!-- Confirmed CT2.5 --> + <!-- High Five Confirmed --> <set name="abnormalLvl" val="2" /> <set name="abnormalTime" val="1200" /> <set name="abnormalType" val="ATTACK_SPEED_UP_BOW" /> + <set name="affectScope" val="SINGLE" /> <set name="effectPoint" val="549" /> + <set name="hitCancelTime" val="500" /> <set name="hitTime" val="1500" /> <set name="icon" val="icon.skill0099" /> <set name="magicLvl" val="70" /> diff --git a/src/main/resources/data/stats/skills/05900-05999.xml b/src/main/resources/data/stats/skills/05900-05999.xml index 2de77d1325..6dd629e679 100644 --- a/src/main/resources/data/stats/skills/05900-05999.xml +++ b/src/main/resources/data/stats/skills/05900-05999.xml @@ -1626,7 +1626,7 @@ <table name="#effectPoint"> 303 549 </table> <table name="#magicLvl"> 32 55 </table> <table name="#mpConsume2"> 14 25 </table> - <table name="#rate"> 8 12 </table> + <table name="#pAtkSpd"> 1.08 1.12 </table> <set name="abnormalLvl" val="#abnormalLvl" /> <set name="abnormalTime" val="1200" /> <set name="abnormalType" val="ATTACK_SPEED_UP_BOW" /> @@ -1643,7 +1643,7 @@ <set name="targetType" val="SELF" /> <effects> <effect name="Buff"> - <mul stat="pAtkSpd" val="#rate"> + <mul stat="pAtkSpd" val="#pAtkSpd"> <using kind="BOW" /> </mul> </effect> -- GitLab