From c90cd413d10862cff5a6f8586760d433784ed7de Mon Sep 17 00:00:00 2001 From: DayV <69717452+DayV-git@users.noreply.github.com> Date: Thu, 21 Nov 2024 04:10:34 +0000 Subject: [PATCH] Remove max quantity from skotizo (and everywhere else) (#6192) --- .../data/killableMonsters/chaeldarMonsters.ts | 3 +- src/lib/minions/types.ts | 1 - .../minionKill/newMinionKill.ts | 6 +--- tests/integration/pvm/pvm.test.ts | 29 ------------------- 4 files changed, 2 insertions(+), 37 deletions(-) diff --git a/src/lib/minions/data/killableMonsters/chaeldarMonsters.ts b/src/lib/minions/data/killableMonsters/chaeldarMonsters.ts index eb50fd3f4e..7dd7a9f555 100644 --- a/src/lib/minions/data/killableMonsters/chaeldarMonsters.ts +++ b/src/lib/minions/data/killableMonsters/chaeldarMonsters.ts @@ -429,8 +429,7 @@ export const chaeldarMonsters: KillableMonster[] = [ itemCost: { itemCost: new Bank().add('Dark totem', 1), qtyPerKill: 1 }, healAmountNeeded: 20 * 15, attackStyleToUse: GearStat.AttackSlash, - attackStylesUsed: [GearStat.AttackSlash, GearStat.AttackMagic], - maxQuantity: 1 + attackStylesUsed: [GearStat.AttackSlash, GearStat.AttackMagic] }, { id: Monsters.TzHaarKet.id, diff --git a/src/lib/minions/types.ts b/src/lib/minions/types.ts index 8c4e078c9c..444f64e605 100644 --- a/src/lib/minions/types.ts +++ b/src/lib/minions/types.ts @@ -140,7 +140,6 @@ export interface KillableMonster { deathProps?: Omit['0'], 'currentKC'>; diaryRequirement?: [DiaryID, DiaryTierName]; wildySlayerCave?: boolean; - maxQuantity?: number; } /* * Monsters will have an array of Consumables diff --git a/src/mahoji/lib/abstracted_commands/minionKill/newMinionKill.ts b/src/mahoji/lib/abstracted_commands/minionKill/newMinionKill.ts index 1a2c8fc276..0565943c49 100644 --- a/src/mahoji/lib/abstracted_commands/minionKill/newMinionKill.ts +++ b/src/mahoji/lib/abstracted_commands/minionKill/newMinionKill.ts @@ -1,5 +1,5 @@ import type { PlayerOwnedHouse } from '@prisma/client'; -import { clamp, increaseNumByPercent, reduceNumByPercent } from 'e'; +import { increaseNumByPercent, reduceNumByPercent } from 'e'; import { Monsters } from 'oldschooljs'; import { mergeDeep } from 'remeda'; import z from 'zod'; @@ -166,10 +166,6 @@ export function newMinionKillCommand(args: MinionKillOptions) { }) : null; - if (monster.maxQuantity) { - args.inputQuantity = clamp(args.inputQuantity ?? 1, 1, monster.maxQuantity); - } - const ephemeralPostTripEffects: PostBoostEffect[] = []; const speedDurationResult = speedCalculations({ ...args, diff --git a/tests/integration/pvm/pvm.test.ts b/tests/integration/pvm/pvm.test.ts index e265eb8125..989bb2e2f6 100644 --- a/tests/integration/pvm/pvm.test.ts +++ b/tests/integration/pvm/pvm.test.ts @@ -260,35 +260,6 @@ describe('PVM', async () => { expect(user.bank.amount('Dark totem')).toBe(99); }); - describe('should default to 1 skotizo kill', async () => { - const user = await client.mockUser({ - bank: new Bank().add('Dark totem', 5), - rangeLevel: 99, - QP: 300, - maxed: true, - meleeGear: resolveItems(["Verac's flail", "Black d'hide body", "Black d'hide chaps"]) - }); - let lastKc = await user.getKC(EMonster.SKOTIZO); - for (const quantity of [undefined, 1, 2, 5]) { - it(`should default to 1 skotizo kill with input of ${quantity}`, async () => { - await user.update({ bank: new Bank().add('Dark totem', 5).toJSON() }); - expect(user.bank.amount('Dark totem')).toBe(5); - const result = await user.kill(EMonster.SKOTIZO, { quantity }); - expect(result.activityResult!.q).toEqual(1); - expect(result.activityResult?.userID).toEqual(user.id); - expect(result.activityResult?.mi).toEqual(EMonster.SKOTIZO); - expect(result.commandResult).toContain('is now killing 1x Skotizo'); - await user.sync(); - expect( - result.newKC, - `LastKC=${lastKc} NewKC=${result.newKC} RawNEWKC=${await user.getKC(EMonster.SKOTIZO)}` - ).toEqual(lastKc + 1); - expect(user.bank.amount('Dark totem')).toBe(4); - lastKc = result.newKC; - }); - } - }); - describe( 'should fail to kill skotizo with no totems', async () => {