slayer: update boss task task lookup

Adam- · Aug 5, 2023 · 5d4de16 · 5d4de16
1 parent bc4bb30
commit 5d4de16
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/runelite-api/src/main/java/net/runelite/api/EnumID.java b/runelite-api/src/main/java/net/runelite/api/EnumID.java
@@ -43,11 +43,7 @@ public final class EnumID
 	 */
 	public static final int RUNEPOUCH_RUNE = 982;
 	public static final int XPDROP_COLORS = 1169;
-	/**
-	 * key: int
-	 * val: string boss name
-	 */
-	public static final int SLAYER_TASK_BOSS = 1174;
+
 	public static final int FRIENDS_CHAT_RANK_ICONS = 1543;
 	/**
 	 * key: int 0-n
@@ -65,4 +61,10 @@ public final class EnumID
 
 	public static final int PRAYERS_NORMAL = 4956;
 	public static final int PRAYERS_RUINOUS = 4959;
+
+	/**
+	 * key: int
+	 * val: struct slayer task
+	 */
+	public static final int SLAYER_TASK = 5008;
 }
diff --git a/runelite-api/src/main/java/net/runelite/api/ParamID.java b/runelite-api/src/main/java/net/runelite/api/ParamID.java
@@ -29,6 +29,15 @@
  */
 public final class ParamID
 {
+	public static final int OC_ITEM_OP1 = 451;
+	public static final int OC_ITEM_OP2 = 452;
+	public static final int OC_ITEM_OP3 = 453;
+	public static final int OC_ITEM_OP4 = 454;
+	public static final int OC_ITEM_OP5 = 455;
+	public static final int OC_ITEM_OP6 = 456;
+	public static final int OC_ITEM_OP7 = 457;
+	public static final int OC_ITEM_OP8 = 458;
+
 	/**
 	 * Long name for NPCs used in the HP hud
 	 */
@@ -50,17 +59,10 @@ public final class ParamID
 	public static final int SETTING_SLIDER_DEADZONE = 1109;
 	public static final int SETTING_SLIDER_DEADTIME = 1110;
 
-	public static final int OC_ITEM_OP1 = 451;
-	public static final int OC_ITEM_OP2 = 452;
-	public static final int OC_ITEM_OP3 = 453;
-	public static final int OC_ITEM_OP4 = 454;
-	public static final int OC_ITEM_OP5 = 455;
-	public static final int OC_ITEM_OP6 = 456;
-	public static final int OC_ITEM_OP7 = 457;
-	public static final int OC_ITEM_OP8 = 458;
-
 	public static final int OC_PRAYER_COMPONENT = 1751;
 	public static final int OC_PRAYER_LEVEL = 1753;
 
 	public static final int NPC_DEATH_HIDER_EXCLUDE = 1799;
+
+	public static final int SLAYER_TASK_NAME = 1801;
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/slayer/SlayerPlugin.java
@@ -58,6 +58,7 @@
 import net.runelite.api.MessageNode;
 import net.runelite.api.NPC;
 import net.runelite.api.NPCComposition;
+import net.runelite.api.ParamID;
 import net.runelite.api.VarPlayer;
 import net.runelite.api.Varbits;
 import net.runelite.api.events.ChatMessage;
@@ -369,8 +370,9 @@ private void updateTask()
 			String taskName;
 			if (taskId == 98 /* Bosses, from [proc,helper_slayer_current_assignment] */)
 			{
-				taskName = client.getEnum(EnumID.SLAYER_TASK_BOSS)
-					.getStringValue(client.getVarbitValue(Varbits.SLAYER_TASK_BOSS));
+				int structId = client.getEnum(EnumID.SLAYER_TASK).getIntValue(client.getVarbitValue(Varbits.SLAYER_TASK_BOSS));
+				taskName = client.getStructComposition(structId)
+					.getStringValue(ParamID.SLAYER_TASK_NAME);
 			}
 			else
 			{