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.

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

crabs #6158

Merged
merged 9 commits into from
Nov 8, 2024
Merged

crabs #6158

Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions docs/src/content/docs/getting-started/wiki.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ This is an automatically generated list of pages with possible issues to be look

[/bso/Skills/divination.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/divination.md): Doesnt use the new command formatting

[/bso/Skills/dungeoneering.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/dungeoneering.md): Doesnt use the new command formatting
[/bso/Skills/Dungeoneering.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/Dungeoneering.md): Doesnt use the new command formatting

[/bso/Skills/farming.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/farming.md): Doesnt use the new command formatting

Expand All @@ -251,9 +251,9 @@ This is an automatically generated list of pages with possible issues to be look

[/bso/Skills/runecraft.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/runecraft.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. `<td>`)

[/bso/Skills/Slayer/README.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/Slayer/README.md): Doesnt use the new command formatting
[/bso/Skills/slayer/README.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/slayer/README.md): Doesnt use the new command formatting

[/bso/Skills/Slayer/slayer-masks-helms.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/Slayer/slayer-masks-helms.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. `<td>`)
[/bso/Skills/slayer/slayer-masks-helms.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/slayer/slayer-masks-helms.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. `<td>`)

[/bso/Skills/smithing.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/smithing.md): Doesnt use the new command formatting

Expand Down
72 changes: 36 additions & 36 deletions docs/src/content/docs/osb/Skills/mining.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,42 +106,42 @@ The only other thing unidentified minerals can be used to purchase are:
{/_ DO NOT EDIT - This section is auto-generated by the build script _/}
| Ore | XP/hr | Powermining |
| --- | --- | --- |
| [[6983]] | 125 000 | Yes |
| [[6975]] | 93 000 | Yes |
| [[6975]] | 83 000 | No |
| [[440]] | 82 000 | Yes |
| [[6983]] | 66 000 | No |
| [[440]] | 58 000 | No |
| [[442]] | 58 000 | Yes |
| [[442]] | 53 000 | No |
| [[453]] | 45 000 | Yes |
| [[444]] | 42 000 | Yes |
| [[444]] | 40 000 | No |
| [[453]] | 38 000 | No |
| [[436]] | 38 000 | Yes |
| [[1625]] | 38 000 | Yes |
| [[438]] | 38 000 | Yes |
| [[1625]] | 36 000 | No |
| [[447]] | 32 000 | Yes |
| [[447]] | 30 000 | No |
| [[21347]] | 22 000 | Yes |
| [[21347]] | 22 000 | No |
| [[449]] | 19 000 | Yes |
| [[449]] | 19 000 | No |
| [[436]] | 19 000 | No |
| [[438]] | 19 000 | No |
| [[451]] | 13 000 | Yes |
| [[451]] | 13 000 | No |
| [[21622]] | 13 000 | Yes |
| [[21622]] | 13 000 | No |
| [[434]] | 11 000 | Yes |
| [[24706]] | 10 000 | Yes |
| [[24706]] | 10 000 | No |
| [[7936]] | 10 000 | Yes |
| [[1436]] | 10 000 | Yes |
| [[7936]] | 7 000 | No |
| [[1436]] | 7 000 | No |
| [[434]] | 5 000 | No |
| [[6983]] | 125,000 | Yes |
| [[6975]] | 93,000 | Yes |
| [[6975]] | 83,000 | No |
| [[440]] | 82,000 | Yes |
| [[6983]] | 66,000 | No |
| [[440]] | 58,000 | No |
| [[442]] | 58,000 | Yes |
| [[442]] | 53,000 | No |
| [[453]] | 45,000 | Yes |
| [[444]] | 42,000 | Yes |
| [[444]] | 40,000 | No |
| [[453]] | 38,000 | No |
| [[436]] | 38,000 | Yes |
| [[1625]] | 38,000 | Yes |
| [[438]] | 38,000 | Yes |
| [[1625]] | 36,000 | No |
| [[447]] | 32,000 | Yes |
| [[447]] | 30,000 | No |
| [[21347]] | 22,000 | Yes |
| [[21347]] | 22,000 | No |
| [[449]] | 19,000 | Yes |
| [[449]] | 19,000 | No |
| [[436]] | 19,000 | No |
| [[438]] | 19,000 | No |
| [[451]] | 13,000 | Yes |
| [[21622]] | 13,000 | Yes |
| [[21622]] | 13,000 | No |
| [[451]] | 12,000 | No |
| [[434]] | 11,000 | Yes |
| [[24706]] | 10,000 | Yes |
| [[24706]] | 10,000 | No |
| [[7936]] | 10,000 | Yes |
| [[1436]] | 10,000 | Yes |
| [[7936]] | 7,000 | No |
| [[1436]] | 7,000 | No |
| [[434]] | 5,000 | No |
| [[13421]] | 0 | Yes |
| [[13421]] | 0 | No |

