From 19d5fd432ef4a8b7bcff965aac6ea1e976c35ab5 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 6 Nov 2022 23:37:49 +0000 Subject: [PATCH] Support rate should not be percentage of base rate. Contributed by Fakee. --- .../single/ChangedEnchantTargetItemProbabilityList.java | 9 ++------- .../single/ChangedEnchantTargetItemProbabilityList.java | 9 ++------- .../single/ChangedEnchantTargetItemProbabilityList.java | 9 ++------- .../single/ChangedEnchantTargetItemProbabilityList.java | 9 ++------- 4 files changed, 8 insertions(+), 28 deletions(-) diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java index fc9acecad5..b8909ef571 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java @@ -77,18 +77,13 @@ public class ChangedEnchantTargetItemProbabilityList extends ServerPacket baseRate = 0; passiveRate = 0; } - double supportBaseRate = 0; double passiveBaseRate = 0; final double supportRate = getSupportRate(request); - if (supportRate != 0) - { - supportBaseRate = (baseRate * supportRate) / 10000; - } if (passiveRate != 0) { passiveBaseRate = (baseRate * passiveRate) / 10000; } - double totalRate = baseRate + supportBaseRate + passiveBaseRate; + double totalRate = baseRate + supportRate + passiveBaseRate; if (totalRate >= 10000) { totalRate = 10000; @@ -103,7 +98,7 @@ public class ChangedEnchantTargetItemProbabilityList extends ServerPacket } writeInt((int) totalRate); // Total success. writeInt((int) baseRate); // Base success. - writeInt((int) supportBaseRate); // Support success. + writeInt((int) supportRate); // Support success. writeInt((int) passiveBaseRate); // Passive success (items, skills). } } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java index fc9acecad5..b8909ef571 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java @@ -77,18 +77,13 @@ public class ChangedEnchantTargetItemProbabilityList extends ServerPacket baseRate = 0; passiveRate = 0; } - double supportBaseRate = 0; double passiveBaseRate = 0; final double supportRate = getSupportRate(request); - if (supportRate != 0) - { - supportBaseRate = (baseRate * supportRate) / 10000; - } if (passiveRate != 0) { passiveBaseRate = (baseRate * passiveRate) / 10000; } - double totalRate = baseRate + supportBaseRate + passiveBaseRate; + double totalRate = baseRate + supportRate + passiveBaseRate; if (totalRate >= 10000) { totalRate = 10000; @@ -103,7 +98,7 @@ public class ChangedEnchantTargetItemProbabilityList extends ServerPacket } writeInt((int) totalRate); // Total success. writeInt((int) baseRate); // Base success. - writeInt((int) supportBaseRate); // Support success. + writeInt((int) supportRate); // Support success. writeInt((int) passiveBaseRate); // Passive success (items, skills). } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java index fc9acecad5..b8909ef571 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java @@ -77,18 +77,13 @@ public class ChangedEnchantTargetItemProbabilityList extends ServerPacket baseRate = 0; passiveRate = 0; } - double supportBaseRate = 0; double passiveBaseRate = 0; final double supportRate = getSupportRate(request); - if (supportRate != 0) - { - supportBaseRate = (baseRate * supportRate) / 10000; - } if (passiveRate != 0) { passiveBaseRate = (baseRate * passiveRate) / 10000; } - double totalRate = baseRate + supportBaseRate + passiveBaseRate; + double totalRate = baseRate + supportRate + passiveBaseRate; if (totalRate >= 10000) { totalRate = 10000; @@ -103,7 +98,7 @@ public class ChangedEnchantTargetItemProbabilityList extends ServerPacket } writeInt((int) totalRate); // Total success. writeInt((int) baseRate); // Base success. - writeInt((int) supportBaseRate); // Support success. + writeInt((int) supportRate); // Support success. writeInt((int) passiveBaseRate); // Passive success (items, skills). } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java index fc9acecad5..b8909ef571 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/serverpackets/enchant/single/ChangedEnchantTargetItemProbabilityList.java @@ -77,18 +77,13 @@ public class ChangedEnchantTargetItemProbabilityList extends ServerPacket baseRate = 0; passiveRate = 0; } - double supportBaseRate = 0; double passiveBaseRate = 0; final double supportRate = getSupportRate(request); - if (supportRate != 0) - { - supportBaseRate = (baseRate * supportRate) / 10000; - } if (passiveRate != 0) { passiveBaseRate = (baseRate * passiveRate) / 10000; } - double totalRate = baseRate + supportBaseRate + passiveBaseRate; + double totalRate = baseRate + supportRate + passiveBaseRate; if (totalRate >= 10000) { totalRate = 10000; @@ -103,7 +98,7 @@ public class ChangedEnchantTargetItemProbabilityList extends ServerPacket } writeInt((int) totalRate); // Total success. writeInt((int) baseRate); // Base success. - writeInt((int) supportBaseRate); // Support success. + writeInt((int) supportRate); // Support success. writeInt((int) passiveBaseRate); // Passive success (items, skills). } }