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

Addition of training camp reward exp/sp multipliers.

Browse Source
This commit is contained in:
MobiusDev 2017-11-17 17:16:53 +00:00
parent dde93f3788
commit 4fbdcabdb0
19 changed files with 86 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_1.0_Ertheia/dist/game/config/TrainingCamp.ini vendored
View File

@ -21,3 +21,11 @@ TrainingCampMinLevel = 18
# Max level to enter Training Camp
# Default: 127
TrainingCampMaxLevel = 127
# Multiplier for rewarded EXP
# Default: 1.0
TrainingCampExpMultiplier = 1.0
# Multiplier for rewarded SP
# Default: 1.0
TrainingCampSpMultiplier = 1.0

8
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java vendored
View File

@ -139,8 +139,8 @@ public final class Recruiter extends AbstractNpcAI
final long trainingTime = Math.max(0, holder.getTrainingTime(TimeUnit.MINUTES));
if (trainingTime > 0)
{
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = expGained / 250L;
final long expGained = (long) ((Config.TRAINING_CAMP_EXP_MULTIPLIER * ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider())) / 60);
final long spGained = (long) (Config.TRAINING_CAMP_SP_MULTIPLIER * (expGained / 250L));
String html = getHtm(player.getHtmlPrefix(), "4378-04.htm");
html = html.replace("%training_level%", String.valueOf(holder.getLevel()));
html = html.replace("%training_time%", String.valueOf(trainingTime));
@ -176,8 +176,8 @@ public final class Recruiter extends AbstractNpcAI
{
player.sendPacket(SystemMessageId.CALCULATING_XP_AND_SP_OBTAINED_FROM_TRAINING);
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = expGained / 250;
final long expGained = (long) ((Config.TRAINING_CAMP_EXP_MULTIPLIER * ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider())) / 60);
final long spGained = (long) (Config.TRAINING_CAMP_SP_MULTIPLIER * (expGained / 250L));
player.addExpAndSp(expGained, spGained);
final SystemMessage sysMsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_COMPLETED_TRAINING_IN_THE_ROYAL_TRAINING_CAMP_AND_OBTAINED_S1_XP_AND_S2_SP);

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

@ -856,6 +856,8 @@ public final class Config
public static int TRAINING_CAMP_MAX_DURATION;
public static int TRAINING_CAMP_MIN_LEVEL;
public static int TRAINING_CAMP_MAX_LEVEL;
public static double TRAINING_CAMP_EXP_MULTIPLIER;
public static double TRAINING_CAMP_SP_MULTIPLIER;
public static boolean SHOW_LICENCE;
public static boolean SHOW_PI_AGREEMENT;
public static boolean ACCEPT_NEW_GAMESERVER;
@ -1745,6 +1747,8 @@ public final class Config
TRAINING_CAMP_MAX_DURATION = trainingCampSettings.getInt("TrainingCampDuration", 18000);
TRAINING_CAMP_MIN_LEVEL = trainingCampSettings.getInt("TrainingCampMinLevel", 18);
TRAINING_CAMP_MAX_LEVEL = trainingCampSettings.getInt("TrainingCampMaxLevel", 127);
TRAINING_CAMP_EXP_MULTIPLIER = trainingCampSettings.getDouble("TrainingCampExpMultiplier", 1.0);
TRAINING_CAMP_SP_MULTIPLIER = trainingCampSettings.getDouble("TrainingCampSpMultiplier", 1.0);
// MMO
final PropertiesParser mmoSettings = new PropertiesParser(MMO_CONFIG_FILE);

4
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java
View File

