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

Sync with L2JServer Jan 9th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-09 19:55:02 +00:00
parent 9c9b0aaff7
commit 4c2db62a63
618 changed files with 19803 additions and 7853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/java/com/l2jserver/gameserver/model/actor/L2Attackable.java
View File

@ -1640,7 +1640,7 @@ public class L2Attackable extends L2Npc
/*
* Return vitality points decrease (if positive) or increase (if negative) based on damage. Maximum for damage = maxHp.
*/
public float getVitalityPoints(int damage)
public int getVitalityPoints(int damage)
{
// sanity check
if (damage <= 0)
@ -1655,7 +1655,7 @@ public class L2Attackable extends L2Npc
}
// negative value - vitality will be consumed
return -Math.min(damage, getMaxHp()) / divider;
return (int) (-Math.min(damage, getMaxHp()) / divider);
}
/*

29
trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java
View File

@ -4201,10 +4201,9 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
* the L2Character position is automatically set to the destination position even if the movement is not finished.<br>
* <FONT COLOR=#FF0000><B><U>Caution</U>: The current Z position is obtained FROM THE CLIENT by the Client->Server ValidatePosition Packet.<br>
* But x and y positions must be calculated to avoid that players try to modify their movement speed.</B></FONT>
* @param gameTicks Nb of ticks since the server start
* @return True if the movement is finished
*/
public boolean updatePosition(int gameTicks)
public boolean updatePosition()
{
// Get movement data
MoveData m = _move;
@ -4228,6 +4227,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
m._yAccurate = getY();
}
int gameTicks = GameTimeController.getInstance().getGameTicks();
// Check if the position has already been calculated
if (m._moveTimestamp == gameTicks)
{
@ -4317,7 +4318,29 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
// Set the timer of last position update to now
m._moveTimestamp = gameTicks;
return (distFraction > 1);
if (distFraction > 1)
{
ThreadPoolManager.getInstance().executeAi(() ->
{
try
{
if (Config.MOVE_BASED_KNOWNLIST)
{
getKnownList().findObjects();
}
getAI().notifyEvent(CtrlEvent.EVT_ARRIVED);
}
catch (final Throwable e)
{
_log.log(Level.WARNING, "", e);
}
});
return true;
}
return false;
}
public void revalidateZone(boolean force)

4
trunk/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java
View File

