Added skilling boosts option alongside combat boosts
This commit is contained in:
@@ -43,4 +43,14 @@ public interface BoostsConfig
|
|||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ConfigItem(
|
||||||
|
keyName = "enableSkill",
|
||||||
|
name = "Enable Skill Boosts",
|
||||||
|
description = "Configures whether or not to display skill boost information"
|
||||||
|
)
|
||||||
|
default boolean enableSkill()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,13 +22,13 @@
|
|||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.runelite.client.plugins.boosts;
|
package net.runelite.client.plugins.boosts;
|
||||||
|
|
||||||
import java.awt.Color;
|
import java.awt.Color;
|
||||||
import java.awt.Dimension;
|
import java.awt.Dimension;
|
||||||
import java.awt.FontMetrics;
|
import java.awt.FontMetrics;
|
||||||
import java.awt.Graphics2D;
|
import java.awt.Graphics2D;
|
||||||
|
import com.google.common.collect.ObjectArrays;
|
||||||
import net.runelite.api.Client;
|
import net.runelite.api.Client;
|
||||||
import net.runelite.api.GameState;
|
import net.runelite.api.GameState;
|
||||||
import net.runelite.api.Skill;
|
import net.runelite.api.Skill;
|
||||||
@@ -43,7 +43,16 @@ class BoostsOverlay extends Overlay
|
|||||||
|
|
||||||
private static final Color BACKGROUND = new Color(Color.gray.getRed(), Color.gray.getGreen(), Color.gray.getBlue(), 127);
|
private static final Color BACKGROUND = new Color(Color.gray.getRed(), Color.gray.getGreen(), Color.gray.getBlue(), 127);
|
||||||
|
|
||||||
private static final Skill[] SHOW = new Skill[] { Skill.ATTACK, Skill.STRENGTH, Skill.DEFENCE, Skill.RANGED, Skill.MAGIC };
|
private static final Skill[] COMBAT = new Skill[]
|
||||||
|
{
|
||||||
|
Skill.ATTACK, Skill.STRENGTH, Skill.DEFENCE, Skill.RANGED, Skill.MAGIC
|
||||||
|
};
|
||||||
|
private static final Skill[] SKILLING = new Skill[]
|
||||||
|
{
|
||||||
|
Skill.COOKING, Skill.WOODCUTTING, Skill.FLETCHING, Skill.FISHING, Skill.FIREMAKING, Skill.CRAFTING,
|
||||||
|
Skill.SMITHING, Skill.HERBLORE, Skill.AGILITY, Skill.THIEVING, Skill.SLAYER, Skill.FARMING, Skill.RUNECRAFT,
|
||||||
|
Skill.HUNTER, Skill.CONSTRUCTION
|
||||||
|
};
|
||||||
|
|
||||||
private static final int TOP_BORDER = 2;
|
private static final int TOP_BORDER = 2;
|
||||||
private static final int LEFT_BORDER = 2;
|
private static final int LEFT_BORDER = 2;
|
||||||
@@ -65,7 +74,19 @@ class BoostsOverlay extends Overlay
|
|||||||
Client client = RuneLite.getClient();
|
Client client = RuneLite.getClient();
|
||||||
|
|
||||||
if (client.getGameState() != GameState.LOGGED_IN || !config.enabled())
|
if (client.getGameState() != GameState.LOGGED_IN || !config.enabled())
|
||||||
|
{
|
||||||
return null;
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
Skill[] show;
|
||||||
|
if (config.enableSkill())
|
||||||
|
{
|
||||||
|
show = ObjectArrays.concat(COMBAT, SKILLING, Skill.class);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
show = COMBAT;
|
||||||
|
}
|
||||||
|
|
||||||
FontMetrics metrics = graphics.getFontMetrics();
|
FontMetrics metrics = graphics.getFontMetrics();
|
||||||
|
|
||||||
@@ -76,13 +97,17 @@ class BoostsOverlay extends Overlay
|
|||||||
base = client.getRealSkillLevel(skill);
|
base = client.getRealSkillLevel(skill);
|
||||||
|
|
||||||
if (boosted == base)
|
if (boosted == base)
|
||||||
|
{
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
height += metrics.getHeight() + SEPARATOR;
|
height += metrics.getHeight() + SEPARATOR;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (height == TOP_BORDER)
|
if (height == TOP_BORDER)
|
||||||
|
{
|
||||||
return null;
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
graphics.setColor(BACKGROUND);
|
graphics.setColor(BACKGROUND);
|
||||||
graphics.fillRect(0, 0, WIDTH, height);
|
graphics.fillRect(0, 0, WIDTH, height);
|
||||||
@@ -94,7 +119,9 @@ class BoostsOverlay extends Overlay
|
|||||||
base = client.getRealSkillLevel(skill);
|
base = client.getRealSkillLevel(skill);
|
||||||
|
|
||||||
if (boosted == base)
|
if (boosted == base)
|
||||||
|
{
|
||||||
continue;
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
graphics.setColor(Color.white);
|
graphics.setColor(Color.white);
|
||||||
graphics.drawString(skill.getName(), LEFT_BORDER, y + metrics.getHeight());
|
graphics.drawString(skill.getName(), LEFT_BORDER, y + metrics.getHeight());
|
||||||
|
|||||||
Reference in New Issue
Block a user