diff --git a/src/lib/minions/data/killableMonsters/custom/SunMoon.ts b/src/lib/minions/data/killableMonsters/custom/SunMoon.ts index cb0cabfc51..dcd22873ef 100644 --- a/src/lib/minions/data/killableMonsters/custom/SunMoon.ts +++ b/src/lib/minions/data/killableMonsters/custom/SunMoon.ts @@ -74,7 +74,8 @@ export const Solis: CustomMonster = { const hasMaxedIgne = tames.some(tame => tame.isMaxedIgneTame()); if (hasMaxedIgne) return null; return 'You need to have a maxed Igne Tame (best gear, all fed items) to fight Solis.'; - } + }, + setupsUsed: ['melee'] }; // export const Celestara: CustomMonster = { diff --git a/src/lib/minions/types.ts b/src/lib/minions/types.ts index b1ad5a84fc..f0822fec79 100644 --- a/src/lib/minions/types.ts +++ b/src/lib/minions/types.ts @@ -141,6 +141,7 @@ export interface KillableMonster { minimumWeaponShieldStats?: Partial>>; tameCantKill?: true; customRequirement?: (user: MUser) => Promise; + setupsUsed?: GearSetupType[]; } /* * Monsters will have an array of Consumables diff --git a/src/mahoji/lib/abstracted_commands/minionKill.ts b/src/mahoji/lib/abstracted_commands/minionKill.ts index 8cc15dcbf7..553908f851 100644 --- a/src/mahoji/lib/abstracted_commands/minionKill.ts +++ b/src/mahoji/lib/abstracted_commands/minionKill.ts @@ -627,7 +627,8 @@ export async function minionKillCommand( for (const degItem of degradeablePvmBoostItems) { const isUsing = convertPvmStylesToGearSetup(attackStyles).includes(degItem.attackStyle) && - user.gear[degItem.attackStyle].hasEquipped(degItem.item.id); + user.gear[degItem.attackStyle].hasEquipped(degItem.item.id) && + (monster.setupsUsed ? monster.setupsUsed.includes(degItem.attackStyle) : true); if (isUsing) { // We assume they have enough charges, add the boost, and degrade at the end to avoid doing it twice. degItemBeingUsed.push(degItem);