Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: java/net/sf/l2j/Config.java
- ===================================================================
- --- java/net/sf/l2j/Config.java (revision 172)
- +++ java/net/sf/l2j/Config.java (working copy)
- @@ -80,7 +80,7 @@
- public static final String CTF_CONFIG_FILE = "./Settings/Modifications/Events/CaptureTheFlag.properties";
- public static final String DM_CONFIG_FILE = "./Settings/Modifications/Events/DeathMatch.properties";
- public static final String CHAT_FILTER_FILE = "./Settings/Modifications/ChatFilter.txt";
- + public static final String ENCHANT_SYSTEM_FILE = "./Settings/Modifications/EnchantSystem.properties";
- //Version Settings
- public static final String SERVER_VERSION_FILE = "./Settings/Version/GameServer-Version.properties";
- @@ -321,8 +321,114 @@
- public static boolean ENCHANT_SCROLL_CRYSTAL_SYSTEM;
- public static boolean ENCHANT_SCROLL_BLESSED_SYSTEM;
- + /** Enchant System Settings Parameters */
- + public static boolean NORMAL_SYSTEM_ENABLED;
- + public static boolean ENCHANT_SYSTEM_ENABLED;
- + public static int ENCHANT_CHANCE_1;
- + public static int ENCHANT_CHANCE_2;
- + public static int ENCHANT_CHANCE_3;
- + public static int ENCHANT_CHANCE_4;
- + public static int ENCHANT_CHANCE_5;
- + public static int ENCHANT_CHANCE_6;
- + public static int ENCHANT_CHANCE_7;
- + public static int ENCHANT_CHANCE_8;
- + public static int ENCHANT_CHANCE_9;
- + public static int ENCHANT_CHANCE_10;
- + public static int ENCHANT_CHANCE_11;
- + public static int ENCHANT_CHANCE_12;
- + public static int ENCHANT_CHANCE_13;
- + public static int ENCHANT_CHANCE_14;
- + public static int ENCHANT_CHANCE_15;
- + public static int ENCHANT_CHANCE_16;
- + public static int ENCHANT_CHANCE_17;
- + public static int ENCHANT_CHANCE_18;
- + public static int ENCHANT_CHANCE_19;
- + public static int ENCHANT_CHANCE_20;
- + public static int ENCHANT_CHANCE_21;
- + public static int ENCHANT_CHANCE_22;
- + public static int ENCHANT_CHANCE_23;
- + public static int ENCHANT_CHANCE_24;
- + public static int ENCHANT_CHANCE_25;
- + public static int ENCHANT_CHANCE_26;
- + public static int ENCHANT_CHANCE_27;
- + public static int ENCHANT_CHANCE_28;
- + public static int ENCHANT_CHANCE_29;
- + public static int ENCHANT_CHANCE_30;
- + public static int ENCHANT_CHANCE_31;
- + public static int ENCHANT_CHANCE_32;
- + public static int ENCHANT_CHANCE_33;
- + public static int ENCHANT_CHANCE_34;
- + public static int ENCHANT_CHANCE_35;
- + public static int CRYSTAL_ENCHANT_CHANCE_1;
- + public static int CRYSTAL_ENCHANT_CHANCE_2;
- + public static int CRYSTAL_ENCHANT_CHANCE_3;
- + public static int CRYSTAL_ENCHANT_CHANCE_4;
- + public static int CRYSTAL_ENCHANT_CHANCE_5;
- + public static int CRYSTAL_ENCHANT_CHANCE_6;
- + public static int CRYSTAL_ENCHANT_CHANCE_7;
- + public static int CRYSTAL_ENCHANT_CHANCE_8;
- + public static int CRYSTAL_ENCHANT_CHANCE_9;
- + public static int CRYSTAL_ENCHANT_CHANCE_10;
- + public static int CRYSTAL_ENCHANT_CHANCE_11;
- + public static int CRYSTAL_ENCHANT_CHANCE_12;
- + public static int CRYSTAL_ENCHANT_CHANCE_13;
- + public static int CRYSTAL_ENCHANT_CHANCE_14;
- + public static int CRYSTAL_ENCHANT_CHANCE_15;
- + public static int CRYSTAL_ENCHANT_CHANCE_16;
- + public static int CRYSTAL_ENCHANT_CHANCE_17;
- + public static int CRYSTAL_ENCHANT_CHANCE_18;
- + public static int CRYSTAL_ENCHANT_CHANCE_19;
- + public static int CRYSTAL_ENCHANT_CHANCE_20;
- + public static int CRYSTAL_ENCHANT_CHANCE_21;
- + public static int CRYSTAL_ENCHANT_CHANCE_22;
- + public static int CRYSTAL_ENCHANT_CHANCE_23;
- + public static int CRYSTAL_ENCHANT_CHANCE_24;
- + public static int CRYSTAL_ENCHANT_CHANCE_25;
- + public static int CRYSTAL_ENCHANT_CHANCE_26;
- + public static int CRYSTAL_ENCHANT_CHANCE_27;
- + public static int CRYSTAL_ENCHANT_CHANCE_28;
- + public static int CRYSTAL_ENCHANT_CHANCE_29;
- + public static int CRYSTAL_ENCHANT_CHANCE_30;
- + public static int CRYSTAL_ENCHANT_CHANCE_31;
- + public static int CRYSTAL_ENCHANT_CHANCE_32;
- + public static int CRYSTAL_ENCHANT_CHANCE_33;
- + public static int CRYSTAL_ENCHANT_CHANCE_34;
- + public static int CRYSTAL_ENCHANT_CHANCE_35;
- + public static int BLESSED_ENCHANT_CHANCE_1;
- + public static int BLESSED_ENCHANT_CHANCE_2;
- + public static int BLESSED_ENCHANT_CHANCE_3;
- + public static int BLESSED_ENCHANT_CHANCE_4;
- + public static int BLESSED_ENCHANT_CHANCE_5;
- + public static int BLESSED_ENCHANT_CHANCE_6;
- + public static int BLESSED_ENCHANT_CHANCE_7;
- + public static int BLESSED_ENCHANT_CHANCE_8;
- + public static int BLESSED_ENCHANT_CHANCE_9;
- + public static int BLESSED_ENCHANT_CHANCE_10;
- + public static int BLESSED_ENCHANT_CHANCE_11;
- + public static int BLESSED_ENCHANT_CHANCE_12;
- + public static int BLESSED_ENCHANT_CHANCE_13;
- + public static int BLESSED_ENCHANT_CHANCE_14;
- + public static int BLESSED_ENCHANT_CHANCE_15;
- + public static int BLESSED_ENCHANT_CHANCE_16;
- + public static int BLESSED_ENCHANT_CHANCE_17;
- + public static int BLESSED_ENCHANT_CHANCE_18;
- + public static int BLESSED_ENCHANT_CHANCE_19;
- + public static int BLESSED_ENCHANT_CHANCE_20;
- + public static int BLESSED_ENCHANT_CHANCE_21;
- + public static int BLESSED_ENCHANT_CHANCE_22;
- + public static int BLESSED_ENCHANT_CHANCE_23;
- + public static int BLESSED_ENCHANT_CHANCE_24;
- + public static int BLESSED_ENCHANT_CHANCE_25;
- + public static int BLESSED_ENCHANT_CHANCE_26;
- + public static int BLESSED_ENCHANT_CHANCE_27;
- + public static int BLESSED_ENCHANT_CHANCE_28;
- + public static int BLESSED_ENCHANT_CHANCE_29;
- + public static int BLESSED_ENCHANT_CHANCE_30;
- + public static int BLESSED_ENCHANT_CHANCE_31;
- + public static int BLESSED_ENCHANT_CHANCE_32;
- + public static int BLESSED_ENCHANT_CHANCE_33;
- + public static int BLESSED_ENCHANT_CHANCE_34;
- + public static int BLESSED_ENCHANT_CHANCE_35;
- /** Modification Settings Parameters */
- public static boolean CUSTOM_START_LEVEL;
- @@ -1797,18 +1904,123 @@
- }
- try
- {
- + Properties EnchantSystem = new Properties();
- + InputStream is = new FileInputStream(new File(ENCHANT_SYSTEM_FILE));
- + EnchantSystem.load(is);
- + is.close();
- +
- + ENCHANT_SYSTEM_ENABLED = Boolean.valueOf(EnchantSystem.getProperty("EnableCustomEnchantSystem", "False"));
- + NORMAL_SYSTEM_ENABLED = Boolean.valueOf(EnchantSystem.getProperty("EnableNormalEnchantSystem", "True"));
- + ENCHANT_CHANCE_1 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance1", "100"));
- + ENCHANT_CHANCE_2 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance2", "100"));
- + ENCHANT_CHANCE_3 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance3", "100"));
- + ENCHANT_CHANCE_4 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance4", "100"));
- + ENCHANT_CHANCE_5 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance5", "100"));
- + ENCHANT_CHANCE_6 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance6", "100"));
- + ENCHANT_CHANCE_7 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance7", "100"));
- + ENCHANT_CHANCE_8 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance8", "100"));
- + ENCHANT_CHANCE_9 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance9", "100"));
- + ENCHANT_CHANCE_10 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance10", "100"));
- + ENCHANT_CHANCE_11 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance11", "100"));
- + ENCHANT_CHANCE_12 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance12", "100"));
- + ENCHANT_CHANCE_13 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance13", "100"));
- + ENCHANT_CHANCE_14 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance14", "100"));
- + ENCHANT_CHANCE_15 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance15", "100"));
- + ENCHANT_CHANCE_16 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance16", "100"));
- + ENCHANT_CHANCE_17 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance17", "100"));
- + ENCHANT_CHANCE_18 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance18", "100"));
- + ENCHANT_CHANCE_19 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance19", "100"));
- + ENCHANT_CHANCE_20 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance20", "100"));
- + ENCHANT_CHANCE_21 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance21", "100"));
- + ENCHANT_CHANCE_22 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance22", "100"));
- + ENCHANT_CHANCE_23 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance23", "100"));
- + ENCHANT_CHANCE_24 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance24", "100"));
- + ENCHANT_CHANCE_25 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance25", "100"));
- + ENCHANT_CHANCE_26 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance26", "100"));
- + ENCHANT_CHANCE_27 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance27", "100"));
- + ENCHANT_CHANCE_28 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance28", "100"));
- + ENCHANT_CHANCE_29 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance29", "100"));
- + ENCHANT_CHANCE_30 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance30", "100"));
- + ENCHANT_CHANCE_31 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance31", "100"));
- + ENCHANT_CHANCE_32 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance32", "100"));
- + ENCHANT_CHANCE_33 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance33", "100"));
- + ENCHANT_CHANCE_34 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance34", "100"));
- + ENCHANT_CHANCE_35 = Integer.parseInt(EnchantSystem.getProperty("EnchantChance35", "100"));
- + CRYSTAL_ENCHANT_CHANCE_1 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance1", "100"));
- + CRYSTAL_ENCHANT_CHANCE_2 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance2", "100"));
- + CRYSTAL_ENCHANT_CHANCE_3 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance3", "100"));
- + CRYSTAL_ENCHANT_CHANCE_4 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance4", "100"));
- + CRYSTAL_ENCHANT_CHANCE_5 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance5", "100"));
- + CRYSTAL_ENCHANT_CHANCE_6 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance6", "100"));
- + CRYSTAL_ENCHANT_CHANCE_7 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance7", "100"));
- + CRYSTAL_ENCHANT_CHANCE_8 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance8", "100"));
- + CRYSTAL_ENCHANT_CHANCE_9 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance9", "100"));
- + CRYSTAL_ENCHANT_CHANCE_10 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance10", "100"));
- + CRYSTAL_ENCHANT_CHANCE_11 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance11", "100"));
- + CRYSTAL_ENCHANT_CHANCE_12 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance12", "100"));
- + CRYSTAL_ENCHANT_CHANCE_13 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance13", "100"));
- + CRYSTAL_ENCHANT_CHANCE_14 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance14", "100"));
- + CRYSTAL_ENCHANT_CHANCE_15 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance15", "100"));
- + CRYSTAL_ENCHANT_CHANCE_16 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance16", "100"));
- + CRYSTAL_ENCHANT_CHANCE_17 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance17", "100"));
- + CRYSTAL_ENCHANT_CHANCE_18 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance18", "100"));
- + CRYSTAL_ENCHANT_CHANCE_19 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance19", "100"));
- + CRYSTAL_ENCHANT_CHANCE_20 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance20", "100"));
- + CRYSTAL_ENCHANT_CHANCE_21 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance21", "100"));
- + CRYSTAL_ENCHANT_CHANCE_22 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance22", "100"));
- + CRYSTAL_ENCHANT_CHANCE_23 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance23", "100"));
- + CRYSTAL_ENCHANT_CHANCE_24 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance24", "100"));
- + CRYSTAL_ENCHANT_CHANCE_25 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance25", "100"));
- + CRYSTAL_ENCHANT_CHANCE_26 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance26", "100"));
- + CRYSTAL_ENCHANT_CHANCE_27 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance27", "100"));
- + CRYSTAL_ENCHANT_CHANCE_28 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance28", "100"));
- + CRYSTAL_ENCHANT_CHANCE_29 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance29", "100"));
- + CRYSTAL_ENCHANT_CHANCE_30 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance30", "100"));
- + CRYSTAL_ENCHANT_CHANCE_31 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance31", "100"));
- + CRYSTAL_ENCHANT_CHANCE_32 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance32", "100"));
- + CRYSTAL_ENCHANT_CHANCE_33 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance33", "100"));
- + CRYSTAL_ENCHANT_CHANCE_34 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance34", "100"));
- + CRYSTAL_ENCHANT_CHANCE_35 = Integer.parseInt(EnchantSystem.getProperty("CrystalEnchantChance35", "100"));
- + BLESSED_ENCHANT_CHANCE_1 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance1", "100"));
- + BLESSED_ENCHANT_CHANCE_2 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance2", "100"));
- + BLESSED_ENCHANT_CHANCE_3 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance3", "100"));
- + BLESSED_ENCHANT_CHANCE_4 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance4", "100"));
- + BLESSED_ENCHANT_CHANCE_5 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance5", "100"));
- + BLESSED_ENCHANT_CHANCE_6 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance6", "100"));
- + BLESSED_ENCHANT_CHANCE_7 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance7", "100"));
- + BLESSED_ENCHANT_CHANCE_8 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance8", "100"));
- + BLESSED_ENCHANT_CHANCE_9 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance9", "100"));
- + BLESSED_ENCHANT_CHANCE_10 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance10", "100"));
- + BLESSED_ENCHANT_CHANCE_11 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance11", "100"));
- + BLESSED_ENCHANT_CHANCE_12 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance12", "100"));
- + BLESSED_ENCHANT_CHANCE_13 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance13", "100"));
- + BLESSED_ENCHANT_CHANCE_14 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance14", "100"));
- + BLESSED_ENCHANT_CHANCE_15 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance15", "100"));
- + BLESSED_ENCHANT_CHANCE_16 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance16", "100"));
- + BLESSED_ENCHANT_CHANCE_17 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance17", "100"));
- + BLESSED_ENCHANT_CHANCE_18 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance18", "100"));
- + BLESSED_ENCHANT_CHANCE_19 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance19", "100"));
- + BLESSED_ENCHANT_CHANCE_20 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance20", "100"));
- + BLESSED_ENCHANT_CHANCE_21 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance21", "100"));
- + BLESSED_ENCHANT_CHANCE_22 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance22", "100"));
- + BLESSED_ENCHANT_CHANCE_23 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance23", "100"));
- + BLESSED_ENCHANT_CHANCE_24 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance24", "100"));
- + BLESSED_ENCHANT_CHANCE_25 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance25", "100"));
- + BLESSED_ENCHANT_CHANCE_26 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance26", "100"));
- + BLESSED_ENCHANT_CHANCE_27 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance27", "100"));
- + BLESSED_ENCHANT_CHANCE_28 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance28", "100"));
- + BLESSED_ENCHANT_CHANCE_29 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance29", "100"));
- + BLESSED_ENCHANT_CHANCE_30 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance30", "100"));
- + BLESSED_ENCHANT_CHANCE_31 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance31", "100"));
- + BLESSED_ENCHANT_CHANCE_32 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance32", "100"));
- + BLESSED_ENCHANT_CHANCE_33 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance33", "100"));
- + BLESSED_ENCHANT_CHANCE_34 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance34", "100"));
- + BLESSED_ENCHANT_CHANCE_35 = Integer.parseInt(EnchantSystem.getProperty("BlessedEnchantChance35", "100"));
- + }
- + catch (Exception e)
- + {
- + e.printStackTrace();
- + throw new Error("Failed to Load "+ENCHANT_SYSTEM_FILE+" File.");
- + }
- try
- Index: java/net/sf/l2j/gameserver/network/clientpackets/RequestEnchantItem.java
- ===================================================================
- --- java/net/sf/l2j/gameserver/network/clientpackets/RequestEnchantItem.java (revision 165)
- +++ java/net/sf/l2j/gameserver/network/clientpackets/RequestEnchantItem.java (working copy)
- @@ -206,30 +206,554 @@
- maxEnchantLevel = Config.ENCHANT_MAX_WEAPON;
- for (int scrollId : ENCHANT_SCROLLS)
- {
- - if (scroll.getItemId() == scrollId)
- + if ((scroll.getItemId() == scrollId) && (Config.NORMAL_SYSTEM_ENABLED) && (!Config.ENCHANT_SYSTEM_ENABLED))
- {
- chance = Config.ENCHANT_CHANCE_WEAPON;
- break;
- }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 0) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_1;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 1) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_2;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 2) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_3;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 3) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_4;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 4) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_5;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 5) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_6;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 6) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_7;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 7) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_8;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 8) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_9;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 9) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_10;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 10) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_11;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 11) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_12;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 12) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_13;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 13) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_14;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 14) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_15;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 15) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_16;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 16) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_17;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 17) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_18;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 18) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_19;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 19) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_20;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 20) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_21;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 21) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_22;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 22) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_23;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 23) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_24;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 24) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_25;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 25) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_26;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 26) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_27;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 27) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_28;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 28) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_29;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 29) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_30;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 30) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_31;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 31) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_32;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 32) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_33;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 33) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_34;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 34) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_35;
- + break;
- + }
- }
- maxEnchantLevel = Config.ENCHANT_MAX_WEAPON_CRYSTAL;
- for (int scrollId : CRYSTAL_SCROLLS)
- {
- - if (scroll.getItemId() == scrollId)
- + if ((scroll.getItemId() == scrollId) && (Config.NORMAL_SYSTEM_ENABLED) && (!Config.ENCHANT_SYSTEM_ENABLED))
- {
- chance = Config.ENCHANT_CHANCE_WEAPON_CRYSTAL;
- - ;
- break;
- }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 0) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_1;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 1) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_2;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 2) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_3;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 3) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_4;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 4) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_5;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 5) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_6;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 6) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_7;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 7) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_8;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 8) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_9;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 9) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_10;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 10) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_11;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 11) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_12;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 12) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_13;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 13) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_14;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 14) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_15;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 15) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_16;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 16) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_17;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 17) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_18;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 18) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_19;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 19) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_20;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 20) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_21;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 21) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_22;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 22) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_23;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 23) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_24;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 24) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_25;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 25) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_26;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 26) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_27;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 27) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_28;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 28) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_29;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 29) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_30;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 30) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_31;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 31) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_32;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 32) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_33;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 33) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_34;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 34) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_35;
- + break;
- + }
- }
- maxEnchantLevel = Config.ENCHANT_MAX_WEAPON_BLESSED;
- for (int scrollId : BLESSED_SCROLLS)
- {
- - if (scroll.getItemId() == scrollId)
- + if ((scroll.getItemId() == scrollId) && (Config.NORMAL_SYSTEM_ENABLED) && (!Config.ENCHANT_SYSTEM_ENABLED))
- {
- chance = Config.ENCHANT_CHANCE_WEAPON_BLESSED;
- break;
- }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 0) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_1;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 1) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_2;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 2) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_3;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 3) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_4;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 4) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_5;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 5) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_6;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 6) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_7;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 7) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_8;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 8) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_9;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 9) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_10;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 10) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_11;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 11) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_12;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 12) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_13;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 13) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_14;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 14) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_15;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 15) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_16;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 16) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_17;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 17) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_18;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 18) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_19;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 19) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_20;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 20) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_21;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 21) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_22;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 22) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_23;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 23) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_24;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 24) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_25;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 25) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_26;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 26) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_27;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 27) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_28;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 28) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_29;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 29) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_30;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 30) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_31;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 31) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_32;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 32) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_33;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 33) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_34;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 34) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_35;
- + break;
- + }
- }
- }
- else if (item.getItem().getType2() == L2Item.TYPE2_SHIELD_ARMOR)
- @@ -237,29 +761,554 @@
- maxEnchantLevel = Config.ENCHANT_MAX_ARMOR;
- for (int scrollId : ENCHANT_SCROLLS)
- {
- - if (scroll.getItemId() == scrollId)
- + if ((scroll.getItemId() == scrollId) && (Config.NORMAL_SYSTEM_ENABLED) && (!Config.ENCHANT_SYSTEM_ENABLED))
- {
- chance = Config.ENCHANT_CHANCE_ARMOR;
- break;
- }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 0) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_1;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 1) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_2;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 2) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_3;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 3) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_4;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 4) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_5;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 5) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_6;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 6) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_7;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 7) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_8;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 8) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_9;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 9) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_10;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 10) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_11;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 11) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_12;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 12) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_13;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 13) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_14;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 14) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_15;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 15) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_16;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 16) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_17;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 17) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_18;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 18) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_19;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 19) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_20;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 20) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_21;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 21) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_22;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 22) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_23;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 23) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_24;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 24) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_25;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 25) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_26;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 26) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_27;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 27) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_28;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 28) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_29;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 29) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_30;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 30) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_31;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 31) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_32;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 32) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_33;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 33) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_34;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 34) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_35;
- + break;
- + }
- }
- maxEnchantLevel = Config.ENCHANT_MAX_ARMOR_CRYSTAL;
- for (int scrollId : CRYSTAL_SCROLLS)
- {
- - if (scroll.getItemId() == scrollId)
- + if ((scroll.getItemId() == scrollId) && (Config.NORMAL_SYSTEM_ENABLED) && (!Config.ENCHANT_SYSTEM_ENABLED))
- {
- chance = Config.ENCHANT_CHANCE_ARMOR_CRYSTAL;
- break;
- }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 0) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_1;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 1) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_2;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 2) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_3;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 3) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_4;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 4) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_5;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 5) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_6;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 6) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_7;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 7) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_8;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 8) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_9;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 9) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_10;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 10) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_11;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 11) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_12;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 12) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_13;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 13) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_14;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 14) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_15;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 15) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_16;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 16) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_17;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 17) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_18;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 18) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_19;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 19) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_20;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 20) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_21;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 21) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_22;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 22) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_23;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 23) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_24;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 24) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_25;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 25) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_26;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 26) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_27;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 27) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_28;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 28) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_29;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 29) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_30;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 30) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_31;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 31) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_32;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 32) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_33;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 33) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_34;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 34) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_35;
- + break;
- + }
- }
- maxEnchantLevel = Config.ENCHANT_MAX_ARMOR_BLESSED;
- for (int scrollId : BLESSED_SCROLLS)
- {
- - if (scroll.getItemId() == scrollId)
- + if ((scroll.getItemId() == scrollId) && (Config.NORMAL_SYSTEM_ENABLED) && (!Config.ENCHANT_SYSTEM_ENABLED))
- {
- chance = Config.ENCHANT_CHANCE_ARMOR_BLESSED;
- break;
- }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 0) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_1;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 1) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_2;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 2) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_3;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 3) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_4;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 4) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_5;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 5) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_6;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 6) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_7;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 7) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_8;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 8) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_9;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 9) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_10;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 10) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_11;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 11) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_12;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 12) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_13;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 13) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_14;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 14) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_15;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 15) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_16;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 16) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_17;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 17) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_18;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 18) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_19;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 19) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_20;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 20) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_21;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 21) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_22;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 22) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_23;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 23) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_24;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 24) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_25;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 25) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_26;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 26) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_27;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 27) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_28;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 28) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_29;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 29) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_30;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 30) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_31;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 31) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_32;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 32) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_33;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 33) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_34;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 34) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_35;
- + break;
- + }
- }
- }
- else if (item.getItem().getType2() == L2Item.TYPE2_ACCESSORY)
- @@ -267,29 +1316,554 @@
- maxEnchantLevel = Config.ENCHANT_MAX_JEWELRY;
- for (int scrollId : ENCHANT_SCROLLS)
- {
- - if (scroll.getItemId() == scrollId)
- + if ((scroll.getItemId() == scrollId) && (Config.NORMAL_SYSTEM_ENABLED) && (!Config.ENCHANT_SYSTEM_ENABLED))
- {
- chance = Config.ENCHANT_CHANCE_JEWELRY;
- break;
- }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 0) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_1;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 1) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_2;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 2) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_3;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 3) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_4;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 4) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_5;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 5) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_6;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 6) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_7;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 7) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_8;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 8) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_9;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 9) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_10;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 10) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_11;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 11) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_12;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 12) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_13;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 13) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_14;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 14) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_15;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 15) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_16;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 16) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_17;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 17) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_18;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 18) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_19;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 19) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_20;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 20) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_21;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 21) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_22;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 22) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_23;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 23) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_24;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 24) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_25;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 25) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_26;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 26) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_27;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 27) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_28;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 28) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_29;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 29) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_30;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 30) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_31;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 31) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_32;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 32) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_33;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 33) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_34;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 34) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.ENCHANT_CHANCE_35;
- + break;
- + }
- }
- maxEnchantLevel = Config.ENCHANT_MAX_JEWERLY_CRYSTAL;
- for (int scrollId : CRYSTAL_SCROLLS)
- {
- - if (scroll.getItemId() == scrollId)
- + if ((scroll.getItemId() == scrollId) && (Config.NORMAL_SYSTEM_ENABLED) && (!Config.ENCHANT_SYSTEM_ENABLED))
- {
- chance = Config.ENCHANT_CHANCE_JEWELRY_CRYSTAL;
- break;
- }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 0) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_1;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 1) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_2;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 2) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_3;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 3) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_4;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 4) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_5;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 5) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_6;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 6) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_7;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 7) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_8;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 8) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_9;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 9) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_10;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 10) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_11;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 11) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_12;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 12) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_13;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 13) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_14;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 14) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_15;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 15) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_16;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 16) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_17;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 17) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_18;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 18) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_19;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 19) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_20;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 20) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_21;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 21) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_22;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 22) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_23;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 23) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_24;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 24) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_25;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 25) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_26;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 26) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_27;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 27) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_28;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 28) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_29;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 29) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_30;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 30) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_31;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 31) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_32;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 32) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_33;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 33) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_34;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 34) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.CRYSTAL_ENCHANT_CHANCE_35;
- + break;
- + }
- }
- maxEnchantLevel = Config.ENCHANT_MAX_JEWERLY_BLESSED;
- for (int scrollId : BLESSED_SCROLLS)
- {
- - if (scroll.getItemId() == scrollId)
- + if ((scroll.getItemId() == scrollId) && (Config.NORMAL_SYSTEM_ENABLED) && (!Config.ENCHANT_SYSTEM_ENABLED))
- {
- chance = Config.ENCHANT_CHANCE_JEWELRY_BLESSED;
- break;
- }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 0) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_1;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 1) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_2;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 2) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_3;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 3) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_4;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 4) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_5;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 5) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_6;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 6) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_7;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 7) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_8;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 8) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_9;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 9) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_10;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 10) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_11;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 11) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_12;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 12) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_13;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 13) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_14;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 14) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_15;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 15) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_16;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 16) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_17;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 17) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_18;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 18) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_19;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 19) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_20;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 20) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_21;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 21) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_22;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 22) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_23;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 23) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_24;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 24) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_25;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 25) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_26;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 26) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_27;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 27) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_28;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 28) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_29;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 29) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_30;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 30) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_31;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 31) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_32;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 32) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_33;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 33) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_34;
- + break;
- + }
- + if ((scroll.getItemId() == scrollId) && (item.getEnchantLevel() == 34) && (Config.ENCHANT_SYSTEM_ENABLED))
- + {
- + chance = Config.BLESSED_ENCHANT_CHANCE_35;
- + break;
- + }
- }
- }
- Index: Settings/Modifications/EnchantSystem.properties
- ===================================================================
- --- Settings/Modifications/EnchantSystem.properties (revision 0)
- +++ Settings/Modifications/EnchantSystem.properties (revision 0)
- @@ -0,0 +1,241 @@
- +# ==================== # # ======================= #
- +# L2J-Server # # Enchant System Settings #
- +# ==================== # # ======================= #
- +# Custom Enchant System by Spidey*
- +
- +# In order to work this system you have to disable
- +# Normal Enchant System
- +# Default: True
- +EnableNormalEnchantSystem = True
- +
- +# ===================== #
- +# Custom Enchant System #
- +# ===================== #
- +# Credits: Spidey*
- +# Enable Enchant System?
- +# True for yes, False for no.
- +# Default: False
- +EnableCustomEnchantSystem = False
- +
- +# How this System Works?
- +# You can select the enchant rate for every enchant number
- +# ================ #
- +# Normal Scrolls #
- +# ================ #
- +# Enchant Rate % at Enchant Level 0 to 1
- +EnchantChance1 = 65
- +# Enchant Rate % at Enchant Level 1 to 2
- +EnchantChance2 = 65
- +# Enchant Rate % at Enchant Level 2 to 3
- +EnchantChance3 = 65
- +# Enchant Rate % at Enchant Level 3 to 4
- +EnchantChance4 = 65
- +# Enchant Rate % at Enchant Level 4 to 5
- +EnchantChance5 = 65
- +# Enchant Rate % at Enchant Level 5 to 6
- +EnchantChance6 = 65
- +# Enchant Rate % at Enchant Level 6 to 7
- +EnchantChance7 = 65
- +# Enchant Rate % at Enchant Level 7 to 8
- +EnchantChance8 = 65
- +# Enchant Rate % at Enchant Level 8 to 9
- +EnchantChance9 = 65
- +# Enchant Rate % at Enchant Level 9 to 10
- +EnchantChance10 = 65
- +# Enchant Rate % at Enchant Level 10 to 11
- +EnchantChance11 = 65
- +# Enchant Rate % at Enchant Level 11 to 12
- +EnchantChance12 = 65
- +# Enchant Rate % at Enchant Level 12 to 13
- +EnchantChance13 = 65
- +# Enchant Rate % at Enchant Level 13 to 14
- +EnchantChance14 = 65
- +# Enchant Rate % at Enchant Level 14 to 15
- +EnchantChance15 = 65
- +# Enchant Rate % at Enchant Level 15 to 16
- +EnchantChance16 = 65
- +# Enchant Rate % at Enchant Level 16 to 17
- +EnchantChance17 = 65
- +# Enchant Rate % at Enchant Level 17 to 18
- +EnchantChance18 = 65
- +# Enchant Rate % at Enchant Level 18 to 19
- +EnchantChance19 = 65
- +# Enchant Rate % at Enchant Level 19 to 20
- +EnchantChance20 = 65
- +# Enchant Rate % at Enchant Level 20 to 21
- +EnchantChance21 = 65
- +# Enchant Rate % at Enchant Level 21 to 22
- +EnchantChance22 = 65
- +# Enchant Rate % at Enchant Level 22 to 23
- +EnchantChance23 = 65
- +# Enchant Rate % at Enchant Level 23 to 24
- +EnchantChance24 = 65
- +# Enchant Rate % at Enchant Level 24 to 25
- +EnchantChance25 = 65
- +# Enchant Rate % at Enchant Level 25 to 26
- +EnchantChance26 = 65
- +# Enchant Rate % at Enchant Level 26 to 27
- +EnchantChance27 = 65
- +# Enchant Rate % at Enchant Level 27 to 28
- +EnchantChance28 = 65
- +# Enchant Rate % at Enchant Level 28 to 29
- +EnchantChance29 = 65
- +# Enchant Rate % at Enchant Level 29 to 30
- +EnchantChance30 = 65
- +# Enchant Rate % at Enchant Level 30 to 31
- +EnchantChance31 = 65
- +# Enchant Rate % at Enchant Level 31 to 32
- +EnchantChance32 = 65
- +# Enchant Rate % at Enchant Level 32 to 33
- +EnchantChance33 = 65
- +# Enchant Rate % at Enchant Level 33 to 34
- +EnchantChance34 = 65
- +# Enchant Rate % at Enchant Level 34 to 35
- +EnchantChance35 = 65
- +# ================ #
- +# Crystal Scrolls #
- +# ================ #
- +# Enchant Rate % at Enchant Level 0 to 1
- +CrystalEnchantChance1 = 100
- +# Enchant Rate % at Enchant Level 1 to 2
- +CrystalEnchantChance2 = 100
- +# Enchant Rate % at Enchant Level 2 to 3
- +CrystalEnchantChance3 = 100
- +# Enchant Rate % at Enchant Level 3 to 4
- +CrystalEnchantChance4 = 100
- +# Enchant Rate % at Enchant Level 4 to 5
- +CrystalEnchantChance5 = 100
- +# Enchant Rate % at Enchant Level 5 to 6
- +CrystalEnchantChance6 = 100
- +# Enchant Rate % at Enchant Level 6 to 7
- +CrystalEnchantChance7 = 100
- +# Enchant Rate % at Enchant Level 7 to 8
- +CrystalEnchantChance8 = 100
- +# Enchant Rate % at Enchant Level 8 to 9
- +CrystalEnchantChance9 = 100
- +# Enchant Rate % at Enchant Level 9 to 10
- +CrystalEnchantChance10 = 100
- +# Enchant Rate % at Enchant Level 10 to 11
- +CrystalEnchantChance11 = 100
- +# Enchant Rate % at Enchant Level 11 to 12
- +CrystalEnchantChance12 = 100
- +# Enchant Rate % at Enchant Level 12 to 13
- +CrystalEnchantChance13 = 100
- +# Enchant Rate % at Enchant Level 13 to 14
- +CrystalEnchantChance14 = 100
- +# Enchant Rate % at Enchant Level 14 to 15
- +CrystalEnchantChance15 = 100
- +# Enchant Rate % at Enchant Level 15 to 16
- +CrystalEnchantChance16 = 100
- +# Enchant Rate % at Enchant Level 16 to 17
- +CrystalEnchantChance17 = 100
- +# Enchant Rate % at Enchant Level 17 to 18
- +CrystalEnchantChance18 = 100
- +# Enchant Rate % at Enchant Level 18 to 19
- +CrystalEnchantChance19 = 100
- +# Enchant Rate % at Enchant Level 19 to 20
- +CrystalEnchantChance20 = 100
- +# Enchant Rate % at Enchant Level 20 to 21
- +CrystalEnchantChance21 = 100
- +# Enchant Rate % at Enchant Level 21 to 22
- +CrystalEnchantChance22 = 100
- +# Enchant Rate % at Enchant Level 22 to 23
- +CrystalEnchantChance23 = 100
- +# Enchant Rate % at Enchant Level 23 to 24
- +CrystalEnchantChance24 = 100
- +# Enchant Rate % at Enchant Level 24 to 25
- +CrystalEnchantChance25 = 100
- +# Enchant Rate % at Enchant Level 25 to 26
- +CrystalEnchantChance26 = 100
- +# Enchant Rate % at Enchant Level 26 to 27
- +CrystalEnchantChance27 = 100
- +# Enchant Rate % at Enchant Level 27 to 28
- +CrystalEnchantChance28 = 100
- +# Enchant Rate % at Enchant Level 28 to 29
- +CrystalEnchantChance29 = 100
- +# Enchant Rate % at Enchant Level 29 to 30
- +CrystalEnchantChance30 = 100
- +# Enchant Rate % at Enchant Level 30 to 31
- +CrystalEnchantChance31 = 100
- +# Enchant Rate % at Enchant Level 31 to 32
- +CrystalEnchantChance32 = 100
- +# Enchant Rate % at Enchant Level 32 to 33
- +CrystalEnchantChance33 = 100
- +# Enchant Rate % at Enchant Level 33 to 34
- +CrystalEnchantChance34 = 100
- +# Enchant Rate % at Enchant Level 34 to 35
- +CrystalEnchantChance35 = 100
- +# ================ #
- +# Blessed Scrolls #
- +# ================ #
- +# Enchant Rate % at Enchant Level 0 to 1
- +BlessedEnchantChance1 = 85
- +# Enchant Rate % at Enchant Level 1 to 2
- +BlessedEnchantChance2 = 85
- +# Enchant Rate % at Enchant Level 2 to 3
- +BlessedEnchantChance3 = 85
- +# Enchant Rate % at Enchant Level 3 to 4
- +BlessedEnchantChance4 = 85
- +# Enchant Rate % at Enchant Level 4 to 5
- +BlessedEnchantChance5 = 85
- +# Enchant Rate % at Enchant Level 5 to 6
- +BlessedEnchantChance6 = 85
- +# Enchant Rate % at Enchant Level 6 to 7
- +BlessedEnchantChance7 = 85
- +# Enchant Rate % at Enchant Level 7 to 8
- +BlessedEnchantChance8 = 85
- +# Enchant Rate % at Enchant Level 8 to 9
- +BlessedEnchantChance9 = 85
- +# Enchant Rate % at Enchant Level 9 to 10
- +BlessedEnchantChance10 = 85
- +# Enchant Rate % at Enchant Level 10 to 11
- +BlessedEnchantChance11 = 85
- +# Enchant Rate % at Enchant Level 11 to 12
- +BlessedEnchantChance12 = 85
- +# Enchant Rate % at Enchant Level 12 to 13
- +BlessedEnchantChance13 = 85
- +# Enchant Rate % at Enchant Level 13 to 14
- +BlessedEnchantChance14 = 85
- +# Enchant Rate % at Enchant Level 14 to 15
- +BlessedEnchantChance15 = 85
- +# Enchant Rate % at Enchant Level 15 to 16
- +BlessedEnchantChance16 = 85
- +# Enchant Rate % at Enchant Level 16 to 17
- +BlessedEnchantChance17 = 85
- +# Enchant Rate % at Enchant Level 17 to 18
- +BlessedEnchantChance18 = 85
- +# Enchant Rate % at Enchant Level 18 to 19
- +BlessedEnchantChance19 = 85
- +# Enchant Rate % at Enchant Level 19 to 20
- +BlessedEnchantChance20 = 85
- +# Enchant Rate % at Enchant Level 20 to 21
- +BlessedEnchantChance21 = 85
- +# Enchant Rate % at Enchant Level 21 to 22
- +BlessedEnchantChance22 = 85
- +# Enchant Rate % at Enchant Level 22 to 23
- +BlessedEnchantChance23 = 85
- +# Enchant Rate % at Enchant Level 23 to 24
- +BlessedEnchantChance24 = 85
- +# Enchant Rate % at Enchant Level 24 to 25
- +BlessedEnchantChance25 = 85
- +# Enchant Rate % at Enchant Level 25 to 26
- +BlessedEnchantChance26 = 85
- +# Enchant Rate % at Enchant Level 26 to 27
- +BlessedEnchantChance27 = 85
- +# Enchant Rate % at Enchant Level 27 to 28
- +BlessedEnchantChance28 = 85
- +# Enchant Rate % at Enchant Level 28 to 29
- +BlessedEnchantChance29 = 85
- +# Enchant Rate % at Enchant Level 29 to 30
- +BlessedEnchantChance30 = 85
- +# Enchant Rate % at Enchant Level 30 to 31
- +BlessedEnchantChance31 = 85
- +# Enchant Rate % at Enchant Level 31 to 32
- +BlessedEnchantChance32 = 85
- +# Enchant Rate % at Enchant Level 32 to 33
- +BlessedEnchantChance33 = 85
- +# Enchant Rate % at Enchant Level 33 to 34
- +BlessedEnchantChance34 = 85
- +# Enchant Rate % at Enchant Level 34 to 35
- +BlessedEnchantChance35 = 85
- +# Credits: Spidey*
- \ No newline at end of file
Advertisement
Add Comment
Please, Sign In to add comment