Separated configs for custom features.

This commit is contained in:
MobiusDev
2017-04-28 19:50:03 +00:00
parent 3e8a51ec0b
commit 110ab19c91
94 changed files with 2248 additions and 2166 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -168,7 +168,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
return false;
}
if (me.isChampion() && Config.L2JMOD_CHAMPION_PASSIVE)
if (me.isChampion() && Config.CHAMPION_PASSIVE)
{
return false;
}

View File

@@ -155,7 +155,7 @@ public final class AntiFeedManager
final AtomicInteger connectionCount = event.computeIfAbsent(addrHash, k -> new AtomicInteger());
if ((connectionCount.get() + 1) <= (max + Config.L2JMOD_DUALBOX_CHECK_WHITELIST.getOrDefault(addrHash, 0)))
if ((connectionCount.get() + 1) <= (max + Config.DUALBOX_CHECK_WHITELIST.getOrDefault(addrHash, 0)))
{
connectionCount.incrementAndGet();
return true;
@@ -259,9 +259,9 @@ public final class AntiFeedManager
final Integer addrHash = Integer.valueOf(client.getConnectionAddress().hashCode());
int limit = max;
if (Config.L2JMOD_DUALBOX_CHECK_WHITELIST.containsKey(addrHash))
if (Config.DUALBOX_CHECK_WHITELIST.containsKey(addrHash))
{
limit += Config.L2JMOD_DUALBOX_CHECK_WHITELIST.get(addrHash);
limit += Config.DUALBOX_CHECK_WHITELIST.get(addrHash);
}
return limit;
}

View File