Expand Down
4 changes: 2 additions & 2 deletions src/lib/data/CollectionsExport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1914,8 +1914,8 @@ export const miscellaneousCL = resolveItems([
'Mossy key',
'Giant key',
'Hespori seed',
// 'Fresh crab claw',
// 'Fresh crab shell',
'Fresh crab claw',
'Fresh crab shell',
"Xeric's talisman (inert)",
'Mask of ranul',
'Elven signet',
Expand Down
10 changes: 10 additions & 0 deletions src/lib/data/buyables/buyables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1106,6 +1106,16 @@ const Buyables: Buyable[] = [
thieving: 50
}
},
{
name: 'Diving apparatus',
gpCost: 1000,
qpRequired: 30
},
{
name: 'Fishbowl helmet',
gpCost: 1000,
qpRequired: 30
},
...sepulchreBuyables,
...constructionBuyables,
...hunterBuyables,
Expand Down
15 changes: 15 additions & 0 deletions src/lib/minions/data/killableMonsters/low.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,21 @@ const killableMonsters: KillableMonster[] = [
canCannon: true,
superior: Monsters.DreadbornAraxyte,
canBarrage: true
},
{
id: Monsters.Crab.id,
name: Monsters.Crab.name,
aliases: Monsters.Crab.aliases,
timeToFinish: Time.Second * 28.2,
table: Monsters.Crab,
wildy: false,
difficultyRating: 1,
qpRequired: 0,
respawnTime: Time.Second * 6,
healAmountNeeded: 3,
attackStyleToUse: GearStat.AttackCrush,
attackStylesUsed: [GearStat.AttackCrush],
itemsRequired: resolveItems(['Fishbowl helmet', 'Diving apparatus'])
}
];

Expand Down
16 changes: 16 additions & 0 deletions src/lib/skilling/skills/crafting/craftables/misc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,22 @@ const Misc: Craftable[] = [
xp: 500,
inputItems: new Bank().add('Amulet of torture').add('Araxyte fang'),
tickRate: 0
},
{
name: 'Crab helmet',
id: itemID('Crab helmet'),
level: 15,
xp: 32.5,
inputItems: new Bank().add('Fresh crab shell'),
tickRate: 2
},
{
name: 'Crab claw',
id: itemID('Crab claw'),
level: 15,
xp: 32.5,
inputItems: new Bank().add('Fresh crab claw'),
tickRate: 2
}
];

Expand Down
Binary file modified tests/unit/snapshots/bank.OSB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions tests/unit/snapshots/banksnapshots.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,20 @@ exports[`OSB Buyables 1`] = `
"thieving": 50,
},
},
{
"gpCost": 1000,
"itemCost": {},
"name": "Diving apparatus",
"outputItems": undefined,
"qpRequired": 30,
},
{
"gpCost": 1000,
"itemCost": {},
"name": "Fishbowl helmet",
"outputItems": undefined,
"qpRequired": 30,
},
{
"itemCost": {
"24711": 1,
Expand Down
Binary file modified tests/unit/snapshots/chatHead.OSB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/unit/snapshots/cl.OSB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion tests/unit/snapshots/clsnapshots.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Mahogany Homes (8)
Master Treasure Trail Rewards (Rare) (45)
Master Treasure Trails (49)
Medium Treasure Trails (115)
Miscellaneous (51)
Miscellaneous (53)
Monkey Backpacks (6)
Motherlode Mine (6)
My Notes (26)
Expand Down Expand Up @@ -721,6 +721,8 @@ Forestry legs
Forestry top
Fox whistle
Fremennik kilt
Fresh crab claw
Fresh crab shell
Frog slippers
Frog token
Frozen cache
Expand Down
Binary file modified tests/unit/snapshots/cox.OSB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/unit/snapshots/poh.OSB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/unit/snapshots/toa.OSB.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.