From 5e81cd0fc61cb7bbbf4444e00988bd71a2a71139 Mon Sep 17 00:00:00 2001
From: Ganom <theariall@gmail.com>
Date: Fri, 19 Jul 2019 21:33:51 -0400
Subject: [PATCH 1/3] Always display weapon, and use discord emoji for skull.

---
 .../client/plugins/playerscouter/Utils.java   | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/Utils.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/Utils.java
index f3dd181ad7..b57636e871 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/Utils.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/Utils.java
@@ -521,20 +521,9 @@ class Utils
 		}
 
 		ThumbnailEmbed image = ThumbnailEmbed.builder()
-			.url("https://oldschool.runescape.wiki/images/a/a1/Skull_(status)_icon.png")
-			.height(50)
-			.width(50)
+			.url(ICONBASEURL + player.getWeapon() + ".png")
 			.build();
 
-		if (player.getPlayer().getSkullIcon() == null)
-		{
-			image = ThumbnailEmbed.builder()
-				.url(ICONBASEURL + player.getWeapon() + ".png")
-				.height(100)
-				.width(100)
-				.build();
-		}
-
 		fieldList.add(FieldEmbed.builder()
 			.name("Risk")
 			.value(StackFormatter.quantityToRSDecimalStack(player.getRisk()))
@@ -613,7 +602,15 @@ class Utils
 			}
 		}
 
-		message(player.getPlayer().getName(), " ", ICONBASEURL + Objects.requireNonNull(getEntry(player.getGear())).getKey() + ".png", image, fieldList, url, discordClient, color);
+		String icon = ICONBASEURL + Objects.requireNonNull(getEntry(player.getGear())).getKey() + ".png";
+		String name = "☠️ " + player.getName() + " ☠️";
+
+		if (player.getPlayer().getSkullIcon() == null)
+		{
+			name = player.getName();
+		}
+
+		message(name, " ", icon, image, fieldList, url, discordClient, color);
 		player.setScouted(true);
 		fieldList.clear();
 	}
@@ -633,7 +630,7 @@ class Utils
 
 		DiscordEmbed discordEmbed = DiscordEmbed.builder()
 			.author(AuthorEmbed.builder()
-				.icon_url(iconUrl) // Icon of npc / player
+				.icon_url(iconUrl)
 				.name(name)
 				.build())
 			.thumbnail(thumbnail)

From 4112292893beb0feaba1612c68ccc52636e5243a Mon Sep 17 00:00:00 2001
From: Ganom <theariall@gmail.com>
Date: Fri, 19 Jul 2019 21:36:33 -0400
Subject: [PATCH 2/3] Ensure player is in wilderness for location webhook.

---
 .../client/plugins/playerscouter/Utils.java        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/Utils.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/Utils.java
index b57636e871..726911ee3c 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/Utils.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/Utils.java
@@ -42,6 +42,7 @@ import net.runelite.api.ItemDefinition;
 import net.runelite.api.NPC;
 import net.runelite.api.Player;
 import net.runelite.api.Prayer;
+import net.runelite.api.Varbits;
 import net.runelite.api.coords.WorldArea;
 import net.runelite.api.coords.WorldPoint;
 import net.runelite.api.kit.KitType;
@@ -548,11 +549,14 @@ class Utils
 			.inline(true)
 			.build());
 
-		fieldList.add(FieldEmbed.builder()
-			.name("Location")
-			.value(player.getLocation())
-			.inline(true)
-			.build());
+		if (client.getVar(Varbits.IN_WILDERNESS) == 1)
+		{
+			fieldList.add(FieldEmbed.builder()
+				.name("Location")
+				.value(player.getLocation())
+				.inline(true)
+				.build());
+		}
 
 		fieldList.add(FieldEmbed.builder()
 			.name("Target")

From 3302e278dde568835fe96c71ac6cdcfa74f6a4f9 Mon Sep 17 00:00:00 2001
From: Ganom <theariall@gmail.com>
Date: Fri, 19 Jul 2019 21:41:20 -0400
Subject: [PATCH 3/3] Include wildy levels.

---
 .../client/plugins/playerscouter/Utils.java         | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/Utils.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/Utils.java
index 726911ee3c..0c5fa3e69d 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/Utils.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/Utils.java
@@ -542,15 +542,14 @@ class Utils
 			.value(Integer.toString(player.getPlayer().getCombatLevel()))
 			.inline(true)
 			.build());
-
-		fieldList.add(FieldEmbed.builder()
-			.name("Wildy Level")
-			.value(Integer.toString(player.getWildyLevel()))
-			.inline(true)
-			.build());
-
 		if (client.getVar(Varbits.IN_WILDERNESS) == 1)
 		{
+			fieldList.add(FieldEmbed.builder()
+				.name("Wildy Level")
+				.value(Integer.toString(player.getWildyLevel()))
+				.inline(true)
+				.build());
+
 			fieldList.add(FieldEmbed.builder()
 				.name("Location")
 				.value(player.getLocation())