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

Add spade requirement reminder to fairy ring clues (#4585)

Browse Source 
Fixes #4449
This commit is contained in:
aquivers
2018-07-31 10:36:21 +02:00
committed by Tomas Slusny
parent 466eca9d90
commit 6d99d3abcb
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
View File

@@ -374,13 +374,13 @@ public class ClueScrollPlugin extends Plugin
} }
} }
if (clue instanceof CoordinateClue) if (clue instanceof CoordinateClue || clue instanceof FairyRingClue)
{ {
ItemContainer container = client.getItemContainer(InventoryID.INVENTORY); ItemContainer container = client.getItemContainer(InventoryID.INVENTORY);
if (container != null) if (container != null)
{ {
equippedItems = container.getItems(); inventoryItems = container.getItems();
} }
} }

4
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CoordinateClue.java
View File

@@ -57,9 +57,9 @@ public class CoordinateClue extends ClueScroll implements TextClueScroll, Locati
.left("Click the clue scroll along the edge of your world map to see where you should dig.") .left("Click the clue scroll along the edge of your world map to see where you should dig.")
.build()); .build());
if (plugin.getEquippedItems() != null) if (plugin.getInventoryItems() != null)
{ {
if (!HAS_SPADE.fulfilledBy(plugin.getEquippedItems())) if (!HAS_SPADE.fulfilledBy(plugin.getInventoryItems()))
{ {
panelComponent.getChildren().add(LineComponent.builder().left("").build()); panelComponent.getChildren().add(LineComponent.builder().left("").build());
panelComponent.getChildren().add(LineComponent.builder().left("Requires Spade!").leftColor(Color.RED).build()); panelComponent.getChildren().add(LineComponent.builder().left("Requires Spade!").leftColor(Color.RED).build());

13
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/FairyRingClue.java
View File

@@ -29,11 +29,14 @@ import java.awt.Color;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.util.Set; import java.util.Set;
import lombok.Getter; import lombok.Getter;
import net.runelite.api.ItemID;
import net.runelite.api.coords.LocalPoint; import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import static net.runelite.client.plugins.cluescrolls.ClueScrollOverlay.TITLED_CONTENT_COLOR; import static net.runelite.client.plugins.cluescrolls.ClueScrollOverlay.TITLED_CONTENT_COLOR;
import net.runelite.client.plugins.cluescrolls.ClueScrollPlugin; import net.runelite.client.plugins.cluescrolls.ClueScrollPlugin;
import static net.runelite.client.plugins.cluescrolls.ClueScrollPlugin.SPADE_IMAGE; import static net.runelite.client.plugins.cluescrolls.ClueScrollPlugin.SPADE_IMAGE;
import net.runelite.client.plugins.cluescrolls.clues.emote.ItemRequirement;
import net.runelite.client.plugins.cluescrolls.clues.emote.SingleItemRequirement;
import net.runelite.client.ui.overlay.OverlayUtil; import net.runelite.client.ui.overlay.OverlayUtil;
import net.runelite.client.ui.overlay.components.LineComponent; import net.runelite.client.ui.overlay.components.LineComponent;
import net.runelite.client.ui.overlay.components.PanelComponent; import net.runelite.client.ui.overlay.components.PanelComponent;
@@ -57,6 +60,7 @@ public class FairyRingClue extends ClueScroll implements TextClueScroll, Locatio
private String text; private String text;
private WorldPoint location; private WorldPoint location;
private static final ItemRequirement HAS_SPADE = new SingleItemRequirement(ItemID.SPADE);
private FairyRingClue(String text, WorldPoint location) private FairyRingClue(String text, WorldPoint location)
{ {
@@ -77,6 +81,15 @@ public class FairyRingClue extends ClueScroll implements TextClueScroll, Locatio
panelComponent.getChildren().add(LineComponent.builder() panelComponent.getChildren().add(LineComponent.builder()
.left("Travel to the fairy ring to see where to dig.") .left("Travel to the fairy ring to see where to dig.")
.build()); .build());
if (plugin.getInventoryItems() != null)
{
if (!HAS_SPADE.fulfilledBy(plugin.getInventoryItems()))
{
panelComponent.getChildren().add(LineComponent.builder().left("").build());
panelComponent.getChildren().add(LineComponent.builder().left("Requires Spade!").leftColor(Color.RED).build());
}
}
} }
@Override @Override