diff --git a/datapack_development/data/html/mercmanager/mercmanager-no.htm b/datapack_development/data/html/mercmanager/mercmanager-no.htm index 688d0ab61e8c0e09a3c712aa6c829e55f927fd3d..56458642386d0430895dcb9bffc6d0cb1ccc9db7 100644 --- a/datapack_development/data/html/mercmanager/mercmanager-no.htm +++ b/datapack_development/data/html/mercmanager/mercmanager-no.htm @@ -2,6 +2,6 @@ <body> %npcname%: <br> -Get away from me! I will only service the lord of this caslte.<br> +Get away from me! I will only service the lord of this castle.<br> </body> </html> diff --git a/datapack_development/data/stats/skills/0400-0499.xml b/datapack_development/data/stats/skills/0400-0499.xml index 2d6ff39158dd24b565efc36d2aef79dacf119b8a..cb10108c530afbcce407d3625216c815c5dd64d0 100644 --- a/datapack_development/data/stats/skills/0400-0499.xml +++ b/datapack_development/data/stats/skills/0400-0499.xml @@ -419,15 +419,36 @@ </for> </skill> <skill id="420" levels="3" name="Zealot"> - <!-- Destroyer & Tyrant --> - <set name="power" val="0.0"/> - <set name="target" val="TARGET_SELF"/> - <set name="skillType" val="NOTDONE"/> - <set name="operateType" val="OP_PASSIVE"/> - <set name="castRange" val="-1"/> - <for> - </for> -</skill> + <table name="#hpConsume"> 159 183 204 </table> + <table name="#mpConsume"> 106 122 136 </table> + <table name="#runSpd"> 10 20 30 </table> + <table name="#pAtkSpd"> 1.1 1.2 1.3 </table> + <table name="#cAtk"> 1.3 1.6 2.0 </table> + <set name="hpConsume" val="#hpConsume"/> + <set name="mpConsume" val="#mpConsume"/> + <set name="power" val="0.0"/> + <set name="hitTime" val="2000"/> + <set name="condition" val="32"/> + <set name="reuseDelay" val="900000"/> + <set name="skillTime" val="2000"/> + <set name="target" val="TARGET_SELF"/> + <set name="skillType" val="BUFF"/> + <set name="operateType" val="OP_ACTIVE"/> + <set name="castRange" val="-1"/> + <set name="effectRange" val="-1"/> + <cond> + <player hp="30"/> + </cond> + <for> + <effect count="60" name="DamOverTime" time="1" val="75"> + <add order="0x40" stat="accCombat" val="6"/> + <add order="0x40" stat="runSpd" val="#runSpd"/> + <mul order="0x30" stat="pAtkSpd" val="#pAtkSpd"/> + <mul order="0x30" stat="regHp" val="0.3"/> + <mul order="0x30" stat="cAtk" val="#cAtk"/> + </effect> + </for> + </skill> <skill id="421" levels="5" name="Fell Swoop"> <table name="#mpConsume"> 27 29 31 33 34 </table> <table name="#range"> 5 10 15 20 25 </table>