lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Retail configurable prohibition for henna premium slot.

Browse Source
This commit is contained in:
MobiusDev
2017-10-18 23:09:09 +00:00
parent 7f8cbb25be
commit 19e7469695
9 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/dist/game/config/Custom/PremiumSystem.ini vendored
View File

@@ -31,6 +31,11 @@ PremiumRateSpoilAmount = 2
# Default: True # Default: True
EnablePremiumHennaSlot = True EnablePremiumHennaSlot = True
# Enable any henna at premium slot.
# Also premium henna drawn at normal slots.
# Retail: False
EnableAnyHennaAtPremiumSlot = False
# Caution: Raid bosses and herbs are not affected by premium rates, but specific items can be affected by rates bellow. # Caution: Raid bosses and herbs are not affected by premium rates, but specific items can be affected by rates bellow.
# List of items affected by custom drop rate by id, used now for Adena rate too. # List of items affected by custom drop rate by id, used now for Adena rate too.
# Usage: itemId1,multiplier1;itemId2,multiplier2;... # Usage: itemId1,multiplier1;itemId2,multiplier2;...

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/Config.java
View File

@@ -1112,6 +1112,7 @@ public final class Config
public static float PREMIUM_RATE_SPOIL_CHANCE; public static float PREMIUM_RATE_SPOIL_CHANCE;
public static float PREMIUM_RATE_SPOIL_AMOUNT; public static float PREMIUM_RATE_SPOIL_AMOUNT;
public static boolean PREMIUM_HENNA_SLOT_ENABLED; public static boolean PREMIUM_HENNA_SLOT_ENABLED;
public static boolean PREMIUM_HENNA_SLOT_ALL_DYES;
public static Map<Integer, Float> PREMIUM_RATE_DROP_CHANCE_BY_ID; public static Map<Integer, Float> PREMIUM_RATE_DROP_CHANCE_BY_ID;
public static Map<Integer, Float> PREMIUM_RATE_DROP_AMOUNT_BY_ID; public static Map<Integer, Float> PREMIUM_RATE_DROP_AMOUNT_BY_ID;
public static boolean PC_CAFE_ENABLED; public static boolean PC_CAFE_ENABLED;
@@ -2548,6 +2549,7 @@ public final class Config
PREMIUM_RATE_SPOIL_CHANCE = PremiumSystem.getFloat("PremiumRateSpoilChance", 2); PREMIUM_RATE_SPOIL_CHANCE = PremiumSystem.getFloat("PremiumRateSpoilChance", 2);
PREMIUM_RATE_SPOIL_AMOUNT = PremiumSystem.getFloat("PremiumRateSpoilAmount", 1); PREMIUM_RATE_SPOIL_AMOUNT = PremiumSystem.getFloat("PremiumRateSpoilAmount", 1);
PREMIUM_HENNA_SLOT_ENABLED = PremiumSystem.getBoolean("EnablePremiumHennaSlot", true); PREMIUM_HENNA_SLOT_ENABLED = PremiumSystem.getBoolean("EnablePremiumHennaSlot", true);
PREMIUM_HENNA_SLOT_ALL_DYES = PremiumSystem.getBoolean("EnableAnyHennaAtPremiumSlot", false);
final String[] premiumDropChanceMultiplier = PremiumSystem.getString("PremiumRateDropChanceByItemId", "").split(";"); final String[] premiumDropChanceMultiplier = PremiumSystem.getString("PremiumRateDropChanceByItemId", "").split(";");
PREMIUM_RATE_DROP_CHANCE_BY_ID = new HashMap<>(premiumDropChanceMultiplier.length); PREMIUM_RATE_DROP_CHANCE_BY_ID = new HashMap<>(premiumDropChanceMultiplier.length);
if (!premiumDropChanceMultiplier[0].isEmpty()) if (!premiumDropChanceMultiplier[0].isEmpty())

