Always display weapon, and use discord emoji for skull.
This commit is contained in:
@@ -521,20 +521,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()))
|
||||||
@@ -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);
|
player.setScouted(true);
|
||||||
fieldList.clear();
|
fieldList.clear();
|
||||||
}
|
}
|
||||||
@@ -633,7 +630,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)
|
||||||
|
|||||||
Reference in New Issue
Block a user