From faacd79e3a6e03f85cd1f94578ddfeb6280ead0a Mon Sep 17 00:00:00 2001 From: trimbe Date: Mon, 8 Oct 2018 03:00:10 -0400 Subject: [PATCH] Kingdom Plugin: fix throne completion state check (#5874) Now uses the correct varp from the quest list completion state script (1358). Additionally, allows the infobox to show if the quest is in progress to allow users to check favor during the last part of the quest. Closes #1980 --- runelite-api/src/main/java/net/runelite/api/VarPlayer.java | 7 +++++++ runelite-api/src/main/java/net/runelite/api/Varbits.java | 1 - .../client/plugins/kingdomofmiscellania/KingdomPlugin.java | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/VarPlayer.java b/runelite-api/src/main/java/net/runelite/api/VarPlayer.java index ac9c75aa2b..af559e0f2b 100644 --- a/runelite-api/src/main/java/net/runelite/api/VarPlayer.java +++ b/runelite-api/src/main/java/net/runelite/api/VarPlayer.java @@ -47,6 +47,13 @@ public enum VarPlayer NMZ_REWARD_POINTS(1060), + /** + * 0 : not started + * greater than 0 : in progress + * greater than 99 : completed + */ + THRONE_OF_MISCELLANIA(359), + /** * Experience tracker goal start. */ diff --git a/runelite-api/src/main/java/net/runelite/api/Varbits.java b/runelite-api/src/main/java/net/runelite/api/Varbits.java index 6bb6d1a538..87b2644ae2 100644 --- a/runelite-api/src/main/java/net/runelite/api/Varbits.java +++ b/runelite-api/src/main/java/net/runelite/api/Varbits.java @@ -342,7 +342,6 @@ public enum Varbits */ KINGDOM_FAVOR(72), KINGDOM_COFFER(74), - THRONE_OF_MISCELLANIA_QUEST(359), /** * The Hand in the Sand quest status diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java index 34c8bd2ae3..6dd0402097 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kingdomofmiscellania/KingdomPlugin.java @@ -32,6 +32,7 @@ import lombok.extern.slf4j.Slf4j; import net.runelite.api.Client; import net.runelite.api.GameState; import static net.runelite.api.ItemID.TEAK_CHEST; +import net.runelite.api.VarPlayer; import net.runelite.api.Varbits; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.VarbitChanged; @@ -129,7 +130,7 @@ public class KingdomPlugin extends Plugin private boolean hasCompletedQuest() { - return client.getVar(Varbits.THRONE_OF_MISCELLANIA_QUEST) == 1; + return client.getVar(VarPlayer.THRONE_OF_MISCELLANIA) > 0; } static int getFavorPercent(int favor)