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

Fixed Talking Island and Faeron Village scrolls of escape.

Browse Source 
Dropped Batalion Zone due to lack of further development.
Added Various missing syncs from L2jServer Ertheia.
This commit is contained in:
MobiusDev
2015-04-22 16:48:31 +00:00
parent 2bc6b7a553
commit 2cf52bad9b
342 changed files with 5639 additions and 3430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
trunk/java/com/l2jserver/gameserver/model/items/L2Item.java
View File

@ -34,6 +34,7 @@ import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.commission.CommissionItemType;
import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.events.ListenersContainer;
import com.l2jserver.gameserver.model.holders.SkillHolder;
@ -126,7 +127,6 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
private final int _time;
private final int _autoDestroyTime;
private final int _bodyPart;
private final String _bodyPartName;
private final int _referencePrice;
private final int _crystalCount;
private final boolean _sellable;
@ -161,6 +161,10 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
private final int _reuseDelay;
private final int _sharedReuseGroup;
private final CommissionItemType _commissionItemType;
private final int _compoundItem;
private final float _compoundChance;
/**
* Constructor of the L2Item that fill class variables.<BR>
* <BR>
@ -179,7 +183,6 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
_time = set.getInt("time", -1);
_autoDestroyTime = set.getInt("auto_destroy_time", -1) * 1000;
_bodyPart = ItemTable.SLOTS.get(set.getString("bodypart", "none"));
_bodyPartName = set.getString("bodypart", "none");
_referencePrice = set.getInt("price", 0);
_crystalType = set.getEnum("crystal_type", CrystalType.class, CrystalType.NONE);
_crystalCount = set.getInt("crystal_count", 0);
@ -206,6 +209,9 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
_defaultEnchantLevel = set.getInt("enchanted", 0);
_reuseDelay = set.getInt("reuse_delay", 0);
_sharedReuseGroup = set.getInt("shared_reuse_group", 0);
_commissionItemType = set.getEnum("commissionItemType", CommissionItemType.class, CommissionItemType.OTHER_ITEM);
_compoundItem = set.getInt("compoundItem", 0);
_compoundChance = set.getFloat("compoundChance", 0);
String skills = set.getString("item_skill", null);
if (skills != null)
@ -932,6 +938,21 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
return _sharedReuseGroup;
}
public CommissionItemType getCommissionItemType()
{
return _commissionItemType;
}
public int getCompoundItem()
{
return _compoundItem;
}
public float getCompoundChance()
{
return _compoundChance;
}
/**
* Usable in HTML windows.
* @return the icon link in client files
@ -941,14 +962,6 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
return _icon;
}
/**
* @return body part name
*/
public String getBodyPartName()
{
return _bodyPartName;
}
public int getDefaultEnchantLevel()
{
return _defaultEnchantLevel;

4
trunk/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java
View File

@ -862,9 +862,7 @@ public final class L2ItemInstance extends L2Object
&& (getItem().getType2() != L2Item.TYPE2_QUEST) // Not Quest Item
&& ((getItem().getType2() != L2Item.TYPE2_MONEY) || (getItem().getType1() != L2Item.TYPE1_SHIELD_ARMOR)) // not money, not shield
&& ((pet == null) || (getObjectId() != pet.getControlObjectId())) // Not Control item of currently summoned pet
&& (player.getActiveEnchantItemId() != getObjectId()) // Not momentarily used enchant scroll
&& (player.getActiveEnchantSupportItemId() != getObjectId()) // Not momentarily used enchant support item
&& (player.getActiveEnchantAttrItemId() != getObjectId()) // Not momentarily used enchant attribute item
&& !(player.isProcessingItem(getObjectId())) // Not momentarily used enchant scroll
&& (allowAdena || (getId() != Inventory.ADENA_ID)) // Not Adena
&& ((player.getCurrentSkill() == null) || (player.getCurrentSkill().getSkill().getItemConsumeId() != getId())) && (!player.isCastingSimultaneouslyNow() || (player.getLastSimultaneousSkillCast() == null) || (player.getLastSimultaneousSkillCast().getItemConsumeId() != getId())) && (allowNonTradeable || (isTradeable() && (!((getItem().getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems())))));
}