@ -342,9 +342,9 @@ public abstract class L2Vehicle extends L2Character
}
@Override
public boolean updatePosition(int gameTicks)
public boolean updatePosition()
{
final boolean result = super.updatePosition(gameTicks);
final boolean result = super.updatePosition();
for (L2PcInstance player : _passengers)
{

2
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2GrandBossInstance.java
View File

@ -108,7 +108,7 @@ public final class L2GrandBossInstance extends L2MonsterInstance
}
@Override
public float getVitalityPoints(int damage)
public int getVitalityPoints(int damage)
{
return -super.getVitalityPoints(damage) / 100;
}

300
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
View File

@ -40,7 +40,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentSkipListMap;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Level;
@ -81,6 +80,7 @@ import com.l2jserver.gameserver.datatables.PlayerXpPercentLostData;
import com.l2jserver.gameserver.datatables.RecipeData;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.datatables.SkillTreesData;
import com.l2jserver.gameserver.enums.CastleSide;
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.HtmlActionScope;
import com.l2jserver.gameserver.enums.IllegalActionPunishmentType;
@ -168,7 +168,6 @@ import com.l2jserver.gameserver.model.actor.tasks.player.InventoryEnableTask;
import com.l2jserver.gameserver.model.actor.tasks.player.LookingForFishTask;
import com.l2jserver.gameserver.model.actor.tasks.player.PetFeedTask;
import com.l2jserver.gameserver.model.actor.tasks.player.PvPFlagTask;
import com.l2jserver.gameserver.model.actor.tasks.player.RecoBonusTaskEnd;
import com.l2jserver.gameserver.model.actor.tasks.player.RecoGiveTask;
import com.l2jserver.gameserver.model.actor.tasks.player.RentPetTask;
import com.l2jserver.gameserver.model.actor.tasks.player.ResetChargesTask;
@ -176,7 +175,6 @@ import com.l2jserver.gameserver.model.actor.tasks.player.ResetSoulsTask;
import com.l2jserver.gameserver.model.actor.tasks.player.SitDownTask;
import com.l2jserver.gameserver.model.actor.tasks.player.StandUpTask;
import com.l2jserver.gameserver.model.actor.tasks.player.TeleportWatchdogTask;
import com.l2jserver.gameserver.model.actor.tasks.player.VitalityTask;
import com.l2jserver.gameserver.model.actor.tasks.player.WarnUserTakeBreakTask;
import com.l2jserver.gameserver.model.actor.tasks.player.WaterTask;
import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate;
@ -262,6 +260,7 @@ import com.l2jserver.gameserver.network.serverpackets.CharInfo;
import com.l2jserver.gameserver.network.serverpackets.ConfirmDlg;
import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate;
import com.l2jserver.gameserver.network.serverpackets.ExAbnormalStatusUpdateFromTarget;
import com.l2jserver.gameserver.network.serverpackets.ExAcquireAPSkillList;
import com.l2jserver.gameserver.network.serverpackets.ExAdenaInvenCount;
import com.l2jserver.gameserver.network.serverpackets.ExAutoSoulShot;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
@ -272,6 +271,7 @@ import com.l2jserver.gameserver.network.serverpackets.ExGetBookMarkInfoPacket;
import com.l2jserver.gameserver.network.serverpackets.ExGetOnAirShip;
import com.l2jserver.gameserver.network.serverpackets.ExMagicAttackInfo;
import com.l2jserver.gameserver.network.serverpackets.ExOlympiadMode;
import com.l2jserver.gameserver.network.serverpackets.ExPledgeCount;
import com.l2jserver.gameserver.network.serverpackets.ExPrivateStoreSetWholeMsg;
import com.l2jserver.gameserver.network.serverpackets.ExSetCompassZoneCode;
import com.l2jserver.gameserver.network.serverpackets.ExStartScenePlayer;
@ -370,9 +370,9 @@ public final class L2PcInstance extends L2Playable
private static final String DELETE_TP_BOOKMARK = "DELETE FROM character_tpbookmark WHERE charId=? AND Id=?";
// Character Subclass SQL String Definitions:
private static final String RESTORE_CHAR_SUBCLASSES = "SELECT class_id,exp,sp,level,class_index FROM character_subclasses WHERE charId=? ORDER BY class_index ASC";
private static final String ADD_CHAR_SUBCLASS = "INSERT INTO character_subclasses (charId,class_id,exp,sp,level,class_index) VALUES (?,?,?,?,?,?)";
private static final String UPDATE_CHAR_SUBCLASS = "UPDATE character_subclasses SET exp=?,sp=?,level=?,class_id=? WHERE charId=? AND class_index =?";
private static final String RESTORE_CHAR_SUBCLASSES = "SELECT class_id,exp,sp,level,class_index,dual_class FROM character_subclasses WHERE charId=? ORDER BY class_index ASC";
private static final String ADD_CHAR_SUBCLASS = "INSERT INTO character_subclasses (charId,class_id,exp,sp,level,class_index,dual_class) VALUES (?,?,?,?,?,?,?)";
private static final String UPDATE_CHAR_SUBCLASS = "UPDATE character_subclasses SET exp=?,sp=?,level=?,class_id=?,dual_class=? WHERE charId=? AND class_index =?";
private static final String DELETE_CHAR_SUBCLASS = "DELETE FROM character_subclasses WHERE charId=? AND class_index=?";
// Character Henna SQL String Definitions:
@ -397,6 +397,8 @@ public final class L2PcInstance extends L2Playable
public static final int REQUEST_TIMEOUT = 15;
public static final String WORLD_CHAT_VARIABLE_NAME = "WORLD_CHAT_POINTS";
private final List<IEventListener> _eventListeners = new FastList<IEventListener>().shared();
public class AIAccessor extends L2Character.AIAccessor
@ -488,9 +490,6 @@ public final class L2PcInstance extends L2Playable
private int _fame;
private ScheduledFuture<?> _fameTask;
/** Vitality recovery task */
private ScheduledFuture<?> _vitalityTask;
private volatile ScheduledFuture<?> _teleportWatchdog;
/** The Siege state of the L2PcInstance */
@ -568,8 +567,6 @@ public final class L2PcInstance extends L2Playable
private int _recomHave; // how much I was recommended by others
/** The number of recommendation that the L2PcInstance can give */
private int _recomLeft; // how many recommendations I can give to others
/** Recommendation Bonus task **/
private ScheduledFuture<?> _recoBonusTask;
/** Recommendation task **/
private ScheduledFuture<?> _recoGiveTask;
/** Recommendation Two Hours bonus **/
@ -1119,8 +1116,6 @@ public final class L2PcInstance extends L2Playable
// Create a L2Radar object
_radar = new L2Radar(this);
startVitalityTask();
}
@Override
@ -5556,6 +5551,10 @@ public final class L2PcInstance extends L2Playable
increasePvpKills(target);
}
}
else if (targetPlayer.isOnDarkSide()) // Member's of Dark side can be killed without any penalty
{
increasePvpKills(target);
}
else if (targetPlayer.getPvpFlag() == 0) // Target player doesn't have karma
{
increasePkKillsAndKarma(target);
@ -5768,8 +5767,6 @@ public final class L2PcInstance extends L2Playable
stopSoulTask();
stopChargeTask();
stopFameTask();
stopVitalityTask();
stopRecoBonusTask();
stopRecoGiveTask();
}
@ -6173,7 +6170,7 @@ public final class L2PcInstance extends L2Playable
@Override
protected void reduceArrowCount(boolean bolts)
{
L2ItemInstance arrows = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
final L2ItemInstance arrows = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
if (arrows == null)
{
@ -6190,6 +6187,12 @@ public final class L2PcInstance extends L2Playable
return;
}
// Infinite quiver doesn't decreases arrows upon use
if (arrows.isEtcItem() && arrows.getEtcItem().isInfinite())
{
return;
}
// Adjust item quantity
if (arrows.getCount() > 1)
{
@ -7017,8 +7020,6 @@ public final class L2PcInstance extends L2Playable
CursedWeaponsManager.getInstance().checkPlayer(player);
player.setVitalityPoints(rset.getInt("vitality_points"), true);
// Set the x,y,z position of the L2PcInstance and make it invisible
player.setXYZInvisible(rset.getInt("x"), rset.getInt("y"), rset.getInt("z"));
@ -7113,6 +7114,9 @@ public final class L2PcInstance extends L2Playable
final long masks = player.getVariables().getLong(COND_OVERRIDE_KEY, PcCondOverride.getAllExceptionsMask());
player.setOverrideCond(masks);
}
player.loadRecommendations();
player.startRecoGiveTask();
}
catch (Exception e)
{
@ -7194,8 +7198,9 @@ public final class L2PcInstance extends L2Playable
subClass.setClassId(rset.getInt("class_id"));
subClass.setLevel(rset.getByte("level"));
subClass.setExp(rset.getLong("exp"));
subClass.setSp(rset.getInt("sp"));
subClass.setSp(rset.getLong("sp"));
subClass.setClassIndex(rset.getInt("class_index"));
subClass.setIsDualClass(rset.getBoolean("dual_class"));
// Enforce the correct indexing of _subClasses against their class indexes.
player.getSubClasses().put(subClass.getClassIndex(), subClass);
@ -7470,7 +7475,7 @@ public final class L2PcInstance extends L2Playable
statement.setString(45, getName());
statement.setLong(46, 0); // unset
statement.setInt(47, getBookMarkSlot());
statement.setInt(48, getVitalityPoints());
statement.setInt(48, 0); // unset
statement.setString(49, getLang());
statement.setInt(50, getObjectId());
@ -7500,7 +7505,7 @@ public final class L2PcInstance extends L2Playable
statement.setInt(4, subClass.getClassId());
statement.setInt(5, getObjectId());
statement.setInt(6, subClass.getClassIndex());
statement.setBoolean(7, subClass.isDualClass());
statement.execute();
statement.clearParameters();
}
@ -9772,6 +9777,42 @@ public final class L2PcInstance extends L2Playable
return _blockList;
}
/**
* @param player
* @return returns {@code true} if player is current player cannot accepting messages from the target player, {@code false} otherwise
*/
public boolean isBlocking(L2PcInstance player)
{
return _blockList.isBlockAll() || _blockList.isInBlockList(player);
}
/**
* @param player
* @return returns {@code true} if player is current player can accepting messages from the target player, {@code false} otherwise
*/
public boolean isNotBlocking(L2PcInstance player)
{
return !_blockList.isBlockAll() && !_blockList.isInBlockList(player);
}
/**
* @param player
* @return returns {@code true} if player is target player cannot accepting messages from the current player, {@code false} otherwise
*/
public boolean isBlocked(L2PcInstance player)
{
return player.getBlockList().isBlockAll() || player.getBlockList().isInBlockList(this);
}
/**
* @param player
* @return returns {@code true} if player is target player can accepting messages from the current player, {@code false} otherwise
*/
public boolean isNotBlocked(L2PcInstance player)
{
return !player.getBlockList().isBlockAll() && !player.getBlockList().isInBlockList(this);
}
public void setHero(boolean hero)
{
if (hero && (_baseClass == _activeClass))
@ -9956,6 +9997,10 @@ public final class L2PcInstance extends L2Playable
_noble = val;
sendSkillList();
if (val && (getLevel() == 99))
{
sendPacket(new ExAcquireAPSkillList(this));
}
}
public void setLvlJoinedAcademy(int lvl)
@ -10092,7 +10137,8 @@ public final class L2PcInstance extends L2Playable
statement.setLong(3, newClass.getExp());
statement.setLong(4, newClass.getSp());
statement.setInt(5, newClass.getLevel());
statement.setInt(6, newClass.getClassIndex()); // <-- Added
statement.setInt(6, newClass.getClassIndex());
statement.setBoolean(7, newClass.isDualClass());
statement.execute();
}
catch (Exception e)
@ -10203,6 +10249,24 @@ public final class L2PcInstance extends L2Playable
return _classIndex > 0;
}
public void setDualClass(int classIndex)
{
if (isSubClassActive())
{
getSubClasses().get(_classIndex).setIsDualClass(true);
}
}
public boolean isDualClassActive()
{
return isSubClassActive() && getSubClasses().get(_classIndex).isDualClass();
}
public boolean hasDualClass()
{
return getSubClasses().values().stream().anyMatch(SubClass::isDualClass);
}
public Map<Integer, SubClass> getSubClasses()
{
if (_subClasses == null)
@ -11567,6 +11631,7 @@ public final class L2PcInstance extends L2Playable
if (getClanId() > 0)
{
getClan().broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this);
getClan().broadcastToOnlineMembers(new ExPledgeCount(getClan()));
// ClanTable.getInstance().getClan(getClanId()).broadcastToOnlineMembers(new PledgeShowMemberListAdd(this));
}
@ -12240,23 +12305,6 @@ public final class L2PcInstance extends L2Playable
}
}
public void startVitalityTask()
{
if (Config.ENABLE_VITALITY && (_vitalityTask == null))
{
_vitalityTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new VitalityTask(this), 1000, 60000);
}
}
public void stopVitalityTask()
{
if (_vitalityTask != null)
{
_vitalityTask.cancel(false);
_vitalityTask = null;
}
}
public int getPowerGrade()
{
return _powerGrade;
@ -12541,20 +12589,12 @@ public final class L2PcInstance extends L2Playable
return getStat().getVitalityPoints();
}
/**
* @return Vitality Level
*/
public int getVitalityLevel()
{
return getStat().getVitalityLevel();
}
public void setVitalityPoints(int points, boolean quiet)
{
getStat().setVitalityPoints(points, quiet);
}
public void updateVitalityPoints(float points, boolean useRates, boolean quiet)
public void updateVitalityPoints(int points, boolean useRates, boolean quiet)
{
getStat().updateVitalityPoints(points, useRates, quiet);
}
@ -13889,11 +13929,9 @@ public final class L2PcInstance extends L2Playable
/**
* Load L2PcInstance Recommendations data.
* @return
*/
private long loadRecommendations()
private void loadRecommendations()
{
long _time_left = 0;
try (Connection con = L2DatabaseFactory.getInstance().getConnection();
PreparedStatement statement = con.prepareStatement("SELECT rec_have,rec_left,time_left FROM character_reco_bonus WHERE charId=? LIMIT 1"))
{
@ -13904,11 +13942,6 @@ public final class L2PcInstance extends L2Playable
{
setRecomHave(rset.getInt("rec_have"));
setRecomLeft(rset.getInt("rec_left"));
_time_left = rset.getLong("time_left");
}
else
{
_time_left = 3600000;
}
}
}
@ -13916,7 +13949,6 @@ public final class L2PcInstance extends L2Playable
{
_log.log(Level.SEVERE, "Could not restore Recommendations for player: " + getObjectId(), e);
}
return _time_left;
}
/**
@ -13924,23 +13956,17 @@ public final class L2PcInstance extends L2Playable
*/
public void storeRecommendations()
{
long recoTaskEnd = 0;
if (_recoBonusTask != null)
{
recoTaskEnd = Math.max(0, _recoBonusTask.getDelay(TimeUnit.MILLISECONDS));
}
try (Connection con = L2DatabaseFactory.getInstance().getConnection();
PreparedStatement statement = con.prepareStatement("INSERT INTO character_reco_bonus (charId,rec_have,rec_left,time_left) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE rec_have=?, rec_left=?, time_left=?"))
{
statement.setInt(1, getObjectId());
statement.setInt(2, getRecomHave());
statement.setInt(3, getRecomLeft());
statement.setLong(4, recoTaskEnd);
statement.setLong(4, 0);
// Update part
statement.setInt(5, getRecomHave());
statement.setInt(6, getRecomLeft());
statement.setLong(7, recoTaskEnd);
statement.setLong(7, 0);
statement.execute();
}
catch (Exception e)
@ -13949,23 +13975,8 @@ public final class L2PcInstance extends L2Playable
}
}
public void checkRecoBonusTask()
public void startRecoGiveTask()
{
// Load data
long taskTime = loadRecommendations();
if (taskTime > 0)
{
// Add 20 recos on first login
if (taskTime == 3600000)
{
setRecomLeft(getRecomLeft() + 20);
}
// If player have some timeleft, start bonus task
_recoBonusTask = ThreadPoolManager.getInstance().scheduleGeneral(new RecoBonusTaskEnd(this), taskTime);
}
// Create task to give new recommendations
_recoGiveTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new RecoGiveTask(this), 7200000, 3600000);
@ -13973,15 +13984,6 @@ public final class L2PcInstance extends L2Playable
storeRecommendations();
}
public void stopRecoBonusTask()
{
if (_recoBonusTask != null)
{
_recoBonusTask.cancel(false);
_recoBonusTask = null;
}
}
public void stopRecoGiveTask()
{
if (_recoGiveTask != null)
@ -14001,22 +14003,6 @@ public final class L2PcInstance extends L2Playable
_recoTwoHoursGiven = val;
}
public int getRecomBonusTime()
{
if (_recoBonusTask != null)
{
return (int) Math.max(0, _recoBonusTask.getDelay(TimeUnit.SECONDS));
}
return 0;
}
public int getRecomBonusType()
{
// Maintain = 1
return 0;
}
public void setLastPetitionGmName(String gmName)
{
_lastPetitionGmName = gmName;
@ -14342,6 +14328,25 @@ public final class L2PcInstance extends L2Playable
}
public boolean isAwaken()
{
if (((getActiveClass() >= 139) && (getActiveClass() <= 181)) || (getActiveClass() >= 188))
{
return true;
}
return false;
}
public int getJumpTrackId()
{
return _jumpTrackId;
}
public void setJumpTrackId(int jumpTrackId)
{
_jumpTrackId = jumpTrackId;
}
/**
* @param target the target
* @return {@code true} if this player got war with the target, {@code false} otherwise.
@ -14362,82 +14367,149 @@ public final class L2PcInstance extends L2Playable
return false;
}
/**
* Sets the beauty shop hair
* @param hairId
*/
public void setVisualHair(int hairId)
{
getVariables().set("visualHairId", hairId);
}
/**
* Sets the beauty shop hair color
* @param colorId
*/
public void setVisualHairColor(int colorId)
{
getVariables().set("visualHairColorId", colorId);
}
/**
* Sets the beauty shop modified face
* @param faceId
*/
public void setVisualFace(int faceId)
{
getVariables().set("visualFaceId", faceId);
}
/**
* @return the beauty shop hair, or his normal if not changed.
*/
public int getVisualHair()
{
return getVariables().getInt("visualHairId", getAppearance().getHairStyle());
}
/**
* @return the beauty shop hair color, or his normal if not changed.
*/
public int getVisualHairColor()
{
return getVariables().getInt("visualHairColorId", getAppearance().getHairColor());
}
/**
* @return the beauty shop modified face, or his normal if not changed.
*/
public int getVisualFace()
{
return getVariables().getInt("visualFaceId", getAppearance().getFace());
}
/**
* @return {@code true} if player has mentees, {@code false} otherwise
*/
public boolean isMentor()
{
return MentorManager.getInstance().isMentor(getObjectId());
}
/**
* @return {@code true} if player has mentor, {@code false} otherwise
*/
public boolean isMentee()
{
return MentorManager.getInstance().isMentee(getObjectId());
}
/**
* @return the amount of ability points player can spend on learning skills.
*/
public int getAbilityPoints()
{
return getVariables().getInt("ABILITY_POINTS", 0);
}
/**
* Sets the amount of ability points player can spend on learning skills.
* @param points
*/
public void setAbilityPoints(int points)
{
getVariables().set("ABILITY_POINTS", points);
}
/**
* @return how much ability points player has spend on learning skills.
*/
public int getAbilityPointsUsed()
{
return getVariables().getInt("ABILITY_POINTS_USED", 0);
}
/**
* Sets how much ability points player has spend on learning skills.
* @param points
*/
public void setAbilityPointsUsed(int points)
{
getVariables().set("ABILITY_POINTS_USED", points);
}
public boolean isAwaken()
/**
* @return The amount of times player can use world chat
*/
public int getWorldChatPoints()
{
if (((getActiveClass() >= 139) && (getActiveClass() <= 181)) || (getActiveClass() >= 188))
return getVariables().getInt(WORLD_CHAT_VARIABLE_NAME, 1);
}
/**
* Sets the amount of times player can use world chat
* @param points
*/
public void setWorldChatPoints(int points)
{
getVariables().set(WORLD_CHAT_VARIABLE_NAME, points);
}
/**
* @return Side of the player.
*/
public CastleSide getPlayerSide()
{
if ((getClan() == null) || (getClan().getCastleId() == 0))
{
return true;
return CastleSide.NEUTRAL;
}
return false;
return CastleManager.getInstance().getCastleById(getClan().getCastleId()).getSide();
}
public int getJumpTrackId()
/**
* @return {@code true} if player is on Dark side, {@code false} otherwise.
*/
public boolean isOnDarkSide()
{
return _jumpTrackId;
return getPlayerSide() == CastleSide.DARK;
}
public void setJumpTrackId(int jumpTrackId)
/**
* @return {@code true} if player is on Light side, {@code false} otherwise.
*/
public boolean isOnLightSide()
{
_jumpTrackId = jumpTrackId;
return getPlayerSide() == CastleSide.LIGHT;
}
}

