From 9168f1ea57f87107c8743ddc218f27eff1b72724 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 24 Aug 2017 12:31:33 +0000 Subject: [PATCH] Fixed enchant bonus display on user info. --- .../model/stats/IStatsFunction.java | 20 +++++++++++++++++++ .../clientpackets/RequestEnchantItem.java | 20 +++++++++++-------- .../model/stats/IStatsFunction.java | 20 +++++++++++++++++++ .../clientpackets/RequestEnchantItem.java | 20 +++++++++++-------- .../model/stats/IStatsFunction.java | 20 +++++++++++++++++++ .../clientpackets/RequestEnchantItem.java | 20 +++++++++++-------- .../model/stats/IStatsFunction.java | 20 +++++++++++++++++++ .../clientpackets/RequestEnchantItem.java | 20 +++++++++++-------- 8 files changed, 128 insertions(+), 32 deletions(-) diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index e4d16e5190..ffc74d6210 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -189,6 +189,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((2 * blessedBonus * enchant) + (4 * blessedBonus * overEnchant)); + } break; } case S: @@ -266,6 +270,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((5 * blessedBonus * enchant) + (10 * blessedBonus * overEnchant)); + } break; } case S: @@ -360,6 +368,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((12 * blessedBonus * enchant) + (24 * blessedBonus * overEnchant)); + } } else { @@ -409,6 +421,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((7 * blessedBonus * enchant) + (14 * blessedBonus * overEnchant)); + } } } else @@ -459,6 +475,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((6 * blessedBonus * enchant) + (12 * blessedBonus * overEnchant)); + } } break; } diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 9f9e2cc7fe..a436671713 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -230,17 +230,21 @@ public final class RequestEnchantItem implements IClientIncomingPacket } } - if (item.isArmor() && item.isEquipped()) + if (item.isEquipped()) { - it.forEachSkill(ItemSkillType.ON_ENCHANT, holder -> + if (item.isArmor()) { - // add skills bestowed from +4 armor - if (item.getEnchantLevel() >= holder.getValue()) + it.forEachSkill(ItemSkillType.ON_ENCHANT, holder -> { - activeChar.addSkill(holder.getSkill(), false); - activeChar.sendSkillList(); - } - }); + // add skills bestowed from +4 armor + if (item.getEnchantLevel() >= holder.getValue()) + { + activeChar.addSkill(holder.getSkill(), false); + activeChar.sendSkillList(); + } + }); + } + activeChar.broadcastUserInfo(); // update user info } break; } diff --git a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index e4d16e5190..ffc74d6210 100644 --- a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -189,6 +189,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((2 * blessedBonus * enchant) + (4 * blessedBonus * overEnchant)); + } break; } case S: @@ -266,6 +270,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((5 * blessedBonus * enchant) + (10 * blessedBonus * overEnchant)); + } break; } case S: @@ -360,6 +368,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((12 * blessedBonus * enchant) + (24 * blessedBonus * overEnchant)); + } } else { @@ -409,6 +421,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((7 * blessedBonus * enchant) + (14 * blessedBonus * overEnchant)); + } } } else @@ -459,6 +475,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((6 * blessedBonus * enchant) + (12 * blessedBonus * overEnchant)); + } } break; } diff --git a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 9f9e2cc7fe..a436671713 100644 --- a/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -230,17 +230,21 @@ public final class RequestEnchantItem implements IClientIncomingPacket } } - if (item.isArmor() && item.isEquipped()) + if (item.isEquipped()) { - it.forEachSkill(ItemSkillType.ON_ENCHANT, holder -> + if (item.isArmor()) { - // add skills bestowed from +4 armor - if (item.getEnchantLevel() >= holder.getValue()) + it.forEachSkill(ItemSkillType.ON_ENCHANT, holder -> { - activeChar.addSkill(holder.getSkill(), false); - activeChar.sendSkillList(); - } - }); + // add skills bestowed from +4 armor + if (item.getEnchantLevel() >= holder.getValue()) + { + activeChar.addSkill(holder.getSkill(), false); + activeChar.sendSkillList(); + } + }); + } + activeChar.broadcastUserInfo(); // update user info } break; } diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index e4d16e5190..ffc74d6210 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -189,6 +189,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((2 * blessedBonus * enchant) + (4 * blessedBonus * overEnchant)); + } break; } case S: @@ -266,6 +270,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((5 * blessedBonus * enchant) + (10 * blessedBonus * overEnchant)); + } break; } case S: @@ -360,6 +368,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((12 * blessedBonus * enchant) + (24 * blessedBonus * overEnchant)); + } } else { @@ -409,6 +421,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((7 * blessedBonus * enchant) + (14 * blessedBonus * overEnchant)); + } } } else @@ -459,6 +475,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((6 * blessedBonus * enchant) + (12 * blessedBonus * overEnchant)); + } } break; } diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 9f9e2cc7fe..a436671713 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -230,17 +230,21 @@ public final class RequestEnchantItem implements IClientIncomingPacket } } - if (item.isArmor() && item.isEquipped()) + if (item.isEquipped()) { - it.forEachSkill(ItemSkillType.ON_ENCHANT, holder -> + if (item.isArmor()) { - // add skills bestowed from +4 armor - if (item.getEnchantLevel() >= holder.getValue()) + it.forEachSkill(ItemSkillType.ON_ENCHANT, holder -> { - activeChar.addSkill(holder.getSkill(), false); - activeChar.sendSkillList(); - } - }); + // add skills bestowed from +4 armor + if (item.getEnchantLevel() >= holder.getValue()) + { + activeChar.addSkill(holder.getSkill(), false); + activeChar.sendSkillList(); + } + }); + } + activeChar.broadcastUserInfo(); // update user info } break; } diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java index e4d16e5190..ffc74d6210 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/stats/IStatsFunction.java @@ -189,6 +189,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((2 * blessedBonus * enchant) + (4 * blessedBonus * overEnchant)); + } break; } case S: @@ -266,6 +270,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((5 * blessedBonus * enchant) + (10 * blessedBonus * overEnchant)); + } break; } case S: @@ -360,6 +368,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((12 * blessedBonus * enchant) + (24 * blessedBonus * overEnchant)); + } } else { @@ -409,6 +421,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((7 * blessedBonus * enchant) + (14 * blessedBonus * overEnchant)); + } } } else @@ -459,6 +475,10 @@ public interface IStatsFunction break; } } + if (value == 0) // 1-3 + { + value += ((6 * blessedBonus * enchant) + (12 * blessedBonus * overEnchant)); + } } break; } diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java index 9f9e2cc7fe..a436671713 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java @@ -230,17 +230,21 @@ public final class RequestEnchantItem implements IClientIncomingPacket } } - if (item.isArmor() && item.isEquipped()) + if (item.isEquipped()) { - it.forEachSkill(ItemSkillType.ON_ENCHANT, holder -> + if (item.isArmor()) { - // add skills bestowed from +4 armor - if (item.getEnchantLevel() >= holder.getValue()) + it.forEachSkill(ItemSkillType.ON_ENCHANT, holder -> { - activeChar.addSkill(holder.getSkill(), false); - activeChar.sendSkillList(); - } - }); + // add skills bestowed from +4 armor + if (item.getEnchantLevel() >= holder.getValue()) + { + activeChar.addSkill(holder.getSkill(), false); + activeChar.sendSkillList(); + } + }); + } + activeChar.broadcastUserInfo(); // update user info } break; }