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

PAttack and MAttack finalizer simplifications.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-03-30 04:45:05 +00:00
parent 62290dadc7
commit 63435873cf
22 changed files with 29 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
} }
// Calculate modifiers Magic Attack // Calculate modifiers Magic Attack
final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double intBonus = BaseStats.INT.calcBonus(creature); baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
} }

3
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
baseValue *= Config.RAID_PATTACK_MULTIPLIER; baseValue *= Config.RAID_PATTACK_MULTIPLIER;
} }
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.; baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
baseValue *= strBonus * creature.getLevelMod() * chaBonus;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
} }

5
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
} }
// Calculate modifiers Magic Attack // Calculate modifiers Magic Attack
final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double intBonus = BaseStats.INT.calcBonus(creature); baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
} }

3
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
baseValue *= Config.RAID_PATTACK_MULTIPLIER; baseValue *= Config.RAID_PATTACK_MULTIPLIER;
} }
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.; baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
baseValue *= strBonus * creature.getLevelMod() * chaBonus;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
} }

5
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
} }
// Calculate modifiers Magic Attack // Calculate modifiers Magic Attack
final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double intBonus = BaseStats.INT.calcBonus(creature); baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
} }

3
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
baseValue *= Config.RAID_PATTACK_MULTIPLIER; baseValue *= Config.RAID_PATTACK_MULTIPLIER;
} }
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.; baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
baseValue *= strBonus * creature.getLevelMod() * chaBonus;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
} }

5
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
} }
// Calculate modifiers Magic Attack // Calculate modifiers Magic Attack
final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double intBonus = BaseStats.INT.calcBonus(creature); baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
} }

3
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
baseValue *= Config.RAID_PATTACK_MULTIPLIER; baseValue *= Config.RAID_PATTACK_MULTIPLIER;
} }
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.; baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
baseValue *= strBonus * creature.getLevelMod() * chaBonus;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
} }

5
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
} }
// Calculate modifiers Magic Attack // Calculate modifiers Magic Attack
final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double intBonus = BaseStats.INT.calcBonus(creature); baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
} }

3
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
baseValue *= Config.RAID_PATTACK_MULTIPLIER; baseValue *= Config.RAID_PATTACK_MULTIPLIER;
} }
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.; baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
baseValue *= strBonus * creature.getLevelMod() * chaBonus;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
} }

5
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
} }
// Calculate modifiers Magic Attack // Calculate modifiers Magic Attack
final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double intBonus = BaseStats.INT.calcBonus(creature); baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
} }

3
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
baseValue *= Config.RAID_PATTACK_MULTIPLIER; baseValue *= Config.RAID_PATTACK_MULTIPLIER;
} }
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.; baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
baseValue *= strBonus * creature.getLevelMod() * chaBonus;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
} }

5
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
} }
// Calculate modifiers Magic Attack // Calculate modifiers Magic Attack
final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double intBonus = BaseStats.INT.calcBonus(creature); baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2) * chaBonus;
baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
} }

3
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -53,8 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
baseValue *= Config.RAID_PATTACK_MULTIPLIER; baseValue *= Config.RAID_PATTACK_MULTIPLIER;
} }
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.; final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.; baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
baseValue *= strBonus * creature.getLevelMod() * chaBonus;
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
} }

3
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -53,8 +53,7 @@ public class MAttackFinalizer implements IStatsFunction
} }
// Calculate modifiers Magic Attack // Calculate modifiers Magic Attack
final double intBonus = BaseStats.INT.calcBonus(creature); baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2);
baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2);
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
} }

3
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -52,8 +52,7 @@ public class PAttackFinalizer implements IStatsFunction
{ {
baseValue *= Config.RAID_PATTACK_MULTIPLIER; baseValue *= Config.RAID_PATTACK_MULTIPLIER;
} }
final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.; baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
baseValue *= strBonus * creature.getLevelMod();
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
} }

3
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -53,8 +53,7 @@ public class MAttackFinalizer implements IStatsFunction
} }
// Calculate modifiers Magic Attack // Calculate modifiers Magic Attack
final double intBonus = BaseStats.INT.calcBonus(creature); baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2);
baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2);
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
} }

3
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -52,8 +52,7 @@ public class PAttackFinalizer implements IStatsFunction
{ {
baseValue *= Config.RAID_PATTACK_MULTIPLIER; baseValue *= Config.RAID_PATTACK_MULTIPLIER;
} }
final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.; baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
baseValue *= strBonus * creature.getLevelMod();
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
} }

3
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -53,8 +53,7 @@ public class MAttackFinalizer implements IStatsFunction
} }
// Calculate modifiers Magic Attack // Calculate modifiers Magic Attack
final double intBonus = BaseStats.INT.calcBonus(creature); baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2);
baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2);
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
} }

3
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -52,8 +52,7 @@ public class PAttackFinalizer implements IStatsFunction
{ {
baseValue *= Config.RAID_PATTACK_MULTIPLIER; baseValue *= Config.RAID_PATTACK_MULTIPLIER;
} }
final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.; baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
baseValue *= strBonus * creature.getLevelMod();
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
} }

3
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -53,8 +53,7 @@ public class MAttackFinalizer implements IStatsFunction
} }
// Calculate modifiers Magic Attack // Calculate modifiers Magic Attack
final double intBonus = BaseStats.INT.calcBonus(creature); baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2);
baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2);
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
} }

3
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -52,8 +52,7 @@ public class PAttackFinalizer implements IStatsFunction
{ {
baseValue *= Config.RAID_PATTACK_MULTIPLIER; baseValue *= Config.RAID_PATTACK_MULTIPLIER;
} }
final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.; baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
baseValue *= strBonus * creature.getLevelMod();
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK); return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
} }