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

statusorbs: Edit graceful recovery rate calculations (#2205)

Browse Source 
statusorbs: Edit graceful recovery rate calculations
This commit is contained in:
Owain van Brakel
2020-01-10 15:24:11 +01:00
committed by GitHub
parent 34da950c59 91906834d8
commit 719f8f163c
3 changed files with 74 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-client/src/main/java/net/runelite/client/plugins/statusorbs/StatusOrbsOverlay.java
View File

@@ -187,10 +187,7 @@ public class StatusOrbsOverlay extends Overlay
{ {
double recoverRate = (48 + client.getBoostedSkillLevel(Skill.AGILITY)) / 360000.0; double recoverRate = (48 + client.getBoostedSkillLevel(Skill.AGILITY)) / 360000.0;
if (Graceful.hasFullSet(client.getItemContainer(InventoryID.EQUIPMENT))) recoverRate *= Graceful.calculateRecoveryRate(client.getItemContainer(InventoryID.EQUIPMENT));
{
recoverRate *= 1.3; // 30% recover rate increase from Graceful set effect
}
percentRun += ms * recoverRate; percentRun += ms * recoverRate;
} }

11
runelite-client/src/main/java/net/runelite/client/plugins/statusorbs/StatusOrbsPlugin.java
View File

@@ -382,11 +382,7 @@ public class StatusOrbsPlugin extends Plugin
// Calculate the amount of energy recovered every second // Calculate the amount of energy recovered every second
double recoverRate = (48 + client.getBoostedSkillLevel(Skill.AGILITY)) / 360.0; double recoverRate = (48 + client.getBoostedSkillLevel(Skill.AGILITY)) / 360.0;
recoverRate *= Graceful.calculateRecoveryRate(client.getItemContainer(InventoryID.EQUIPMENT));
if (Graceful.hasFullSet(client.getItemContainer(InventoryID.EQUIPMENT)))
{
recoverRate *= 1.3; // 30% recover rate increase from Graceful set effect
}
// Calculate the number of seconds left // Calculate the number of seconds left
final double secondsLeft = (100 - client.getEnergy()) / recoverRate; final double secondsLeft = (100 - client.getEnergy()) / recoverRate;
@@ -432,11 +428,8 @@ public class StatusOrbsPlugin extends Plugin
private double runRegenPerTick() private double runRegenPerTick()
{ {
double recoverRate = (client.getBoostedSkillLevel(Skill.AGILITY) / 6d + 8) / 100; double recoverRate = (client.getBoostedSkillLevel(Skill.AGILITY) / 6d + 8) / 100;
recoverRate *= Graceful.calculateRecoveryRate(client.getItemContainer(InventoryID.EQUIPMENT));
if (Graceful.hasFullSet(client.getItemContainer(InventoryID.EQUIPMENT)))
{
return recoverRate * 1.3;
}
return recoverRate; return recoverRate;
} }

75
runelite-client/src/main/java/net/runelite/client/util/Graceful.java
View File

@@ -78,20 +78,87 @@ public enum Graceful
this.ids = ImmutableSet.copyOf(ids); this.ids = ImmutableSet.copyOf(ids);
} }
public static boolean hasFullSet(final ItemContainer equipment) public static double calculateRecoveryRate(final ItemContainer equipment)
{ {
double rate = 1;
if (equipment == null) if (equipment == null)
{ {
return false; return rate;
} }
final Item[] items = equipment.getItems(); final Item[] items = equipment.getItems();
if (equipment == null || items.length <= EquipmentInventorySlot.BOOTS.getSlotIdx()) if (hasFullSet(items))
{ {
return false; return 1.3;
} }
if (hasHood(items))
{
rate += 0.03;
}
if (hasTop(items))
{
rate += 0.04;
}
if (hasLegs(items))
{
rate += 0.04;
}
if (hasGloves(items))
{
rate += 0.03;
}
if (hasBoots(items))
{
rate += 0.03;
}
if (hasCape(items))
{
rate += 0.03;
}
return rate;
}
public static boolean hasHood(final Item[] items)
{
return HOOD.ids.contains(items[EquipmentInventorySlot.HEAD.getSlotIdx()].getId());
}
public static boolean hasTop(final Item[] items)
{
return TOP.ids.contains(items[EquipmentInventorySlot.BODY.getSlotIdx()].getId());
}
public static boolean hasLegs(final Item[] items)
{
return LEGS.ids.contains(items[EquipmentInventorySlot.LEGS.getSlotIdx()].getId());
}
public static boolean hasGloves(final Item[] items)
{
return GLOVES.ids.contains(items[EquipmentInventorySlot.GLOVES.getSlotIdx()].getId());
}
public static boolean hasBoots(final Item[] items)
{
return BOOTS.ids.contains(items[EquipmentInventorySlot.BOOTS.getSlotIdx()].getId());
}
public static boolean hasCape(final Item[] items)
{
return CAPE.ids.contains(items[EquipmentInventorySlot.CAPE.getSlotIdx()].getId());
}
public static boolean hasFullSet(final Item[] items)
{
return HOOD.ids.contains(items[EquipmentInventorySlot.HEAD.getSlotIdx()].getId()) return HOOD.ids.contains(items[EquipmentInventorySlot.HEAD.getSlotIdx()].getId())
&& TOP.ids.contains(items[EquipmentInventorySlot.BODY.getSlotIdx()].getId()) && TOP.ids.contains(items[EquipmentInventorySlot.BODY.getSlotIdx()].getId())
&& LEGS.ids.contains(items[EquipmentInventorySlot.LEGS.getSlotIdx()].getId()) && LEGS.ids.contains(items[EquipmentInventorySlot.LEGS.getSlotIdx()].getId())