diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/PremiumSystem.ini b/L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/PremiumSystem.ini index e829ed42fe..8b5d1f1f06 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/PremiumSystem.ini +++ b/L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/PremiumSystem.ini @@ -37,6 +37,10 @@ PremiumRateDropAmountByItemId = 57,2;6656,1;6657,1;6658,1;6659,1;6660,1;6661,1;6 # Default: True EnablePremiumHennaSlot = True +# Enable premium henna slot for non premium players. +# Default: True +EnablePremiumHennaSlotforNonPremium = True + # Draw any henna at premium slot. # Also premium henna drawn at normal slots. # Retail: False diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java index d07bd0a244..30c5c9b280 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java @@ -1191,6 +1191,7 @@ public final class Config public static float PREMIUM_RATE_SPOIL_CHANCE; public static float PREMIUM_RATE_SPOIL_AMOUNT; public static boolean PREMIUM_HENNA_SLOT_ENABLED; + public static boolean PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL; public static boolean PREMIUM_HENNA_SLOT_ALL_DYES; public static Map PREMIUM_RATE_DROP_CHANCE_BY_ID; public static Map PREMIUM_RATE_DROP_AMOUNT_BY_ID; @@ -2719,6 +2720,7 @@ public final class Config PREMIUM_RATE_SPOIL_CHANCE = PremiumSystem.getFloat("PremiumRateSpoilChance", 2); PREMIUM_RATE_SPOIL_AMOUNT = PremiumSystem.getFloat("PremiumRateSpoilAmount", 1); PREMIUM_HENNA_SLOT_ENABLED = PremiumSystem.getBoolean("EnablePremiumHennaSlot", true); + PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL = PremiumSystem.getBoolean("EnablePremiumHennaSlotforNonPremium", true); PREMIUM_HENNA_SLOT_ALL_DYES = PremiumSystem.getBoolean("EnableAnyHennaAtPremiumSlot", false); final String[] premiumDropChanceMultiplier = PremiumSystem.getString("PremiumRateDropChanceByItemId", "").split(";"); PREMIUM_RATE_DROP_CHANCE_BY_ID = new HashMap<>(premiumDropChanceMultiplier.length); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 0f0b002fed..0e23914a54 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -58,7 +58,7 @@ public final class RequestHennaEquip implements IClientIncomingPacket } int totalHennaSlots = activeChar.getHennaEmptySlots(); - if (activeChar.hasPremiumStatus() && Config.PREMIUM_HENNA_SLOT_ENABLED && (activeChar.getClassId().level() > 1) && (activeChar.getHenna(4) == null)) + if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || activeChar.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (activeChar.getClassId().level() > 1) && (activeChar.getHenna(4) == null)) { totalHennaSlots++; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/config/Custom/PremiumSystem.ini b/L2J_Mobius_2.5_Underground/dist/game/config/Custom/PremiumSystem.ini index e829ed42fe..8b5d1f1f06 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/config/Custom/PremiumSystem.ini +++ b/L2J_Mobius_2.5_Underground/dist/game/config/Custom/PremiumSystem.ini @@ -37,6 +37,10 @@ PremiumRateDropAmountByItemId = 57,2;6656,1;6657,1;6658,1;6659,1;6660,1;6661,1;6 # Default: True EnablePremiumHennaSlot = True +# Enable premium henna slot for non premium players. +# Default: True +EnablePremiumHennaSlotforNonPremium = True + # Draw any henna at premium slot. # Also premium henna drawn at normal slots. # Retail: False diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java index 64903de28f..8a7ed94945 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java @@ -1198,6 +1198,7 @@ public final class Config public static float PREMIUM_RATE_SPOIL_CHANCE; public static float PREMIUM_RATE_SPOIL_AMOUNT; public static boolean PREMIUM_HENNA_SLOT_ENABLED; + public static boolean PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL; public static boolean PREMIUM_HENNA_SLOT_ALL_DYES; public static Map PREMIUM_RATE_DROP_CHANCE_BY_ID; public static Map PREMIUM_RATE_DROP_AMOUNT_BY_ID; @@ -2735,6 +2736,7 @@ public final class Config PREMIUM_RATE_SPOIL_CHANCE = PremiumSystem.getFloat("PremiumRateSpoilChance", 2); PREMIUM_RATE_SPOIL_AMOUNT = PremiumSystem.getFloat("PremiumRateSpoilAmount", 1); PREMIUM_HENNA_SLOT_ENABLED = PremiumSystem.getBoolean("EnablePremiumHennaSlot", true); + PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL = PremiumSystem.getBoolean("EnablePremiumHennaSlotforNonPremium", true); PREMIUM_HENNA_SLOT_ALL_DYES = PremiumSystem.getBoolean("EnableAnyHennaAtPremiumSlot", false); final String[] premiumDropChanceMultiplier = PremiumSystem.getString("PremiumRateDropChanceByItemId", "").split(";"); PREMIUM_RATE_DROP_CHANCE_BY_ID = new HashMap<>(premiumDropChanceMultiplier.length); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 0f0b002fed..0e23914a54 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -58,7 +58,7 @@ public final class RequestHennaEquip implements IClientIncomingPacket } int totalHennaSlots = activeChar.getHennaEmptySlots(); - if (activeChar.hasPremiumStatus() && Config.PREMIUM_HENNA_SLOT_ENABLED && (activeChar.getClassId().level() > 1) && (activeChar.getHenna(4) == null)) + if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || activeChar.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (activeChar.getClassId().level() > 1) && (activeChar.getHenna(4) == null)) { totalHennaSlots++; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/config/Custom/PremiumSystem.ini b/L2J_Mobius_3.0_Helios/dist/game/config/Custom/PremiumSystem.ini index e829ed42fe..8b5d1f1f06 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/config/Custom/PremiumSystem.ini +++ b/L2J_Mobius_3.0_Helios/dist/game/config/Custom/PremiumSystem.ini @@ -37,6 +37,10 @@ PremiumRateDropAmountByItemId = 57,2;6656,1;6657,1;6658,1;6659,1;6660,1;6661,1;6 # Default: True EnablePremiumHennaSlot = True +# Enable premium henna slot for non premium players. +# Default: True +EnablePremiumHennaSlotforNonPremium = True + # Draw any henna at premium slot. # Also premium henna drawn at normal slots. # Retail: False diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java index 89cb62aeee..a17e87ea29 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java @@ -1206,6 +1206,7 @@ public final class Config public static float PREMIUM_RATE_SPOIL_CHANCE; public static float PREMIUM_RATE_SPOIL_AMOUNT; public static boolean PREMIUM_HENNA_SLOT_ENABLED; + public static boolean PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL; public static boolean PREMIUM_HENNA_SLOT_ALL_DYES; public static Map PREMIUM_RATE_DROP_CHANCE_BY_ID; public static Map PREMIUM_RATE_DROP_AMOUNT_BY_ID; @@ -2752,6 +2753,7 @@ public final class Config PREMIUM_RATE_SPOIL_CHANCE = PremiumSystem.getFloat("PremiumRateSpoilChance", 2); PREMIUM_RATE_SPOIL_AMOUNT = PremiumSystem.getFloat("PremiumRateSpoilAmount", 1); PREMIUM_HENNA_SLOT_ENABLED = PremiumSystem.getBoolean("EnablePremiumHennaSlot", true); + PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL = PremiumSystem.getBoolean("EnablePremiumHennaSlotforNonPremium", true); PREMIUM_HENNA_SLOT_ALL_DYES = PremiumSystem.getBoolean("EnableAnyHennaAtPremiumSlot", false); final String[] premiumDropChanceMultiplier = PremiumSystem.getString("PremiumRateDropChanceByItemId", "").split(";"); PREMIUM_RATE_DROP_CHANCE_BY_ID = new HashMap<>(premiumDropChanceMultiplier.length); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 0f0b002fed..0e23914a54 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -58,7 +58,7 @@ public final class RequestHennaEquip implements IClientIncomingPacket } int totalHennaSlots = activeChar.getHennaEmptySlots(); - if (activeChar.hasPremiumStatus() && Config.PREMIUM_HENNA_SLOT_ENABLED && (activeChar.getClassId().level() > 1) && (activeChar.getHenna(4) == null)) + if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || activeChar.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (activeChar.getClassId().level() > 1) && (activeChar.getHenna(4) == null)) { totalHennaSlots++; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Custom/PremiumSystem.ini b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Custom/PremiumSystem.ini index e829ed42fe..8b5d1f1f06 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Custom/PremiumSystem.ini +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/config/Custom/PremiumSystem.ini @@ -37,6 +37,10 @@ PremiumRateDropAmountByItemId = 57,2;6656,1;6657,1;6658,1;6659,1;6660,1;6661,1;6 # Default: True EnablePremiumHennaSlot = True +# Enable premium henna slot for non premium players. +# Default: True +EnablePremiumHennaSlotforNonPremium = True + # Draw any henna at premium slot. # Also premium henna drawn at normal slots. # Retail: False diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java index b127b577c2..fafd1a83fb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java @@ -1205,6 +1205,7 @@ public final class Config public static float PREMIUM_RATE_SPOIL_CHANCE; public static float PREMIUM_RATE_SPOIL_AMOUNT; public static boolean PREMIUM_HENNA_SLOT_ENABLED; + public static boolean PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL; public static boolean PREMIUM_HENNA_SLOT_ALL_DYES; public static Map PREMIUM_RATE_DROP_CHANCE_BY_ID; public static Map PREMIUM_RATE_DROP_AMOUNT_BY_ID; @@ -2750,6 +2751,7 @@ public final class Config PREMIUM_RATE_SPOIL_CHANCE = PremiumSystem.getFloat("PremiumRateSpoilChance", 2); PREMIUM_RATE_SPOIL_AMOUNT = PremiumSystem.getFloat("PremiumRateSpoilAmount", 1); PREMIUM_HENNA_SLOT_ENABLED = PremiumSystem.getBoolean("EnablePremiumHennaSlot", true); + PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL = PremiumSystem.getBoolean("EnablePremiumHennaSlotforNonPremium", true); PREMIUM_HENNA_SLOT_ALL_DYES = PremiumSystem.getBoolean("EnableAnyHennaAtPremiumSlot", false); final String[] premiumDropChanceMultiplier = PremiumSystem.getString("PremiumRateDropChanceByItemId", "").split(";"); PREMIUM_RATE_DROP_CHANCE_BY_ID = new HashMap<>(premiumDropChanceMultiplier.length); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java index 0f0b002fed..0e23914a54 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestHennaEquip.java @@ -58,7 +58,7 @@ public final class RequestHennaEquip implements IClientIncomingPacket } int totalHennaSlots = activeChar.getHennaEmptySlots(); - if (activeChar.hasPremiumStatus() && Config.PREMIUM_HENNA_SLOT_ENABLED && (activeChar.getClassId().level() > 1) && (activeChar.getHenna(4) == null)) + if ((Config.PREMIUM_HENNA_SLOT_ENABLED_FOR_ALL || activeChar.hasPremiumStatus()) && Config.PREMIUM_HENNA_SLOT_ENABLED && (activeChar.getClassId().level() > 1) && (activeChar.getHenna(4) == null)) { totalHennaSlots++; }