From 9359757f552abaf80f0f3db145a63ef5621b7ff5 Mon Sep 17 00:00:00 2001 From: TURB042O Date: Wed, 21 Feb 2024 23:49:34 -0600 Subject: [PATCH] dung & rc work in bank --- src/lib/skilling/skills/dung/dungDbFunctions.ts | 4 ++-- src/mahoji/commands/runecraft.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/skilling/skills/dung/dungDbFunctions.ts b/src/lib/skilling/skills/dung/dungDbFunctions.ts index 22d09751c5..134206edbf 100644 --- a/src/lib/skilling/skills/dung/dungDbFunctions.ts +++ b/src/lib/skilling/skills/dung/dungDbFunctions.ts @@ -15,9 +15,9 @@ export function calcMaxFloorUserCanDo(user: MUser) { export function calcUserGorajanShardChance(user: MUser) { return calcGorajanShardChance({ - hasMasterCape: user.hasEquipped('Dungeoneering master cape'), + hasMasterCape: user.hasEquippedOrInBank('Dungeoneering master cape'), dungLevel: user.skillLevel(SkillsEnum.Dungeoneering), - hasRingOfLuck: user.hasEquipped('Ring of luck') + hasRingOfLuck: user.hasEquippedOrInBank('Ring of luck') }); } diff --git a/src/mahoji/commands/runecraft.ts b/src/mahoji/commands/runecraft.ts index 41215356f8..00c2aa381f 100644 --- a/src/mahoji/commands/runecraft.ts +++ b/src/mahoji/commands/runecraft.ts @@ -140,7 +140,7 @@ export const runecraftCommand: OSBMahojiCommand = { tripLength /= 2; boosts.push('2x from Obis (3x more essence)'); } - if (user.hasEquipped('Runecraft master cape')) { + if (user.hasEquippedOrInBank('Runecraft master cape')) { tripLength /= 2; boosts.push(`${Emoji.RunecraftMasterCape} 2x faster`); } @@ -254,8 +254,8 @@ export const runecraftCommand: OSBMahojiCommand = { let removeTalismanAndOrRunes = new Bank(); let hasRingOfTheElements = false; if (runeObj.inputTalisman) { - const tomeOfFire = user.hasEquipped(['Tome of fire', 'Tome of fire (empty)']) ? 0 : 7; - const tomeOfWater = user.hasEquipped(['Tome of water', 'Tome of water (empty)']) ? 0 : 7; + const tomeOfFire = user.hasEquippedOrInBank(['Tome of fire', 'Tome of fire (empty)']) ? 0 : 7; + const tomeOfWater = user.hasEquippedOrInBank(['Tome of water', 'Tome of water (empty)']) ? 0 : 7; const magicImbueRuneCost = determineRunes( user, new Bank({ 'Astral rune': 2, 'Fire rune': tomeOfFire, 'Water rune': tomeOfWater })