@@ -474,10 +474,10 @@ public class L2Attackable extends L2Npc
long exp = expSp[0];
int sp = expSp[1];
if (Config.L2JMOD_CHAMPION_ENABLE && isChampion())
if (Config.CHAMPION_ENABLE && isChampion())
{
exp *= Config.L2JMOD_CHAMPION_REWARDS_EXP_SP;
sp *= Config.L2JMOD_CHAMPION_REWARDS_EXP_SP;
exp *= Config.CHAMPION_REWARDS_EXP_SP;
sp *= Config.CHAMPION_REWARDS_EXP_SP;
}
exp *= penalty;
@@ -586,10 +586,10 @@ public class L2Attackable extends L2Npc
long exp = expSp[0];
int sp = expSp[1];
if (Config.L2JMOD_CHAMPION_ENABLE && isChampion())
if (Config.CHAMPION_ENABLE && isChampion())
{
exp *= Config.L2JMOD_CHAMPION_REWARDS_EXP_SP;
sp *= Config.L2JMOD_CHAMPION_REWARDS_EXP_SP;
exp *= Config.CHAMPION_REWARDS_EXP_SP;
sp *= Config.CHAMPION_REWARDS_EXP_SP;
}
exp *= partyMul;
@@ -1005,12 +1005,12 @@ public class L2Attackable extends L2Npc
}
// Apply Special Item drop with random(rnd) quantity(qty) for champions.
if (Config.L2JMOD_CHAMPION_ENABLE && isChampion() && ((Config.L2JMOD_CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.L2JMOD_CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0)))
if (Config.CHAMPION_ENABLE && isChampion() && ((Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE > 0) || (Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE > 0)))
{
int champqty = Rnd.get(Config.L2JMOD_CHAMPION_REWARD_QTY);
final ItemHolder item = new ItemHolder(Config.L2JMOD_CHAMPION_REWARD_ID, ++champqty);
int champqty = Rnd.get(Config.CHAMPION_REWARD_QTY);
final ItemHolder item = new ItemHolder(Config.CHAMPION_REWARD_ID, ++champqty);
if ((player.getLevel() <= getLevel()) && (Rnd.get(100) < Config.L2JMOD_CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE))
if ((player.getLevel() <= getLevel()) && (Rnd.get(100) < Config.CHAMPION_REWARD_LOWER_LVL_ITEM_CHANCE))
{
if (Config.AUTO_LOOT || isFlying())
{
@@ -1021,7 +1021,7 @@ public class L2Attackable extends L2Npc
dropItem(player, item);
}
}
else if ((player.getLevel() > getLevel()) && (Rnd.get(100) < Config.L2JMOD_CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE))
else if ((player.getLevel() > getLevel()) && (Rnd.get(100) < Config.CHAMPION_REWARD_HIGHER_LVL_ITEM_CHANCE))
{
if (Config.AUTO_LOOT || isFlying())
{
@@ -1401,15 +1401,15 @@ public class L2Attackable extends L2Npc
// Reset champion state
_champion = false;
if (Config.L2JMOD_CHAMPION_ENABLE)
if (Config.CHAMPION_ENABLE)
{
// Set champion on next spawn
if (isMonster() && !getTemplate().isUndying() && !isRaid() && !isRaidMinion() && (Config.L2JMOD_CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.L2JMOD_CHAMP_MIN_LVL) && (getLevel() <= Config.L2JMOD_CHAMP_MAX_LVL) && (Config.L2JMOD_CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0)))
if (isMonster() && !getTemplate().isUndying() && !isRaid() && !isRaidMinion() && (Config.CHAMPION_FREQUENCY > 0) && (getLevel() >= Config.CHAMP_MIN_LVL) && (getLevel() <= Config.CHAMP_MAX_LVL) && (Config.CHAMPION_ENABLE_IN_INSTANCES || (getInstanceId() == 0)))
{
if (Rnd.get(100) < Config.L2JMOD_CHAMPION_FREQUENCY)
if (Rnd.get(100) < Config.CHAMPION_FREQUENCY)
{
_champion = true;
if (Config.L2JMOD_SHOW_CHAMPION_AURA)
if (Config.SHOW_CHAMPION_AURA)
{
setTeam(Team.RED);
}
@@ -1613,7 +1613,7 @@ public class L2Attackable extends L2Npc
*/
public boolean useVitalityRate()
{
return !isChampion() || Config.L2JMOD_CHAMPION_ENABLE_VITALITY;
return !isChampion() || Config.CHAMPION_ENABLE_VITALITY;
}
/** Return True if the L2Character is RaidBoss or his minion. */

View File

@@ -2495,7 +2495,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
if (isChampion())
{
return Config.L2JMOD_CHAMP_TITLE;
return Config.CHAMP_TITLE;
}
if (Config.SHOW_NPC_LVL && isMonster())
{
@@ -4830,9 +4830,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
if (Config.L2JMOD_CHAMPION_ENABLE && isChampion() && (Config.L2JMOD_CHAMPION_HP != 0))
if (Config.CHAMPION_ENABLE && isChampion() && (Config.CHAMPION_HP != 0))
{
getStatus().reduceHp(value / Config.L2JMOD_CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
getStatus().reduceHp(value / Config.CHAMPION_HP, attacker, (skill == null) || !skill.isToggle(), isDOT, false);
}
else
{

View File

@@ -12522,7 +12522,7 @@ public final class L2PcInstance extends L2Playable
public String getHtmlPrefix()
{
if (!Config.L2JMOD_MULTILANG_ENABLE)
if (!Config.MULTILANG_ENABLE)
{
return null;
}
@@ -12538,16 +12538,16 @@ public final class L2PcInstance extends L2Playable
public boolean setLang(String lang)
{
boolean result = false;
if (Config.L2JMOD_MULTILANG_ENABLE)
if (Config.MULTILANG_ENABLE)
{
if (Config.L2JMOD_MULTILANG_ALLOWED.contains(lang))
if (Config.MULTILANG_ALLOWED.contains(lang))
{
_lang = lang;
result = true;
}
else
{
_lang = Config.L2JMOD_MULTILANG_DEFAULT;
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";

View File

@@ -119,7 +119,7 @@ public class GeneralDropItem implements IDropItem
// global champions amount multiplier
if (victim.isChampion())
{
multiplier *= getItemId() != Inventory.ADENA_ID ? Config.L2JMOD_CHAMPION_REWARDS_AMOUNT : Config.L2JMOD_CHAMPION_ADENAS_REWARDS_AMOUNT;
multiplier *= getItemId() != Inventory.ADENA_ID ? Config.CHAMPION_REWARDS_AMOUNT : Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
}
return (long) (val * multiplier);
@@ -241,7 +241,7 @@ public class GeneralDropItem implements IDropItem
if (victim.isChampion())
{
multiplier *= getItemId() != Inventory.ADENA_ID ? Config.L2JMOD_CHAMPION_REWARDS_CHANCE : Config.L2JMOD_CHAMPION_ADENAS_REWARDS_CHANCE;
multiplier *= getItemId() != Inventory.ADENA_ID ? Config.CHAMPION_REWARDS_CHANCE : Config.CHAMPION_ADENAS_REWARDS_CHANCE;
}
return (getChance() * multiplier);
@@ -277,7 +277,7 @@ public class GeneralDropItem implements IDropItem
{
final Collection<ItemHolder> items = new ArrayList<>(1);
final long baseDropCount = Rnd.get(getMin(victim, killer), getMax(victim, killer));
final long finaldropCount = (long) (Config.L2JMOD_OLD_DROP_BEHAVIOR ? (baseDropCount * Math.max(1, chance / 100)) + (chance > 100 ? (chance % 100) > (Rnd.nextDouble() * 100) ? baseDropCount : 0 : 0) : baseDropCount);
final long finaldropCount = (long) (Config.OLD_DROP_BEHAVIOR ? (baseDropCount * Math.max(1, chance / 100)) + (chance > 100 ? (chance % 100) > (Rnd.nextDouble() * 100) ? baseDropCount : 0 : 0) : baseDropCount);
items.add(new ItemHolder(getItemId(), finaldropCount));
return items;
}

View File

@@ -135,7 +135,7 @@ public class GroupedGeneralDropItem implements IDropItem
{
final Collection<ItemHolder> items = new ArrayList<>(1);
final long baseDropCount = Rnd.get(item.getMin(victim, killer), item.getMax(victim, killer));
final long finaldropCount = (long) (Config.L2JMOD_OLD_DROP_BEHAVIOR ? (baseDropCount * Math.max(1, chance / 100)) + ((chance > 100) && ((chance % 100) > (Rnd.nextDouble() * 100)) ? baseDropCount : 0) : baseDropCount);
final long finaldropCount = (long) (Config.OLD_DROP_BEHAVIOR ? (baseDropCount * Math.max(1, chance / 100)) + ((chance > 100) && ((chance % 100) > (Rnd.nextDouble() * 100)) ? baseDropCount : 0) : baseDropCount);
items.add(new ItemHolder(item.getItemId(), finaldropCount));
return items;
}

View File

@@ -253,7 +253,7 @@ public class L2Event
return;
}
if ((Config.L2JMOD_DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP == 0) || AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.L2EVENT_ID, player, Config.L2JMOD_DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP))
if ((Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP == 0) || AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.L2EVENT_ID, player, Config.DUALBOX_CHECK_MAX_L2EVENT_PARTICIPANTS_PER_IP))
{
_registeredPlayers.add(player);
}

View File

@@ -2620,19 +2620,19 @@ public abstract class AbstractScript extends ManagedScript implements IEventTime
minAmount *= Config.RATE_QUEST_DROP;
maxAmount *= Config.RATE_QUEST_DROP;
dropChance *= Config.RATE_QUEST_DROP; // TODO separate configs for rate and amount
if ((npc != null) && Config.L2JMOD_CHAMPION_ENABLE && npc.isChampion())
if ((npc != null) && Config.CHAMPION_ENABLE && npc.isChampion())
{
if ((itemId == Inventory.ADENA_ID) || (itemId == Inventory.ANCIENT_ADENA_ID))
{
dropChance *= Config.L2JMOD_CHAMPION_ADENAS_REWARDS_CHANCE;
minAmount *= Config.L2JMOD_CHAMPION_ADENAS_REWARDS_AMOUNT;
maxAmount *= Config.L2JMOD_CHAMPION_ADENAS_REWARDS_AMOUNT;
dropChance *= Config.CHAMPION_ADENAS_REWARDS_CHANCE;
minAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
maxAmount *= Config.CHAMPION_ADENAS_REWARDS_AMOUNT;
}
else
{
dropChance *= Config.L2JMOD_CHAMPION_REWARDS_CHANCE;
minAmount *= Config.L2JMOD_CHAMPION_REWARDS_AMOUNT;
maxAmount *= Config.L2JMOD_CHAMPION_REWARDS_AMOUNT;
dropChance *= Config.CHAMPION_REWARDS_CHANCE;
minAmount *= Config.CHAMPION_REWARDS_AMOUNT;
maxAmount *= Config.CHAMPION_REWARDS_AMOUNT;
}
}

View File

@@ -385,7 +385,7 @@ public abstract class AbstractOlympiadGame
player.setCurrentMp(player.getMaxMp());
player.getStatus().startHpMpRegeneration();
if (Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0)
if (Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0)
{
AntiFeedManager.getInstance().removePlayer(AntiFeedManager.OLYMPIAD_ID, player);
}

View File

@@ -203,11 +203,11 @@ public class OlympiadManager
return false;
}
if ((Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.OLYMPIAD_ID, player, Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP))
if ((Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.OLYMPIAD_ID, player, Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP))
{
final NpcHtmlMessage message = new NpcHtmlMessage(player.getLastHtmlActionOriginId());
message.setFile(player.getHtmlPrefix(), "data/html/mods/OlympiadIPRestriction.htm");
message.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP)));
message.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP)));
player.sendPacket(message);
if (player.isGM() && player.isDebug())
{
@@ -234,11 +234,11 @@ public class OlympiadManager
return false;
}
if ((Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.OLYMPIAD_ID, player, Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP))
if ((Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.OLYMPIAD_ID, player, Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP))
{
final NpcHtmlMessage message = new NpcHtmlMessage(player.getLastHtmlActionOriginId());
message.setFile(player.getHtmlPrefix(), "data/html/mods/OlympiadIPRestriction.htm");
message.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP)));
message.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP)));
player.sendPacket(message);
if (player.isGM() && player.isDebug())
{
@@ -291,7 +291,7 @@ public class OlympiadManager
final Integer objId = Integer.valueOf(noble.getObjectId());
if (_nonClassBasedRegisters.remove(objId))
{
if (Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0)
if (Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0)
{
AntiFeedManager.getInstance().removePlayer(AntiFeedManager.OLYMPIAD_ID, noble);
}
@@ -303,7 +303,7 @@ public class OlympiadManager
final Set<Integer> classed = _classBasedRegisters.get(noble.getBaseClass());
if ((classed != null) && classed.remove(objId))
{
if (Config.L2JMOD_DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0)
if (Config.DUALBOX_CHECK_MAX_OLYMPIAD_PARTICIPANTS_PER_IP > 0)
{
AntiFeedManager.getInstance().removePlayer(AntiFeedManager.OLYMPIAD_ID, noble);
}

View File

@@ -43,9 +43,9 @@ public class MAttackFinalizer implements IStatsFunction
baseValue += calcEnchantBodyPart(creature, L2Item.SLOT_CHEST, L2Item.SLOT_FULL_ARMOR);
}
if (Config.L2JMOD_CHAMPION_ENABLE && creature.isChampion())
if (Config.CHAMPION_ENABLE && creature.isChampion())
{
baseValue *= Config.L2JMOD_CHAMPION_ATK;
baseValue *= Config.CHAMPION_ATK;
}
if (creature.isRaid())
{

View File

@@ -35,9 +35,9 @@ public class MAttackSpeedFinalizer implements IStatsFunction
throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat);
if (Config.L2JMOD_CHAMPION_ENABLE && creature.isChampion())
if (Config.CHAMPION_ENABLE && creature.isChampion())
{
baseValue *= Config.L2JMOD_CHAMPION_SPD_ATK;
baseValue *= Config.CHAMPION_SPD_ATK;
}
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;

View File

@@ -44,9 +44,9 @@ public class PAttackFinalizer implements IStatsFunction
baseValue += calcEnchantBodyPart(creature, L2Item.SLOT_CHEST, L2Item.SLOT_FULL_ARMOR);
}
if (Config.L2JMOD_CHAMPION_ENABLE && creature.isChampion())
if (Config.CHAMPION_ENABLE && creature.isChampion())
{
baseValue *= Config.L2JMOD_CHAMPION_ATK;
baseValue *= Config.CHAMPION_ATK;
}
if (creature.isRaid())
{

View File

@@ -34,9 +34,9 @@ public class PAttackSpeedFinalizer implements IStatsFunction
{
throwIfPresent(base);
double baseValue = calcWeaponBaseValue(creature, stat);
if (Config.L2JMOD_CHAMPION_ENABLE && creature.isChampion())
if (Config.CHAMPION_ENABLE && creature.isChampion())
{
baseValue *= Config.L2JMOD_CHAMPION_SPD_ATK;
baseValue *= Config.CHAMPION_SPD_ATK;
}
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double dexBonus = creature.getDEX() > 0 ? BaseStats.DEX.calcBonus(creature) : 1.;

View File

@@ -55,9 +55,9 @@ public class RegenHPFinalizer implements IStatsFunction
double baseValue = creature.isPlayer() ? creature.getActingPlayer().getTemplate().getBaseHpRegen(creature.getLevel()) : creature.getTemplate().getBaseHpReg();
baseValue *= creature.isRaid() ? Config.RAID_HP_REGEN_MULTIPLIER : Config.HP_REGEN_MULTIPLIER;
if (Config.L2JMOD_CHAMPION_ENABLE && creature.isChampion())
if (Config.CHAMPION_ENABLE && creature.isChampion())
{
baseValue *= Config.L2JMOD_CHAMPION_HP_REGEN;
baseValue *= Config.CHAMPION_HP_REGEN;
}
if (creature.isPlayer())

View File

@@ -114,11 +114,11 @@ public class CharacterSelect implements IClientIncomingPacket
return;
}
if ((Config.L2JMOD_DUALBOX_CHECK_MAX_PLAYERS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddClient(AntiFeedManager.GAME_ID, client, Config.L2JMOD_DUALBOX_CHECK_MAX_PLAYERS_PER_IP))
if ((Config.DUALBOX_CHECK_MAX_PLAYERS_PER_IP > 0) && !AntiFeedManager.getInstance().tryAddClient(AntiFeedManager.GAME_ID, client, Config.DUALBOX_CHECK_MAX_PLAYERS_PER_IP))
{
final NpcHtmlMessage msg = new NpcHtmlMessage();
msg.setFile(info.getHtmlPrefix(), "data/html/mods/IPRestriction.htm");
msg.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(client, Config.L2JMOD_DUALBOX_CHECK_MAX_PLAYERS_PER_IP)));
msg.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(client, Config.DUALBOX_CHECK_MAX_PLAYERS_PER_IP)));
client.sendPacket(msg);
return;
}

View File

@@ -329,12 +329,12 @@ public class CharSelectionInfo implements IClientOutgoingPacket
charInfopackage.setEvil();
}
if (Config.L2JMOD_MULTILANG_ENABLE)
if (Config.MULTILANG_ENABLE)
{
String lang = chardata.getString("language");
if (!Config.L2JMOD_MULTILANG_ALLOWED.contains(lang))
if (!Config.MULTILANG_ALLOWED.contains(lang))
{
lang = Config.L2JMOD_MULTILANG_DEFAULT;
lang = Config.MULTILANG_DEFAULT;
}
charInfopackage.setHtmlPrefix("data/lang/" + lang + "/");
}