Adjusted and disabled class damage settings.
This commit is contained in:
@@ -3,9 +3,9 @@
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
# Enable Class Damages Settings
|
# Enable Class Damages Settings
|
||||||
EnableClassDamagesSettings = True
|
EnableClassDamageSettings = False
|
||||||
EnableClassDamagesLogger = False
|
EnableClassDamageSettingsInOly = True
|
||||||
EnableClassDamagesSettingsInOly = True
|
EnableClassDamageLogger = False
|
||||||
|
|
||||||
# --------------------------------
|
# --------------------------------
|
||||||
# Setting effect Blow
|
# Setting effect Blow
|
||||||
|
@@ -941,9 +941,9 @@ public class Config
|
|||||||
public static boolean REMOVE_WEAPON_SUBCLASS;
|
public static boolean REMOVE_WEAPON_SUBCLASS;
|
||||||
public static boolean REMOVE_CHEST_SUBCLASS;
|
public static boolean REMOVE_CHEST_SUBCLASS;
|
||||||
public static boolean REMOVE_LEG_SUBCLASS;
|
public static boolean REMOVE_LEG_SUBCLASS;
|
||||||
public static boolean ENABLE_CLASS_DAMAGES;
|
public static boolean ENABLE_CLASS_DAMAGE_SETTINGS;
|
||||||
public static boolean ENABLE_CLASS_DAMAGES_IN_OLY;
|
public static boolean ENABLE_CLASS_DAMAGE_SETTINGS_IN_OLY;
|
||||||
public static boolean ENABLE_CLASS_DAMAGES_LOGGER;
|
public static boolean ENABLE_CLASS_DAMAGE_LOGGER;
|
||||||
public static boolean LEAVE_BUFFS_ON_DIE;
|
public static boolean LEAVE_BUFFS_ON_DIE;
|
||||||
public static boolean ALT_RAIDS_STATS_BONUS;
|
public static boolean ALT_RAIDS_STATS_BONUS;
|
||||||
|
|
||||||
@@ -2931,9 +2931,9 @@ public class Config
|
|||||||
PHYSICSSetting.load(is);
|
PHYSICSSetting.load(is);
|
||||||
is.close();
|
is.close();
|
||||||
|
|
||||||
ENABLE_CLASS_DAMAGES = Boolean.parseBoolean(PHYSICSSetting.getProperty("EnableClassDamagesSettings", "true"));
|
ENABLE_CLASS_DAMAGE_SETTINGS = Boolean.parseBoolean(PHYSICSSetting.getProperty("EnableClassDamageSettings", "true"));
|
||||||
ENABLE_CLASS_DAMAGES_IN_OLY = Boolean.parseBoolean(PHYSICSSetting.getProperty("EnableClassDamagesSettingsInOly", "true"));
|
ENABLE_CLASS_DAMAGE_SETTINGS_IN_OLY = Boolean.parseBoolean(PHYSICSSetting.getProperty("EnableClassDamageSettingsInOly", "true"));
|
||||||
ENABLE_CLASS_DAMAGES_LOGGER = Boolean.parseBoolean(PHYSICSSetting.getProperty("EnableClassDamagesLogger", "true"));
|
ENABLE_CLASS_DAMAGE_LOGGER = Boolean.parseBoolean(PHYSICSSetting.getProperty("EnableClassDamageLogger", "false"));
|
||||||
|
|
||||||
BLOW_ATTACK_FRONT = Integer.parseInt(PHYSICSSetting.getProperty("BlowAttackFront", "50"));
|
BLOW_ATTACK_FRONT = Integer.parseInt(PHYSICSSetting.getProperty("BlowAttackFront", "50"));
|
||||||
BLOW_ATTACK_SIDE = Integer.parseInt(PHYSICSSetting.getProperty("BlowAttackSide", "60"));
|
BLOW_ATTACK_SIDE = Integer.parseInt(PHYSICSSetting.getProperty("BlowAttackSide", "60"));
|
||||||
|
@@ -217,7 +217,7 @@ public class GameServer
|
|||||||
|
|
||||||
Util.printSection("Players");
|
Util.printSection("Players");
|
||||||
PlayerTemplateData.getInstance();
|
PlayerTemplateData.getInstance();
|
||||||
if (Config.ENABLE_CLASS_DAMAGES)
|
if (Config.ENABLE_CLASS_DAMAGE_SETTINGS)
|
||||||
{
|
{
|
||||||
ClassDamageManager.loadConfig();
|
ClassDamageManager.loadConfig();
|
||||||
}
|
}
|
||||||
|
@@ -211,7 +211,7 @@ public class ClassDamageManager
|
|||||||
|
|
||||||
final double output = attackerMulti * attackedMulti;
|
final double output = attackerMulti * attackedMulti;
|
||||||
|
|
||||||
if (Config.ENABLE_CLASS_DAMAGES_LOGGER)
|
if (Config.ENABLE_CLASS_DAMAGE_LOGGER)
|
||||||
{
|
{
|
||||||
LOGGER.info("ClassDamageManager -");
|
LOGGER.info("ClassDamageManager -");
|
||||||
LOGGER.info("ClassDamageManager - Attacker: " + attacker.getName() + " Class: " + getNameById(attacker.getClassId().getId()) + " ClassId: " + attacker.getClassId().getId() + " isMage: " + attacker.isMageClass() + " mult: " + attackerMulti);
|
LOGGER.info("ClassDamageManager - Attacker: " + attacker.getName() + " Class: " + getNameById(attacker.getClassId().getId()) + " ClassId: " + attacker.getClassId().getId() + " isMage: " + attacker.isMageClass() + " mult: " + attackerMulti);
|
||||||
|
@@ -1370,11 +1370,11 @@ public class Formulas
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Config.ENABLE_CLASS_DAMAGES && (attacker instanceof PlayerInstance) && (target instanceof PlayerInstance))
|
if (Config.ENABLE_CLASS_DAMAGE_SETTINGS && (attacker instanceof PlayerInstance) && (target instanceof PlayerInstance))
|
||||||
{
|
{
|
||||||
if (((PlayerInstance) attacker).isInOlympiadMode() && ((PlayerInstance) target).isInOlympiadMode())
|
if (((PlayerInstance) attacker).isInOlympiadMode() && ((PlayerInstance) target).isInOlympiadMode())
|
||||||
{
|
{
|
||||||
if (Config.ENABLE_CLASS_DAMAGES_IN_OLY)
|
if (Config.ENABLE_CLASS_DAMAGE_SETTINGS_IN_OLY)
|
||||||
{
|
{
|
||||||
damage = damage * ClassDamageManager.getDamageMultiplier((PlayerInstance) attacker, (PlayerInstance) target);
|
damage = damage * ClassDamageManager.getDamageMultiplier((PlayerInstance) attacker, (PlayerInstance) target);
|
||||||
}
|
}
|
||||||
@@ -1703,11 +1703,11 @@ public class Formulas
|
|||||||
damage = damage * Config.ALT_NPC_PHYSICAL_DAMAGE_MULTI;
|
damage = damage * Config.ALT_NPC_PHYSICAL_DAMAGE_MULTI;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Config.ENABLE_CLASS_DAMAGES && (attacker instanceof PlayerInstance) && (target instanceof PlayerInstance))
|
if (Config.ENABLE_CLASS_DAMAGE_SETTINGS && (attacker instanceof PlayerInstance) && (target instanceof PlayerInstance))
|
||||||
{
|
{
|
||||||
if (((PlayerInstance) attacker).isInOlympiadMode() && ((PlayerInstance) target).isInOlympiadMode())
|
if (((PlayerInstance) attacker).isInOlympiadMode() && ((PlayerInstance) target).isInOlympiadMode())
|
||||||
{
|
{
|
||||||
if (Config.ENABLE_CLASS_DAMAGES_IN_OLY)
|
if (Config.ENABLE_CLASS_DAMAGE_SETTINGS_IN_OLY)
|
||||||
{
|
{
|
||||||
damage = damage * ClassDamageManager.getDamageMultiplier((PlayerInstance) attacker, (PlayerInstance) target);
|
damage = damage * ClassDamageManager.getDamageMultiplier((PlayerInstance) attacker, (PlayerInstance) target);
|
||||||
}
|
}
|
||||||
@@ -1876,11 +1876,11 @@ public class Formulas
|
|||||||
damage = damage * (1.0 - (attacker.getStatus().getCurrentHp() / attacker.getMaxHp())) * 2.0;
|
damage = damage * (1.0 - (attacker.getStatus().getCurrentHp() / attacker.getMaxHp())) * 2.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Config.ENABLE_CLASS_DAMAGES && (attacker instanceof PlayerInstance) && (target instanceof PlayerInstance))
|
if (Config.ENABLE_CLASS_DAMAGE_SETTINGS && (attacker instanceof PlayerInstance) && (target instanceof PlayerInstance))
|
||||||
{
|
{
|
||||||
if (((PlayerInstance) attacker).isInOlympiadMode() && ((PlayerInstance) target).isInOlympiadMode())
|
if (((PlayerInstance) attacker).isInOlympiadMode() && ((PlayerInstance) target).isInOlympiadMode())
|
||||||
{
|
{
|
||||||
if (Config.ENABLE_CLASS_DAMAGES_IN_OLY)
|
if (Config.ENABLE_CLASS_DAMAGE_SETTINGS_IN_OLY)
|
||||||
{
|
{
|
||||||
damage = damage * ClassDamageManager.getDamageMultiplier((PlayerInstance) attacker, (PlayerInstance) target);
|
damage = damage * ClassDamageManager.getDamageMultiplier((PlayerInstance) attacker, (PlayerInstance) target);
|
||||||
}
|
}
|
||||||
@@ -3318,11 +3318,11 @@ public class Formulas
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Config.ENABLE_CLASS_DAMAGES && (attacker instanceof PlayerInstance) && (target instanceof PlayerInstance))
|
if (Config.ENABLE_CLASS_DAMAGE_SETTINGS && (attacker instanceof PlayerInstance) && (target instanceof PlayerInstance))
|
||||||
{
|
{
|
||||||
if (((PlayerInstance) attacker).isInOlympiadMode() && ((PlayerInstance) target).isInOlympiadMode())
|
if (((PlayerInstance) attacker).isInOlympiadMode() && ((PlayerInstance) target).isInOlympiadMode())
|
||||||
{
|
{
|
||||||
if (Config.ENABLE_CLASS_DAMAGES_IN_OLY)
|
if (Config.ENABLE_CLASS_DAMAGE_SETTINGS_IN_OLY)
|
||||||
{
|
{
|
||||||
damage = damage * ClassDamageManager.getDamageMultiplier((PlayerInstance) attacker, (PlayerInstance) target);
|
damage = damage * ClassDamageManager.getDamageMultiplier((PlayerInstance) attacker, (PlayerInstance) target);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user