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

Merge pull request #853 from Kamielvf/raids-move-points-box

Browse Source 
Raids plugin: Reposition the points box to prevent it from overlapping overlays
This commit is contained in:
Tomas Slusny
2018-03-09 00:06:51 +01:00
committed by GitHub
parent 683cef9b09 bcb579344b
commit 081c60f4b3
5 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runelite-api/src/main/java/net/runelite/api/Varbits.java
View File

@@ -170,6 +170,13 @@ public enum Varbits
*/ */
SACK_NUMBER(5558), SACK_NUMBER(5558),
/**
* Experience tracker
*/
EXPERIENCE_TRACKER_POSITION(4692),
EXPERIENCE_TRACKER_COUNTER(4697),
EXPERIENCE_TRACKER_PROGRESS_BAR(4698),
/** /**
* Experience drop color * Experience drop color
*/ */

7
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
View File

@@ -74,6 +74,7 @@ public class WidgetID
public static final int WORLD_MAP = 595; public static final int WORLD_MAP = 595;
public static final int PYRAMID_PLUNDER_GROUP_ID = 428; public static final int PYRAMID_PLUNDER_GROUP_ID = 428;
public static final int RAIDS_REWARD_GROUP_ID = 539; public static final int RAIDS_REWARD_GROUP_ID = 539;
public static final int EXPERIENCE_TRACKER_GROUP_ID = 122;
static class WorldMap static class WorldMap
{ {
@@ -318,4 +319,10 @@ public class WidgetID
static final int SPRITE = 0; static final int SPRITE = 0;
static final int TEXT = 1; static final int TEXT = 1;
} }
static class ExperienceTracker
{
static final int WIDGET = 1;
static final int BOTTOM_BAR = 14;
}
} }

5
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
View File

@@ -186,7 +186,10 @@ public enum WidgetInfo
BLAST_FURNACE_COFFER(WidgetID.BLAST_FURNACE_GROUP_ID, 0), BLAST_FURNACE_COFFER(WidgetID.BLAST_FURNACE_GROUP_ID, 0),
PYRAMID_PLUNDER_DATA(WidgetID.PYRAMID_PLUNDER_GROUP_ID, 0); PYRAMID_PLUNDER_DATA(WidgetID.PYRAMID_PLUNDER_GROUP_ID, 0),
EXPERIENCE_TRACKER(WidgetID.EXPERIENCE_TRACKER_GROUP_ID, WidgetID.ExperienceTracker.WIDGET),
EXPERIENCE_TRACKER_BOTTOM_BAR(WidgetID.EXPERIENCE_TRACKER_GROUP_ID, WidgetID.ExperienceTracker.BOTTOM_BAR);
private final int groupId; private final int groupId;
private final int childId; private final int childId;

5
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsOverlay.java
View File

@@ -57,6 +57,11 @@ public class RaidsOverlay extends Overlay
@Override @Override
public Dimension render(Graphics2D graphics, Point parent) public Dimension render(Graphics2D graphics, Point parent)
{ {
if (plugin.isInRaidChambers())
{
plugin.repositionPointsBox();
}
if (!config.scoutOverlay() || !scoutOverlayShown) if (!config.scoutOverlay() || !scoutOverlayShown)
{ {
return null; return null;

25
runelite-client/src/main/java/net/runelite/client/plugins/raids/RaidsPlugin.java
View File

@@ -53,6 +53,8 @@ import static net.runelite.api.Perspective.SCENE_SIZE;
import net.runelite.api.events.ChatMessage; import net.runelite.api.events.ChatMessage;
import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.VarbitChanged; import net.runelite.api.events.VarbitChanged;
import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.chat.ChatColor; import net.runelite.client.chat.ChatColor;
import net.runelite.client.chat.ChatColorType; import net.runelite.client.chat.ChatColorType;
import net.runelite.client.chat.ChatMessageBuilder; import net.runelite.client.chat.ChatMessageBuilder;
@@ -84,6 +86,8 @@ public class RaidsPlugin extends Plugin
private BufferedImage raidsIcon; private BufferedImage raidsIcon;
private RaidsTimer timer; private RaidsTimer timer;
@Getter
private boolean inRaidChambers; private boolean inRaidChambers;
@Inject @Inject
@@ -302,6 +306,27 @@ public class RaidsPlugin extends Plugin
} }
} }
public void repositionPointsBox()
{
Widget widget = client.getWidget(WidgetInfo.RAIDS_POINTS_INFOBOX);
int x = widget.getParent().getWidth() - widget.getWidth() - 2;
int y = widget.getOriginalY();
if (client.getSetting(Varbits.EXPERIENCE_TRACKER_POSITION) == 0)
{
Widget area = client.getWidget(WidgetInfo.EXPERIENCE_TRACKER_BOTTOM_BAR);
if (area != null)
{
y = area.getOriginalY() + 2;
area.setRelativeY(y + widget.getHeight());
}
}
widget.setRelativeX(x);
widget.setRelativeY(y);
}
private void updateInfoBoxState() private void updateInfoBoxState()
{ {
if (timer != null) if (timer != null)