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

crabs #6158

Merged
merged 9 commits into from
Nov 8, 2024
Merged

crabs #6158

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b145581
crabs
DarkWorldsArtist Oct 29, 2024
504e679
Merge branch 'master' into alabastorosb
DarkWorldsArtist Oct 29, 2024
0f5affb
crabs 2
DarkWorldsArtist Oct 29, 2024
89f88f5
merge
DarkWorldsArtist Oct 29, 2024
1de74f9
remove gp cost
DarkWorldsArtist Oct 29, 2024
0c9b310
re add price
DarkWorldsArtist Oct 30, 2024
3f66668
Merge branch 'master' into alabastorosb
DarkWorldsArtist Oct 31, 2024
f6271f6
update price
DarkWorldsArtist Oct 31, 2024
3b9bdc6
lint
DarkWorldsArtist Oct 31, 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
18 changes: 8 additions & 10 deletions docs/src/content/docs/getting-started/wiki.md
View file
Open in desktop
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 Expand Up @@ -291,8 +291,12 @@ This is an automatically generated list of pages with possible issues to be look

[/index.mdx](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/index.mdx): Doesnt use the new command formatting

[/osb/Activities/aerial-fishing.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/aerial-fishing.md): Doesnt use the new command formatting

[/osb/Activities/fountain-of-rune.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/fountain-of-rune.md): Doesnt use the new command formatting

[/osb/Activities/guardians-of-the-rift.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/guardians-of-the-rift.md): Doesnt use the new command formatting

[/osb/Activities/hallowed-sepulchre.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/hallowed-sepulchre.md): Doesnt use the new command formatting

[/osb/Activities/mage-training-arena.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/mage-training-arena.md): Doesnt use the new command formatting
Expand Down Expand Up @@ -421,8 +425,6 @@ This is an automatically generated list of pages with possible issues to be look

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

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

[/osb/Skills/fishing/drift-net-fishing.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Skills/fishing/drift-net-fishing.md): Doesnt use the new command formatting

[/osb/Skills/fishing/fishing-training.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Skills/fishing/fishing-training.md): Doesnt use the new command formatting
Expand Down Expand Up @@ -453,11 +455,7 @@ This is an automatically generated list of pages with possible issues to be look

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

[/osb/Skills/runecrafting/guardians-of-the-rift.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Skills/runecrafting/guardians-of-the-rift.md): Doesnt use the new command formatting

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions src/lib/data/CollectionsExport.ts
View file
Open in desktop
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
View file
Open in desktop
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: 0,
Copy link
Collaborator

Choose a reason for hiding this comment

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

This may let people buy an infinite amount. I would set a cheap GP price, say 1k each.

qpRequired: 30
},
{
name: 'Fishbowl helmet',
gpCost: 0,
qpRequired: 30
},
...sepulchreBuyables,
...constructionBuyables,
...hunterBuyables,
Expand Down
15 changes: 15 additions & 0 deletions src/lib/minions/data/killableMonsters/low.ts
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,20 @@ exports[`OSB Buyables 1`] = `
"thieving": 50,
},
},
{
"gpCost": 0,
"itemCost": {},
"name": "Diving apparatus",
"outputItems": undefined,
"qpRequired": 30,
},
{
"gpCost": 0,
"itemCost": {},
"name": "Fishbowl helmet",
"outputItems": undefined,
"qpRequired": 30,
},
{
"itemCost": {
"24711": 1,
Expand Down
Binary file modified tests/unit/snapshots/chatHead.OSB.png
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.