API tools faq
paste
Advertisement
Nik

Static Damage DP Support

Nik
Sep 24th, 2011
142
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.32 KB | None | 0 0
raw download clone embed print report
  1. Index: data/scripts/handlers/skillhandlers/Blow.java
  2. ===================================================================
  3. --- data/scripts/handlers/skillhandlers/Blow.java   (revision 8364)
  4. +++ data/scripts/handlers/skillhandlers/Blow.java   (working copy)
  5. @@ -102,8 +102,8 @@
  6.                 boolean soul = (weapon != null && weapon.getChargedSoulshot() == L2ItemInstance.CHARGED_SOULSHOT && (weapon.getItemType() == L2WeaponType.DAGGER || weapon.getItemType() == L2WeaponType.DUALDAGGER || weapon.getItemType() == L2WeaponType.RAPIER));
  7.                 byte shld = Formulas.calcShldUse(activeChar, target, skill);
  8.                
  9. -               double damage = (int) Formulas.calcBlowDamage(activeChar, target, skill, shld, soul);
  10. -               if (skill.getMaxSoulConsumeCount() > 0 && activeChar instanceof L2PcInstance)
  11. +               double damage = skill.isStaticDamage() ? skill.getPower() : (int) Formulas.calcBlowDamage(activeChar, target, skill, shld, soul);
  12. +               if (!skill.isStaticDamage() && skill.getMaxSoulConsumeCount() > 0 && activeChar instanceof L2PcInstance)
  13.                 {
  14.                     switch (((L2PcInstance) activeChar).getSouls())
  15.                     {
  16. @@ -128,7 +128,7 @@
  17.                 }
  18.                
  19.                 // Crit rate base crit rate for skill, modified with STR bonus
  20. -               if (Formulas.calcCrit(skill.getBaseCritRate() * 10 * BaseStats.STR.calcBonus(activeChar), true, target))
  21. +               if (!skill.isStaticDamage() && Formulas.calcCrit(skill.getBaseCritRate() * 10 * BaseStats.STR.calcBonus(activeChar), true, target))
  22.                     damage *= 2;
  23.                
  24.                 if (soul)
  25. Index: data/scripts/handlers/skillhandlers/Manadam.java
  26. ===================================================================
  27. --- data/scripts/handlers/skillhandlers/Manadam.java    (revision 8364)
  28. +++ data/scripts/handlers/skillhandlers/Manadam.java    (working copy)
  29. @@ -111,9 +111,9 @@
  30.                     }
  31.                 }
  32.                
  33. -               double damage = Formulas.calcManaDam(activeChar, target, skill, ss, bss);
  34. +               double damage = skill.isStaticDamage() ? skill.getPower() : Formulas.calcManaDam(activeChar, target, skill, ss, bss);
  35.                
  36. -               if (Formulas.calcMCrit(activeChar.getMCriticalHit(target, skill)))
  37. +               if (!skill.isStaticDamage() && Formulas.calcMCrit(activeChar.getMCriticalHit(target, skill)))
  38.                 {
  39.                     damage *= 3.;
  40.                     activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CRITICAL_HIT_MAGIC));
  41. Index: data/scripts/handlers/skillhandlers/Mdam.java
  42. ===================================================================
  43. --- data/scripts/handlers/skillhandlers/Mdam.java   (revision 8364)
  44. +++ data/scripts/handlers/skillhandlers/Mdam.java   (working copy)
  45. @@ -110,12 +110,12 @@
  46.             final byte shld = Formulas.calcShldUse(activeChar, target, skill);
  47.             final byte reflect = Formulas.calcSkillReflect(target, skill);
  48.            
  49. -           int damage = (int) Formulas.calcMagicDam(activeChar, target, skill, shld, ss, bss, mcrit);
  50. +           int damage = skill.isStaticDamage() ? (int)skill.getPower() : (int) Formulas.calcMagicDam(activeChar, target, skill, shld, ss, bss, mcrit);
  51.            
  52. -           if (skill.getDependOnTargetBuff() != 0)
  53. +           if (!skill.isStaticDamage() && skill.getDependOnTargetBuff() != 0)
  54.                 damage += (int) (damage * target.getBuffCount() * skill.getDependOnTargetBuff());
  55.            
  56. -           if (skill.getMaxSoulConsumeCount() > 0 && activeChar instanceof L2PcInstance)
  57. +           if (!skill.isStaticDamage() && skill.getMaxSoulConsumeCount() > 0 && activeChar instanceof L2PcInstance)
  58.             {
  59.                 switch (((L2PcInstance) activeChar).getSouls())
  60.                 {
  61. Index: data/scripts/handlers/skillhandlers/Pdam.java
  62. ===================================================================
  63. --- data/scripts/handlers/skillhandlers/Pdam.java   (revision 8364)
  64. +++ data/scripts/handlers/skillhandlers/Pdam.java   (working copy)
  65. @@ -98,15 +98,15 @@
  66.             final byte shld = Formulas.calcShldUse(activeChar, target, skill);
  67.             // PDAM critical chance not affected by buffs, only by STR. Only some skills are meant to crit.
  68.             boolean crit = false;
  69. -           if (skill.getBaseCritRate() > 0)
  70. +           if (!skill.isStaticDamage() && skill.getBaseCritRate() > 0)
  71.                 crit = Formulas.calcCrit(skill.getBaseCritRate() * 10 * BaseStats.STR.calcBonus(activeChar), true, target);
  72.            
  73.            
  74.             if (!crit && (skill.getCondition() & L2Skill.COND_CRIT) != 0)
  75.                 damage = 0;
  76.             else
  77. -               damage = (int) Formulas.calcPhysDam(activeChar, target, skill, shld, false, dual, soul);
  78. -           if (skill.getMaxSoulConsumeCount() > 0 && activeChar instanceof L2PcInstance)
  79. +               damage = skill.isStaticDamage() ? (int)skill.getPower() : (int) Formulas.calcPhysDam(activeChar, target, skill, shld, false, dual, soul);
  80. +           if (!skill.isStaticDamage() && skill.getMaxSoulConsumeCount() > 0 && activeChar instanceof L2PcInstance)
  81.             {
  82.                 switch (((L2PcInstance) activeChar).getSouls())
  83.                 {
  84. Index: data/scripts/handlers/skillhandlers/StrSiegeAssault.java
  85. ===================================================================
  86. --- data/scripts/handlers/skillhandlers/StrSiegeAssault.java    (revision 8364)
  87. +++ data/scripts/handlers/skillhandlers/StrSiegeAssault.java    (working copy)
  88. @@ -97,7 +97,7 @@
  89.                 if (!crit && (skill.getCondition() & L2Skill.COND_CRIT) != 0)
  90.                     damage = 0;
  91.                 else
  92. -                   damage = (int) Formulas.calcPhysDam(activeChar, target, skill, shld, crit, dual, soul);
  93. +                   damage = skill.isStaticDamage() ? (int)skill.getPower() : (int) Formulas.calcPhysDam(activeChar, target, skill, shld, crit, dual, soul);
  94.                
  95.                 if (damage > 0)
  96.                 {
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!