@ -36,8 +36,8 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket
{
_timeElapsed = timeElapsed;
_timeRemaining = timeRemaing;
_maxExp = (ExperienceData.getInstance().getExpForLevel(level) * ExperienceData.getInstance().getTrainingRate(level)) / Config.TRAINING_CAMP_MAX_DURATION;
_maxSp = _maxExp / 250d;
_maxExp = Config.TRAINING_CAMP_EXP_MULTIPLIER * ((ExperienceData.getInstance().getExpForLevel(level) * ExperienceData.getInstance().getTrainingRate(level)) / Config.TRAINING_CAMP_MAX_DURATION);
_maxSp = Config.TRAINING_CAMP_SP_MULTIPLIER * (_maxExp / 250d);
}
@Override

8
L2J_Mobius_2.5_Underground/dist/game/config/TrainingCamp.ini vendored
View File

@ -21,3 +21,11 @@ TrainingCampMinLevel = 18
# Max level to enter Training Camp
# Default: 127
TrainingCampMaxLevel = 127
# Multiplier for rewarded EXP
# Default: 1.0
TrainingCampExpMultiplier = 1.0
# Multiplier for rewarded SP
# Default: 1.0
TrainingCampSpMultiplier = 1.0

8
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java vendored
View File

@ -139,8 +139,8 @@ public final class Recruiter extends AbstractNpcAI
final long trainingTime = Math.max(0, holder.getTrainingTime(TimeUnit.MINUTES));
if (trainingTime > 0)
{
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = expGained / 250L;
final long expGained = (long) ((Config.TRAINING_CAMP_EXP_MULTIPLIER * ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider())) / 60);
final long spGained = (long) (Config.TRAINING_CAMP_SP_MULTIPLIER * (expGained / 250L));
String html = getHtm(player.getHtmlPrefix(), "4378-04.htm");
html = html.replace("%training_level%", String.valueOf(holder.getLevel()));
html = html.replace("%training_time%", String.valueOf(trainingTime));
@ -176,8 +176,8 @@ public final class Recruiter extends AbstractNpcAI
{
player.sendPacket(SystemMessageId.CALCULATING_XP_AND_SP_OBTAINED_FROM_TRAINING);
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = expGained / 250;
final long expGained = (long) ((Config.TRAINING_CAMP_EXP_MULTIPLIER * ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider())) / 60);
final long spGained = (long) (Config.TRAINING_CAMP_SP_MULTIPLIER * (expGained / 250L));
player.addExpAndSp(expGained, spGained);
final SystemMessage sysMsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_COMPLETED_TRAINING_IN_THE_ROYAL_TRAINING_CAMP_AND_OBTAINED_S1_XP_AND_S2_SP);

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

@ -857,6 +857,8 @@ public final class Config
public static int TRAINING_CAMP_MAX_DURATION;
public static int TRAINING_CAMP_MIN_LEVEL;
public static int TRAINING_CAMP_MAX_LEVEL;
public static double TRAINING_CAMP_EXP_MULTIPLIER;
public static double TRAINING_CAMP_SP_MULTIPLIER;
public static boolean SHOW_LICENCE;
public static boolean SHOW_PI_AGREEMENT;
public static boolean ACCEPT_NEW_GAMESERVER;
@ -1746,6 +1748,8 @@ public final class Config
TRAINING_CAMP_MAX_DURATION = trainingCampSettings.getInt("TrainingCampDuration", 18000);
TRAINING_CAMP_MIN_LEVEL = trainingCampSettings.getInt("TrainingCampMinLevel", 18);
TRAINING_CAMP_MAX_LEVEL = trainingCampSettings.getInt("TrainingCampMaxLevel", 127);
TRAINING_CAMP_EXP_MULTIPLIER = trainingCampSettings.getDouble("TrainingCampExpMultiplier", 1.0);
TRAINING_CAMP_SP_MULTIPLIER = trainingCampSettings.getDouble("TrainingCampSpMultiplier", 1.0);
// MMO
final PropertiesParser mmoSettings = new PropertiesParser(MMO_CONFIG_FILE);

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java
View File

