Game assistant circlet exchange adjustments.

Contributed by CostyKiller.
This commit is contained in:
MobiusDevelopment
2021-03-30 07:52:34 +00:00
parent 6e4422cc3d
commit 85265decd8
2 changed files with 70 additions and 54 deletions

View File

@@ -238,7 +238,10 @@ public class GameAssistant extends AbstractNpcAI
{ {
String htmltext = null; String htmltext = null;
final int circletId = CIRCLET_EXCHANGE.get(event); final int circletId = CIRCLET_EXCHANGE.get(event);
final Collection<ItemInstance> circletNum = player.getInventory().getAllItemsByItemId(circletId);
final Collection<ItemInstance> enchCircletNum = player.getInventory().getAllItemsByItemId(circletId, 5); final Collection<ItemInstance> enchCircletNum = player.getInventory().getAllItemsByItemId(circletId, 5);
if (circletNum.size() == enchCircletNum.size())
{
switch (enchCircletNum.size()) switch (enchCircletNum.size())
{ {
case 0: case 0:
@@ -272,6 +275,11 @@ public class GameAssistant extends AbstractNpcAI
break; break;
} }
} }
}
else
{
htmltext = "32478-21b.html";
}
return htmltext; return htmltext;
} }

View File

@@ -238,7 +238,10 @@ public class GameAssistant extends AbstractNpcAI
{ {
String htmltext = null; String htmltext = null;
final int circletId = CIRCLET_EXCHANGE.get(event); final int circletId = CIRCLET_EXCHANGE.get(event);
final Collection<ItemInstance> circletNum = player.getInventory().getAllItemsByItemId(circletId);
final Collection<ItemInstance> enchCircletNum = player.getInventory().getAllItemsByItemId(circletId, 5); final Collection<ItemInstance> enchCircletNum = player.getInventory().getAllItemsByItemId(circletId, 5);
if (circletNum.size() == enchCircletNum.size())
{
switch (enchCircletNum.size()) switch (enchCircletNum.size())
{ {
case 0: case 0:
@@ -272,6 +275,11 @@ public class GameAssistant extends AbstractNpcAI
break; break;
} }
} }
}
else
{
htmltext = "32478-21b.html";
}
return htmltext; return htmltext;
} }