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

Fix XP Drop plugin recolouring ALL drops whenever a combat prayer is enabled (#1341)

Browse Source 
* api: Add SpriteIDs for skill icons
* experiencedrop: Verify xp drop icons for recolouring based on active prayer

Fixes: #555
This commit is contained in:
Jack
2018-04-13 21:36:09 +10:00
committed by Tomas Slusny
parent 511d6d51b2
commit 0b342a2d70
2 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
runelite-api/src/main/java/net/runelite/api/SpriteID.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, Lotto <https://github.com/devLotto> * Copyright (c) 2018, Lotto <https://github.com/devLotto>, SoyChai <https://github.com/SoyChai>
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -28,6 +28,32 @@ package net.runelite.api;
// through the cache and widget inspector. Please add sprites as you happen to use them. // through the cache and widget inspector. Please add sprites as you happen to use them.
public final class SpriteID public final class SpriteID
{ {
public static final int SKILL_ATTACK = 197;
public static final int SKILL_STRENGTH = 198;
public static final int SKILL_DEFENCE = 199;
public static final int SKILL_RANGED = 200;
public static final int SKILL_PRAYER = 201;
public static final int SKILL_MAGIC = 202;
public static final int SKILL_HITPOINTS = 203;
public static final int SKILL_AGILITY = 204;
public static final int SKILL_HERBLORE = 205;
public static final int SKILL_THIEVING = 206;
public static final int SKILL_CRAFTING = 207;
public static final int SKILL_FLETCHING = 208;
public static final int SKILL_MINING = 209;
public static final int SKILL_SMITHING = 210;
public static final int SKILL_FISHING = 211;
public static final int SKILL_COOKING = 212;
public static final int SKILL_FIREMAKING = 213;
public static final int SKILL_WOODCUTTING = 214;
public static final int SKILL_RUNECRAFT = 215;
public static final int SKILL_SLAYER = 216;
public static final int SKILL_FARMING = 217;
public static final int UNKNOWN_SHOVEL = 218;
public static final int UNKNOWN_RAT = 219;
public static final int SKILL_HUNTER = 220;
public static final int SKILL_CONSTRUCTION = 221;
public static final int SKILL_TOTAL_XP = 222;
public static final int EMOTE_YES = 700; public static final int EMOTE_YES = 700;
public static final int EMOTE_NO = 701; public static final int EMOTE_NO = 701;
public static final int EMOTE_THINK = 702; public static final int EMOTE_THINK = 702;

28
runelite-client/src/main/java/net/runelite/client/plugins/experiencedrop/XpDropPlugin.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, Cameron <https://github.com/noremac201> * Copyright (c) 2018, Cameron <https://github.com/noremac201>, SoyChai <https://github.com/SoyChai>
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -26,8 +26,11 @@ package net.runelite.client.plugins.experiencedrop;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.util.Arrays;
import java.util.stream.IntStream;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.SpriteID;
import net.runelite.api.Varbits; import net.runelite.api.Varbits;
import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.events.WidgetHiddenChanged;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
@@ -85,20 +88,37 @@ public class XpDropPlugin extends Plugin
} }
String text = widget.getText(); String text = widget.getText();
final IntStream spriteIDs =
Arrays.stream(widget.getParent().getDynamicChildren()).mapToInt(Widget::getSpriteId);
if (text != null) if (text != null)
{ {
int color = widget.getTextColor();
switch (prayer) switch (prayer)
{ {
case MELEE: case MELEE:
widget.setTextColor(config.getMeleePrayerColor().getRGB()); if (spriteIDs.anyMatch(id ->
id == SpriteID.SKILL_ATTACK || id == SpriteID.SKILL_STRENGTH || id == SpriteID.SKILL_DEFENCE))
{
color = config.getMeleePrayerColor().getRGB();
}
break; break;
case RANGE: case RANGE:
widget.setTextColor(config.getRangePrayerColor().getRGB()); if (spriteIDs.anyMatch(id -> id == SpriteID.SKILL_RANGED))
{
color = config.getRangePrayerColor().getRGB();
}
break; break;
case MAGIC: case MAGIC:
widget.setTextColor(config.getMagePrayerColor().getRGB()); if (spriteIDs.anyMatch(id -> id == SpriteID.SKILL_MAGIC))
{
color = config.getMagePrayerColor().getRGB();
}
break; break;
} }
widget.setTextColor(color);
} }
} }