@ -36,8 +36,8 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket
{
_timeElapsed = timeElapsed;
_timeRemaining = timeRemaing;
_maxExp = (ExperienceData.getInstance().getExpForLevel(level) * ExperienceData.getInstance().getTrainingRate(level)) / Config.TRAINING_CAMP_MAX_DURATION;
_maxSp = _maxExp / 250d;
_maxExp = Config.TRAINING_CAMP_EXP_MULTIPLIER * ((ExperienceData.getInstance().getExpForLevel(level) * ExperienceData.getInstance().getTrainingRate(level)) / Config.TRAINING_CAMP_MAX_DURATION);
_maxSp = Config.TRAINING_CAMP_SP_MULTIPLIER * (_maxExp / 250d);
}
@Override

8
L2J_Mobius_3.0_Helios/dist/game/config/TrainingCamp.ini vendored
View File

@ -21,3 +21,11 @@ TrainingCampMinLevel = 18
# Max level to enter Training Camp
# Default: 127
TrainingCampMaxLevel = 127
# Multiplier for rewarded EXP
# Default: 1.0
TrainingCampExpMultiplier = 1.0
# Multiplier for rewarded SP
# Default: 1.0
TrainingCampSpMultiplier = 1.0

8
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java vendored
View File

@ -139,8 +139,8 @@ public final class Recruiter extends AbstractNpcAI
final long trainingTime = Math.max(0, holder.getTrainingTime(TimeUnit.MINUTES));
if (trainingTime > 0)
{
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = expGained / 250L;
final long expGained = (long) ((Config.TRAINING_CAMP_EXP_MULTIPLIER * ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider())) / 60);
final long spGained = (long) (Config.TRAINING_CAMP_SP_MULTIPLIER * (expGained / 250L));
String html = getHtm(player.getHtmlPrefix(), "4378-04.htm");
html = html.replace("%training_level%", String.valueOf(holder.getLevel()));
html = html.replace("%training_time%", String.valueOf(trainingTime));
@ -176,8 +176,8 @@ public final class Recruiter extends AbstractNpcAI
{
player.sendPacket(SystemMessageId.CALCULATING_XP_AND_SP_OBTAINED_FROM_TRAINING);
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = expGained / 250;
final long expGained = (long) ((Config.TRAINING_CAMP_EXP_MULTIPLIER * ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider())) / 60);
final long spGained = (long) (Config.TRAINING_CAMP_SP_MULTIPLIER * (expGained / 250L));
player.addExpAndSp(expGained, spGained);
final SystemMessage sysMsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_COMPLETED_TRAINING_IN_THE_ROYAL_TRAINING_CAMP_AND_OBTAINED_S1_XP_AND_S2_SP);

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

@ -858,6 +858,8 @@ public final class Config
public static int TRAINING_CAMP_MAX_DURATION;
public static int TRAINING_CAMP_MIN_LEVEL;
public static int TRAINING_CAMP_MAX_LEVEL;
public static double TRAINING_CAMP_EXP_MULTIPLIER;
public static double TRAINING_CAMP_SP_MULTIPLIER;
public static boolean SHOW_LICENCE;
public static boolean SHOW_PI_AGREEMENT;
public static boolean ACCEPT_NEW_GAMESERVER;
@ -1754,6 +1756,8 @@ public final class Config
TRAINING_CAMP_MAX_DURATION = trainingCampSettings.getInt("TrainingCampDuration", 18000);
TRAINING_CAMP_MIN_LEVEL = trainingCampSettings.getInt("TrainingCampMinLevel", 18);
TRAINING_CAMP_MAX_LEVEL = trainingCampSettings.getInt("TrainingCampMaxLevel", 127);
TRAINING_CAMP_EXP_MULTIPLIER = trainingCampSettings.getDouble("TrainingCampExpMultiplier", 1.0);
TRAINING_CAMP_SP_MULTIPLIER = trainingCampSettings.getDouble("TrainingCampSpMultiplier", 1.0);
// MMO
final PropertiesParser mmoSettings = new PropertiesParser(MMO_CONFIG_FILE);

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java
View File

