From f76663b49172f622a31b0bfbc39e54349774073d Mon Sep 17 00:00:00 2001 From: TastyPumPum <79149170+TastyPumPum@users.noreply.github.com> Date: Fri, 5 Jul 2024 09:56:22 +0100 Subject: [PATCH 1/5] Update monsterActivity.ts --- src/tasks/minions/monsterActivity.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tasks/minions/monsterActivity.ts b/src/tasks/minions/monsterActivity.ts index 4006274e76..a71bb61a1a 100644 --- a/src/tasks/minions/monsterActivity.ts +++ b/src/tasks/minions/monsterActivity.ts @@ -202,7 +202,7 @@ export const monsterTask: MinionTask = { const superiorTable = isOnTaskResult.hasSuperiorsUnlocked && monster.superior ? monster.superior : undefined; const isInCatacombs = (!usingCannon ? monster.existsInCatacombs ?? undefined : undefined) && !isInWilderness; - + const hasRingOfWealthI = user.gear.wildy.hasEquipped('Ring of wealth (i)') && isInWilderness; if (hasRingOfWealthI) { messages.push('\nYour clue scroll chance is doubled due to wearing a Ring of Wealth (i).'); @@ -256,6 +256,7 @@ export const monsterTask: MinionTask = { loot.add(superiorTable?.kill(newSuperiorCount)); if (isInCatacombs) loot.add('Dark totem base', newSuperiorCount); if (isInWilderness) loot.add("Larran's key", newSuperiorCount); + if (e.slayerMasters.includes(usersTask.currentTask?.slayer_master_id === 8)) loot.add('Brimstone key', newSuperiorCount); } // Hill giant key wildy buff From 8625542209f49b014af0955bf2d7ebf1c2d77092 Mon Sep 17 00:00:00 2001 From: TastyPumPum <79149170+TastyPumPum@users.noreply.github.com> Date: Fri, 5 Jul 2024 09:57:02 +0100 Subject: [PATCH 2/5] Update monsterActivity.ts --- src/tasks/minions/monsterActivity.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks/minions/monsterActivity.ts b/src/tasks/minions/monsterActivity.ts index a71bb61a1a..69e0e673b8 100644 --- a/src/tasks/minions/monsterActivity.ts +++ b/src/tasks/minions/monsterActivity.ts @@ -202,7 +202,7 @@ export const monsterTask: MinionTask = { const superiorTable = isOnTaskResult.hasSuperiorsUnlocked && monster.superior ? monster.superior : undefined; const isInCatacombs = (!usingCannon ? monster.existsInCatacombs ?? undefined : undefined) && !isInWilderness; - + const hasRingOfWealthI = user.gear.wildy.hasEquipped('Ring of wealth (i)') && isInWilderness; if (hasRingOfWealthI) { messages.push('\nYour clue scroll chance is doubled due to wearing a Ring of Wealth (i).'); From 79cd9b18dab1056f14be50737cc15690319ca562 Mon Sep 17 00:00:00 2001 From: TastyPumPum <79149170+TastyPumPum@users.noreply.github.com> Date: Fri, 5 Jul 2024 10:00:25 +0100 Subject: [PATCH 3/5] Update monsterActivity.ts --- src/tasks/minions/monsterActivity.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks/minions/monsterActivity.ts b/src/tasks/minions/monsterActivity.ts index 69e0e673b8..e51a1b167f 100644 --- a/src/tasks/minions/monsterActivity.ts +++ b/src/tasks/minions/monsterActivity.ts @@ -256,7 +256,7 @@ export const monsterTask: MinionTask = { loot.add(superiorTable?.kill(newSuperiorCount)); if (isInCatacombs) loot.add('Dark totem base', newSuperiorCount); if (isInWilderness) loot.add("Larran's key", newSuperiorCount); - if (e.slayerMasters.includes(usersTask.currentTask?.slayer_master_id === 8)) loot.add('Brimstone key', newSuperiorCount); + if (usersTask.currentTask?.slayer_master_id === 8) loot.add('Brimstone key', newSuperiorCount); } // Hill giant key wildy buff From 744f69d77395311af4623aa7155d758bf79895ae Mon Sep 17 00:00:00 2001 From: TastyPumPum <79149170+TastyPumPum@users.noreply.github.com> Date: Fri, 5 Jul 2024 10:02:29 +0100 Subject: [PATCH 4/5] Update monsterActivity.ts --- src/tasks/minions/monsterActivity.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tasks/minions/monsterActivity.ts b/src/tasks/minions/monsterActivity.ts index e51a1b167f..dc98c294df 100644 --- a/src/tasks/minions/monsterActivity.ts +++ b/src/tasks/minions/monsterActivity.ts @@ -256,6 +256,7 @@ export const monsterTask: MinionTask = { loot.add(superiorTable?.kill(newSuperiorCount)); if (isInCatacombs) loot.add('Dark totem base', newSuperiorCount); if (isInWilderness) loot.add("Larran's key", newSuperiorCount); + const usersTask = await getUsersCurrentSlayerInfo(user.id); if (usersTask.currentTask?.slayer_master_id === 8) loot.add('Brimstone key', newSuperiorCount); } From 7a446ca52506438a37e95094d815cbb242596a7f Mon Sep 17 00:00:00 2001 From: TastyPumPum <79149170+TastyPumPum@users.noreply.github.com> Date: Sun, 14 Jul 2024 09:40:27 +0100 Subject: [PATCH 5/5] Fixes --- src/lib/types/minions.ts | 1 + src/mahoji/lib/abstracted_commands/minionKill.ts | 6 +++++- src/tasks/minions/monsterActivity.ts | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/lib/types/minions.ts b/src/lib/types/minions.ts index c6712b5914..768dc45004 100644 --- a/src/lib/types/minions.ts +++ b/src/lib/types/minions.ts @@ -135,6 +135,7 @@ export interface MonsterActivityTaskOptions extends ActivityTaskOptions { pkEncounters?: number; hasWildySupplies?: boolean; isInWilderness?: boolean; + isUsingKonar?: boolean; } export interface ClueActivityTaskOptions extends ActivityTaskOptions { diff --git a/src/mahoji/lib/abstracted_commands/minionKill.ts b/src/mahoji/lib/abstracted_commands/minionKill.ts index 984e7d0852..80c3bfc050 100644 --- a/src/mahoji/lib/abstracted_commands/minionKill.ts +++ b/src/mahoji/lib/abstracted_commands/minionKill.ts @@ -181,6 +181,9 @@ export async function minionKillCommand( usersTask.currentTask !== null && usersTask.assignedTask.monsters.includes(monster.id); + let isUsingKonar = false; + if (isOnTask && usersTask.slayerMaster.id === 5) isUsingKonar = true; + if (monster.slayerOnly && !isOnTask) { return `You can't kill ${monster.name}, because you're not on a slayer task.`; } @@ -960,7 +963,8 @@ export async function minionKillCommand( died: hasDied, pkEncounters: thePkCount, hasWildySupplies, - isInWilderness + isInWilderness, + isUsingKonar }); let response = `${minionName} is now killing ${quantity}x ${monster.name}, it'll take around ${formatDuration( duration diff --git a/src/tasks/minions/monsterActivity.ts b/src/tasks/minions/monsterActivity.ts index dc98c294df..9eab3ee67b 100644 --- a/src/tasks/minions/monsterActivity.ts +++ b/src/tasks/minions/monsterActivity.ts @@ -36,7 +36,8 @@ export const monsterTask: MinionTask = { died, pkEncounters, hasWildySupplies, - isInWilderness + isInWilderness, + isUsingKonar } = data; const monster = killableMonsters.find(mon => mon.id === monsterID)!; @@ -256,8 +257,7 @@ export const monsterTask: MinionTask = { loot.add(superiorTable?.kill(newSuperiorCount)); if (isInCatacombs) loot.add('Dark totem base', newSuperiorCount); if (isInWilderness) loot.add("Larran's key", newSuperiorCount); - const usersTask = await getUsersCurrentSlayerInfo(user.id); - if (usersTask.currentTask?.slayer_master_id === 8) loot.add('Brimstone key', newSuperiorCount); + if (isUsingKonar) loot.add('Brimstone key', newSuperiorCount); } // Hill giant key wildy buff