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

Sync with L2JServer Jan 24th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-24 20:02:32 +00:00
parent d349bd3924
commit 1c6301c46d
1012 changed files with 23069 additions and 6307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummon.java → trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummonPet.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2004-2015 L2J Server
* Copyright (C) 2004-2014 L2J Server
*
* This file is part of L2J Server.
*
@@ -19,7 +19,7 @@
package com.l2jserver.gameserver.model.conditions;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.CharSummonTable;
import com.l2jserver.gameserver.data.sql.impl.CharSummonTable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.L2Item;
@@ -30,11 +30,11 @@ import com.l2jserver.gameserver.network.SystemMessageId;
* Player Can Summon condition implementation.
* @author Zoey76
*/
public class ConditionPlayerCanSummon extends Condition
public class ConditionPlayerCanSummonPet extends Condition
{
private final boolean _val;
public ConditionPlayerCanSummon(boolean val)
public ConditionPlayerCanSummonPet(boolean val)
{
_val = val;
}
@@ -49,25 +49,21 @@ public class ConditionPlayerCanSummon extends Condition
}
boolean canSummon = true;
if (Config.RESTORE_SERVITOR_ON_RECONNECT && CharSummonTable.getInstance().getServitors().containsKey(player.getObjectId()))
if (Config.RESTORE_PET_ON_RECONNECT && CharSummonTable.getInstance().getPets().containsKey(player.getObjectId()))
{
player.sendPacket(SystemMessageId.YOU_MAY_NOT_SUMMON_MULTIPLE_PETS_AT_THE_SAME_TIME);
canSummon = false;
}
else if (Config.RESTORE_PET_ON_RECONNECT && CharSummonTable.getInstance().getPets().containsKey(player.getObjectId()))
else if (player.hasPet())
{
player.sendPacket(SystemMessageId.YOU_MAY_NOT_SUMMON_MULTIPLE_PETS_AT_THE_SAME_TIME);
canSummon = false;
}
else if (player.hasSummon())
{
player.sendPacket(SystemMessageId.YOU_MAY_NOT_SUMMON_MULTIPLE_PETS_AT_THE_SAME_TIME);
canSummon = false;
}
else if (player.isFlyingMounted() || player.isMounted())
else if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{
canSummon = false;
}
return (_val == canSummon);
}
}
}

60
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummonServitor.java Normal file
View File

@@ -0,0 +1,60 @@
/*
* Copyright (C) 2004-2014 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.conditions;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.L2Item;
import com.l2jserver.gameserver.model.skills.Skill;
/**
* Player Can Summon condition implementation.
* @author Sdw
*/
public class ConditionPlayerCanSummonServitor extends Condition
{
private final boolean _val;
public ConditionPlayerCanSummonServitor(boolean val)
{
_val = val;
}
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
final L2PcInstance player = effector.getActingPlayer();
if (player == null)
{
return false;
}
boolean canSummon = true;
if (player.isFlyingMounted() || player.isMounted() || player.inObserverMode() || player.isTeleporting())
{
canSummon = false;
}
else if (player.getServitors().size() >= 4)
{
canSummon = false;
}
return canSummon == _val;
}
}

2
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSweep.java
View File

@@ -68,7 +68,7 @@ public class ConditionPlayerCanSweep extends Condition
target = (L2Attackable) objTarget;
if (target.isDead())
{
if (target.isSpoil())
if (target.isSpoiled())
{
canSweep = target.checkSpoilOwner(sweeper, true);
canSweep &= !target.isOldCorpse(sweeper, Config.CORPSE_CONSUME_SKILL_ALLOWED_TIME_BEFORE_DECAY, true);

2
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanUntransform.java
View File

@@ -51,7 +51,7 @@ public class ConditionPlayerCanUntransform extends Condition
{
canUntransform = false;
}
else if ((player.isTransformed() || player.isInStance()) && player.isFlyingMounted() && player.isInsideZone(ZoneId.LANDING))
else if ((player.isTransformed() || player.isInStance()) && player.isFlyingMounted() && !player.isInsideZone(ZoneId.LANDING))
{
player.sendPacket(SystemMessageId.YOU_ARE_TOO_HIGH_TO_PERFORM_THIS_ACTION_PLEASE_LOWER_YOUR_ALTITUDE_AND_TRY_AGAIN); // TODO: check if message is retail like.
canUntransform = false;

66
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasFreeSummonPoints.java Normal file
View File

@@ -0,0 +1,66 @@
/*
* 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.conditions;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.L2Item;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* @author Sdw
*/
public class ConditionPlayerHasFreeSummonPoints extends Condition
{
private final int _summonPoints;
public ConditionPlayerHasFreeSummonPoints(int summonPoints)
{
_summonPoints = summonPoints;
}
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
final L2PcInstance player = effector.getActingPlayer();
if (player == null)
{
return false;
}
boolean canSummon = true;
if ((_summonPoints == 0) && player.hasServitors())
{
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_THE_S1_SKILL_DUE_TO_INSUFFICIENT_SUMMON_POINTS);
canSummon = false;
}
else if ((player.getSummonPoints() + _summonPoints) > player.getMaxSummonPoints())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_CANNOT_USE_THE_S1_SKILL_DUE_TO_INSUFFICIENT_SUMMON_POINTS);
sm.addSkillName(skill);
player.sendPacket(sm);
canSummon = false;
}
return canSummon;
}
}

6
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasPet.java
View File

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.model.conditions;
import java.util.ArrayList;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
import com.l2jserver.gameserver.model.items.L2Item;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
@@ -52,7 +53,8 @@ public class ConditionPlayerHasPet extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if ((effector.getActingPlayer() == null) || (!(effector.getActingPlayer().getSummon() instanceof L2PetInstance)))
final L2Summon pet = effector.getActingPlayer().getPet();
if ((effector.getActingPlayer() == null) || (pet == null))
{
return false;
}
@@ -62,7 +64,7 @@ public class ConditionPlayerHasPet extends Condition
return true;
}
final L2ItemInstance controlItem = ((L2PetInstance) effector.getActingPlayer().getSummon()).getControlItem();
final L2ItemInstance controlItem = ((L2PetInstance) pet).getControlItem();
return (controlItem != null) && _controlItemIds.contains(controlItem.getId());
}
}

14
trunk/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerServitorNpcId.java
View File

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.model.conditions;
import java.util.List;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.items.L2Item;
import com.l2jserver.gameserver.model.skills.Skill;
@@ -54,6 +55,17 @@ public class ConditionPlayerServitorNpcId extends Condition
{
return false;
}
return (_npcIds == null) || _npcIds.contains(effector.getActingPlayer().getSummon().getId());
if (_npcIds == null)
{
return true;
}
for (L2Summon summon : effector.getServitors().values())
{
if (_npcIds.contains(summon.getId()))
{
return true;
}
}
return false;
}
}