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

Venatrix & Akumu all flag for cl + cl fixes #5908

Merged
merged 1 commit into from
Jun 13, 2024
Merged

Venatrix & Akumu all flag for cl + cl fixes #5908

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 23 additions & 25 deletions src/lib/data/Collections.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import { inventionCL } from '../invention/inventions';
import { keyCrates } from '../keyCrates';
import killableMonsters, { effectiveMonsters, NightmareMonster } from '../minions/data/killableMonsters';
import { AkumuLootTable } from '../minions/data/killableMonsters/custom/bosses/Akumu';
import { Ignecarus } from '../minions/data/killableMonsters/custom/bosses/Ignecarus';
import {
kalphiteKingLootTable,
Expand All @@ -24,6 +25,7 @@
import { MOKTANG_ID, MoktangLootTable } from '../minions/data/killableMonsters/custom/bosses/Moktang';
import { Naxxus, NaxxusLootTableFinishable } from '../minions/data/killableMonsters/custom/bosses/Naxxus';
import { VasaMagus } from '../minions/data/killableMonsters/custom/bosses/VasaMagus';
import { VenatrixLootTable } from '../minions/data/killableMonsters/custom/bosses/Venatrix';
import { BSOMonsters } from '../minions/data/killableMonsters/custom/customMonsters';
import { sepulchreFloors } from '../minions/data/sepulchre';
import {
Expand Down Expand Up @@ -311,14 +313,12 @@
},
allItems: (() => {
return [
...new Set(
...[
Monsters.GeneralGraardor.allItems,
Monsters.CommanderZilyana.allItems,
Monsters.Kreearra.allItems,
Monsters.KrilTsutsaroth.allItems
]
)
...new Set([
...Monsters.GeneralGraardor.allItems,
...Monsters.CommanderZilyana.allItems,
...Monsters.Kreearra.allItems,
...Monsters.KrilTsutsaroth.allItems
])
];
})(),
items: [
Expand Down Expand Up @@ -681,13 +681,13 @@
},
Akumu: {
alias: ['akumu'],
allItems: akumuCL,
allItems: AkumuLootTable.allItems,
items: akumuCL,
fmtProg: kcProg(BSOMonsters.Akumu.id)
},
Venatrix: {
alias: ['venatrix'],
allItems: venatrixCL,
allItems: VenatrixLootTable.allItems,
items: venatrixCL,
fmtProg: kcProg(BSOMonsters.Venatrix.id)
},
Expand Down Expand Up @@ -785,21 +785,19 @@
},
allItems: (() => {
return [
...new Set(
...[
Monsters.RevenantImp.allItems,
Monsters.RevenantGoblin.allItems,
Monsters.RevenantPyrefiend.allItems,
Monsters.RevenantHobgoblin.allItems,
Monsters.RevenantCyclops.allItems,
Monsters.RevenantHellhound.allItems,
Monsters.RevenantDemon.allItems,
Monsters.RevenantOrk.allItems,
Monsters.RevenantDarkBeast.allItems,
Monsters.RevenantKnight.allItems,
Monsters.RevenantDragon.allItems
]
)
...new Set([
...Monsters.RevenantImp.allItems,
...Monsters.RevenantGoblin.allItems,
...Monsters.RevenantPyrefiend.allItems,
...Monsters.RevenantHobgoblin.allItems,
...Monsters.RevenantCyclops.allItems,
...Monsters.RevenantHellhound.allItems,
...Monsters.RevenantDemon.allItems,
...Monsters.RevenantOrk.allItems,
...Monsters.RevenantDarkBeast.allItems,
...Monsters.RevenantKnight.allItems,
...Monsters.RevenantDragon.allItems
])
];
})(),
items: revenantsCL
Expand Down Expand Up @@ -1320,7 +1318,7 @@
'Monkey Backpacks': {
alias: ['monkey', 'monkey bps', 'backpacks'],
kcActivity: {
Default: async (_, __, u) => u.lapsScores[6] || 0

Check warning on line 1321 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v18.12.0 - ubuntu-latest 

Unexpected number value in conditional. An explicit zero/NaN check is required

Check warning on line 1321 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v20 - ubuntu-latest 

Unexpected number value in conditional. An explicit zero/NaN check is required
},
items: monkeyBackpacksCL,
isActivity: true
Expand Down Expand Up @@ -1464,7 +1462,7 @@
'Dyed Items': {
counts: false,
items: dyedItems
.map(i => i.dyedVersions.filter(i => !discontinuedDyes.includes(i.dye.id)).map(i => i.item.id))

Check warning on line 1465 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v18.12.0 - ubuntu-latest 

'i' is already declared in the upper scope on line 1465 column 11

Check warning on line 1465 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v18.12.0 - ubuntu-latest 

'i' is already declared in the upper scope on line 1465 column 11

Check warning on line 1465 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v20 - ubuntu-latest 

'i' is already declared in the upper scope on line 1465 column 11

Check warning on line 1465 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v20 - ubuntu-latest 

'i' is already declared in the upper scope on line 1465 column 11
.flat(2)
},
'Clothing Mystery Box': {
Expand Down Expand Up @@ -1818,7 +1816,7 @@
'Dyed Items (Discontinued)': {
counts: false,
items: dyedItems
.map(i => i.dyedVersions.filter(i => discontinuedDyes.includes(i.dye.id)).map(i => i.item.id))

Check warning on line 1819 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v18.12.0 - ubuntu-latest 

'i' is already declared in the upper scope on line 1819 column 11

Check warning on line 1819 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v18.12.0 - ubuntu-latest 

'i' is already declared in the upper scope on line 1819 column 11

Check warning on line 1819 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v20 - ubuntu-latest 

'i' is already declared in the upper scope on line 1819 column 11

Check warning on line 1819 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v20 - ubuntu-latest 

'i' is already declared in the upper scope on line 1819 column 11
.flat(2)
},
'Miscelleanous (Discontinued)': {
Expand Down Expand Up @@ -1847,7 +1845,7 @@
)
.flat(100),
...Object.values(Monsters)
.map(m => (m && m.allItems ? m.allItems : []))

Check warning on line 1848 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v18.12.0 - ubuntu-latest 

Unexpected any value in conditional. An explicit comparison or type cast is required

Check warning on line 1848 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v18.12.0 - ubuntu-latest 

Unexpected any value in conditional. An explicit comparison or type cast is required

Check warning on line 1848 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v20 - ubuntu-latest 

Unexpected any value in conditional. An explicit comparison or type cast is required

Check warning on line 1848 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v20 - ubuntu-latest 

Unexpected any value in conditional. An explicit comparison or type cast is required
.flat(100)
]);

