itemstats: Fix stamina restore with Ring of Endurance (#13692)
This commit is contained in:
@@ -36,6 +36,7 @@ import net.runelite.client.plugins.itemstats.food.Anglerfish;
|
|||||||
import net.runelite.client.plugins.itemstats.potions.GauntletPotion;
|
import net.runelite.client.plugins.itemstats.potions.GauntletPotion;
|
||||||
import net.runelite.client.plugins.itemstats.potions.PrayerPotion;
|
import net.runelite.client.plugins.itemstats.potions.PrayerPotion;
|
||||||
import net.runelite.client.plugins.itemstats.potions.SaradominBrew;
|
import net.runelite.client.plugins.itemstats.potions.SaradominBrew;
|
||||||
|
import net.runelite.client.plugins.itemstats.potions.StaminaPotion;
|
||||||
import net.runelite.client.plugins.itemstats.potions.SuperRestore;
|
import net.runelite.client.plugins.itemstats.potions.SuperRestore;
|
||||||
import net.runelite.client.plugins.itemstats.special.CastleWarsBandage;
|
import net.runelite.client.plugins.itemstats.special.CastleWarsBandage;
|
||||||
import net.runelite.client.plugins.itemstats.special.SpicyStew;
|
import net.runelite.client.plugins.itemstats.special.SpicyStew;
|
||||||
@@ -160,7 +161,7 @@ public class ItemStatChanges
|
|||||||
add(new SuperRestore(.25, 8), SUPER_RESTORE1, SUPER_RESTORE2, SUPER_RESTORE3, SUPER_RESTORE4,
|
add(new SuperRestore(.25, 8), SUPER_RESTORE1, SUPER_RESTORE2, SUPER_RESTORE3, SUPER_RESTORE4,
|
||||||
BLIGHTED_SUPER_RESTORE1, BLIGHTED_SUPER_RESTORE2, BLIGHTED_SUPER_RESTORE3, BLIGHTED_SUPER_RESTORE4);
|
BLIGHTED_SUPER_RESTORE1, BLIGHTED_SUPER_RESTORE2, BLIGHTED_SUPER_RESTORE3, BLIGHTED_SUPER_RESTORE4);
|
||||||
add(new SuperRestore(.30, 4), SANFEW_SERUM1, SANFEW_SERUM2, SANFEW_SERUM3, SANFEW_SERUM4);
|
add(new SuperRestore(.30, 4), SANFEW_SERUM1, SANFEW_SERUM2, SANFEW_SERUM3, SANFEW_SERUM4);
|
||||||
add(heal(RUN_ENERGY, 20), STAMINA_POTION1, STAMINA_POTION2, STAMINA_POTION3, STAMINA_POTION4);
|
add(new StaminaPotion(), STAMINA_POTION1, STAMINA_POTION2, STAMINA_POTION3, STAMINA_POTION4);
|
||||||
|
|
||||||
// Raids potions (+)
|
// Raids potions (+)
|
||||||
add(combo(5, boost(ATTACK, perc(.16, 6)), boost(STRENGTH, perc(.16, 6)), boost(DEFENCE, perc(.16, 6)), boost(RANGED, perc(.16, 6)), boost(MAGIC, perc(.16, 6)), heal(HITPOINTS, -50)), OVERLOAD_1_20993, OVERLOAD_2_20994, OVERLOAD_3_20995, OVERLOAD_4_20996);
|
add(combo(5, boost(ATTACK, perc(.16, 6)), boost(STRENGTH, perc(.16, 6)), boost(DEFENCE, perc(.16, 6)), boost(RANGED, perc(.16, 6)), boost(MAGIC, perc(.16, 6)), heal(HITPOINTS, -50)), OVERLOAD_1_20993, OVERLOAD_2_20994, OVERLOAD_3_20995, OVERLOAD_4_20996);
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2016-2018, Adam <Adam@sigterm.info>
|
||||||
|
* Copyright (c) 2021, Tanlines <tanlines@outlook.com.au>
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* 1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
* list of conditions and the following disclaimer.
|
||||||
|
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
package net.runelite.client.plugins.itemstats.potions;
|
||||||
|
|
||||||
|
import net.runelite.api.Client;
|
||||||
|
import net.runelite.api.EquipmentInventorySlot;
|
||||||
|
import net.runelite.api.InventoryID;
|
||||||
|
import net.runelite.api.Item;
|
||||||
|
import net.runelite.api.ItemContainer;
|
||||||
|
import net.runelite.api.ItemID;
|
||||||
|
import net.runelite.client.plugins.itemstats.StatBoost;
|
||||||
|
import static net.runelite.client.plugins.itemstats.stats.Stats.RUN_ENERGY;
|
||||||
|
|
||||||
|
public class StaminaPotion extends StatBoost
|
||||||
|
{
|
||||||
|
public StaminaPotion()
|
||||||
|
{
|
||||||
|
super(RUN_ENERGY, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int heals(Client client)
|
||||||
|
{
|
||||||
|
ItemContainer equipContainer = client.getItemContainer(InventoryID.EQUIPMENT);
|
||||||
|
if (equipContainer != null)
|
||||||
|
{
|
||||||
|
Item ring = equipContainer.getItem(EquipmentInventorySlot.RING.getSlotIdx());
|
||||||
|
if (ring != null && ring.getId() == ItemID.RING_OF_ENDURANCE)
|
||||||
|
{
|
||||||
|
return 40;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 20;
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user