16
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -7940,6 +7940,22 @@ public final class L2PcInstance extends L2Playable
{ {
for (int i = 1; i < 5; i++) for (int i = 1; i < 5; i++)
{ {
// Check for retail premium dyes slot
if (!Config.PREMIUM_HENNA_SLOT_ALL_DYES)
{
if (i == 4)
{
if ((_henna[3] != null) || (henna.getDyeItemId() < 23825) || (henna.getDyeItemId() > 23830))
{
return false;
}
}
else if ((henna.getDyeItemId() > 23824) && (henna.getDyeItemId() < 23831))
{
continue;
}
}
if (_henna[i - 1] == null) if (_henna[i - 1] == null)
{ {
_henna[i - 1] = henna; _henna[i - 1] = henna;

5
L2J_Mobius_2.5_Underground/dist/game/config/Custom/PremiumSystem.ini vendored
View File

@@ -31,6 +31,11 @@ PremiumRateSpoilAmount = 2
# Default: True # Default: True
EnablePremiumHennaSlot = True EnablePremiumHennaSlot = True
# Enable any henna at premium slot.
# Also premium henna drawn at normal slots.
# Retail: False
EnableAnyHennaAtPremiumSlot = False
# Caution: Raid bosses and herbs are not affected by premium rates, but specific items can be affected by rates bellow. # Caution: Raid bosses and herbs are not affected by premium rates, but specific items can be affected by rates bellow.
# List of items affected by custom drop rate by id, used now for Adena rate too. # List of items affected by custom drop rate by id, used now for Adena rate too.
# Usage: itemId1,multiplier1;itemId2,multiplier2;... # Usage: itemId1,multiplier1;itemId2,multiplier2;...

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/Config.java
View File

@@ -1113,6 +1113,7 @@ public final class Config
public static float PREMIUM_RATE_SPOIL_CHANCE; public static float PREMIUM_RATE_SPOIL_CHANCE;
public static float PREMIUM_RATE_SPOIL_AMOUNT; public static float PREMIUM_RATE_SPOIL_AMOUNT;
public static boolean PREMIUM_HENNA_SLOT_ENABLED; public static boolean PREMIUM_HENNA_SLOT_ENABLED;
public static boolean PREMIUM_HENNA_SLOT_ALL_DYES;
public static Map<Integer, Float> PREMIUM_RATE_DROP_CHANCE_BY_ID; public static Map<Integer, Float> PREMIUM_RATE_DROP_CHANCE_BY_ID;
public static Map<Integer, Float> PREMIUM_RATE_DROP_AMOUNT_BY_ID; public static Map<Integer, Float> PREMIUM_RATE_DROP_AMOUNT_BY_ID;
public static boolean PC_CAFE_ENABLED; public static boolean PC_CAFE_ENABLED;
@@ -2550,6 +2551,7 @@ public final class Config
PREMIUM_RATE_SPOIL_CHANCE = PremiumSystem.getFloat("PremiumRateSpoilChance", 2); PREMIUM_RATE_SPOIL_CHANCE = PremiumSystem.getFloat("PremiumRateSpoilChance", 2);
PREMIUM_RATE_SPOIL_AMOUNT = PremiumSystem.getFloat("PremiumRateSpoilAmount", 1); PREMIUM_RATE_SPOIL_AMOUNT = PremiumSystem.getFloat("PremiumRateSpoilAmount", 1);
PREMIUM_HENNA_SLOT_ENABLED = PremiumSystem.getBoolean("EnablePremiumHennaSlot", true); PREMIUM_HENNA_SLOT_ENABLED = PremiumSystem.getBoolean("EnablePremiumHennaSlot", true);
PREMIUM_HENNA_SLOT_ALL_DYES = PremiumSystem.getBoolean("EnableAnyHennaAtPremiumSlot", false);
final String[] premiumDropChanceMultiplier = PremiumSystem.getString("PremiumRateDropChanceByItemId", "").split(";"); final String[] premiumDropChanceMultiplier = PremiumSystem.getString("PremiumRateDropChanceByItemId", "").split(";");
PREMIUM_RATE_DROP_CHANCE_BY_ID = new HashMap<>(premiumDropChanceMultiplier.length); PREMIUM_RATE_DROP_CHANCE_BY_ID = new HashMap<>(premiumDropChanceMultiplier.length);
if (!premiumDropChanceMultiplier[0].isEmpty()) if (!premiumDropChanceMultiplier[0].isEmpty())

16
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -7940,6 +7940,22 @@ public final class L2PcInstance extends L2Playable
{ {
for (int i = 1; i < 5; i++) for (int i = 1; i < 5; i++)
{ {
// Check for retail premium dyes slot
if (!Config.PREMIUM_HENNA_SLOT_ALL_DYES)
{
if (i == 4)
{
if ((_henna[3] != null) || (henna.getDyeItemId() < 23825) || (henna.getDyeItemId() > 23830))
{
return false;
}
}
else if ((henna.getDyeItemId() > 23824) && (henna.getDyeItemId() < 23831))
{
continue;
}
}
if (_henna[i - 1] == null) if (_henna[i - 1] == null)
{ {
_henna[i - 1] = henna; _henna[i - 1] = henna;

5
L2J_Mobius_3.0_Helios/dist/game/config/Custom/PremiumSystem.ini vendored
View File

@@ -31,6 +31,11 @@ PremiumRateSpoilAmount = 2
# Default: True # Default: True
EnablePremiumHennaSlot = True EnablePremiumHennaSlot = True
# Enable any henna at premium slot.
# Also premium henna drawn at normal slots.
# Retail: False
EnableAnyHennaAtPremiumSlot = False
# Caution: Raid bosses and herbs are not affected by premium rates, but specific items can be affected by rates bellow. # Caution: Raid bosses and herbs are not affected by premium rates, but specific items can be affected by rates bellow.
# List of items affected by custom drop rate by id, used now for Adena rate too. # List of items affected by custom drop rate by id, used now for Adena rate too.
# Usage: itemId1,multiplier1;itemId2,multiplier2;... # Usage: itemId1,multiplier1;itemId2,multiplier2;...

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java
View File

@@ -1121,6 +1121,7 @@ public final class Config
public static float PREMIUM_RATE_SPOIL_CHANCE; public static float PREMIUM_RATE_SPOIL_CHANCE;
public static float PREMIUM_RATE_SPOIL_AMOUNT; public static float PREMIUM_RATE_SPOIL_AMOUNT;
public static boolean PREMIUM_HENNA_SLOT_ENABLED; public static boolean PREMIUM_HENNA_SLOT_ENABLED;
public static boolean PREMIUM_HENNA_SLOT_ALL_DYES;
public static Map<Integer, Float> PREMIUM_RATE_DROP_CHANCE_BY_ID; public static Map<Integer, Float> PREMIUM_RATE_DROP_CHANCE_BY_ID;
public static Map<Integer, Float> PREMIUM_RATE_DROP_AMOUNT_BY_ID; public static Map<Integer, Float> PREMIUM_RATE_DROP_AMOUNT_BY_ID;
public static boolean PC_CAFE_ENABLED; public static boolean PC_CAFE_ENABLED;
@@ -2567,6 +2568,7 @@ public final class Config
PREMIUM_RATE_SPOIL_CHANCE = PremiumSystem.getFloat("PremiumRateSpoilChance", 2); PREMIUM_RATE_SPOIL_CHANCE = PremiumSystem.getFloat("PremiumRateSpoilChance", 2);
PREMIUM_RATE_SPOIL_AMOUNT = PremiumSystem.getFloat("PremiumRateSpoilAmount", 1); PREMIUM_RATE_SPOIL_AMOUNT = PremiumSystem.getFloat("PremiumRateSpoilAmount", 1);
PREMIUM_HENNA_SLOT_ENABLED = PremiumSystem.getBoolean("EnablePremiumHennaSlot", true); PREMIUM_HENNA_SLOT_ENABLED = PremiumSystem.getBoolean("EnablePremiumHennaSlot", true);
PREMIUM_HENNA_SLOT_ALL_DYES = PremiumSystem.getBoolean("EnableAnyHennaAtPremiumSlot", false);
final String[] premiumDropChanceMultiplier = PremiumSystem.getString("PremiumRateDropChanceByItemId", "").split(";"); final String[] premiumDropChanceMultiplier = PremiumSystem.getString("PremiumRateDropChanceByItemId", "").split(";");
PREMIUM_RATE_DROP_CHANCE_BY_ID = new HashMap<>(premiumDropChanceMultiplier.length); PREMIUM_RATE_DROP_CHANCE_BY_ID = new HashMap<>(premiumDropChanceMultiplier.length);
if (!premiumDropChanceMultiplier[0].isEmpty()) if (!premiumDropChanceMultiplier[0].isEmpty())

16
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -7942,6 +7942,22 @@ public final class L2PcInstance extends L2Playable
{ {
for (int i = 1; i < 5; i++) for (int i = 1; i < 5; i++)
{ {
// Check for retail premium dyes slot
if (!Config.PREMIUM_HENNA_SLOT_ALL_DYES)
{
if (i == 4)
{
if ((_henna[3] != null) || (henna.getDyeItemId() < 23825) || (henna.getDyeItemId() > 23830))
{
return false;
}
}
else if ((henna.getDyeItemId() > 23824) && (henna.getDyeItemId() < 23831))
{
continue;
}
}
if (_henna[i - 1] == null) if (_henna[i - 1] == null)
{ {
_henna[i - 1] = henna; _henna[i - 1] = henna;