Corrections to match proper ImmobileDamageResist effect logic.

This commit is contained in:
MobiusDevelopment
2021-01-10 01:22:27 +00:00
parent 71d48985e4
commit d9f63e6f77
28 changed files with 146 additions and 146 deletions
@@ -4415,7 +4415,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -4415,7 +4415,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -4415,7 +4415,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -4415,7 +4415,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -4415,7 +4415,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -4415,7 +4415,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -4415,7 +4415,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -4414,7 +4414,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -244,26 +244,26 @@
</effect> </effect>
<effect name="ImmobileDamageResist"> <effect name="ImmobileDamageResist">
<amount> <amount>
<value level="11">1</value> <value level="11">-1</value>
<value level="12">1</value> <value level="12">-1</value>
<value level="13">1</value> <value level="13">-1</value>
<value level="14">2</value> <value level="14">-2</value>
<value level="15">2</value> <value level="15">-2</value>
<value level="16">3</value> <value level="16">-3</value>
<value level="17">3</value> <value level="17">-3</value>
<value level="18">4</value> <value level="18">-4</value>
<value level="19">4</value> <value level="19">-4</value>
<value level="20">5</value> <value level="20">-5</value>
<value level="21">6</value> <value level="21">-6</value>
<value level="22">7</value> <value level="22">-7</value>
<value level="23">8</value> <value level="23">-8</value>
<value level="24">9</value> <value level="24">-9</value>
<value level="25">10</value> <value level="25">-10</value>
<value level="26">11</value> <value level="26">-11</value>
<value level="27">12</value> <value level="27">-12</value>
<value level="28">13</value> <value level="28">-13</value>
<value level="29">14</value> <value level="29">-14</value>
<value level="30">15</value> <value level="30">-15</value>
</amount> </amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
@@ -1623,8 +1623,8 @@
<effects> <effects>
<effect name="ImmobileDamageResist"> <effect name="ImmobileDamageResist">
<amount> <amount>
<value level="1">7</value> <value level="1">-7</value>
<value level="2">15</value> <value level="2">-15</value>
</amount> </amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
@@ -568,9 +568,9 @@
</effect> </effect>
<effect name="ImmobileDamageResist" fromLevel="4" toLevel="6"> <effect name="ImmobileDamageResist" fromLevel="4" toLevel="6">
<amount> <amount>
<value level="4">3</value> <value level="4">-3</value>
<value level="5">3</value> <value level="5">-3</value>
<value level="6">5</value> <value level="6">-5</value>
</amount> </amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
@@ -1258,7 +1258,7 @@
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
<effect name="ImmobileDamageResist"> <effect name="ImmobileDamageResist">
<amount>3</amount> <amount>-3</amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
</effects> </effects>
@@ -2403,10 +2403,10 @@
<effects> <effects>
<effect name="ImmobileDamageResist"> <effect name="ImmobileDamageResist">
<amount> <amount>
<value level="1">1</value> <value level="1">-1</value>
<value level="2">2</value> <value level="2">-2</value>
<value level="3">3</value> <value level="3">-3</value>
<value level="4">5</value> <value level="4">-5</value>
</amount> </amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
@@ -155,7 +155,7 @@
<operateType>P</operateType> <operateType>P</operateType>
<effects> <effects>
<effect name="ImmobileDamageResist"> <effect name="ImmobileDamageResist">
<amount>20</amount> <amount>-20</amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
</effects> </effects>
@@ -1499,9 +1499,9 @@
<value level="1">0</value> <value level="1">0</value>
<value level="2">0</value> <value level="2">0</value>
<value level="3">0</value> <value level="3">0</value>
<value level="4">2</value> <value level="4">-2</value>
<value level="5">3</value> <value level="5">-3</value>
<value level="6">5</value> <value level="6">-5</value>
</amount> </amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
@@ -1711,17 +1711,17 @@
</effect> </effect>
<effect name="ImmobileDamageResist"> <effect name="ImmobileDamageResist">
<amount> <amount>
<value level="1">5</value> <value level="1">-5</value>
<value level="2">6</value> <value level="2">-6</value>
<value level="3">7</value> <value level="3">-7</value>
<value level="4">8</value> <value level="4">-8</value>
<value level="5">9</value> <value level="5">-9</value>
<value level="6">10</value> <value level="6">-10</value>
<value level="7">11</value> <value level="7">-11</value>
<value level="8">12</value> <value level="8">-12</value>
<value level="9">13</value> <value level="9">-13</value>
<value level="10">14</value> <value level="10">-14</value>
<value level="11">15</value> <value level="11">-15</value>
</amount> </amount>
<mode>PER</mode> <mode>PER</mode>
</effect> </effect>
@@ -4414,7 +4414,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -4405,7 +4405,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -1343,20 +1343,20 @@
<value level="4">0</value> <value level="4">0</value>
<value level="5">0</value> <value level="5">0</value>
<value level="6">0</value> <value level="6">0</value>
<value level="7">5</value> <value level="7">-5</value>
<value level="8">7</value> <value level="8">-7</value>
<value level="9">9</value> <value level="9">-9</value>
<value level="10">11</value> <value level="10">-11</value>
<value level="11">13</value> <value level="11">-13</value>
<value level="12">15</value> <value level="12">-15</value>
<value level="13">17</value> <value level="13">-17</value>
<value level="14">18</value> <value level="14">-18</value>
<value level="15">20</value> <value level="15">-20</value>
<value level="16">22</value> <value level="16">-22</value>
<value level="17">24</value> <value level="17">-24</value>
<value level="18">26</value> <value level="18">-26</value>
<value level="19">28</value> <value level="19">-28</value>
<value level="20">30</value> <value level="20">-30</value>
</amount> </amount>
</effect> </effect>
<effect name="PveMagicalSkillDefenceBonus"> <effect name="PveMagicalSkillDefenceBonus">
@@ -4405,7 +4405,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -1367,20 +1367,20 @@
<value level="4">0</value> <value level="4">0</value>
<value level="5">0</value> <value level="5">0</value>
<value level="6">0</value> <value level="6">0</value>
<value level="7">5</value> <value level="7">-5</value>
<value level="8">7</value> <value level="8">-7</value>
<value level="9">9</value> <value level="9">-9</value>
<value level="10">11</value> <value level="10">-11</value>
<value level="11">13</value> <value level="11">-13</value>
<value level="12">15</value> <value level="12">-15</value>
<value level="13">17</value> <value level="13">-17</value>
<value level="14">18</value> <value level="14">-18</value>
<value level="15">20</value> <value level="15">-20</value>
<value level="16">22</value> <value level="16">-22</value>
<value level="17">24</value> <value level="17">-24</value>
<value level="18">26</value> <value level="18">-26</value>
<value level="19">28</value> <value level="19">-28</value>
<value level="20">30</value> <value level="20">-30</value>
</amount> </amount>
</effect> </effect>
<effect name="PveMagicalSkillDefenceBonus"> <effect name="PveMagicalSkillDefenceBonus">
@@ -4405,7 +4405,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -1367,20 +1367,20 @@
<value level="4">0</value> <value level="4">0</value>
<value level="5">0</value> <value level="5">0</value>
<value level="6">0</value> <value level="6">0</value>
<value level="7">5</value> <value level="7">-5</value>
<value level="8">7</value> <value level="8">-7</value>
<value level="9">9</value> <value level="9">-9</value>
<value level="10">11</value> <value level="10">-11</value>
<value level="11">13</value> <value level="11">-13</value>
<value level="12">15</value> <value level="12">-15</value>
<value level="13">17</value> <value level="13">-17</value>
<value level="14">18</value> <value level="14">-18</value>
<value level="15">20</value> <value level="15">-20</value>
<value level="16">22</value> <value level="16">-22</value>
<value level="17">24</value> <value level="17">-24</value>
<value level="18">26</value> <value level="18">-26</value>
<value level="19">28</value> <value level="19">-28</value>
<value level="20">30</value> <value level="20">-30</value>
</amount> </amount>
</effect> </effect>
<effect name="PveMagicalSkillDefenceBonus"> <effect name="PveMagicalSkillDefenceBonus">
@@ -4418,7 +4418,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -1367,20 +1367,20 @@
<value level="4">0</value> <value level="4">0</value>
<value level="5">0</value> <value level="5">0</value>
<value level="6">0</value> <value level="6">0</value>
<value level="7">5</value> <value level="7">-5</value>
<value level="8">7</value> <value level="8">-7</value>
<value level="9">9</value> <value level="9">-9</value>
<value level="10">11</value> <value level="10">-11</value>
<value level="11">13</value> <value level="11">-13</value>
<value level="12">15</value> <value level="12">-15</value>
<value level="13">17</value> <value level="13">-17</value>
<value level="14">18</value> <value level="14">-18</value>
<value level="15">20</value> <value level="15">-20</value>
<value level="16">22</value> <value level="16">-22</value>
<value level="17">24</value> <value level="17">-24</value>
<value level="18">26</value> <value level="18">-26</value>
<value level="19">28</value> <value level="19">-28</value>
<value level="20">30</value> <value level="20">-30</value>
</amount> </amount>
</effect> </effect>
<effect name="PveMagicalSkillDefenceBonus"> <effect name="PveMagicalSkillDefenceBonus">
@@ -4418,7 +4418,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -1367,20 +1367,20 @@
<value level="4">0</value> <value level="4">0</value>
<value level="5">0</value> <value level="5">0</value>
<value level="6">0</value> <value level="6">0</value>
<value level="7">5</value> <value level="7">-5</value>
<value level="8">7</value> <value level="8">-7</value>
<value level="9">9</value> <value level="9">-9</value>
<value level="10">11</value> <value level="10">-11</value>
<value level="11">13</value> <value level="11">-13</value>
<value level="12">15</value> <value level="12">-15</value>
<value level="13">17</value> <value level="13">-17</value>
<value level="14">18</value> <value level="14">-18</value>
<value level="15">20</value> <value level="15">-20</value>
<value level="16">22</value> <value level="16">-22</value>
<value level="17">24</value> <value level="17">-24</value>
<value level="18">26</value> <value level="18">-26</value>
<value level="19">28</value> <value level="19">-28</value>
<value level="20">30</value> <value level="20">-30</value>
</amount> </amount>
</effect> </effect>
<effect name="PveMagicalSkillDefenceBonus"> <effect name="PveMagicalSkillDefenceBonus">
@@ -4417,7 +4417,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -4405,7 +4405,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)
@@ -1367,20 +1367,20 @@
<value level="4">0</value> <value level="4">0</value>
<value level="5">0</value> <value level="5">0</value>
<value level="6">0</value> <value level="6">0</value>
<value level="7">5</value> <value level="7">-5</value>
<value level="8">7</value> <value level="8">-7</value>
<value level="9">9</value> <value level="9">-9</value>
<value level="10">11</value> <value level="10">-11</value>
<value level="11">13</value> <value level="11">-13</value>
<value level="12">15</value> <value level="12">-15</value>
<value level="13">17</value> <value level="13">-17</value>
<value level="14">18</value> <value level="14">-18</value>
<value level="15">20</value> <value level="15">-20</value>
<value level="16">22</value> <value level="16">-22</value>
<value level="17">24</value> <value level="17">-24</value>
<value level="18">26</value> <value level="18">-26</value>
<value level="19">28</value> <value level="19">-28</value>
<value level="20">30</value> <value level="20">-30</value>
</amount> </amount>
</effect> </effect>
<effect name="PveMagicalSkillDefenceBonus"> <effect name="PveMagicalSkillDefenceBonus">
@@ -4427,7 +4427,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (target.isImmobilized()) if (target.isImmobilized())
{ {
damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1); damage *= _stat.getMul(Stat.IMMOBILE_DAMAGE_BONUS, 1);
damage /= target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1); damage *= Math.max(0.22, target.getStat().getMul(Stat.IMMOBILE_DAMAGE_RESIST, 1));
} }
if (!reflect && !isDOT) if (!reflect && !isDOT)