From 4b4af0fa2b3d56355ca854893ba150191c85df56 Mon Sep 17 00:00:00 2001
From: Kyle <48519776+xKylee@users.noreply.github.com>
Date: Thu, 22 Aug 2019 12:53:03 +0100
Subject: [PATCH] Playerscouter: add combat bracket (#1413)

* Update PlayerScouter.java

* Update PlayerScouterConfig.java

* Update PlayerScouter.java

* Update PlayerScouter.java

* Update PlayerScouterConfig.java
---
 .../plugins/playerscouter/PlayerScouter.java  | 13 +++++++-
 .../playerscouter/PlayerScouterConfig.java    | 33 ++++++++++++++++++-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java
index 178c38a2ca..d08b79d7d7 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java
@@ -111,6 +111,8 @@ public class PlayerScouter extends Plugin
 	private int minimumRisk;
 	private int minimumValue;
 	private int timeout;
+	private int minimumCombat;
+	private int maximumCombat;
 	private boolean onlyWildy;
 	private boolean outputItems;
 	private boolean scoutFriends;
@@ -176,6 +178,7 @@ public class PlayerScouter extends Plugin
 
 	private void onGameTick(GameTick event)
 	{
+
 		resetBlacklist();
 
 		if (!checkWildy() || playerContainer.isEmpty())
@@ -186,7 +189,13 @@ public class PlayerScouter extends Plugin
 		playerContainer.forEach(player ->
 		{
 			update(player);
-			if (player.getRisk() > this.minimumRisk)
+			if (player.getPlayer().getCombatLevel() < this.minimumCombat
+				|| player.getPlayer().getCombatLevel() > this.maximumCombat)
+			{
+				return;
+			}
+			if ((player.getPlayer().getCombatLevel() >= this.minimumCombat
+				&& player.getPlayer().getCombatLevel() <= this.maximumCombat) && player.getRisk() > this.minimumRisk)
 			{
 				scoutPlayer(player);
 			}
@@ -259,6 +268,8 @@ public class PlayerScouter extends Plugin
 		this.outputItems = config.outputItems();
 		this.scoutClan = config.scoutClan();
 		this.scoutFriends = config.scoutFriends();
+		this.minimumCombat = config.minimumCombat();
+		this.maximumCombat = config.maximumCombat();
 	}
 
 	private void update(PlayerContainer player)
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouterConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouterConfig.java
index 1b05c1c13e..f83976bfed 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouterConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouterConfig.java
@@ -26,6 +26,7 @@ package net.runelite.client.plugins.playerscouter;
 import net.runelite.client.config.Config;
 import net.runelite.client.config.ConfigGroup;
 import net.runelite.client.config.ConfigItem;
+import net.runelite.client.config.Range;
 
 @ConfigGroup("playerscouter")
 public interface PlayerScouterConfig extends Config
@@ -108,11 +109,41 @@ public interface PlayerScouterConfig extends Config
 		return 1000;
 	}
 
+	@Range(
+		min = 3,
+		max = 125
+	)
+	@ConfigItem(
+		keyName = "minimumCombat",
+		name = "Minimum Combat Level",
+		description = "The Minimum Combat Level you wish to scout.",
+		position = 7
+	)
+	default int minimumCombat()
+	{
+		return 3;
+	}
+
+	@Range(
+		min = 4,
+		max = 126
+	)
+	@ConfigItem(
+		keyName = "maximumCombat",
+		name = "Maximum Combat Level",
+		description = "The Maximum Combat Level you wish to scout.",
+		position = 8
+	)
+	default int maximumCombat()
+	{
+		return 126;
+	}
+
 	@ConfigItem(
 		keyName = "timeout",
 		name = "Timeout",
 		description = "Minimum amount of ticks before the player can be scouted again. (1 tick = 600ms)",
-		position = 7
+		position = 9
 	)
 	default int timeout()
 	{