@ -36,8 +36,8 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket
{
_timeElapsed = timeElapsed;
_timeRemaining = timeRemaing;
_maxExp = (ExperienceData.getInstance().getExpForLevel(level) * ExperienceData.getInstance().getTrainingRate(level)) / Config.TRAINING_CAMP_MAX_DURATION;
_maxSp = _maxExp / 250d;
_maxExp = Config.TRAINING_CAMP_EXP_MULTIPLIER * ((ExperienceData.getInstance().getExpForLevel(level) * ExperienceData.getInstance().getTrainingRate(level)) / Config.TRAINING_CAMP_MAX_DURATION);
_maxSp = Config.TRAINING_CAMP_SP_MULTIPLIER * (_maxExp / 250d);
}
@Override

8
L2J_Mobius_4.0_GrandCrusade/dist/game/config/TrainingCamp.ini vendored
View File

@ -21,3 +21,11 @@ TrainingCampMinLevel = 18
# Max level to enter Training Camp
# Default: 127
TrainingCampMaxLevel = 127
# Multiplier for rewarded EXP
# Default: 1.0
TrainingCampExpMultiplier = 1.0
# Multiplier for rewarded SP
# Default: 1.0
TrainingCampSpMultiplier = 1.0

8
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java vendored
View File

@ -139,8 +139,8 @@ public final class Recruiter extends AbstractNpcAI
final long trainingTime = Math.max(0, holder.getTrainingTime(TimeUnit.MINUTES));
if (trainingTime > 0)
{
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = expGained / 250L;
final long expGained = (long) ((Config.TRAINING_CAMP_EXP_MULTIPLIER * ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider())) / 60);
final long spGained = (long) (Config.TRAINING_CAMP_SP_MULTIPLIER * (expGained / 250L));
String html = getHtm(player.getHtmlPrefix(), "4378-04.htm");
html = html.replace("%training_level%", String.valueOf(holder.getLevel()));
html = html.replace("%training_time%", String.valueOf(trainingTime));
@ -176,8 +176,8 @@ public final class Recruiter extends AbstractNpcAI
{
player.sendPacket(SystemMessageId.CALCULATING_XP_AND_SP_OBTAINED_FROM_TRAINING);
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = expGained / 250;
final long expGained = (long) ((Config.TRAINING_CAMP_EXP_MULTIPLIER * ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider())) / 60);
final long spGained = (long) (Config.TRAINING_CAMP_SP_MULTIPLIER * (expGained / 250L));
player.addExpAndSp(expGained, spGained);
final SystemMessage sysMsg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_COMPLETED_TRAINING_IN_THE_ROYAL_TRAINING_CAMP_AND_OBTAINED_S1_XP_AND_S2_SP);

4
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/Config.java
View File

@ -857,6 +857,8 @@ public final class Config
public static int TRAINING_CAMP_MAX_DURATION;
public static int TRAINING_CAMP_MIN_LEVEL;
public static int TRAINING_CAMP_MAX_LEVEL;
public static double TRAINING_CAMP_EXP_MULTIPLIER;
public static double TRAINING_CAMP_SP_MULTIPLIER;
public static boolean SHOW_LICENCE;
public static boolean SHOW_PI_AGREEMENT;
public static boolean ACCEPT_NEW_GAMESERVER;
@ -1752,6 +1754,8 @@ public final class Config
TRAINING_CAMP_MAX_DURATION = trainingCampSettings.getInt("TrainingCampDuration", 18000);
TRAINING_CAMP_MIN_LEVEL = trainingCampSettings.getInt("TrainingCampMinLevel", 18);
TRAINING_CAMP_MAX_LEVEL = trainingCampSettings.getInt("TrainingCampMaxLevel", 127);
TRAINING_CAMP_EXP_MULTIPLIER = trainingCampSettings.getDouble("TrainingCampExpMultiplier", 1.0);
TRAINING_CAMP_SP_MULTIPLIER = trainingCampSettings.getDouble("TrainingCampSpMultiplier", 1.0);
// MMO
final PropertiesParser mmoSettings = new PropertiesParser(MMO_CONFIG_FILE);

