API tools faq
paste
Advertisement
hitnar

18.03.2016

hitnar
Mar 18th, 2016
96
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 22.82 KB | None | 0 0
raw download clone embed print report
  1. Index: dist/game/data/scripts/handlers/effecthandlers/MarkRetriever.java
  2. ===================================================================
  3. --- dist/game/data/scripts/handlers/effecthandlers/MarkRetriever.java   (revision 0)
  4. +++ dist/game/data/scripts/handlers/effecthandlers/MarkRetriever.java   (revision 0)
  5. @@ -0,0 +1,114 @@
  6. +/*
  7. + * This file is part of the L2J Mobius project.
  8. + *
  9. + * This program is free software: you can redistribute it and/or modify
  10. + * it under the terms of the GNU General Public License as published by
  11. + * the Free Software Foundation, either version 3 of the License, or
  12. + * (at your option) any later version.
  13. + *
  14. + * This program is distributed in the hope that it will be useful,
  15. + * but WITHOUT ANY WARRANTY; without even the implied warranty of
  16. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  17. + * General Public License for more details.
  18. + *
  19. + * You should have received a copy of the GNU General Public License
  20. + * along with this program. If not, see <http://www.gnu.org/licenses/>.
  21. + */
  22. +package handlers.effecthandlers;
  23. +
  24. +import com.l2jmobius.gameserver.model.StatsSet;
  25. +import com.l2jmobius.gameserver.enums.ShotType;
  26. +import com.l2jmobius.gameserver.model.actor.L2Character;
  27. +import com.l2jmobius.gameserver.model.conditions.Condition;
  28. +import com.l2jmobius.gameserver.model.effects.AbstractEffect;
  29. +import com.l2jmobius.gameserver.model.skills.BuffInfo;
  30. +import com.l2jmobius.gameserver.model.stats.Formulas;
  31. +import com.l2jmobius.gameserver.model.stats.Stats;
  32. +import com.l2jmobius.util.Rnd;
  33. +import java.util.List;
  34. +
  35. +/**
  36. +   * damage for each mark on the target
  37. +   * @author hitnar
  38. + */
  39. +public final class MarkRetriever extends AbstractEffect
  40. +{
  41. +  
  42. +       private final double _mul;
  43. +  
  44. +   public MarkRetriever(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
  45. +   {
  46. +       super(attachCond, applyCond, set, params);
  47. +      
  48. +       _mul = params.getDouble("mul", 0);
  49. +   }
  50. +  
  51. +   @Override
  52. +   public boolean isInstant()
  53. +   {
  54. +       return true;
  55. +   }
  56. +  
  57. +   @Override
  58. +   public void onStart(BuffInfo info)
  59. +   {
  60. +
  61. +       final L2Character effected = info.getEffected();
  62. +       final L2Character activeChar = info.getEffector();
  63. +      
  64. +       if (activeChar.isAlikeDead())
  65. +       {
  66. +           return;
  67. +       }
  68. +      
  69. +       final boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
  70. +       final boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
  71. +       final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(effected, info.getSkill()));
  72. +       final byte shld = Formulas.calcShldUse(activeChar, effected, info.getSkill());
  73. +       double damage = Formulas.calcMagicDam(activeChar, effected, info.getSkill(), shld, sps, bss, mcrit);
  74. +       int count = 0;
  75. +      
  76. +       List <BuffInfo> effects = effected.getEffectList().getEffects();
  77. +       for (BuffInfo buff : effects){
  78. +           if(buff.getSkill().getId() == 11259 || buff.getSkill().getId() == 11261 || buff.getSkill().getId() == 11262){
  79. +               count++;       
  80. +           }
  81. +       }
  82. +
  83. +       damage = damage * _mul * count;
  84. +      
  85. +       if (damage > 0) {
  86. +                   // reduce damage if target has maxdamage buff
  87. +           final double maxDamage = (effected.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null));
  88. +           if (maxDamage > 0)
  89. +           {
  90. +               damage = maxDamage;
  91. +           }
  92. +          
  93. +           // Manage attack or cast break of the target (calculating rate, sending message...)
  94. +           if (!effected.isRaid() && Formulas.calcAtkBreak(effected, damage))
  95. +           {
  96. +               effected.breakAttack();
  97. +               effected.breakCast();
  98. +           }
  99. +          
  100. +           // Shield Deflect Magic: Reflect all damage on caster.
  101. +           if (effected.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, effected, info.getSkill()) > Rnd.get(100))
  102. +           {
  103. +               activeChar.reduceCurrentHp((int) damage, effected, info.getSkill());
  104. +               activeChar.notifyDamageReceived((int) damage, effected, info.getSkill(), false, false);
  105. +           }
  106. +           else
  107. +           {
  108. +               effected.reduceCurrentHp((int) damage, activeChar, info.getSkill());
  109. +               effected.notifyDamageReceived((int) damage, activeChar, info.getSkill(), false, false);
  110. +               activeChar.sendDamageMessage(effected, (int) damage, false, false, false);
  111. +           }
  112. +
  113. +           effected.getEffectList().stopSkillEffects(true, 11259);
  114. +           effected.getEffectList().stopSkillEffects(true, 11261);
  115. +           effected.getEffectList().stopSkillEffects(true, 11262);
  116. +              
  117. +       }
  118. +   }
  119. +}
  120. Index: dist/game/data/stats/skills/11200-11299.xml
  121. ===================================================================
  122. --- dist/game/data/stats/skills/11200-11299.xml (revision 1328)
  123. +++ dist/game/data/stats/skills/11200-11299.xml (working copy)
  124. @@ -352,13 +352,17 @@
  125.     </skill>
  126.     <skill id="11259" levels="11" name="Mark of Weakness">
  127.     <!-- Source: https://l2wiki.com/Mark_of_Weakness_-_Wynn_Spectral_Master -->
  128. +       <table name="#effectPoints"> -318 -323 -328 -333 -338 -343 -348 -343 -348 -353 -358 </table>
  129.         <table name="#magicLvl"> 85 87 89 91 93 95 97 99 101 103 105 </table>
  130.         <table name="#mpConsume"> 54 58 62 66 70 74 78 82 86 90 94 </table>
  131. +       <table name="#Dam"> 85 89 93 97 101 105 109 113 117 121 125 </table>
  132.         <set name="icon" val="icon.skill11259" />
  133.         <set name="magicLvl" val="#magicLvl" />
  134.         <set name="operateType" val="ACTIVE_CONTINUOUS" />
  135.         <set name="mpConsume" val="#mpConsume" />
  136. +       <set name="activateRate" val="80" />
  137.         <set name="effectRange" val="900" />
  138. +       <set name="effectPoint" val="#effectPoints" />
  139.         <set name="hitTime" val="1200" />
  140.         <set name="coolTime" val="500" />
  141.         <set name="reuseDelay" val="5000" />
  142. @@ -367,78 +371,124 @@
  143.         <set name="isDebuff" val="true" />
  144.         <set name="targetType" val="ONE" />
  145.         <for>
  146. -           <effect name="Buff">
  147. -               <mul stat="mDef" val="1.3" />
  148. -               <mul stat="pDef" val="1.3" />
  149. -               <mul stat="debuffVuln" val="1.3" />
  150. +           <effect name="Debuff">
  151. +               <mul stat="mDef" val="0.9" />
  152. +               <mul stat="pDef" val="0.9" />
  153. +           </effect>
  154. +           <effect name="DamOverTime" ticks="1">
  155. +               <param power="#Dam" />
  156.             </effect>
  157.         </for>
  158.     </skill>
  159.     <skill id="11260" levels="8" name="Mark of Void">
  160.     <!-- Source: https://l2wiki.com/Mark_of_Void_-_Wynn_Elemental_Master -->
  161. -       <table name="#magicLvl"> 85 88 91 94 97 101 103 105 </table>
  162. +       <table name="#effectPoints"> -333 -338 -343 -348 -343 -348 -353 -358 </table>
  163. +       <table name="#magicLvl"> 91 93 95 97 99 101 103 105 </table>
  164.         <table name="#mpConsume"> 54 60 66 72 78 84 90 96 </table>
  165. +       <table name="#Dam"> 85 91 97 103 109 117 121 125 </table>
  166.         <set name="icon" val="icon.skill11260" />
  167.         <set name="magicLvl" val="#magicLvl" />
  168.         <set name="operateType" val="ACTIVE_CONTINUOUS" />
  169.         <set name="mpConsume" val="#mpConsume" />
  170. +       <set name="activateRate" val="80" />
  171.         <set name="effectRange" val="900" />
  172. -       <set name="hitTime" val="1490" />
  173. -       <set name="coolTime" val="300" />
  174. +       <set name="effectPoint" val="#effectPoints" />
  175. +       <set name="hitTime" val="1200" />
  176. +       <set name="coolTime" val="500" />
  177.         <set name="reuseDelay" val="5000" />
  178.         <set name="abnormalTime" val="10" />
  179.         <set name="isMagic" val="1" />
  180.         <set name="isDebuff" val="true" />
  181.         <set name="targetType" val="ONE" />
  182. +       <for>
  183. +           <effect name="DamOverTime" ticks="1">
  184. +               <param power="#Dam" />
  185. +           </effect>
  186. +       </for>
  187.     </skill>
  188.     <skill id="11261" levels="9" name="Mark of Plague">
  189.     <!-- Source: https://l2wiki.com/Mark_of_Plague_-_Wynn_Arcana_Lord -->
  190. -       <table name="#magicLvl"> 85 87 90 93 96 99 101 103 105 </table>
  191. +       <table name="#effectPoints"> -328 -333 -338 -343 -348 -343 -348 -353 -358 </table>
  192. +       <table name="#magicLvl"> 89 91 93 95 97 99 101 103 105 </table>
  193.         <table name="#mpConsume"> 54 58 64 70 76 82 88 94 100 </table>
  194. +       <table name="#Dam"> 85 89 95 101 107 113 117 121 125 </table>
  195.         <set name="icon" val="icon.skill11261" />
  196.         <set name="magicLvl" val="#magicLvl" />
  197.         <set name="operateType" val="ACTIVE_CONTINUOUS" />
  198.         <set name="mpConsume" val="#mpConsume" />
  199. +       <set name="activateRate" val="80" />
  200.         <set name="effectRange" val="900" />
  201. -       <set name="hitTime" val="1500" />
  202. +       <set name="effectPoint" val="#effectPoints" />
  203. +       <set name="hitTime" val="1200" />
  204.         <set name="coolTime" val="500" />
  205.         <set name="reuseDelay" val="5000" />
  206.         <set name="abnormalTime" val="10" />
  207.         <set name="isMagic" val="1" />
  208.         <set name="isDebuff" val="true" />
  209.         <set name="targetType" val="ONE" />
  210. +       <for>
  211. +           <effect name="Debuff">
  212. +               <mul stat="healEffect" val="0.8" /> <!-- Need Verify -->
  213. +           </effect>
  214. +           <effect name="DamOverTime" ticks="1">
  215. +               <param power="#Dam" />
  216. +           </effect>
  217. +       </for>
  218.     </skill>
  219.     <skill id="11262" levels="9" name="Mark of Trick">
  220.     <!-- Source: https://l2wiki.com/Mark_of_Trick_-_Wynn_Spectral_Master -->
  221. -       <table name="#magicLvl"> 85 86 89 92 95 98 101 103 105 </table>
  222. +       <table name="#effectPoints"> -328 -333 -338 -343 -348 -343 -348 -353 -358 </table>
  223. +       <table name="#magicLvl"> 89 91 93 95 97 99 101 103 105 </table>
  224.         <table name="#mpConsume"> 54 56 62 68 74 80 86 92 98 </table>
  225. -       <set name="icon" val="icon.skill11262" />
  226. +       <table name="#Dam"> 85 89 95 101 107 113 117 121 125 </table>
  227. +       <set name="icon" val="icon.skill11261" />
  228.         <set name="magicLvl" val="#magicLvl" />
  229.         <set name="operateType" val="ACTIVE_CONTINUOUS" />
  230.         <set name="mpConsume" val="#mpConsume" />
  231. +       <set name="activateRate" val="80" />
  232.         <set name="effectRange" val="900" />
  233. -       <set name="hitTime" val="1500" />
  234. +       <set name="effectPoint" val="#effectPoints" />
  235. +       <set name="hitTime" val="1200" />
  236.         <set name="coolTime" val="500" />
  237.         <set name="reuseDelay" val="5000" />
  238.         <set name="abnormalTime" val="10" />
  239.         <set name="isMagic" val="1" />
  240.         <set name="isDebuff" val="true" />
  241.         <set name="targetType" val="ONE" />
  242. +       <for>
  243. +           <effect name="Mute" />
  244. +           <effect name="DamOverTime" ticks="1">
  245. +               <param power="#Dam" />
  246. +           </effect>
  247. +       </for>
  248.     </skill>
  249.     <skill id="11263" levels="10" name="Invoke">
  250.     <!-- Source: https://l2wiki.com/Invoke_-_Wynn_Elemental_Master -->
  251. +       <table name="#effectPoints"> -318 -323 -328 -333 -338 -343 -348 -343 -348 -353 -358 </table>
  252.         <table name="#magicLvl"> 87 89 91 93 95 97 99 101 103 105 </table>
  253.         <table name="#mpConsume"> 227 236 245 255 265 276 286 296 306 316 </table>
  254. +       <table name="#power"> 147 151 156 160 164 168 172 198 204 210 </table>
  255. +       <set name="affectLimit" val="5-12" />
  256. +       <set name="affectRange" val="200" />
  257. +       <set name="castRange" val="500" />
  258. +       <set name="effectPoint" val="#effectPoints" />
  259. +       <set name="effectRange" val="1000" />
  260. +       <set name="hitTime" val="5000" />
  261.         <set name="icon" val="icon.skill11263" />
  262. +       <set name="isMagic" val="1" /> <!-- Magic Skill -->
  263.         <set name="magicLvl" val="#magicLvl" />
  264. -       <set name="operateType" val="ACTIVE_INSTANT" />
  265.         <set name="mpConsume" val="#mpConsume" />
  266. -       <set name="effectRange" val="600" />
  267. -       <set name="hitTime" val="2559" />
  268. -       <set name="coolTime" val="500" />
  269. -       <set name="reuseDelay" val="15000" />
  270. -       <set name="isMagic" val="1" />
  271. +       <set name="operateType" val="ACTIVE_INSTANT" />
  272. +       <set name="power" val="#power" />
  273. +       <set name="reuseDelay" val="4000" />
  274. +       <set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
  275.         <set name="targetType" val="AREA" />
  276. +       <for>
  277. +           <effect name="MagicalAttack" />
  278. +       </for> 
  279.     </skill>
  280.     <skill id="11264" levels="4" name="Strong Will" enchantGroup1="10" enchantGroup2="10">
  281.         <!-- Consume HP to recover 200 MP. Dispels debuffs and escapes immobility. -->
  282. @@ -566,12 +621,16 @@
  283.         <set name="abnormalLvl" val="1" />
  284.         <set name="abnormalTime" val="300" />
  285.         <set name="magicLvl" val="#magicLvl" />
  286. +       <set name="abnormalType" val="TRANSFORM" />
  287. +       <set name="effectPoint" val="1" />
  288.         <set name="operateType" val="ACTIVE_CONTINUOUS" />
  289.         <set name="mpConsume" val="70" />
  290.         <set name="hitTime" val="4000" />
  291.         <set name="coolTime" val="500" />
  292.         <set name="reuseDelay" val="3600000" />
  293. -       <set name="isMagic" val="1" />
  294. +       <set name="isMagic" val="2" /> <!-- Static Skill -->
  295. +       <set name="magicLvl" val="-1" />
  296. +       <set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
  297.         <set name="targetType" val="SELF" />
  298.         <cond addName="1" msgId="113">
  299.             <player canTransform="true" />
  300. @@ -588,6 +647,10 @@
  301.                 <mul stat="mDef" val="1.50" />
  302.                 <mul stat="rEvas" val="0.5" />
  303.             </effect>
  304. +           <effect name="DefenceTrait">
  305. +               <param BOW="50" />
  306. +               <param CROSSBOW="50" />
  307. +           </effect>
  308.             <effect name="Transformation">
  309.                 <param id="509" />
  310.             </effect>
  311. @@ -604,6 +667,10 @@
  312.                 <mul stat="mDef" val="1.50" />
  313.                 <mul stat="rEvas" val="0.5" />
  314.             </effect>
  315. +           <effect name="DefenceTrait">
  316. +               <param BOW="50" />
  317. +               <param CROSSBOW="50" />
  318. +           </effect>
  319.             <effect name="Transformation">
  320.                 <param id="509" />
  321.             </effect>
  322. @@ -683,16 +750,26 @@
  323.     <!-- Source: https://l2wiki.com/Mark_Retriever_-_Wynn_Spectral_Master -->
  324.         <table name="#magicLvl"> 85 86 88 90 92 94 96 98 101 103 105 </table>
  325.         <table name="#mpConsume"> 82 84 88 92 96 100 104 108 112 116 120 </table>
  326. -       <set name="icon" val="icon.skill11271" />
  327. +       <table name="#effectPoints"> -318 -323 -328 -333 -338 -343 -348 -343 -348 -353 -358 </table>
  328. +       <table name="#power"> 300 350 400 450 500 550 600 650 700 750 800 </table> <!-- Need Verify -->
  329. +       <set name="icon" val="icon.skill11261" />
  330.         <set name="magicLvl" val="#magicLvl" />
  331.         <set name="operateType" val="ACTIVE_INSTANT" />
  332.         <set name="mpConsume" val="#mpConsume" />
  333.         <set name="effectRange" val="900" />
  334. -       <set name="hitTime" val="1759" />
  335. -       <set name="coolTime" val="300" />
  336. +       <set name="effectPoint" val="#effectPoints" />
  337. +       <set name="power" val="#power" /> <!-- Need Verify -->
  338. +       <set name="hitTime" val="1200" />
  339. +       <set name="coolTime" val="500" />
  340.         <set name="reuseDelay" val="5000" />
  341.         <set name="isMagic" val="1" />
  342. -       <set name="targetType" val="SELF" />
  343. +       <set name="isDebuff" val="true" />
  344. +       <set name="targetType" val="ONE" />
  345. +       <for>
  346. +           <effect name="MarkRetriever" >
  347. +           <param mul="1" /> <!-- For Enchant -->
  348. +           </effect>
  349. +       </for>
  350.     </skill>
  351.     <!-- Level 1 : Switches locations with target servitor. -->
  352.     <!-- Level 101 : Trades places with targeted servitor. Enchant Cost: Decreases MP Consumption. (+ 1 Cost | Decreases MP Consumption.) -->
  353. @@ -729,19 +806,33 @@
  354.     </skill>
  355.     <skill id="11273" levels="8" name="Exile">
  356.     <!-- Source: https://l2wiki.com/Exile_-_Wynn_Arcana_Lord -->
  357. +       <table name="#effectPoints"> -333 -338 -343 -348 -343 -348 -353 -358 </table>
  358.         <table name="#magicLvl"> 85 88 91 94 97 101 103 105 </table>
  359. -       <table name="#mpConsume"> 78 83 87 92 97 101 103 105 </table>
  360. +       <table name="#mpConsume"> 78 83 87 92 97 102 107 112 </table>
  361. +       <table name="#Dam"> 353 364 374 385 395 409 416 423 </table>
  362.         <set name="icon" val="icon.skill11273" />
  363.         <set name="magicLvl" val="#magicLvl" />
  364.         <set name="operateType" val="ACTIVE_CONTINUOUS" />
  365.         <set name="mpConsume" val="#mpConsume" />
  366. +       <set name="abnormalTime" val="10" /> <!-- Need Verify -->
  367. +       <set name="activateRate" val="90" /> <!-- Need Verify -->
  368. +       <set name="abnormalType" val="MD_DOWN" />
  369. +       <set name="effectPoint" val="#effectPoints" />
  370. +       <set name="effectRange" val="1400" />
  371.         <set name="effectRange" val="600" />
  372.         <set name="hitTime" val="1500" />
  373.         <set name="coolTime" val="500" />
  374.         <set name="reuseDelay" val="60000" />
  375.         <set name="isMagic" val="1" />
  376.         <set name="isDebuff" val="true" />
  377. -       <set name="targetType" val="SELF" />
  378. +       <set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
  379. +       <set name="targetType" val="ONE" />
  380. +       <for>
  381. +           <effect name="DamOverTime" ticks="1">
  382. +               <param power="#Dam" />
  383. +           </effect>
  384. +           <effect name="Paralyze" />
  385. +       </for>
  386.     </skill>
  387.     <!-- Level 1 : Becomes invincible with energy from your servitor. Increases HP Recovery Bonus while skill is in effect. Requires a servitor. -->
  388.     <!-- Level 2 : Becomes invincible with energy from your servitor. Increases HP Recovery Bonus while skill is in effect. Requires a servitor. -->
  389. @@ -856,16 +947,29 @@
  390.     </skill>
  391.     <skill id="11276" levels="6" name="Dimensional Binding">
  392.     <!-- Source: https://l2wiki.com/Dimensional_Binding_-_Wynn_Arcana_Lord -->
  393. +       <table name="#effectPoints"> -343 -348 -343 -348 -353 -358 </table>
  394.         <table name="#magicLvl"> 93 96 99 101 103 105 </table>
  395.         <set name="icon" val="icon.skill11276" />
  396.         <set name="magicLvl" val="#magicLvl" />
  397. -       <set name="operateType" val="ACTIVE_INSTANT" />
  398. +       <set name="operateType" val="ACTIVE_CONTINUOUS" />
  399.         <set name="mpConsume" val="90" />
  400.         <set name="effectRange" val="900" />
  401. +       <set name="abnormalTime" val="10" /> <!-- Need Verify -->
  402. +       <set name="activateRate" val="90" /> <!-- Need Verify -->
  403.         <set name="hitTime" val="10000" />
  404.         <set name="reuseDelay" val="300000" />
  405.         <set name="isDebuff" val="true" />
  406. -       <set name="targetType" val="SELF" />
  407. +       <set name="abnormalType" val="MD_DOWN" />
  408. +       <set name="effectPoint" val="#effectPoints" />
  409. +       <set name="effectRange" val="1400" />
  410. +       <set name="targetType" val="ONE" />
  411. +       <for>
  412. +           <effect name="Debuff">
  413. +               <mul stat="mDef" val="0.7" />
  414. +               <mul stat="pDef" val="0.7" />
  415. +           </effect>
  416. +           <effect name="Root" />
  417. +       </for>
  418.     </skill>
  419.     <skill id="11277" levels="4" name="Sense of Loyalty">
  420.         <!-- AUTO GENERATED SKILL -->
  421. @@ -1149,19 +1253,32 @@
  422.     </skill>
  423.     <skill id="11296" levels="9" name="Mass Exile">
  424.     <!-- Source: https://l2wiki.com/Mass_Exile_-_Wynn_Elemental_Master -->
  425. +       <table name="#effectPoints"> -333 -338 -343 -348 -343 -348 -353 -358 -363 </table>
  426.         <table name="#magicLvl"> 85 87 90 93 96 99 101 103 105 </table>
  427.         <table name="#mpConsume"> 102 106 112 118 125 132 139 146 153 </table>
  428. +       <table name="#Dam"> 282 288 296 305 313 322 336 343 350</table>
  429.         <set name="icon" val="icon.skill11296" />
  430.         <set name="magicLvl" val="#magicLvl" />
  431.         <set name="operateType" val="ACTIVE_CONTINUOUS" />
  432. +       <set name="abnormalTime" val="10" /> <!-- Need Verify -->
  433. +       <set name="activateRate" val="90" /> <!-- Need Verify -->
  434.         <set name="mpConsume" val="#mpConsume" />
  435.         <set name="effectRange" val="600" />
  436. +       <set name="effectPoint" val="#effectPoints" />
  437. +       <set name="effectRange" val="1400" />
  438.         <set name="hitTime" val="3000" />
  439.         <set name="coolTime" val="500" />
  440.         <set name="reuseDelay" val="300000" />
  441.         <set name="isMagic" val="1" />
  442.         <set name="isDebuff" val="true" />
  443. -       <set name="targetType" val="AREA" />
  444. +       <set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
  445. +       <set name="targetType" val="AURA" />
  446. +       <for>
  447. +           <effect name="DamOverTime" ticks="1">
  448. +               <param power="#Dam" />
  449. +           </effect>
  450. +           <effect name="Paralyze" />
  451. +       </for>
  452.     </skill>
  453.     <!-- Level 1 : For 30 minutes, increases the servitor's Max MP by 20%, HP Recovery Bonus by 20%, M. Critical Rate by 20, Critical Damage during a normal attack by 20%, P. Atk. by 10%, P. Def. by 20%, Atk. Spd. by 20%, M. Atk. by 20%, M. Def. by 20%, Casting Spd. by 20%, and Debuff Resistance by 10%. Decreases received Critical Damage by 30% and speed by 15%. -->
  454.     <!-- Level 2 : For 30 minutes, increases the servitor's Max MP by 20%, HP Recovery Bonus by 20%, M. Critical Rate by 20, Critical Damage during a normal attack by 20%, P. Atk. by 10%, P. Def. by 20%, Atk. Spd. by 20%, M. Atk. by 20%, M. Def. by 20%, Casting Spd. by 20%, and Debuff Resistance by 10%. Decreases received Critical Damage by 30% and speed by 10%. -->
  455. @@ -1228,6 +1345,7 @@
  456.     </skill>
  457.     <skill id="11298" levels="11" name="Mark of Fire" enchantGroup1="10" enchantGroup2="10" enchantGroup3="10" enchantGroup4="10" enchantGroup5="10" enchantGroup6="10" enchantGroup7="10" enchantGroup8="10">
  458.     <!-- Source: https://l2wiki.com/Mark_of_Fire_-_Wynn_Elemental_Master -->
  459. +       <table name="#effectPoints"> -318 -323 -328 -333 -338 -343 -348 -343 -348 -353 -358 </table>
  460.         <table name="#magicLvl"> 85 86 88 90 92 94 96 98 101 103 105 </table>
  461.         <table name="#mpConsume"> 63 65 68 70 73 76 79 82 85 88 91 </table>
  462.         <table name="#ench1MpConsume"> 78 75 72 68 65 62 59 55 52 49 </table>
  463. @@ -1236,16 +1354,20 @@
  464.         <table name="#enchElementPower"> 21 22 23 24 25 26 27 28 29 30 </table>
  465.         <set name="icon" val="icon.skill11298" />
  466.         <set name="magicLvl" val="#magicLvl" />
  467. -       <set name="operateType" val="ACTIVE_INSTANT" />
  468. +       <set name="operateType" val="ACTIVE_CONTINUOUS" />
  469. +       <set name="effectRange" val="900" />
  470. +       <set name="effectPoint" val="#effectPoints" />
  471.         <set name="power" val="#power" />
  472.         <set name="mpConsume" val="#mpConsume" />
  473. +       <set name="activateRate" val="80" />
  474.         <set name="effectRange" val="900" />
  475.         <set name="hitTime" val="3359" />
  476.         <set name="coolTime" val="200" />
  477. -       <set name="reuseDelay" val="5000" />
  478. +       <set name="reuseDelay" val="30000" />
  479. +       <set name="abnormalTime" val="5" />
  480.         <set name="isMagic" val="1" />
  481.         <set name="isDebuff" val="true" />
  482. -       <set name="targetType" val="SELF" />
  483. +       <set name="targetType" val="ONE" />
  484.         <enchant1 name="mpConsume" val="#ench1MpConsume" />
  485.         <enchant1 name="power" val="#enchPower" />
  486.         <enchant2 name="pvpPower" val="#enchPower" />
  487. @@ -1268,10 +1390,14 @@
  488.         <enchant8 name="element" val="5" />
  489.         <enchant8 name="power" val="#enchPower" />
  490.         <for>
  491. -           <effect name="PhysicalAttack" />
  492. +           <effect name="MagicalAttack" />
  493.             <effect name="DamOverTime" ticks="5">
  494.                 <param power="#power" />
  495.             </effect>
  496. +           <effect name="Debuff">
  497. +               <mul stat="runSpd" val="0.1" />
  498. +           </effect>
  499. +           <effect name="Fear" />
  500.         </for>
  501.     </skill>
  502.     <!-- Level 1 : Balances you and your servitor's HP. -->
  503. Index: dist/game/data/stats/skills/11300-11399.xml
  504. ===================================================================
  505. --- dist/game/data/stats/skills/11300-11399.xml (revision 1328)
  506. +++ dist/game/data/stats/skills/11300-11399.xml (working copy)
  507. @@ -320,6 +320,9 @@
  508.         <set name="mpConsume" val="398" />
  509.         <set name="hitTime" val="3000" />
  510.         <set name="reuseDelay" val="60000" />
  511. +       <set name="mpConsume" val="270" />
  512. +       <set name="itemConsumeCount" val="1" />
  513. +       <set name="itemConsumeId" val="17371" /> <!--  Crystal (R-grade) -->
  514.         <set name="isMagic" val="1" />
  515.         <set name="targetType" val="SELF" />
  516.         <cond msgId="129">
  517. Index: dist/game/data/xsd/skills.xsd
  518. ===================================================================
  519. --- dist/game/data/xsd/skills.xsd   (revision 1328)
  520. +++ dist/game/data/xsd/skills.xsd   (working copy)
  521. @@ -643,6 +643,7 @@
  522.                     <xs:enumeration value="ManaHealByLevel" />
  523.                     <xs:enumeration value="ManaHealOverTime" />
  524.                     <xs:enumeration value="ManaHealPercent" />
  525. +                   <xs:enumeration value="MarkRetriever" />                   
  526.                     <xs:enumeration value="MaxCp" />
  527.                     <xs:enumeration value="MaxHp" />
  528.                     <xs:enumeration value="MpConsumePerLevel" />
  529. @@ -668,6 +669,7 @@
  530.                     <xs:enumeration value="Recovery" />
  531.                     <xs:enumeration value="Reeling" />
  532.                     <xs:enumeration value="RefuelAirship" />
  533.                     <xs:enumeration value="Relax" />
  534.                     <xs:enumeration value="RemoteControl" />
  535.                     <xs:enumeration value="RemoveArmor" />
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!