Ver Fonte

Removed custom stats from skills.

Adry85 há 7 anos atrás
pai
commit
5175f4a617

+ 0 - 22
src/main/java/com/l2jserver/gameserver/model/stats/Formulas.java

@@ -818,15 +818,6 @@ public final class Formulas
 		damage *= calcAttributeBonus(attacker, target, null);
 		if (target.isAttackable())
 		{
-			final L2Weapon weapon = attacker.getActiveWeaponItem();
-			if ((weapon != null) && ((weapon.getItemType() == WeaponType.BOW) || (weapon.getItemType() == WeaponType.CROSSBOW)))
-			{
-				damage *= attacker.calcStat(Stats.PVE_BOW_DMG, 1, null, null);
-			}
-			else
-			{
-				damage *= attacker.calcStat(Stats.PVE_PHYSICAL_DMG, 1, null, null);
-			}
 			if (!target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2))
 			{
 				int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1;
@@ -928,16 +919,6 @@ public final class Formulas
 		damage *= calcAttributeBonus(attacker, target, null);
 		if (target.isAttackable())
 		{
-			final L2Weapon weapon = attacker.getActiveWeaponItem();
-			if ((weapon != null) && ((weapon.getItemType() == WeaponType.BOW) || (weapon.getItemType() == WeaponType.CROSSBOW)))
-			{
-				damage *= attacker.calcStat(Stats.PVE_BOW_SKILL_DMG, 1, null, null);
-			}
-			else
-			{
-				damage *= attacker.calcStat(Stats.PVE_PHYSICAL_DMG, 1, null, null);
-			}
-			
 			if (!target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2))
 			{
 				int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1;
@@ -1069,7 +1050,6 @@ public final class Formulas
 		
 		if (target.isAttackable())
 		{
-			damage *= attacker.calcStat(Stats.PVE_MAGICAL_DMG, 1, null, null);
 			if (!target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2))
 			{
 				int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1;
@@ -1153,7 +1133,6 @@ public final class Formulas
 		
 		if (target.isAttackable())
 		{
-			damage *= attacker.getOwner().calcStat(Stats.PVE_MAGICAL_DMG, 1, null, null);
 			if (!target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY) && (attacker.getOwner() != null) && ((target.getLevel() - attacker.getOwner().getLevel()) >= 2))
 			{
 				int lvlDiff = target.getLevel() - attacker.getOwner().getLevel() - 1;
@@ -1630,7 +1609,6 @@ public final class Formulas
 		
 		if (target.isAttackable())
 		{
-			damage *= attacker.calcStat(Stats.PVE_MAGICAL_DMG, 1, null, null);
 			if (!target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= Config.MIN_NPC_LVL_DMG_PENALTY) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2))
 			{
 				int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1;

+ 0 - 7
src/main/java/com/l2jserver/gameserver/model/stats/Stats.java

@@ -68,13 +68,6 @@ public enum Stats
 	PVP_MAGICAL_DEF("pvpMagicalDef"),
 	PVP_PHYS_SKILL_DEF("pvpPhysSkillsDef"),
 	
-	// PVE BONUS
-	PVE_PHYSICAL_DMG("pvePhysDmg"),
-	PVE_PHYS_SKILL_DMG("pvePhysSkillsDmg"),
-	PVE_BOW_DMG("pveBowDmg"),
-	PVE_BOW_SKILL_DMG("pveBowSkillsDmg"),
-	PVE_MAGICAL_DMG("pveMagicalDmg"),
-	
 	// ATTACK & DEFENCE RATES
 	EVASION_RATE("rEvas"),
 	P_SKILL_EVASION("pSkillEvas"),