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

Augmentation improvements/fixes.

Browse Source
This commit is contained in:
MobiusDev
2016-06-13 18:08:19 +00:00
parent 24b3b00918
commit 68c58fd88e
100 changed files with 40881 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
trunk/java/com/l2jmobius/gameserver/model/items/L2Item.java
View File

@ -123,6 +123,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
private int _itemId;
private int _displayId;
private String _name;
private String _additionalName;
private String _icon;
private int _weight;
private boolean _stackable;
@ -190,6 +191,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
_itemId = set.getInt("item_id");
_displayId = set.getInt("displayId", _itemId);
_name = set.getString("name");
_additionalName = set.getString("additionalName", null);
_icon = set.getString("icon", null);
_weight = set.getInt("weight", 0);
_materialType = set.getEnum("material", MaterialType.class, MaterialType.STEEL);
@ -377,12 +379,18 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
{
case S80:
case S84:
{
return CrystalType.S;
}
case R95:
case R99:
{
return CrystalType.R;
}
default:
{
return _crystalType;
}
}
}
@ -440,6 +448,14 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
return _name;
}
/**
* @return the item's additional name.
*/
public String getAdditionalName()
{
return _additionalName;
}
public Collection<AttributeHolder> getAttributes()
{
return _elementals != null ? _elementals.values() : null;
@ -601,17 +617,17 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
public boolean isPotion()
{
return (getItemType() == EtcItemType.POTION);
return getItemType() == EtcItemType.POTION;
}
public boolean isElixir()
{
return (getItemType() == EtcItemType.ELIXIR);
return getItemType() == EtcItemType.ELIXIR;
}
public boolean isScroll()
{
return (getItemType() == EtcItemType.SCROLL);
return getItemType() == EtcItemType.SCROLL;
}
public List<FuncTemplate> getFunctionTemplates()