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

Training camp improvements.

Browse Source
This commit is contained in:
MobiusDev
2017-11-17 16:39:39 +00:00
parent 669b008d20
commit dde93f3788
14 changed files with 25 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,15 +114,7 @@ public final class Recruiter extends AbstractNpcAI
// @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it.
player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1));
final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration;
if (trainingCampDuration > 0)
{
player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining));
}
else
{
player.sendPacket(new ExTrainingZone_Admission(player));
}
player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining));
startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player);
}
else
@@ -147,10 +139,8 @@ public final class Recruiter extends AbstractNpcAI
final long trainingTime = Math.max(0, holder.getTrainingTime(TimeUnit.MINUTES));
if (trainingTime > 0)
{
long expGained = 0;
long spGained = 0;
expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider());
spGained = expGained / 250L;
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = 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));
@@ -186,7 +176,7 @@ 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();
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = expGained / 250;
player.addExpAndSp(expGained, spGained);
@@ -215,6 +205,7 @@ public final class Recruiter extends AbstractNpcAI
if ((holder != null) && (holder.getObjectId() == player.getObjectId()))
{
holder.setEndTime(System.currentTimeMillis());
player.setTraingCampInfo(holder);
player.enableAllSkills();
player.setIsInvul(false);
player.setInvisible(false);

1
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java
View File

@@ -53,6 +53,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket
if (holder.isTraining())
{
holder.setEndTime(System.currentTimeMillis());
activeChar.setTraingCampInfo(holder);
activeChar.enableAllSkills();
activeChar.setIsInvul(false);
activeChar.setInvisible(false);

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

@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.network.serverpackets.training;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketWriter;
import com.l2jmobius.gameserver.data.xml.impl.ExperienceData;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.OutgoingPackets;
import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
@@ -33,14 +32,6 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket
private final double _maxExp;
private final double _maxSp;
public ExTrainingZone_Admission(L2PcInstance player)
{
_timeElapsed = 0;
_timeRemaining = Config.TRAINING_CAMP_MAX_DURATION;
_maxExp = (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel())) / Config.TRAINING_CAMP_MAX_DURATION;
_maxSp = _maxExp / 250d;
}
public ExTrainingZone_Admission(int level, long timeElapsed, long timeRemaing)
{
_timeElapsed = timeElapsed;

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

@@ -114,15 +114,7 @@ public final class Recruiter extends AbstractNpcAI
// @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it.
player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1));
final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration;
if (trainingCampDuration > 0)
{
player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining));
}
else
{
player.sendPacket(new ExTrainingZone_Admission(player));
}
player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining));
startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player);
}
else
@@ -147,10 +139,8 @@ public final class Recruiter extends AbstractNpcAI
final long trainingTime = Math.max(0, holder.getTrainingTime(TimeUnit.MINUTES));
if (trainingTime > 0)
{
long expGained = 0;
long spGained = 0;
expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider());
spGained = expGained / 250L;
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = 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));
@@ -186,7 +176,7 @@ 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();
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = expGained / 250;
player.addExpAndSp(expGained, spGained);
@@ -215,6 +205,7 @@ public final class Recruiter extends AbstractNpcAI
if ((holder != null) && (holder.getObjectId() == player.getObjectId()))
{
holder.setEndTime(System.currentTimeMillis());
player.setTraingCampInfo(holder);
player.enableAllSkills();
player.setIsInvul(false);
player.setInvisible(false);

1
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java
View File

@@ -53,6 +53,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket
if (holder.isTraining())
{
holder.setEndTime(System.currentTimeMillis());
activeChar.setTraingCampInfo(holder);
activeChar.enableAllSkills();
activeChar.setIsInvul(false);
activeChar.setInvisible(false);

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

@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.network.serverpackets.training;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketWriter;
import com.l2jmobius.gameserver.data.xml.impl.ExperienceData;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.OutgoingPackets;
import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
@@ -33,14 +32,6 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket
private final double _maxExp;
private final double _maxSp;
public ExTrainingZone_Admission(L2PcInstance player)
{
_timeElapsed = 0;
_timeRemaining = Config.TRAINING_CAMP_MAX_DURATION;
_maxExp = (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel())) / Config.TRAINING_CAMP_MAX_DURATION;
_maxSp = _maxExp / 250d;
}
public ExTrainingZone_Admission(int level, long timeElapsed, long timeRemaing)
{
_timeElapsed = timeElapsed;

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

@@ -114,15 +114,7 @@ public final class Recruiter extends AbstractNpcAI
// @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it.
player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1));
final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration;
if (trainingCampDuration > 0)
{
player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining));
}
else
{
player.sendPacket(new ExTrainingZone_Admission(player));
}
player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining));
startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player);
}
else
@@ -147,10 +139,8 @@ public final class Recruiter extends AbstractNpcAI
final long trainingTime = Math.max(0, holder.getTrainingTime(TimeUnit.MINUTES));
if (trainingTime > 0)
{
long expGained = 0;
long spGained = 0;
expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider());
spGained = expGained / 250L;
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = 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));
@@ -186,7 +176,7 @@ 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();
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = expGained / 250;
player.addExpAndSp(expGained, spGained);
@@ -215,6 +205,7 @@ public final class Recruiter extends AbstractNpcAI
if ((holder != null) && (holder.getObjectId() == player.getObjectId()))
{
holder.setEndTime(System.currentTimeMillis());
player.setTraingCampInfo(holder);
player.enableAllSkills();
player.setIsInvul(false);
player.setInvisible(false);

1
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java
View File

@@ -53,6 +53,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket
if (holder.isTraining())
{
holder.setEndTime(System.currentTimeMillis());
activeChar.setTraingCampInfo(holder);
activeChar.enableAllSkills();
activeChar.setIsInvul(false);
activeChar.setInvisible(false);

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

@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.network.serverpackets.training;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketWriter;
import com.l2jmobius.gameserver.data.xml.impl.ExperienceData;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.OutgoingPackets;
import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
@@ -33,14 +32,6 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket
private final double _maxExp;
private final double _maxSp;
public ExTrainingZone_Admission(L2PcInstance player)
{
_timeElapsed = 0;
_timeRemaining = Config.TRAINING_CAMP_MAX_DURATION;
_maxExp = (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel())) / Config.TRAINING_CAMP_MAX_DURATION;
_maxSp = _maxExp / 250d;
}
public ExTrainingZone_Admission(int level, long timeElapsed, long timeRemaing)
{
_timeElapsed = timeElapsed;

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

@@ -114,15 +114,7 @@ public final class Recruiter extends AbstractNpcAI
// @Sdw: Here we are supposed to send ExUserInfoEquipSlot with a fake equip of a SLS, feels ugly to me, not doing it.
player.setTraingCampInfo(new TrainingHolder(player.getObjectId(), player.getClassIndex(), player.getLevel(), System.currentTimeMillis(), -1));
final long timeRemaining = Config.TRAINING_CAMP_MAX_DURATION - trainingCampDuration;
if (trainingCampDuration > 0)
{
player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining));
}
else
{
player.sendPacket(new ExTrainingZone_Admission(player));
}
player.sendPacket(new ExTrainingZone_Admission(player.getLevel(), 0L, timeRemaining));
startQuestTimer("finish", TimeUnit.SECONDS.toMillis(timeRemaining), npc, player);
}
else
@@ -147,10 +139,8 @@ public final class Recruiter extends AbstractNpcAI
final long trainingTime = Math.max(0, holder.getTrainingTime(TimeUnit.MINUTES));
if (trainingTime > 0)
{
long expGained = 0;
long spGained = 0;
expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider());
spGained = expGained / 250L;
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(holder.getLevel()) * ExperienceData.getInstance().getTrainingRate(holder.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = 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));
@@ -186,7 +176,7 @@ 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();
final long expGained = (long) ((trainingTime * (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel()))) / TrainingHolder.getTrainingDivider()) / 60;
final long spGained = expGained / 250;
player.addExpAndSp(expGained, spGained);
@@ -215,6 +205,7 @@ public final class Recruiter extends AbstractNpcAI
if ((holder != null) && (holder.getObjectId() == player.getObjectId()))
{
holder.setEndTime(System.currentTimeMillis());
player.setTraingCampInfo(holder);
player.enableAllSkills();
player.setIsInvul(false);
player.setInvisible(false);

1
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java
View File

@@ -53,6 +53,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket
if (holder.isTraining())
{
holder.setEndTime(System.currentTimeMillis());
activeChar.setTraingCampInfo(holder);
activeChar.enableAllSkills();
activeChar.setIsInvul(false);
activeChar.setInvisible(false);

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

@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.network.serverpackets.training;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketWriter;
import com.l2jmobius.gameserver.data.xml.impl.ExperienceData;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.OutgoingPackets;
import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
@@ -33,14 +32,6 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket
private final double _maxExp;
private final double _maxSp;
public ExTrainingZone_Admission(L2PcInstance player)
{
_timeElapsed = 0;
_timeRemaining = Config.TRAINING_CAMP_MAX_DURATION;
_maxExp = (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel())) / Config.TRAINING_CAMP_MAX_DURATION;
_maxSp = _maxExp / 250d;
}
public ExTrainingZone_Admission(int level, long timeElapsed, long timeRemaing)
{
_timeElapsed = timeElapsed;

1
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/training/NotifyTrainingRoomEnd.java
View File

@@ -53,6 +53,7 @@ public class NotifyTrainingRoomEnd implements IClientIncomingPacket
if (holder.isTraining())
{
holder.setEndTime(System.currentTimeMillis());
activeChar.setTraingCampInfo(holder);
activeChar.enableAllSkills();
activeChar.setIsInvul(false);
activeChar.setInvisible(false);

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

@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.network.serverpackets.training;
import com.l2jmobius.Config;
import com.l2jmobius.commons.network.PacketWriter;
import com.l2jmobius.gameserver.data.xml.impl.ExperienceData;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.OutgoingPackets;
import com.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
@@ -33,14 +32,6 @@ public class ExTrainingZone_Admission implements IClientOutgoingPacket
private final double _maxExp;
private final double _maxSp;
public ExTrainingZone_Admission(L2PcInstance player)
{
_timeElapsed = 0;
_timeRemaining = Config.TRAINING_CAMP_MAX_DURATION;
_maxExp = (ExperienceData.getInstance().getExpForLevel(player.getLevel()) * ExperienceData.getInstance().getTrainingRate(player.getLevel())) / Config.TRAINING_CAMP_MAX_DURATION;
_maxSp = _maxExp / 250d;
}
public ExTrainingZone_Admission(int level, long timeElapsed, long timeRemaing)
{
_timeElapsed = timeElapsed;