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

Removed CHA and LUC from everywhere.

Browse Source
This commit is contained in:
MobiusDev
2018-08-31 07:36:05 +00:00
parent 9af5336ce2
commit e05acf38aa
336 changed files with 54 additions and 1434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@@ -4279,16 +4279,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return _stat.getMEN();
}
public int getLUC()
{
return _stat.getLUC();
}
public int getCHA()
{
return _stat.getCHA();
}
// Status - NEED TO REMOVE ONCE L2CHARTATUS IS COMPLETE
public void addStatusListener(L2Character object)
{

10
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/stat/CharStat.java
View File

@@ -289,16 +289,6 @@ public class CharStat
return (int) getValue(Stats.STAT_MEN);
}
public final int getLUC()
{
return (int) getValue(Stats.STAT_LUC);
}
public final int getCHA()
{
return (int) getValue(Stats.STAT_CHA);
}
public double getMovementSpeedMultiplier()
{
double baseSpeed;

18
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/templates/L2CharTemplate.java
View File

@@ -63,8 +63,6 @@ public class L2CharTemplate extends ListenersContainer
_baseValues.put(Stats.STAT_INT, set.getDouble("baseINT", 0));
_baseValues.put(Stats.STAT_WIT, set.getDouble("baseWIT", 0));
_baseValues.put(Stats.STAT_MEN, set.getDouble("baseMEN", 0));
_baseValues.put(Stats.STAT_LUC, set.getDouble("baseLUC", 0));
_baseValues.put(Stats.STAT_CHA, set.getDouble("baseCHA", 0));
// Max HP/MP/CP
_baseValues.put(Stats.MAX_HP, set.getDouble("baseHpMax", 0));
@@ -191,22 +189,6 @@ public class L2CharTemplate extends ListenersContainer
return _baseValues.getOrDefault(Stats.STAT_MEN, 0d).intValue();
}
/**
* @return the baseLUC
*/
public int getBaseLUC()
{
return _baseValues.getOrDefault(Stats.STAT_LUC, 0d).intValue();
}
/**
* @return the baseCHA
*/
public int getBaseCHA()
{
return _baseValues.getOrDefault(Stats.STAT_CHA, 0d).intValue();
}
/**
* @return the baseHpMax
*/

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/items/L2Henna.java
View File

@@ -54,8 +54,6 @@ public class L2Henna
_baseStats.put(BaseStats.INT, set.getInt("int", 0));
_baseStats.put(BaseStats.MEN, set.getInt("men", 0));
_baseStats.put(BaseStats.WIT, set.getInt("wit", 0));
_baseStats.put(BaseStats.LUC, set.getInt("luc", 0));
_baseStats.put(BaseStats.CHA, set.getInt("cha", 0));
_wear_fee = set.getInt("wear_fee");
_wear_count = set.getInt("wear_count");
_cancel_fee = set.getInt("cancel_fee");

4
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/BaseStats.java
View File

@@ -37,9 +37,7 @@ public enum BaseStats
DEX(Stats.STAT_DEX),
WIT(Stats.STAT_WIT),
CON(Stats.STAT_CON),
MEN(Stats.STAT_MEN),
CHA(Stats.STAT_CHA),
LUC(Stats.STAT_LUC);
MEN(Stats.STAT_MEN);
public static final int MAX_STAT_VALUE = 201;

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/Stats.java
View File

@@ -165,8 +165,6 @@ public enum Stats
STAT_INT("INT", new BaseStatsFinalizer()),
STAT_WIT("WIT", new BaseStatsFinalizer()),
STAT_MEN("MEN", new BaseStatsFinalizer()),
STAT_LUC("LUC", new BaseStatsFinalizer()),
STAT_CHA("CHA", new BaseStatsFinalizer()),
// Special stats, share one slot in Calculator

3
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
View File

@@ -53,9 +53,8 @@ public class MAttackFinalizer implements IStatsFunction
}
// Calculate modifiers Magic Attack
final double chaMod = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double intBonus = BaseStats.INT.calcBonus(creature);
baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2) * chaMod;
baseValue *= Math.pow(intBonus, 2) * Math.pow(creature.getLevelMod(), 2);
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
}

3
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/MAttackSpeedFinalizer.java
View File

@@ -40,9 +40,8 @@ public class MAttackSpeedFinalizer implements IStatsFunction
baseValue *= Config.CHAMPION_SPD_ATK;
}
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double witBonus = creature.getWIT() > 0 ? BaseStats.WIT.calcBonus(creature) : 1.;
baseValue *= witBonus * chaBonus;
baseValue *= witBonus;
return validateValue(creature, defaultValue(creature, stat, baseValue), 1, Config.MAX_MATK_SPEED);
}

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/MDefenseFinalizer.java
View File

@@ -74,8 +74,6 @@ public class MDefenseFinalizer implements IStatsFunction
baseValue -= creature.getTransformation().map(transform -> transform.getBaseDefBySlot(player, slot)).orElse(defaultStatValue);
}
}
baseValue *= BaseStats.CHA.calcBonus(creature);
}
else if (creature.isPet() && (creature.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_NECK) != 0))
{

3
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxCpFinalizer.java
View File

@@ -40,9 +40,8 @@ public class MaxCpFinalizer implements IStatsFunction
{
baseValue = player.getTemplate().getBaseCpMax(player.getLevel());
}
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double conBonus = creature.getCON() > 0 ? BaseStats.CON.calcBonus(creature) : 1.;
baseValue *= conBonus * chaBonus;
baseValue *= conBonus;
return Stats.defaultValue(creature, stat, baseValue);
}
}

3
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxHpFinalizer.java
View File