Expand Down Expand Up @@ -1988,7 +1986,7 @@

// get monsters
for (const monster of effectiveMonsters) {
categories.push(['Monsters', monster.name, monster.aliases ? monster.aliases.join(', ') : '']);

Check warning on line 1989 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v18.12.0 - ubuntu-latest 

Unexpected object value in conditional. The condition is always true

Check warning on line 1989 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v20 - ubuntu-latest 

Unexpected object value in conditional. The condition is always true
}
const normalTable = makeTable(['Type', 'name: ', 'Alias'], [...categories, ...activities, ...roles]);
return new AttachmentBuilder(Buffer.from(normalTable), { name: 'possible_logs.txt' });
Expand Down Expand Up @@ -2083,7 +2081,7 @@

const allItems = Boolean(flags.all);
if (logType === undefined) logType = 'collection';
if (flags.tame) {

Check warning on line 2084 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v18.12.0 - ubuntu-latest 

Unexpected value in conditional. A boolean expression is required

Check warning on line 2084 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v20 - ubuntu-latest 

Unexpected value in conditional. A boolean expression is required
logType = 'tame';
}

Expand Down Expand Up @@ -2146,7 +2144,7 @@
let userKC: Record<string, number> | undefined = { Default: 0 };

// Defaults to the activity name
if (attributes.kcActivity) {

Check warning on line 2147 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v18.12.0 - ubuntu-latest 

Unexpected value in conditional. A boolean expression is required

Check warning on line 2147 in src/lib/data/Collections.ts

View workflow job for this annotation

GitHub Actions / Node v20 - ubuntu-latest 

Unexpected value in conditional. A boolean expression is required
if (typeof attributes.kcActivity === 'string') {
userKC.Default += (await user.getKCByName(attributes.kcActivity))[1];
} else {
Expand Down
Loading