ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

clue scroll plugin: Check for sets across inventory and equipment

Browse Source 
Fixes runelite/runelite#3271
This commit is contained in:
Jordan Atwood
2018-09-06 15:19:06 -07:00
parent 8b3a4440ff
commit 8fa437ed62
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
View File

@@ -259,16 +259,20 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu
inventory = new Item[0]; inventory = new Item[0];
} }
Item[] combined = new Item[equipment.length + inventory.length];
System.arraycopy(equipment, 0, combined, 0, equipment.length);
System.arraycopy(inventory, 0, combined, equipment.length, inventory.length);
for (ItemRequirement requirement : getItemRequirements()) for (ItemRequirement requirement : getItemRequirements())
{ {
boolean equipmentFulfilled = requirement.fulfilledBy(equipment); boolean equipmentFulfilled = requirement.fulfilledBy(equipment);
boolean inventoryFulfilled = requirement.fulfilledBy(inventory); boolean combinedFulfilled = requirement.fulfilledBy(combined);
panelComponent.getChildren().add(LineComponent.builder() panelComponent.getChildren().add(LineComponent.builder()
.left(requirement.getCollectiveName(plugin.getClient())) .left(requirement.getCollectiveName(plugin.getClient()))
.leftColor(TITLED_CONTENT_COLOR) .leftColor(TITLED_CONTENT_COLOR)
.right(equipmentFulfilled || inventoryFulfilled ? "\u2713" : "\u2717") .right(combinedFulfilled ? "\u2713" : "\u2717")
.rightColor(equipmentFulfilled ? Color.GREEN : (inventoryFulfilled ? Color.ORANGE : Color.RED)) .rightColor(equipmentFulfilled ? Color.GREEN : (combinedFulfilled ? Color.ORANGE : Color.RED))
.build()); .build());
} }
} }