Code: Select all
### Eclipse Workspace Patch 1.0#P L2_GameServerIndex: java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java===================================================================--- java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java (revision 3959)+++ java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java (working copy)@@ -241,7 +241,7 @@ return false; if (item.isAugmented()) return false;- if (item.isHeroItem())+ if (item.isHeroItem() && !Config.ENABLE_HERO_WEAPON_AGUMENT) return false; if (item.isShadowItem()) return false;@@ -253,7 +253,7 @@ return false; if (item.isWear()) return false;- if (item.isPvp())+ if (item.isPvp() && !Config.ENABLE_PVP_WEAPON_AGUMENT) return false; if (item.getItem().getCrystalType() < L2Item.CRYSTAL_C) return false;Index: java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java===================================================================--- java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java (revision 3959)+++ java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java (working copy)@@ -66,7 +66,7 @@ return; } - if (item.isPvp())+ if (item.isPvp() && !Config.ENABLE_PVP_WEAPON_AGUMENT && !Config.ENABLE_HERO_WEAPON_AGUMENT) { activeChar.sendPacket(new SystemMessage(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM)); return;Index: java/com/l2jserver/gameserver/network/clientpackets/AbstractEnchantPacket.java===================================================================--- java/com/l2jserver/gameserver/network/clientpackets/AbstractEnchantPacket.java (revision 3959)+++ java/com/l2jserver/gameserver/network/clientpackets/AbstractEnchantPacket.java (working copy)@@ -295,7 +295,7 @@ */ protected static final boolean isEnchantable(L2ItemInstance item) {- if (item.isHeroItem())+ if (item.isHeroItem() && !Config.ENABLE_HERO_WEAPON_ENCHANT) return false; if (item.isShadowItem()) return false;Index: java/com/l2jserver/Config.java===================================================================--- java/com/l2jserver/Config.java (revision 3959)+++ java/com/l2jserver/Config.java (working copy)@@ -658,6 +658,11 @@ public static String ANNOUNCE_PK_MSG; public static String ANNOUNCE_PVP_MSG; public static boolean L2JMOD_CHAT_ADMIN;+ public static boolean ENABLE_HERO_WEAPON_ENCHANT;+ public static boolean ENABLE_PVP_WEAPON_ELEMENT;+ public static boolean ENABLE_HERO_WEAPON_ELEMENT;+ public static boolean ENABLE_PVP_WEAPON_AGUMENT;+ public static boolean ENABLE_HERO_WEAPON_AGUMENT; //-------------------------------------------------- // NPC Settings@@ -1967,7 +1972,7 @@ L2JMOD_WEDDING_SAMESEX = Boolean.parseBoolean(L2JModSettings.getProperty("WeddingAllowSameSex", "False")); L2JMOD_WEDDING_FORMALWEAR = Boolean.parseBoolean(L2JModSettings.getProperty("WeddingFormalWear", "True")); L2JMOD_WEDDING_DIVORCE_COSTS = Integer.parseInt(L2JModSettings.getProperty("WeddingDivorceCosts", "20"));-+ L2JMOD_ENABLE_WAREHOUSESORTING_CLAN = Boolean.valueOf(L2JModSettings.getProperty("EnableWarehouseSortingClan", "False")); L2JMOD_ENABLE_WAREHOUSESORTING_PRIVATE = Boolean.valueOf(L2JModSettings.getProperty("EnableWarehouseSortingPrivate", "False")); @@ -2173,6 +2178,12 @@ ANNOUNCE_PVP_MSG = L2JModSettings.getProperty("AnnouncePvpMsg", "$killer has defeated $target"); L2JMOD_CHAT_ADMIN = Boolean.parseBoolean(L2JModSettings.getProperty("ChatAdmin", "false"));+ + ENABLE_HERO_WEAPON_ENCHANT = Boolean.parseBoolean(L2JModSettings.getProperty("EnableHeroWeaponEnchant", "False"));+ ENABLE_PVP_WEAPON_ELEMENT = Boolean.parseBoolean(L2JModSettings.getProperty("EnablePvPWeaponElement", "False"));+ ENABLE_HERO_WEAPON_ELEMENT = Boolean.parseBoolean(L2JModSettings.getProperty("EnableHeroWeaponElement", "False"));+ ENABLE_PVP_WEAPON_AGUMENT = Boolean.parseBoolean(L2JModSettings.getProperty("EnablePvPWeaponAgument", "False"));+ ENABLE_HERO_WEAPON_AGUMENT = Boolean.parseBoolean(L2JModSettings.getProperty("EnableHeroWeaponAgument", "False")); } catch (Exception e) {Index: java/config/l2jmods.properties===================================================================--- java/config/l2jmods.properties (revision 3959)+++ java/config/l2jmods.properties (working copy)@@ -263,6 +263,35 @@ # ---------------------------------------------------------------------------+# PvP/Hero Special Options+# ---------------------------------------------------------------------------+# Hero Weapons in offical servers can not be enchanted. Whit this option,+# you can enable the enchant feature for Hero Weapons.+# Default: False+EnableHeroWeaponEnchant = False++# PvP Weapons in offical servers can not be Elemental Attributed. Whit this option,+# you can enable the attribute feature for PvP Weapons.+# Default: False+EnablePvPWeaponElement = False++# Hero Weapons in offical servers can not be Elemental Attributed. Whit this option,+# you can enable the attribute feature for Hero Weapons.+# Default: False+EnableHeroWeaponElement = False++# PvP Weapons in offical servers can not be agumented. Whit this option,+# you can enable the agumentation feature for PvP Weapons.+# Default: False+EnablePvPWeaponAgument = False++# Hero Weapons in offical servers can not be agumented. Whit this option,+# you can enable the agumentation feature for Hero Weapons.+# Default: False+EnableHeroWeaponAgument = False+++# --------------------------------------------------------------------------- # Display Server Time # --------------------------------------------------------------------------- # This option will enable displaying of the local server time for /time command.Index: java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java===================================================================--- java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java (revision 3959)+++ java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java (working copy)@@ -94,7 +94,7 @@ } //can't enchant rods, shadow items, adventurers', PvP items, hero items, cloaks, bracelets, underwear (e.g. shirt), belt, necklace, earring, ring- if (item.getItem().getItemType() == L2WeaponType.ROD || item.isShadowItem() || item.isPvp() || item.isHeroItem() || item.isTimeLimitedItem() ||+ if (item.getItem().getItemType() == L2WeaponType.ROD || item.isShadowItem() || (item.isPvp() && !Config.ENABLE_PVP_WEAPON_ELEMENT) || (item.isHeroItem() && !Config.ENABLE_HERO_WEAPON_ELEMENT) || item.isTimeLimitedItem() || (item.getItemId() >= 7816 && item.getItemId() <= 7831) || (item.getItem().getItemType() == L2WeaponType.NONE) || item.getItem().getItemGradeSPlus() != L2Item.CRYSTAL_S || item.getItem().getBodyPart() == L2Item.SLOT_BACK || item.getItem().getBodyPart() == L2Item.SLOT_R_BRACELET || item.getItem().getBodyPart() == L2Item.SLOT_UNDERWEAR || thx to all...
