From 900f111a54721215f918cdd15e621a553d3d29ee Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 9 Jan 2019 17:36:44 +0000 Subject: [PATCH] Prevent weapon trait bonus calculation exceed 100%. --- .../java/com/l2jmobius/gameserver/model/stats/Formulas.java | 3 +-- .../java/com/l2jmobius/gameserver/model/stats/Formulas.java | 3 +-- .../java/com/l2jmobius/gameserver/model/stats/Formulas.java | 3 +-- .../java/com/l2jmobius/gameserver/model/stats/Formulas.java | 3 +-- .../java/com/l2jmobius/gameserver/model/stats/Formulas.java | 3 +-- .../java/com/l2jmobius/gameserver/model/stats/Formulas.java | 3 +-- .../java/com/l2jmobius/gameserver/model/stats/Formulas.java | 3 +-- .../java/com/l2jmobius/gameserver/model/stats/Formulas.java | 3 +-- .../java/com/l2jmobius/gameserver/model/stats/Formulas.java | 3 +-- .../java/com/l2jmobius/gameserver/model/stats/Formulas.java | 3 +-- 10 files changed, 10 insertions(+), 20 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 2a7250c158..7025e214b4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1255,8 +1255,7 @@ public final class Formulas public static double calcWeaponTraitBonus(L2Character attacker, L2Character target) { - double result = target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()) - 1.0; - return 1.0 - result; + return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType())); } public static double calcAttackTraitBonus(L2Character attacker, L2Character target) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 2a7250c158..7025e214b4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1255,8 +1255,7 @@ public final class Formulas public static double calcWeaponTraitBonus(L2Character attacker, L2Character target) { - double result = target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()) - 1.0; - return 1.0 - result; + return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType())); } public static double calcAttackTraitBonus(L2Character attacker, L2Character target) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 2a7250c158..7025e214b4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1255,8 +1255,7 @@ public final class Formulas public static double calcWeaponTraitBonus(L2Character attacker, L2Character target) { - double result = target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()) - 1.0; - return 1.0 - result; + return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType())); } public static double calcAttackTraitBonus(L2Character attacker, L2Character target) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java index b8d7843587..e6ffb8960c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1255,8 +1255,7 @@ public final class Formulas public static double calcWeaponTraitBonus(L2Character attacker, L2Character target) { - double result = target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()) - 1.0; - return 1.0 - result; + return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType())); } public static double calcAttackTraitBonus(L2Character attacker, L2Character target) diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java index b8d7843587..e6ffb8960c 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1255,8 +1255,7 @@ public final class Formulas public static double calcWeaponTraitBonus(L2Character attacker, L2Character target) { - double result = target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()) - 1.0; - return 1.0 - result; + return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType())); } public static double calcAttackTraitBonus(L2Character attacker, L2Character target) diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java index b8d7843587..e6ffb8960c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1255,8 +1255,7 @@ public final class Formulas public static double calcWeaponTraitBonus(L2Character attacker, L2Character target) { - double result = target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()) - 1.0; - return 1.0 - result; + return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType())); } public static double calcAttackTraitBonus(L2Character attacker, L2Character target) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 0f2de301f1..059f7b5837 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1255,8 +1255,7 @@ public final class Formulas public static double calcWeaponTraitBonus(L2Character attacker, L2Character target) { - double result = target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()) - 1.0; - return 1.0 - result; + return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType())); } public static double calcAttackTraitBonus(L2Character attacker, L2Character target) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 0f2de301f1..059f7b5837 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1255,8 +1255,7 @@ public final class Formulas public static double calcWeaponTraitBonus(L2Character attacker, L2Character target) { - double result = target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()) - 1.0; - return 1.0 - result; + return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType())); } public static double calcAttackTraitBonus(L2Character attacker, L2Character target) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 0f2de301f1..059f7b5837 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1255,8 +1255,7 @@ public final class Formulas public static double calcWeaponTraitBonus(L2Character attacker, L2Character target) { - double result = target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()) - 1.0; - return 1.0 - result; + return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType())); } public static double calcAttackTraitBonus(L2Character attacker, L2Character target) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java index 0f2de301f1..059f7b5837 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/stats/Formulas.java @@ -1255,8 +1255,7 @@ public final class Formulas public static double calcWeaponTraitBonus(L2Character attacker, L2Character target) { - double result = target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType()) - 1.0; - return 1.0 - result; + return Math.max(0, 2.0 - target.getStat().getDefenceTrait(attacker.getAttackType().getTraitType())); } public static double calcAttackTraitBonus(L2Character attacker, L2Character target)