diff --git a/src/mahoji/commands/mine.ts b/src/mahoji/commands/mine.ts index e556bc3895..4cfcf15aa1 100644 --- a/src/mahoji/commands/mine.ts +++ b/src/mahoji/commands/mine.ts @@ -83,7 +83,7 @@ export function calculateMiningInput({ effectiveMiningLevel += 7; } // Checks if user own Celestial ring or Celestial signet - if (gearValues.some(g => g.hasEquippedOrInBank(['Celestial ring (uncharged)']))) { + if (gearValues.some(g => g.hasEquipped(['Celestial ring (uncharged)']))) { messages.push('+4 invisible Mining lvls for Celestial ring'); effectiveMiningLevel += 4; } @@ -105,7 +105,7 @@ export function calculateMiningInput({ let glovesRate = 0; if (miningLevel >= 60) { for (const glove of miningGloves) { - if (!gearValues.some(g => g.hasEquippedOrInBank(glove.id)) || !glove.Percentages.has(ore.id)) continue; + if (!gearValues.some(g => g.hasEquipped(glove.id)) || !glove.Percentages.has(ore.id)) continue; glovesRate = glove.Percentages.amount(ore.id); if (glovesRate !== 0) { messages.push(`Lowered rock depletion rate by **${glovesRate}%** for ${itemNameFromID(glove.id)}`); @@ -116,7 +116,7 @@ export function calculateMiningInput({ let armourEffect = 0; for (const armour of varrockArmours) { - if (!gearValues.some(g => g.hasEquippedOrInBank(armour.id)) || !armour.Percentages.has(ore.id)) continue; + if (!gearValues.some(g => g.hasEquipped(armour.id)) || !armour.Percentages.has(ore.id)) continue; armourEffect = armour.Percentages.amount(ore.id); if (armourEffect !== 0) { messages.push(`**${armourEffect}%** chance to mine an extra ore using ${itemNameFromID(armour.id)}`); @@ -131,7 +131,7 @@ export function calculateMiningInput({ } let miningCapeEffect = 0; - if (gearValues.some(g => g.hasEquippedOrInBank('Mining cape')) && miningCapeOreEffect.has(ore.id)) { + if (gearValues.some(g => g.hasEquipped('Mining cape')) && miningCapeOreEffect.has(ore.id)) { miningCapeEffect = miningCapeOreEffect.amount(ore.id); if (miningCapeEffect !== 0) { messages.push(`**${miningCapeEffect}%** chance to mine an extra ore using Mining cape`); diff --git a/src/mahoji/lib/abstracted_commands/warriorsGuildCommand.ts b/src/mahoji/lib/abstracted_commands/warriorsGuildCommand.ts index 358dc8e06d..7612b07fc3 100644 --- a/src/mahoji/lib/abstracted_commands/warriorsGuildCommand.ts +++ b/src/mahoji/lib/abstracted_commands/warriorsGuildCommand.ts @@ -77,7 +77,7 @@ async function tokensCommand(user: MUser, channelID: string, quantity: number | async function cyclopsCommand(user: MUser, channelID: string, quantity: number | undefined) { const userBank = user.bank; - const hasAttackCape = user.gear.melee.hasEquippedOrInBank('Attack cape'); + const hasAttackCape = user.gear.melee.hasEquipped('Attack cape'); const maxTripLength = calcMaxTripLength(user, 'Cyclops'); // Check if either 100 warrior guild tokens or attack cape (similar items in future) const amountTokens = userBank.amount('Warrior guild token'); diff --git a/src/tasks/minions/miningActivity.ts b/src/tasks/minions/miningActivity.ts index d549395e3a..c6eec2888d 100644 --- a/src/tasks/minions/miningActivity.ts +++ b/src/tasks/minions/miningActivity.ts @@ -256,7 +256,7 @@ export const miningTask: MinionTask = { const spiritOre = stoneSpirits.find(t => t.ore.id === ore.id); const amountOfSpiritsToUse = spiritOre !== undefined ? Math.min(quantity, user.bank.amount(spiritOre.spirit.id)) : 0; - const hasMiningMasterCape = user.hasEquippedhasEquipped('Mining master cape'); + const hasMiningMasterCape = User.hasEquippedOrInBank('Mining master cape'); const portentResult = amountOfSpiritsToUse > 0 ? await chargePortentIfHasCharges({