4
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java
View File

@ -36,8 +36,8 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket
{
_timeElapsed = timeElapsed;
_timeRemaining = timeRemaing;
_maxExp = (ExperienceData.getInstance().getExpForLevel(level) * ExperienceData.getInstance().getTrainingRate(level)) / Config.TRAINING_CAMP_MAX_DURATION;
_maxSp = _maxExp / 250d;
_maxExp = Config.TRAINING_CAMP_EXP_MULTIPLIER * ((ExperienceData.getInstance().getExpForLevel(level) * ExperienceData.getInstance().getTrainingRate(level)) / Config.TRAINING_CAMP_MAX_DURATION);
_maxSp = Config.TRAINING_CAMP_SP_MULTIPLIER * (_maxExp / 250d);
}
@Override

8
L2J_Mobius_Classic_2.0_Saviors/dist/game/config/TrainingCamp.ini vendored
View File

@ -21,3 +21,11 @@ TrainingCampMinLevel = 18
# Max level to enter Training Camp
# Default: 127
TrainingCampMaxLevel = 127
# Multiplier for rewarded EXP
# Default: 1.0
TrainingCampExpMultiplier = 1.0
# Multiplier for rewarded SP
# Default: 1.0
TrainingCampSpMultiplier = 1.0

4
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/Config.java
View File

@ -847,6 +847,8 @@ public final class Config
public static int TRAINING_CAMP_MAX_DURATION;
public static int TRAINING_CAMP_MIN_LEVEL;
public static int TRAINING_CAMP_MAX_LEVEL;
public static double TRAINING_CAMP_EXP_MULTIPLIER;
public static double TRAINING_CAMP_SP_MULTIPLIER;
public static boolean SHOW_LICENCE;
public static boolean SHOW_PI_AGREEMENT;
public static boolean ACCEPT_NEW_GAMESERVER;
@ -1680,6 +1682,8 @@ public final class Config
TRAINING_CAMP_MAX_DURATION = trainingCampSettings.getInt("TrainingCampDuration", 18000);
TRAINING_CAMP_MIN_LEVEL = trainingCampSettings.getInt("TrainingCampMinLevel", 18);
TRAINING_CAMP_MAX_LEVEL = trainingCampSettings.getInt("TrainingCampMaxLevel", 127);
TRAINING_CAMP_EXP_MULTIPLIER = trainingCampSettings.getDouble("TrainingCampExpMultiplier", 1.0);
TRAINING_CAMP_SP_MULTIPLIER = trainingCampSettings.getDouble("TrainingCampSpMultiplier", 1.0);
// MMO
final PropertiesParser mmoSettings = new PropertiesParser(MMO_CONFIG_FILE);

4
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/training/ExTrainingZone_Admission.java
View File

@ -36,8 +36,8 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket
{
_timeElapsed = timeElapsed;
_timeRemaining = timeRemaing;
_maxExp = (ExperienceData.getInstance().getExpForLevel(level) * ExperienceData.getInstance().getTrainingRate(level)) / Config.TRAINING_CAMP_MAX_DURATION;
_maxSp = _maxExp / 250d;
_maxExp = Config.TRAINING_CAMP_EXP_MULTIPLIER * ((ExperienceData.getInstance().getExpForLevel(level) * ExperienceData.getInstance().getTrainingRate(level)) / Config.TRAINING_CAMP_MAX_DURATION);
_maxSp = Config.TRAINING_CAMP_SP_MULTIPLIER * (_maxExp / 250d);
}
@Override