Unhardcoded and simplified artifact equip method.

This commit is contained in:
MobiusDevelopment 2020-10-29 22:29:45 +00:00
parent 69e9b1b018
commit af6bc6cf25
12 changed files with 240 additions and 1088 deletions

View File

@ -2161,19 +2161,17 @@ public abstract class Inventory extends ItemContainer
private void equipArtifact(ItemInstance item)
{
if (getArtifactSlots() == 0)
final int slotNumber = getArtifactSlots();
if (slotNumber == 0)
{
return;
}
switch (getArtifactSlots())
switch (item.getItem().getArtifactSlot())
{
case 1:
case 1: // Attack
{
// 4 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 4); i++)
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2181,52 +2179,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 1 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 2:
case 2: // Protection
{
// 8 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 8); i++)
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2234,52 +2191,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 2 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 3:
case 3: // Support
{
// 12 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 12); i++)
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2287,12 +2203,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
break;
}
// 3 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
case 4: // Balance
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 3); i++)
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + (4 * slotNumber)); i++)
{
if (_paperdoll[i] == null)
{
@ -2300,31 +2215,6 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 3 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 3 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
}

View File

@ -2161,19 +2161,17 @@ public abstract class Inventory extends ItemContainer
private void equipArtifact(ItemInstance item)
{
if (getArtifactSlots() == 0)
final int slotNumber = getArtifactSlots();
if (slotNumber == 0)
{
return;
}
switch (getArtifactSlots())
switch (item.getItem().getArtifactSlot())
{
case 1:
case 1: // Attack
{
// 4 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 4); i++)
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2181,52 +2179,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 1 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 2:
case 2: // Protection
{
// 8 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 8); i++)
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2234,52 +2191,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 2 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 3:
case 3: // Support
{
// 12 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 12); i++)
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2287,12 +2203,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
break;
}
// 3 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
case 4: // Balance
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 3); i++)
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + (4 * slotNumber)); i++)
{
if (_paperdoll[i] == null)
{
@ -2300,31 +2215,6 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 3 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 3 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
}

View File

@ -2145,19 +2145,17 @@ public abstract class Inventory extends ItemContainer
private void equipArtifact(ItemInstance item)
{
if (getArtifactSlots() == 0)
final int slotNumber = getArtifactSlots();
if (slotNumber == 0)
{
return;
}
switch (getArtifactSlots())
switch (item.getItem().getArtifactSlot())
{
case 1:
case 1: // Attack
{
// 4 Balance Artifact Equip
if (((item.getId() >= 48969) && (item.getId() <= 48985)) || ((item.getId() >= 80656) && (item.getId() <= 80662)))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 4); i++)
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2165,52 +2163,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 1 Spirit Artifact Equip
if (((item.getId() >= 48957) && (item.getId() <= 48960)) || ((item.getId() >= 80647) && (item.getId() <= 80649)))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Protection Artifact Equip
if (((item.getId() >= 48961) && (item.getId() <= 48964)) || ((item.getId() >= 80650) && (item.getId() <= 80652)))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Support Artifact Equip
if (((item.getId() >= 48965) && (item.getId() <= 48968)) || ((item.getId() >= 80653) && (item.getId() <= 80655)))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 2:
case 2: // Protection
{
// 8 Balance Artifact Equip
if (((item.getId() >= 48969) && (item.getId() <= 48985)) || ((item.getId() >= 80656) && (item.getId() <= 80662)))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 8); i++)
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2218,52 +2175,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 2 Spirit Artifact Equip
if (((item.getId() >= 48957) && (item.getId() <= 48960)) || ((item.getId() >= 80647) && (item.getId() <= 80649)))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Protection Artifact Equip
if (((item.getId() >= 48961) && (item.getId() <= 48964)) || ((item.getId() >= 80650) && (item.getId() <= 80652)))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Support Artifact Equip
if (((item.getId() >= 48965) && (item.getId() <= 48968)) || ((item.getId() >= 80653) && (item.getId() <= 80655)))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 3:
case 3: // Support
{
// 12 Balance Artifact Equip
if (((item.getId() >= 48969) && (item.getId() <= 48985)) || ((item.getId() >= 80656) && (item.getId() <= 80662)))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 12); i++)
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2271,12 +2187,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
break;
}
// 3 Spirit Artifact Equip
if (((item.getId() >= 48957) && (item.getId() <= 48960)) || ((item.getId() >= 80647) && (item.getId() <= 80649)))
case 4: // Balance
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 3); i++)
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + (4 * slotNumber)); i++)
{
if (_paperdoll[i] == null)
{
@ -2284,31 +2199,6 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 3 Protection Artifact Equip
if (((item.getId() >= 48961) && (item.getId() <= 48964)) || ((item.getId() >= 80650) && (item.getId() <= 80652)))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 3 Support Artifact Equip
if (((item.getId() >= 48965) && (item.getId() <= 48968)) || ((item.getId() >= 80653) && (item.getId() <= 80655)))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
}

View File

@ -2145,19 +2145,17 @@ public abstract class Inventory extends ItemContainer
private void equipArtifact(ItemInstance item)
{
if (getArtifactSlots() == 0)
final int slotNumber = getArtifactSlots();
if (slotNumber == 0)
{
return;
}
switch (getArtifactSlots())
switch (item.getItem().getArtifactSlot())
{
case 1:
case 1: // Attack
{
// 4 Balance Artifact Equip
if (((item.getId() >= 48969) && (item.getId() <= 48985)) || ((item.getId() >= 80656) && (item.getId() <= 80662)))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 4); i++)
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2165,52 +2163,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 1 Spirit Artifact Equip
if (((item.getId() >= 48957) && (item.getId() <= 48960)) || ((item.getId() >= 80647) && (item.getId() <= 80649)))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Protection Artifact Equip
if (((item.getId() >= 48961) && (item.getId() <= 48964)) || ((item.getId() >= 80650) && (item.getId() <= 80652)))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Support Artifact Equip
if (((item.getId() >= 48965) && (item.getId() <= 48968)) || ((item.getId() >= 80653) && (item.getId() <= 80655)))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 2:
case 2: // Protection
{
// 8 Balance Artifact Equip
if (((item.getId() >= 48969) && (item.getId() <= 48985)) || ((item.getId() >= 80656) && (item.getId() <= 80662)))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 8); i++)
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2218,52 +2175,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 2 Spirit Artifact Equip
if (((item.getId() >= 48957) && (item.getId() <= 48960)) || ((item.getId() >= 80647) && (item.getId() <= 80649)))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Protection Artifact Equip
if (((item.getId() >= 48961) && (item.getId() <= 48964)) || ((item.getId() >= 80650) && (item.getId() <= 80652)))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Support Artifact Equip
if (((item.getId() >= 48965) && (item.getId() <= 48968)) || ((item.getId() >= 80653) && (item.getId() <= 80655)))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 3:
case 3: // Support
{
// 12 Balance Artifact Equip
if (((item.getId() >= 48969) && (item.getId() <= 48985)) || ((item.getId() >= 80656) && (item.getId() <= 80662)))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 12); i++)
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2271,12 +2187,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
break;
}
// 3 Spirit Artifact Equip
if (((item.getId() >= 48957) && (item.getId() <= 48960)) || ((item.getId() >= 80647) && (item.getId() <= 80649)))
case 4: // Balance
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 3); i++)
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + (4 * slotNumber)); i++)
{
if (_paperdoll[i] == null)
{
@ -2284,31 +2199,6 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 3 Protection Artifact Equip
if (((item.getId() >= 48961) && (item.getId() <= 48964)) || ((item.getId() >= 80650) && (item.getId() <= 80652)))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 3 Support Artifact Equip
if (((item.getId() >= 48965) && (item.getId() <= 48968)) || ((item.getId() >= 80653) && (item.getId() <= 80655)))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
}

View File

@ -2161,19 +2161,17 @@ public abstract class Inventory extends ItemContainer
private void equipArtifact(ItemInstance item)
{
if (getArtifactSlots() == 0)
final int slotNumber = getArtifactSlots();
if (slotNumber == 0)
{
return;
}
switch (getArtifactSlots())
switch (item.getItem().getArtifactSlot())
{
case 1:
case 1: // Attack
{
// 4 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 4); i++)
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2181,52 +2179,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 1 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 2:
case 2: // Protection
{
// 8 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 8); i++)
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2234,52 +2191,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 2 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 3:
case 3: // Support
{
// 12 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 12); i++)
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2287,12 +2203,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
break;
}
// 3 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
case 4: // Balance
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 3); i++)
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + (4 * slotNumber)); i++)
{
if (_paperdoll[i] == null)
{
@ -2300,31 +2215,6 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 3 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 3 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
}

View File

@ -174,6 +174,8 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
private boolean _isAppearanceable;
private boolean _isBlessed;
private int _artifactSlot;
/**
* Constructor of the Item that fill class variables.
* @param set : StatSet corresponding to a set of couples (key,value) for description of the item
@ -224,6 +226,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_forNpc = set.getBoolean("for_npc", false);
_isAppearanceable = set.getBoolean("isAppearanceable", false);
_isBlessed = set.getBoolean("blessed", false);
_artifactSlot = set.getInt("artifactSlot", 0);
_immediateEffect = set.getBoolean("immediate_effect", false);
_exImmediateEffect = set.getBoolean("ex_immediate_effect", false);
_defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE);
@ -943,6 +946,11 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
return _isBlessed;
}
public int getArtifactSlot()
{
return _artifactSlot;
}
/**
* Returns the name of the item followed by the item ID.
* @return the name and the ID of the item

View File

@ -2161,19 +2161,17 @@ public abstract class Inventory extends ItemContainer
private void equipArtifact(ItemInstance item)
{
if (getArtifactSlots() == 0)
final int slotNumber = getArtifactSlots();
if (slotNumber == 0)
{
return;
}
switch (getArtifactSlots())
switch (item.getItem().getArtifactSlot())
{
case 1:
case 1: // Attack
{
// 4 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 4); i++)
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2181,52 +2179,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 1 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 2:
case 2: // Protection
{
// 8 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 8); i++)
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2234,52 +2191,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 2 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 3:
case 3: // Support
{
// 12 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 12); i++)
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2287,12 +2203,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
break;
}
// 3 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
case 4: // Balance
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 3); i++)
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + (4 * slotNumber)); i++)
{
if (_paperdoll[i] == null)
{
@ -2300,31 +2215,6 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 3 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 3 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
}

View File

@ -174,6 +174,8 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
private boolean _isAppearanceable;
private boolean _isBlessed;
private int _artifactSlot;
/**
* Constructor of the Item that fill class variables.
* @param set : StatSet corresponding to a set of couples (key,value) for description of the item
@ -224,6 +226,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_forNpc = set.getBoolean("for_npc", false);
_isAppearanceable = set.getBoolean("isAppearanceable", false);
_isBlessed = set.getBoolean("blessed", false);
_artifactSlot = set.getInt("artifactSlot", 0);
_immediateEffect = set.getBoolean("immediate_effect", false);
_exImmediateEffect = set.getBoolean("ex_immediate_effect", false);
_defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE);
@ -943,6 +946,11 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
return _isBlessed;
}
public int getArtifactSlot()
{
return _artifactSlot;
}
/**
* Returns the name of the item followed by the item ID.
* @return the name and the ID of the item

View File

@ -2145,19 +2145,17 @@ public abstract class Inventory extends ItemContainer
private void equipArtifact(ItemInstance item)
{
if (getArtifactSlots() == 0)
final int slotNumber = getArtifactSlots();
if (slotNumber == 0)
{
return;
}
switch (getArtifactSlots())
switch (item.getItem().getArtifactSlot())
{
case 1:
case 1: // Attack
{
// 4 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 4); i++)
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2165,52 +2163,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 1 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 2:
case 2: // Protection
{
// 8 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 8); i++)
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2218,52 +2175,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 2 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 3:
case 3: // Support
{
// 12 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 12); i++)
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2271,12 +2187,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
break;
}
// 3 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
case 4: // Balance
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 3); i++)
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + (4 * slotNumber)); i++)
{
if (_paperdoll[i] == null)
{
@ -2284,31 +2199,6 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 3 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 3 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
}

View File

@ -174,6 +174,8 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
private boolean _isAppearanceable;
private boolean _isBlessed;
private int _artifactSlot;
/**
* Constructor of the Item that fill class variables.
* @param set : StatSet corresponding to a set of couples (key,value) for description of the item
@ -224,6 +226,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_forNpc = set.getBoolean("for_npc", false);
_isAppearanceable = set.getBoolean("isAppearanceable", false);
_isBlessed = set.getBoolean("blessed", false);
_artifactSlot = set.getInt("artifactSlot", 0);
_immediateEffect = set.getBoolean("immediate_effect", false);
_exImmediateEffect = set.getBoolean("ex_immediate_effect", false);
_defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE);
@ -943,6 +946,11 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
return _isBlessed;
}
public int getArtifactSlot()
{
return _artifactSlot;
}
/**
* Returns the name of the item followed by the item ID.
* @return the name and the ID of the item

View File

@ -2145,19 +2145,17 @@ public abstract class Inventory extends ItemContainer
private void equipArtifact(ItemInstance item)
{
if (getArtifactSlots() == 0)
final int slotNumber = getArtifactSlots();
if (slotNumber == 0)
{
return;
}
switch (getArtifactSlots())
switch (item.getItem().getArtifactSlot())
{
case 1:
case 1: // Attack
{
// 4 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 4); i++)
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2165,52 +2163,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 1 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 1 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 1); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 2:
case 2: // Protection
{
// 8 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 8); i++)
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2218,52 +2175,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 2 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 2 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 2); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
case 3:
case 3: // Support
{
// 12 Balance Artifact Equip
if ((item.getId() >= 48969) && (item.getId() <= 48985))
{
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + 12); i++)
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + slotNumber); i++)
{
if (_paperdoll[i] == null)
{
@ -2271,12 +2187,11 @@ public abstract class Inventory extends ItemContainer
return;
}
}
break;
}
// 3 Spirit Artifact Equip
if ((item.getId() >= 48957) && (item.getId() <= 48960))
case 4: // Balance
{
for (int i = PAPERDOLL_ARTIFACT13; i < (PAPERDOLL_ARTIFACT13 + 3); i++)
for (int i = PAPERDOLL_ARTIFACT1; i < (PAPERDOLL_ARTIFACT1 + (4 * slotNumber)); i++)
{
if (_paperdoll[i] == null)
{
@ -2284,31 +2199,6 @@ public abstract class Inventory extends ItemContainer
return;
}
}
}
// 3 Protection Artifact Equip
if ((item.getId() >= 48961) && (item.getId() <= 48964))
{
for (int i = PAPERDOLL_ARTIFACT16; i < (PAPERDOLL_ARTIFACT16 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
// 3 Support Artifact Equip
if ((item.getId() >= 48965) && (item.getId() <= 48968))
{
for (int i = PAPERDOLL_ARTIFACT19; i < (PAPERDOLL_ARTIFACT19 + 3); i++)
{
if (_paperdoll[i] == null)
{
setPaperdollItem(i, item);
return;
}
}
}
break;
}
}

View File

@ -174,6 +174,8 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
private boolean _isAppearanceable;
private boolean _isBlessed;
private int _artifactSlot;
/**
* Constructor of the Item that fill class variables.
* @param set : StatSet corresponding to a set of couples (key,value) for description of the item
@ -224,6 +226,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
_forNpc = set.getBoolean("for_npc", false);
_isAppearanceable = set.getBoolean("isAppearanceable", false);
_isBlessed = set.getBoolean("blessed", false);
_artifactSlot = set.getInt("artifactSlot", 0);
_immediateEffect = set.getBoolean("immediate_effect", false);
_exImmediateEffect = set.getBoolean("ex_immediate_effect", false);
_defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE);
@ -943,6 +946,11 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
return _isBlessed;
}
public int getArtifactSlot()
{
return _artifactSlot;
}
/**
* Returns the name of the item followed by the item ID.
* @return the name and the ID of the item