Added physicalSkillPowerAdd, mCritPowerAdd, reflectDamageRes and receivedDamageModifier stats.

New Talismans.
This commit is contained in:
MobiusDev
2015-05-26 09:09:41 +00:00
parent 8528749ad5
commit 1ac91de53c
12 changed files with 178 additions and 14 deletions

View File

@@ -5006,7 +5006,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
// Reduce HP of the target and calculate reflection damage to reduce HP of attacker if necessary
double reflectPercent = target.getStat().calcStat(Stats.REFLECT_DAMAGE_PERCENT, 0, null, null);
if (reflectPercent > 0)
{
reflectedDamage = (int) ((reflectPercent / 100.) * damage);
@@ -5016,6 +5015,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
reflectedDamage = target.getMaxHp();
}
}
// Reflect resistance
double reflectResistance = target.getStat().calcStat(Stats.REFLECT_DAMAGE_RESISTANCE, 0, null, null);
if (reflectResistance > 0)
{
reflectedDamage -= reflectResistance;
}
}
}
@@ -6472,13 +6478,16 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
public void reduceCurrentHp(double i, L2Character attacker, boolean awake, boolean isDOT, Skill skill)
{
// Damage modifier
final double damage = getStat().calcStat(Stats.RECEIVED_DAMAGE_MODIFIER, i, null, null);
if (Config.L2JMOD_CHAMPION_ENABLE && isChampion() && (Config.L2JMOD_CHAMPION_HP != 0))
{
getStatus().reduceHp(i / Config.L2JMOD_CHAMPION_HP, attacker, awake, isDOT, false);
getStatus().reduceHp((damage / Config.L2JMOD_CHAMPION_HP), attacker, awake, isDOT, false);
}
else
{
getStatus().reduceHp(i, attacker, awake, isDOT, false);
getStatus().reduceHp(damage, attacker, awake, isDOT, false);
}
}

View File

@@ -91,6 +91,7 @@ public enum AbnormalVisualEffect
HERB_OF_POWER(69),
HERB_OF_MAGIC(70),
TALISMAN_DECO_DARK_PURPLE(71),
TALISMAN_POWER2(72), // removed?
TALISMAN_DECO_GOLD(73),
TALISMAN_DECO_ORANGE(74),
TALISMAN_DECO_BLUE(75),

View File

@@ -827,6 +827,13 @@ public final class Formulas
}
}
}
// Physical skill dmg add
if (skill != null)
{
damage += attacker.calcStat(Stats.PHYSICAL_SKILL_POWER_ADD, 0, null, null);
}
return damage;
}
@@ -936,6 +943,13 @@ public final class Formulas
}
}
}
// Magical Crit dmg add
if (mcrit)
{
damage += attacker.calcStat(Stats.MAGIC_CRIT_DMG_ADD, 0, null, null);
}
return damage;
}

View File

@@ -47,6 +47,7 @@ public enum Stats
POWER_ATTACK("pAtk"),
MAGIC_ATTACK("mAtk"),
PHYSICAL_SKILL_POWER("physicalSkillPower"),
PHYSICAL_SKILL_POWER_ADD("physicalSkillPowerAdd"),
POWER_ATTACK_SPEED("pAtkSpd"),
MAGIC_ATTACK_SPEED("mAtkSpd"), // Magic Skill Casting Time Rate
ATK_REUSE("atkReuse"), // Bows Hits Reuse Rate
@@ -57,6 +58,7 @@ public enum Stats
CRITICAL_DAMAGE("cAtk"),
CRITICAL_DAMAGE_ADD("cAtkAdd"), // this is another type for special critical damage mods - vicious stance, critical power and critical damage SA
MAGIC_CRIT_DMG("mCritPower"),
MAGIC_CRIT_DMG_ADD("mCritPowerAdd"),
// PVP BONUS
PVP_PHYSICAL_DMG("pvpPhysDmg"),
@@ -147,6 +149,7 @@ public enum Stats
REFLECT_DAMAGE_PERCENT("reflectDam"),
REFLECT_SKILL_MAGIC("reflectSkillMagic"),
REFLECT_SKILL_PHYSIC("reflectSkillPhysic"),
REFLECT_DAMAGE_RESISTANCE("reflectDamageRes"),
VENGEANCE_SKILL_MAGIC_DAMAGE("vengeanceMdam"),
VENGEANCE_SKILL_PHYSICAL_DAMAGE("vengeancePdam"),
ABSORB_DAMAGE_PERCENT("absorbDam"),
@@ -154,6 +157,7 @@ public enum Stats
MANA_SHIELD_PERCENT("manaShield"),
TRANSFER_DAMAGE_TO_PLAYER("transDamToPlayer"),
ABSORB_MANA_DAMAGE_PERCENT("absorbDamMana"),
RECEIVED_DAMAGE_MODIFIER("receivedDamageModifier"),
WEIGHT_LIMIT("weightLimit"),
WEIGHT_PENALTY("weightPenalty"),