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

Adjustments for singular accessory slot.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-06-15 21:31:39 +00:00
parent 43e954d1a8
commit e0c68052fe
2 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -69,8 +69,8 @@ public abstract class Inventory extends ItemContainer
public static final int PAPERDOLL_BACK = 13;
public static final int PAPERDOLL_LRHAND = 14;
public static final int PAPERDOLL_FACE = 15;
public static final int PAPERDOLL_HAIR = 16;
public static final int PAPERDOLL_DHAIR = 17;
public static final int PAPERDOLL_HAIR = 15; // 16 - Added after C4.
public static final int PAPERDOLL_DHAIR = 15; // 17 - Added after C4.
public static final int PAPERDOLL_TOTALSLOTS = 18;
@@ -957,16 +957,16 @@ public abstract class Inventory extends ItemContainer
slot = Item.SLOT_L_FINGER;
break;
}
case PAPERDOLL_HAIR:
{
slot = Item.SLOT_HAIR;
break;
}
case PAPERDOLL_FACE:
{
slot = Item.SLOT_FACE;
break;
}
// case PAPERDOLL_HAIR:
// {
// slot = Item.SLOT_HAIR;
// break;
// }
// case PAPERDOLL_FACE:
// {
// slot = Item.SLOT_FACE;
// break;
// }
case PAPERDOLL_DHAIR:
{
slot = Item.SLOT_DHAIR;
@@ -1118,16 +1118,16 @@ public abstract class Inventory extends ItemContainer
pdollSlot = PAPERDOLL_LFINGER;
break;
}
case Item.SLOT_HAIR:
{
pdollSlot = PAPERDOLL_HAIR;
break;
}
case Item.SLOT_FACE:
{
pdollSlot = PAPERDOLL_FACE;
break;
}
// case Item.SLOT_HAIR:
// {
// pdollSlot = PAPERDOLL_HAIR;
// break;
// }
// case Item.SLOT_FACE:
// {
// pdollSlot = PAPERDOLL_FACE;
// break;
// }
case Item.SLOT_DHAIR:
{
setPaperdollItem(PAPERDOLL_HAIR, null);
@@ -1375,36 +1375,36 @@ public abstract class Inventory extends ItemContainer
setPaperdollItem(PAPERDOLL_HEAD, item);
break;
}
case Item.SLOT_HAIR:
{
if (setPaperdollItem(PAPERDOLL_DHAIR, null) != null)
{
setPaperdollItem(PAPERDOLL_DHAIR, null);
setPaperdollItem(PAPERDOLL_HAIR, null);
setPaperdollItem(PAPERDOLL_FACE, null);
}
else
{
setPaperdollItem(PAPERDOLL_HAIR, null);
}
setPaperdollItem(PAPERDOLL_HAIR, item);
break;
}
case Item.SLOT_FACE:
{
if (setPaperdollItem(PAPERDOLL_DHAIR, null) != null)
{
setPaperdollItem(PAPERDOLL_DHAIR, null);
setPaperdollItem(PAPERDOLL_HAIR, null);
setPaperdollItem(PAPERDOLL_FACE, null);
}
else
{
setPaperdollItem(PAPERDOLL_FACE, null);
}
setPaperdollItem(PAPERDOLL_FACE, item);
break;
}
// case Item.SLOT_HAIR:
// {
// if (setPaperdollItem(PAPERDOLL_DHAIR, null) != null)
// {
// setPaperdollItem(PAPERDOLL_DHAIR, null);
// setPaperdollItem(PAPERDOLL_HAIR, null);
// setPaperdollItem(PAPERDOLL_FACE, null);
// }
// else
// {
// setPaperdollItem(PAPERDOLL_HAIR, null);
// }
// setPaperdollItem(PAPERDOLL_HAIR, item);
// break;
// }
// case Item.SLOT_FACE:
// {
// if (setPaperdollItem(PAPERDOLL_DHAIR, null) != null)
// {
// setPaperdollItem(PAPERDOLL_DHAIR, null);
// setPaperdollItem(PAPERDOLL_HAIR, null);
// setPaperdollItem(PAPERDOLL_FACE, null);
// }
// else
// {
// setPaperdollItem(PAPERDOLL_FACE, null);
// }
// setPaperdollItem(PAPERDOLL_FACE, item);
// break;
// }
case Item.SLOT_DHAIR:
{
if (setPaperdollItem(PAPERDOLL_HAIR, null) != null)

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -78,8 +78,8 @@ public abstract class Item
public static final int SLOT_HATCHLING = 0x100000;
public static final int SLOT_STRIDER = 0x200000;
public static final int SLOT_BABYPET = 0x400000;
public static final int SLOT_FACE = 0x040000;
public static final int SLOT_DHAIR = 0x080000;
public static final int SLOT_FACE = 0x010000; // 0x040000 - Added after C4.
public static final int SLOT_DHAIR = 0x010000; // 0x080000 - Added after C4.
public static final int CRYSTAL_NONE = 0x00;
public static final int CRYSTAL_D = 0x01;