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,40 +238,48 @@ 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);
switch (enchCircletNum.size()) if (circletNum.size() == enchCircletNum.size())
{ {
case 0: switch (enchCircletNum.size())
default:
{ {
htmltext = "32478-21b.html"; case 0:
break; default:
}
case 1:
{
switch (circletId)
{ {
case 48202: // Warrior's Circlet htmltext = "32478-21b.html";
case 48205: // Wizard's Circlet break;
case 48208: // Knight's Circlet }
{ case 1:
takeItems(player, circletId, 1); {
giveItems(player, NOBLE_UPG_STONE, 1); switch (circletId)
break; {
} case 48202: // Warrior's Circlet
case 48203: // Noble Warrior's Circlet case 48205: // Wizard's Circlet
case 48206: // Noble Wizard's Circlet case 48208: // Knight's Circlet
case 48209: // Noble Knight's Circlet {
{ takeItems(player, circletId, 1);
takeItems(player, circletId, 1); giveItems(player, NOBLE_UPG_STONE, 1);
giveItems(player, RADIANT_UPG_STONE, 1); break;
break; }
} case 48203: // Noble Warrior's Circlet
case 48206: // Noble Wizard's Circlet
case 48209: // Noble Knight's Circlet
{
takeItems(player, circletId, 1);
giveItems(player, RADIANT_UPG_STONE, 1);
break;
}
}
htmltext = "32478-21a.html";
break;
} }
htmltext = "32478-21a.html";
break;
} }
} }
else
{
htmltext = "32478-21b.html";
}
return htmltext; return htmltext;
} }

View File

@@ -238,40 +238,48 @@ 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);
switch (enchCircletNum.size()) if (circletNum.size() == enchCircletNum.size())
{ {
case 0: switch (enchCircletNum.size())
default:
{ {
htmltext = "32478-21b.html"; case 0:
break; default:
}
case 1:
{
switch (circletId)
{ {
case 48202: // Warrior's Circlet htmltext = "32478-21b.html";
case 48205: // Wizard's Circlet break;
case 48208: // Knight's Circlet }
{ case 1:
takeItems(player, circletId, 1); {
giveItems(player, NOBLE_UPG_STONE, 1); switch (circletId)
break; {
} case 48202: // Warrior's Circlet
case 48203: // Noble Warrior's Circlet case 48205: // Wizard's Circlet
case 48206: // Noble Wizard's Circlet case 48208: // Knight's Circlet
case 48209: // Noble Knight's Circlet {
{ takeItems(player, circletId, 1);
takeItems(player, circletId, 1); giveItems(player, NOBLE_UPG_STONE, 1);
giveItems(player, RADIANT_UPG_STONE, 1); break;
break; }
} case 48203: // Noble Warrior's Circlet
case 48206: // Noble Wizard's Circlet
case 48209: // Noble Knight's Circlet
{
takeItems(player, circletId, 1);
giveItems(player, RADIANT_UPG_STONE, 1);
break;
}
}
htmltext = "32478-21a.html";
break;
} }
htmltext = "32478-21a.html";
break;
} }
} }
else
{
htmltext = "32478-21b.html";
}
return htmltext; return htmltext;
} }