2
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2RaidBossInstance.java
View File

@ -157,7 +157,7 @@ public class L2RaidBossInstance extends L2MonsterInstance
}
@Override
public float getVitalityPoints(int damage)
public int getVitalityPoints(int damage)
{
return -super.getVitalityPoints(damage) / 100;
}

19
trunk/java/com/l2jserver/gameserver/model/actor/instance/L2TeleporterInstance.java
View File

@ -129,7 +129,7 @@ public final class L2TeleporterInstance extends L2Npc
finalName = "<fstring>" + loc.getNpcStringId().getId() + "</fstring>";
confirmDesc = "F;" + loc.getNpcStringId().getId();
}
if (shouldPayFee(player, loc))
if (shouldPayFee(player, type, loc))
{
finalName += " - " + calculateFee(player, type, loc) + " " + getItemName(loc.getFeeId(), true);
}
@ -192,7 +192,7 @@ public final class L2TeleporterInstance extends L2Npc
{
player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_WHILE_IN_POSSESSION_OF_A_WARD);
}
else if (shouldPayFee(player, loc) && !player.destroyItemByItemId("Teleport", loc.getFeeId(), calculateFee(player, type, loc), this, true))
else if (shouldPayFee(player, type, loc) && !player.destroyItemByItemId("Teleport", loc.getFeeId(), calculateFee(player, type, loc), this, true))
{
if (loc.getFeeId() == Inventory.ADENA_ID)
{
@ -227,13 +227,13 @@ public final class L2TeleporterInstance extends L2Npc
*/
private long calculateFee(L2PcInstance player, TeleportType type, TeleportLocation loc)
{
if (player.getLevel() < 77)
{
return 0;
}
if (type == TeleportType.NORMAL)
{
if (!player.isSubClassActive() && (player.getLevel() < 77))
{
return 0;
}
final Calendar cal = Calendar.getInstance();
final int hour = cal.get(Calendar.HOUR_OF_DAY);
final int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
@ -242,13 +242,12 @@ public final class L2TeleporterInstance extends L2Npc
return loc.getFeeCount() / 2;
}
}
return loc.getFeeCount();
}
protected boolean shouldPayFee(L2PcInstance player, TeleportLocation loc)
protected boolean shouldPayFee(L2PcInstance player, TeleportType type, TeleportLocation loc)
{
return Config.ALT_GAME_FREE_TELEPORT || ((player.getLevel() >= 76) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0)));
return (type != TeleportType.NORMAL) || (!Config.ALT_GAME_FREE_TELEPORT && ((player.getLevel() > 76) || player.isSubClassActive()) && ((loc.getFeeId() != 0) && (loc.getFeeCount() > 0)));
}
protected int parseNextInt(StringTokenizer st, int defaultVal)

