Static skills should not be affected by double time.

Contributed by nasseka.
This commit is contained in:
MobiusDevelopment 2021-07-08 15:57:11 +00:00
parent d77e6a54ab
commit 28585f740d
21 changed files with 21 additions and 21 deletions

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1195,7 +1195,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1195,7 +1195,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1195,7 +1195,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1194,7 +1194,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1195,7 +1195,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1195,7 +1195,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}

View File

@ -1195,7 +1195,7 @@ public class Formulas
int time = (skill == null) || skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
// If the skill is a mastery skill, the effect will last twice the default time.
if ((skill != null) && calcSkillMastery(caster, skill))
if ((skill != null) && !skill.isStatic() && calcSkillMastery(caster, skill))
{
time *= 2;
}