Adjustments for singular accessory slot.

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

View File

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

View File

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