Skip to content

Commit

Permalink
update osjs
Browse files Browse the repository at this point in the history
  • Loading branch information
nwjgit committed Feb 21, 2024
1 parent e9d842f commit 8255e8e
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 258 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"murmurhash": "^2.0.1",
"node-cron": "^3.0.2",
"node-fetch": "^2.6.7",
"oldschooljs": "^2.3.8",
"oldschooljs": "^2.4.0",
"p-queue": "^6.6.2",
"piscina": "^3.2.0",
"random-js": "^2.1.0",
Expand Down
9 changes: 6 additions & 3 deletions src/lib/data/CollectionsExport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1488,7 +1488,12 @@ export const troubleBrewingCL = resolveItems([
'Red rum (trouble brewing)',
'Blue rum (trouble brewing)'
]);
export const volcanicMineCL = resolveItems(['Ash covered tome', 'Large water container', 'Volcanic mine teleport']);
export const volcanicMineCL = resolveItems([
'Ash covered tome',
'Large water container',
'Volcanic mine teleport',
'Dragon pickaxe (broken)'
]);
export const anglerOutfit = resolveItems(['Angler hat', 'Angler top', 'Angler waders', 'Angler boots']);
export const aerialFishingCL = resolveItems([
'Golden tench',
Expand Down Expand Up @@ -2265,8 +2270,6 @@ export const LMSBuyables: LMSBuyable[] = [
{ item: getOSItem('Guthixian icon'), cost: 500 },
{ item: getOSItem('Trouver parchment'), cost: 18 },
{ item: getOSItem('Wilderness crabs teleport'), cost: 1 },
{ item: getOSItem('Blighted bind sack'), quantity: 300, cost: 1 },
{ item: getOSItem('Blighted snare sack'), quantity: 150, cost: 1 },
{ item: getOSItem('Blighted entangle sack'), quantity: 70, cost: 1 },
{ item: getOSItem('Blighted teleport spell sack'), quantity: 50, cost: 1 },
{ item: getOSItem('Blighted vengeance sack'), quantity: 50, cost: 1 },
Expand Down
4 changes: 4 additions & 0 deletions src/lib/data/itemAliases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ setItemAlias(11_901, 'Decorative quiver');
// Lamp (Genie event)
setItemAlias(2528, 'Genie lamp');

// Ore Sack
setItemAlias(27_019, "Ore pack (Giant's Foundry)");
setItemAlias(27_693, 'Ore pack (Volcanic Mine)');

// Birds eggs
setItemAlias(5076, 'Red bird egg');
setItemAlias(5077, 'Blue bird egg');
Expand Down
5 changes: 1 addition & 4 deletions src/mahoji/commands/open.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ export const openCommand: OSBMahojiCommand = {
val.toLowerCase().includes(value.toLowerCase())
);
})
.map(i => {
const openable = allOpenables.find(o => o.id === i[0].id);
return { name: `${openable!.name} (${i[1]}x Owned)`, value: openable!.name.toLowerCase() };
})
.map(i => ({ name: `${i[0].name} (${i[1]}x Owned)`, value: i[0].name.toLowerCase() }))
.concat([{ name: 'All (Open Everything)', value: 'all' }]);
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/mahoji/lib/abstracted_commands/giantsFoundryCommand.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ export const giantsFoundryBuyables: { name: string; output: Bank; cost: number;
},
{
name: 'Ore pack',
output: new Bank().add('Ore pack', 1),
output: new Bank().add("Ore pack (Giant's Foundry)", 1),
cost: 200,
aliases: []
aliases: ["Ore pack (Giant's Foundry)"]
},
{
name: 'Smiths tunic',
Expand Down
5 changes: 5 additions & 0 deletions src/mahoji/lib/abstracted_commands/volcanicMineCommand.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ export const VolcanicMineShop: { name: string; output: Bank; cost: number; clOnl
output: new Bank({ Pyrophosphite: 1 }),
cost: 70
},
{
name: 'Ore pack',
output: new Bank({ 'Ore pack (Volcanic Mine)': 1 }),
cost: 4000
},
{
name: 'Volcanic mine teleport',
output: new Bank({ 'Volcanic mine teleport': 1 }),
Expand Down
Loading

0 comments on commit 8255e8e

Please sign in to comment.