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

Merge pull request #7335 from deathbeam/item-stats-speed

Browse Source 
Add support for unarmed a speed, and inverse a speed display
This commit is contained in:
Tomas Slusny
2019-01-14 07:11:45 +01:00
committed by GitHub
parent bf0d0b1010 44273dfb0f
commit a4ccb031ea
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
runelite-client/src/main/java/net/runelite/client/plugins/itemstats/ItemStatOverlay.java
View File

@@ -29,6 +29,7 @@ import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.EquipmentInventorySlot;
import net.runelite.api.InventoryID; import net.runelite.api.InventoryID;
import net.runelite.api.Item; import net.runelite.api.Item;
import net.runelite.api.ItemContainer; import net.runelite.api.ItemContainer;
@@ -46,6 +47,12 @@ import net.runelite.http.api.item.ItemStats;
public class ItemStatOverlay extends Overlay public class ItemStatOverlay extends Overlay
{ {
// Unarmed attack speed is 6
private static final ItemStats UNARMED = new ItemStats(false, true, 0,
ItemEquipmentStats.builder()
.aspeed(6)
.build());
@Inject @Inject
private Client client; private Client client;
@@ -191,15 +198,22 @@ public class ItemStatOverlay extends Overlay
if (s.isEquipable() && currentEquipment != null && c != null) if (s.isEquipable() && currentEquipment != null && c != null)
{ {
final Item[] items = c.getItems(); final Item[] items = c.getItems();
final int slot = currentEquipment.getSlot();
if (currentEquipment.getSlot() != -1 && currentEquipment.getSlot() < items.length) if (slot != -1 && slot < items.length)
{ {
final Item item = items[currentEquipment.getSlot()]; final Item item = items[slot];
if (item != null) if (item != null)
{ {
other = itemManager.getItemStats(item.getId()); other = itemManager.getItemStats(item.getId());
} }
} }
if (other == null && slot == EquipmentInventorySlot.WEAPON.getSlotIdx())
{
// Unarmed
other = UNARMED;
}
} }
final ItemStats subtracted = s.subtract(other); final ItemStats subtracted = s.subtract(other);
@@ -208,7 +222,7 @@ public class ItemStatOverlay extends Overlay
if (subtracted.isEquipable() && e != null) if (subtracted.isEquipable() && e != null)
{ {
b.append(getChangeString("Prayer", e.getPrayer(), false, false)); b.append(getChangeString("Prayer", e.getPrayer(), false, false));
b.append(getChangeString("Speed", e.getAspeed(), false, false)); b.append(getChangeString("Speed", e.getAspeed(), true, false));
b.append(getChangeString("Melee Str", e.getStr(), false, false)); b.append(getChangeString("Melee Str", e.getStr(), false, false));
b.append(getChangeString("Range Str", e.getRstr(), false, false)); b.append(getChangeString("Range Str", e.getRstr(), false, false));
b.append(getChangeString("Magic Dmg", e.getMdmg(), false, true)); b.append(getChangeString("Magic Dmg", e.getMdmg(), false, true));