Code improvements.

This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions

View File

@@ -55,19 +55,16 @@ public class FuncEnchant extends AbstractFunction
enchant = 3;
}
if (effector.isPlayer())
if (effector.isPlayer() && effector.getActingPlayer().isInOlympiadMode() && (Config.ALT_OLY_ENCHANT_LIMIT >= 0) && ((enchant + overenchant) > Config.ALT_OLY_ENCHANT_LIMIT))
{
if (effector.getActingPlayer().isInOlympiadMode() && (Config.ALT_OLY_ENCHANT_LIMIT >= 0) && ((enchant + overenchant) > Config.ALT_OLY_ENCHANT_LIMIT))
if (Config.ALT_OLY_ENCHANT_LIMIT > 3)
{
if (Config.ALT_OLY_ENCHANT_LIMIT > 3)
{
overenchant = Config.ALT_OLY_ENCHANT_LIMIT - 3;
}
else
{
overenchant = 0;
enchant = Config.ALT_OLY_ENCHANT_LIMIT;
}
overenchant = Config.ALT_OLY_ENCHANT_LIMIT - 3;
}
else
{
overenchant = 0;
enchant = Config.ALT_OLY_ENCHANT_LIMIT;
}
}

View File

@@ -42,11 +42,10 @@ public class FuncAtkEvasion extends AbstractFunction
public double calc(L2Character effector, L2Character effected, Skill skill, double initVal)
{
final int level = effector.getLevel();
double value = initVal;
// [Square(DEX)] * 5 + lvl;
double value = initVal + (Math.sqrt(effector.getDEX()) * 5) + level;
if (effector.isPlayer())
{
// [Square(DEX)] * 5 + lvl;
value += (Math.sqrt(effector.getDEX()) * 5) + level;
if (level > 69)
{
value += level - 69;
@@ -72,14 +71,9 @@ public class FuncAtkEvasion extends AbstractFunction
value += 1;
}
}
else
else if (level > 69)
{
// [Square(DEX)] * 5 + lvl;
value += (Math.sqrt(effector.getDEX()) * 5) + level;
if (level > 69)
{
value += (level - 69) + 2;
}
value += (level - 69) + 2;
}
return (int) value;
}