@@ -57,9 +57,8 @@ public class MaxHpFinalizer implements IStatsFunction
}
}
}
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double conBonus = creature.getCON() > 0 ? BaseStats.CON.calcBonus(creature) : 1.;
baseValue *= conBonus * chaBonus;
baseValue *= conBonus;
return Stats.defaultValue(creature, stat, baseValue);
}
}

3
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/MaxMpFinalizer.java
View File

@@ -49,9 +49,8 @@ public class MaxMpFinalizer implements IStatsFunction
baseValue += player.getTemplate().getBaseMpMax(player.getLevel());
}
}
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double menBonus = creature.getMEN() > 0 ? BaseStats.MEN.calcBonus(creature) : 1.;
baseValue *= menBonus * chaBonus;
baseValue *= menBonus;
return Stats.defaultValue(creature, stat, baseValue);
}
}

3
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
View File

@@ -52,9 +52,8 @@ public class PAttackFinalizer implements IStatsFunction
{
baseValue *= Config.RAID_PATTACK_MULTIPLIER;
}
final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
final double strBonus = creature.getSTR() > 0 ? BaseStats.STR.calcBonus(creature) : 1.;
baseValue *= strBonus * creature.getLevelMod() * chaBonus;
baseValue *= strBonus * creature.getLevelMod();
return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
}

3
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/PAttackSpeedFinalizer.java
View File

@@ -38,9 +38,8 @@ public class PAttackSpeedFinalizer implements IStatsFunction
{
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.;
baseValue *= dexBonus * chaBonus;
baseValue *= dexBonus;
return validateValue(creature, defaultValue(creature, stat, baseValue), 1, Config.MAX_PATK_SPEED);
}

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/stats/finalizers/PDefenseFinalizer.java
View File

@@ -25,7 +25,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PetInstance;
import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.stats.BaseStats;
import com.l2jmobius.gameserver.model.stats.IStatsFunction;
import com.l2jmobius.gameserver.model.stats.Stats;
@@ -78,7 +77,6 @@ public class PDefenseFinalizer implements IStatsFunction
baseValue -= creature.getTransformation().map(transform -> transform.getBaseDefBySlot(player, slot)).orElse(defaultStatValue);
}
}
baseValue *= BaseStats.CHA.calcBonus(creature);
}
}
if (creature.isRaid())

4
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/GMHennaInfo.java
View File

@@ -57,8 +57,8 @@ public final class GMHennaInfo implements IClientOutgoingPacket
packet.writeH(_activeChar.getHennaValue(BaseStats.MEN)); // equip MEN
packet.writeH(_activeChar.getHennaValue(BaseStats.DEX)); // equip DEX
packet.writeH(_activeChar.getHennaValue(BaseStats.WIT)); // equip WIT
packet.writeH(_activeChar.getHennaValue(BaseStats.LUC)); // equip LUC
packet.writeH(_activeChar.getHennaValue(BaseStats.CHA)); // equip CHA
packet.writeH(0x00); // equip LUC
packet.writeH(0x00); // equip CHA
packet.writeD(3); // Slots
packet.writeD(_hennas.size()); // Size
for (L2Henna henna : _hennas)

4
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
View File

@@ -66,8 +66,8 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket
packet.writeD(_activeChar.getINT());
packet.writeD(_activeChar.getWIT());
packet.writeD(_activeChar.getMEN());
packet.writeD(_activeChar.getLUC());
packet.writeD(_activeChar.getCHA());
packet.writeD(0x00); // LUC
packet.writeD(0x00); // CHA
packet.writeD(_activeChar.getMaxHp());
packet.writeD((int) _activeChar.getCurrentHp());
packet.writeD(_activeChar.getMaxMp());

4
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaInfo.java
View File

@@ -57,8 +57,8 @@ public final class HennaInfo implements IClientOutgoingPacket
packet.writeH(_activeChar.getHennaValue(BaseStats.MEN)); // equip MEN
packet.writeH(_activeChar.getHennaValue(BaseStats.DEX)); // equip DEX
packet.writeH(_activeChar.getHennaValue(BaseStats.WIT)); // equip WIT
packet.writeH(_activeChar.getHennaValue(BaseStats.LUC)); // equip LUC
packet.writeH(_activeChar.getHennaValue(BaseStats.CHA)); // equip CHA
packet.writeH(0x00); // equip LUC
packet.writeH(0x00); // equip CHA
packet.writeD(3 - _activeChar.getHennaEmptySlots()); // Slots
packet.writeD(_hennas.size()); // Size
for (L2Henna henna : _hennas)

8
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/HennaItemRemoveInfo.java
View File

@@ -59,10 +59,10 @@ public final class HennaItemRemoveInfo implements IClientOutgoingPacket
packet.writeH(_activeChar.getDEX() - _activeChar.getHennaValue(BaseStats.DEX)); // equip DEX
packet.writeD(_activeChar.getWIT()); // current WIT
packet.writeH(_activeChar.getWIT() - _activeChar.getHennaValue(BaseStats.WIT)); // equip WIT
packet.writeD(_activeChar.getLUC()); // current LUC
packet.writeH(_activeChar.getLUC() - _activeChar.getHennaValue(BaseStats.LUC)); // equip LUC
packet.writeD(_activeChar.getCHA()); // current CHA
packet.writeH(_activeChar.getCHA() - _activeChar.getHennaValue(BaseStats.CHA)); // equip CHA
packet.writeD(0x00); // current LUC
packet.writeH(0x00); // equip LUC
packet.writeD(0x00); // current CHA
packet.writeH(0x00); // equip CHA
packet.writeD(0x00);
return true;
}