lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with L2jServer HighFive Feb 15th 2015.

Browse Source
This commit is contained in:
mobius
2015-02-15 23:48:35 +00:00
parent f2d6aedabe
commit 06c765ea63
45 changed files with 474 additions and 843 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
trunk/java/com/l2jserver/gameserver/model/stats/Formulas.java
View File

@ -446,50 +446,28 @@ public final class Formulas
}
/**
* Calculate the CP regen rate (base + modifiers).
* @param cha
* @return
* Calculates the CP regeneration rate (base + modifiers).
* @param player the player
* @return the CP regeneration rate
*/
public static final double calcCpRegen(L2Character cha)
public static final double calcCpRegen(L2PcInstance player)
{
double init = cha.isPlayer() ? cha.getActingPlayer().getTemplate().getBaseCpRegen(cha.getLevel()) : cha.getTemplate().getBaseHpReg();
// With CON bonus
final double init = player.getActingPlayer().getTemplate().getBaseCpRegen(player.getLevel()) * player.getLevelMod() * BaseStats.CON.calcBonus(player);
double cpRegenMultiplier = Config.CP_REGEN_MULTIPLIER;
double cpRegenBonus = 0;
if (cha.isPlayer())
if (player.isSitting())
{
L2PcInstance player = cha.getActingPlayer();
// Calculate Movement bonus
if (player.isSitting())
{
cpRegenMultiplier *= 1.5; // Sitting
}
else if (!player.isMoving())
{
cpRegenMultiplier *= 1.1; // Staying
}
else if (player.isRunning())
{
cpRegenMultiplier *= 0.7; // Running
}
cpRegenMultiplier *= 1.5; // Sitting
}
else
else if (!player.isMoving())
{
// Calculate Movement bonus
if (!cha.isMoving())
{
cpRegenMultiplier *= 1.1; // Staying
}
else if (cha.isRunning())
{
cpRegenMultiplier *= 0.7; // Running
}
cpRegenMultiplier *= 1.1; // Staying
}
// Apply CON bonus
init *= cha.getLevelMod() * BaseStats.CON.calcBonus(cha);
return (cha.calcStat(Stats.REGENERATE_CP_RATE, Math.max(1, init), null, null) * cpRegenMultiplier) + cpRegenBonus;
else if (player.isRunning())
{
cpRegenMultiplier *= 0.7; // Running
}
return player.calcStat(Stats.REGENERATE_CP_RATE, Math.max(1, init), null, null) * cpRegenMultiplier;
}
public static final double calcSiegeRegenModifier(L2PcInstance activeChar)