Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Brimstone key from Superior #5942

Closed
wants to merge 5 commits into from
Closed

Brimstone key from Superior #5942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f76663b
Update monsterActivity.ts
TastyPumPum Jul 5, 2024
8625542
Update monsterActivity.ts
TastyPumPum Jul 5, 2024
79cd9b1
Update monsterActivity.ts
TastyPumPum Jul 5, 2024
744f69d
Update monsterActivity.ts
TastyPumPum Jul 5, 2024
7a446ca
Fixes
TastyPumPum Jul 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/lib/types/minions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ export interface MonsterActivityTaskOptions extends ActivityTaskOptions {
pkEncounters?: number;
hasWildySupplies?: boolean;
isInWilderness?: boolean;
isUsingKonar?: boolean;
}

export interface ClueActivityTaskOptions extends ActivityTaskOptions {
Expand Down
6 changes: 5 additions & 1 deletion src/mahoji/lib/abstracted_commands/minionKill.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Comment on lines +184 to +185
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be changed to be the same as these:

usingCannon: !usingCannon ? undefined : usingCannon,
		cannonMulti: !cannonMulti ? undefined : cannonMulti,

and change the type to isUsingKonar?: true;, so its either undefined, or true.

This is just to not have unnecessary stuff in the data in the db.


if (monster.slayerOnly && !isOnTask) {
return `You can't kill ${monster.name}, because you're not on a slayer task.`;
}
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion src/tasks/minions/monsterActivity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ export const monsterTask: MinionTask = {
died,
pkEncounters,
hasWildySupplies,
isInWilderness
isInWilderness,
isUsingKonar
} = data;

const monster = killableMonsters.find(mon => mon.id === monsterID)!;
Expand Down Expand Up @@ -256,6 +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);
if (isUsingKonar) loot.add('Brimstone key', newSuperiorCount);
}

// Hill giant key wildy buff
Expand Down