Fixes

oldschoolgg · Jul 14, 2024 · 7a446ca · 7a446ca
1 parent 744f69d
commit 7a446ca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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