176
trunk/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java
View File

@ -31,7 +31,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2ClassMasterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
import com.l2jserver.gameserver.model.actor.transform.TransformTemplate;
import com.l2jserver.gameserver.model.entity.RecoBonus;
import com.l2jserver.gameserver.model.events.EventDispatcher;
import com.l2jserver.gameserver.model.events.impl.character.player.OnPlayerLevelChanged;
import com.l2jserver.gameserver.model.stats.Formulas;
@ -40,6 +39,7 @@ import com.l2jserver.gameserver.model.stats.Stats;
import com.l2jserver.gameserver.model.zone.ZoneId;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList;
import com.l2jserver.gameserver.network.serverpackets.ExAcquireAPSkillList;
import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
import com.l2jserver.gameserver.network.serverpackets.ExVitalityPointInfo;
import com.l2jserver.gameserver.network.serverpackets.ExVoteSystemInfo;
@ -57,8 +57,6 @@ public class PcStat extends PlayableStat
private int _oldMaxHp; // stats watch
private int _oldMaxMp; // stats watch
private int _oldMaxCp; // stats watch
private float _vitalityPoints = 1;
private byte _vitalityLevel = 0;
private long _startingXp;
/** Player's maximum cubic count. */
private int _maxCubicCount = 1;
@ -66,17 +64,9 @@ public class PcStat extends PlayableStat
private final AtomicInteger _talismanSlots = new AtomicInteger();
private boolean _cloakSlot = false;
public static final int VITALITY_LEVELS[] =
{
240,
2000,
13000,
17000,
20000
};
public static final int MAX_VITALITY_POINTS = VITALITY_LEVELS[4];
public static final int MAX_VITALITY_POINTS = 140000;
public static final int MIN_VITALITY_POINTS = 1;
public static String VITALITY_VARIABLE = "vitality_points";
public PcStat(L2PcInstance activeChar)
{
@ -316,7 +306,6 @@ public class PcStat extends PlayableStat
getActiveChar().sendPacket(new UserInfo(getActiveChar()));
// Send acquirable skill list
getActiveChar().sendPacket(new AcquireSkillList(getActiveChar()));
getActiveChar().sendPacket(new ExBrExtraUserInfo(getActiveChar()));
getActiveChar().sendPacket(new ExVoteSystemInfo(getActiveChar()));
if (getActiveChar().isInParty())
{
@ -324,6 +313,10 @@ public class PcStat extends PlayableStat
partyWindow.addUpdateType(PartySmallWindowUpdateType.LEVEL);
getActiveChar().getParty().broadcastToPartyMembers(getActiveChar(), partyWindow);
}
if ((getLevel() == 99) && getActiveChar().isNoble())
{
getActiveChar().sendPacket(new ExAcquireAPSkillList(getActiveChar()));
}
return levelIncreased;
}
@ -655,60 +648,17 @@ public class PcStat extends PlayableStat
return val;
}
private void updateVitalityLevel(boolean quiet)
{
final byte level;
if (_vitalityPoints <= VITALITY_LEVELS[0])
{
level = 0;
}
else if (_vitalityPoints <= VITALITY_LEVELS[1])
{
level = 1;
}
else if (_vitalityPoints <= VITALITY_LEVELS[2])
{
level = 2;
}
else if (_vitalityPoints <= VITALITY_LEVELS[3])
{
level = 3;
}
else
{
level = 4;
}
if (!quiet && (level != _vitalityLevel))
{
if (level < _vitalityLevel)
{
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_HAS_DECREASED);
}
else
{
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_HAS_INCREASED);
}
if (level == 0)
{
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_IS_FULLY_EXHAUSTED);
}
else if (level == 4)
{
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_IS_AT_MAXIMUM);
}
}
_vitalityLevel = level;
}
/*
* Return current vitality points in integer format
*/
public int getVitalityPoints()
{
return (int) _vitalityPoints;
return getActiveChar().getAccountVariables().getInt(VITALITY_VARIABLE, Config.STARTING_VITALITY_POINTS);
}
public void setVitalityPoints(int points)
{
getActiveChar().getAccountVariables().set(VITALITY_VARIABLE, points);
}
/*
@ -717,13 +667,31 @@ public class PcStat extends PlayableStat
public void setVitalityPoints(int points, boolean quiet)
{
points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
if (points == _vitalityPoints)
if (points == getVitalityPoints())
{
return;
}
_vitalityPoints = points;
updateVitalityLevel(quiet);
if (points < getVitalityPoints())
{
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_HAS_DECREASED);
}
else
{
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_HAS_INCREASED);
}
setVitalityPoints(points);
if (points == 0)
{
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_IS_FULLY_EXHAUSTED);
}
else if (points == MAX_VITALITY_POINTS)
{
getActiveChar().sendPacket(SystemMessageId.YOUR_VITALITY_IS_AT_MAXIMUM);
}
final L2PcInstance player = getActiveChar();
player.sendPacket(new ExVitalityPointInfo(getVitalityPoints()));
if (player.isInParty())
@ -734,7 +702,7 @@ public class PcStat extends PlayableStat
}
}
public synchronized void updateVitalityPoints(float points, boolean useRates, boolean quiet)
public synchronized void updateVitalityPoints(int points, boolean useRates, boolean quiet)
{
if ((points == 0) || !Config.ENABLE_VITALITY)
{
@ -776,73 +744,35 @@ public class PcStat extends PlayableStat
if (points > 0)
{
points = Math.min(_vitalityPoints + points, MAX_VITALITY_POINTS);
points = Math.min(getVitalityPoints() + points, MAX_VITALITY_POINTS);
}
else
{
points = Math.max(_vitalityPoints + points, MIN_VITALITY_POINTS);
points = Math.max(getVitalityPoints() + points, MIN_VITALITY_POINTS);
}
if (Math.abs(points - _vitalityPoints) <= 1e-6)
if (Math.abs(points - getVitalityPoints()) <= 1e-6)
{
return;
}
_vitalityPoints = points;
updateVitalityLevel(quiet);
setVitalityPoints(points);
}
public double getVitalityMultiplier()
{
double vitality = 1.0;
if (Config.ENABLE_VITALITY)
{
switch (getVitalityLevel())
{
case 1:
vitality = Config.RATE_VITALITY_LEVEL_1;
break;
case 2:
vitality = Config.RATE_VITALITY_LEVEL_2;
break;
case 3:
vitality = Config.RATE_VITALITY_LEVEL_3;
break;
case 4:
vitality = Config.RATE_VITALITY_LEVEL_4;
break;
}
}
return vitality;
}
/**
* @return the _vitalityLevel
*/
public byte getVitalityLevel()
{
return _vitalityLevel;
return Config.ENABLE_VITALITY ? Config.RATE_VITALITY_EXP_MULTIPLIER : 1;
}
public double getExpBonusMultiplier()
{
double bonus = 1.0;
double vitality = 1.0;
double nevits = 1.0;
double hunting = 1.0;
double bonusExp = 1.0;
// Bonus from Vitality System
vitality = getVitalityMultiplier();
// Bonus from Nevit's Blessing
nevits = RecoBonus.getRecoMultiplier(getActiveChar());
// Bonus from Nevit's Hunting
// TODO: Nevit's hunting bonus
// Bonus exp from skills
bonusExp = 1 + (calcStat(Stats.BONUS_EXP, 0, null, null) / 100);
@ -850,14 +780,7 @@ public class PcStat extends PlayableStat
{
bonus += (vitality - 1);
}
if (nevits > 1.0)
{
bonus += (nevits - 1);
}
if (hunting > 1.0)
{
bonus += (hunting - 1);
}
if (bonusExp > 1)
{
bonus += (bonusExp - 1);
@ -874,19 +797,11 @@ public class PcStat extends PlayableStat
{
double bonus = 1.0;
double vitality = 1.0;
double nevits = 1.0;
double hunting = 1.0;
double bonusSp = 1.0;
// Bonus from Vitality System
vitality = getVitalityMultiplier();
// Bonus from Nevit's Blessing
nevits = RecoBonus.getRecoMultiplier(getActiveChar());
// Bonus from Nevit's Hunting
// TODO: Nevit's hunting bonus
// Bonus sp from skills
bonusSp = 1 + (calcStat(Stats.BONUS_SP, 0, null, null) / 100);
@ -894,14 +809,7 @@ public class PcStat extends PlayableStat
{
bonus += (vitality - 1);
}
if (nevits > 1.0)
{
bonus += (nevits - 1);
}
if (hunting > 1.0)
{
bonus += (hunting - 1);
}
if (bonusSp > 1)
{
bonus += (bonusSp - 1);

56
trunk/java/com/l2jserver/gameserver/model/actor/tasks/player/VitalityTask.java
View File

@ -1,56 +0,0 @@
/*
* Copyright (C) 2004-2015 L2J Server
*
* This file is part of L2J Server.
*
* L2J Server is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* L2J Server is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.gameserver.model.actor.tasks.player;
import com.l2jserver.Config;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.stat.PcStat;
import com.l2jserver.gameserver.model.zone.ZoneId;
import com.l2jserver.gameserver.network.serverpackets.ExVitalityPointInfo;
/**
* Task dedicated to reward player with vitality.
* @author UnAfraid
*/
public class VitalityTask implements Runnable
{
private final L2PcInstance _player;
public VitalityTask(L2PcInstance player)
{
_player = player;
}
@Override
public void run()
{
if (!_player.isInsideZone(ZoneId.PEACE))
{
return;
}
if (_player.getVitalityPoints() >= PcStat.MAX_VITALITY_POINTS)
{
return;
}
_player.updateVitalityPoints(Config.RATE_RECOVERY_VITALITY_PEACE_ZONE, false, false);
_player.sendPacket(new ExVitalityPointInfo(_player.getVitalityPoints()));
}
}