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

Merge pull request #1056 from Ganom/scouter-webhook-skull-update-change-version-something-or-another

Browse Source 
playerscouter: Always display weapon, and use discord emoji for skull.
This commit is contained in:
Tyler Bochard
2019-07-19 23:55:28 -04:00
committed by GitHub
parent 6193f8297a 3302e278dd
commit cbc3b27fd7
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/Utils.java
View File

@@ -42,6 +42,7 @@ import net.runelite.api.ItemDefinition;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.Player; import net.runelite.api.Player;
import net.runelite.api.Prayer; import net.runelite.api.Prayer;
import net.runelite.api.Varbits;
import net.runelite.api.coords.WorldArea; import net.runelite.api.coords.WorldArea;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.kit.KitType; import net.runelite.api.kit.KitType;
@@ -521,20 +522,9 @@ class Utils
} }
ThumbnailEmbed image = ThumbnailEmbed.builder() ThumbnailEmbed image = ThumbnailEmbed.builder()
.url("https://oldschool.runescape.wiki/images/a/a1/Skull_(status)_icon.png") .url(ICONBASEURL + player.getWeapon() + ".png")
.height(50)
.width(50)
.build(); .build();
if (player.getPlayer().getSkullIcon() == null)
{
image = ThumbnailEmbed.builder()
.url(ICONBASEURL + player.getWeapon() + ".png")
.height(100)
.width(100)
.build();
}
fieldList.add(FieldEmbed.builder() fieldList.add(FieldEmbed.builder()
.name("Risk") .name("Risk")
.value(StackFormatter.quantityToRSDecimalStack(player.getRisk())) .value(StackFormatter.quantityToRSDecimalStack(player.getRisk()))
@@ -552,18 +542,20 @@ class Utils
.value(Integer.toString(player.getPlayer().getCombatLevel())) .value(Integer.toString(player.getPlayer().getCombatLevel()))
.inline(true) .inline(true)
.build()); .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() fieldList.add(FieldEmbed.builder()
.name("Wildy Level") .name("Location")
.value(Integer.toString(player.getWildyLevel())) .value(player.getLocation())
.inline(true) .inline(true)
.build()); .build());
}
fieldList.add(FieldEmbed.builder()
.name("Location")
.value(player.getLocation())
.inline(true)
.build());
fieldList.add(FieldEmbed.builder() fieldList.add(FieldEmbed.builder()
.name("Target") .name("Target")
@@ -613,7 +605,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); player.setScouted(true);
fieldList.clear(); fieldList.clear();
} }
@@ -633,7 +633,7 @@ class Utils
DiscordEmbed discordEmbed = DiscordEmbed.builder() DiscordEmbed discordEmbed = DiscordEmbed.builder()
.author(AuthorEmbed.builder() .author(AuthorEmbed.builder()
.icon_url(iconUrl) // Icon of npc / player .icon_url(iconUrl)
.name(name) .name(name)
.build()) .build())
.thumbnail(thumbnail) .thumbnail(thumbnail)