From 90a1c30ac2fd35b52ef84cc90253c8c58fb7fb00 Mon Sep 17 00:00:00 2001 From: DayV Date: Mon, 25 Nov 2024 19:32:59 +0000 Subject: [PATCH] Remove some clue roll restrictions --- src/lib/minions/functions/addSkillingClueToLoot.ts | 9 +-------- src/tasks/minions/minigames/tobActivity.ts | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/lib/minions/functions/addSkillingClueToLoot.ts b/src/lib/minions/functions/addSkillingClueToLoot.ts index 9c19fb4c397..1d374ed4652 100644 --- a/src/lib/minions/functions/addSkillingClueToLoot.ts +++ b/src/lib/minions/functions/addSkillingClueToLoot.ts @@ -1,7 +1,6 @@ import { percentChance, sumArr } from 'e'; import type { Bank } from 'oldschooljs'; -import { BOT_TYPE } from '../../constants'; import { birdsNestID, eggNest, @@ -70,16 +69,10 @@ export default function addSkillingClueToLoot( } if (!roll(chance)) continue; - let nextTier = false; let gotClue = false; let clueRoll = randFloat(0, cluesTotalWeight); for (const clue of clues) { - if (clueRoll < clue[1] || nextTier) { - if (BOT_TYPE === 'OSB' && (user.bank.amount(clue[0]) >= 1 || loot.amount(clue[0]) >= 1)) { - nextTier = true; - continue; - } - + if (clueRoll < clue[1]) { nests++; gotClue = true; loot.add(clue[0]); diff --git a/src/tasks/minions/minigames/tobActivity.ts b/src/tasks/minions/minigames/tobActivity.ts index 08e347f5486..ab64e49bc39 100644 --- a/src/tasks/minions/minigames/tobActivity.ts +++ b/src/tasks/minions/minigames/tobActivity.ts @@ -3,7 +3,7 @@ import { roll, shuffleArr } from 'e'; import { Bank } from 'oldschooljs'; import { drawChestLootImage } from '../../../lib/bankImage'; -import { BOT_TYPE, Emoji, Events } from '../../../lib/constants'; +import { Emoji, Events } from '../../../lib/constants'; import { tobMetamorphPets } from '../../../lib/data/CollectionsExport'; import { TOBRooms, TOBUniques, TOBUniquesToAnnounce } from '../../../lib/data/tob'; import { trackLoot } from '../../../lib/lootTrack'; @@ -140,13 +140,6 @@ export const tobTask: MinionTask = { // Refund initial 100k entry cost userLoot.add('Coins', 100_000); - // Remove elite clue scroll if OSB & user has one in bank - if (BOT_TYPE === 'OSB') { - if (user.owns('Clue scroll (elite)')) { - userLoot.remove('Clue scroll (elite)', 1); - } - } - // Add this raids loot to the raid's total loot: totalLoot.add(userLoot);