Merge branch 'oldschoolgg:master' into varlamore

oldschoolgg · Nov 8, 2024 · f2f4492 · f2f4492
2 parents e645e57 + acb2196
commit f2f4492
Show file tree

Hide file tree

Showing 34 changed files with 1,545 additions and 1,002 deletions.
diff --git a/docs/src/content/docs/getting-started/wiki.md b/docs/src/content/docs/getting-started/wiki.md
@@ -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
 
@@ -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
 

diff --git a/docs/src/content/docs/osb/Skills/mining.md b/docs/src/content/docs/osb/Skills/mining.md
@@ -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 |
 

diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
 		"murmurhash": "^2.0.1",
 		"node-cron": "^3.0.3",
 		"node-fetch": "^2.6.7",
-		"oldschooljs": "git+https://github.com/oldschoolgg/oldschooljs.git#3c165d84fb79abca6f6b85877165f94dcf7e2940",
+		"oldschooljs": "git+https://github.com/oldschoolgg/oldschooljs.git#7094eb4a53e5301fb401adadb25f6993448b1c83",
 		"p-queue": "^6.6.2",
 		"piscina": "^4.7.0",
 		"postgres": "^3.4.4",

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
@@ -345,7 +345,8 @@ export const BadgesEnum = {
 	SotWTrophy: 12,
 	Slayer: 13,
 	TopGiveawayer: 14,
-	Farmer: 15
+	Farmer: 15,
+	Hacktoberfest: 16
 } as const;
 
 export const badges: { [key: number]: string } = {
@@ -364,7 +365,8 @@ export const badges: { [key: number]: string } = {
 	[BadgesEnum.SotWTrophy]: Emoji.SOTWTrophy,
 	[BadgesEnum.Slayer]: Emoji.Slayer,
 	[BadgesEnum.TopGiveawayer]: Emoji.SantaHat,
-	[BadgesEnum.Farmer]: Emoji.Farming
+	[BadgesEnum.Farmer]: Emoji.Farming,
+	[BadgesEnum.Hacktoberfest]: '<:hacktoberfest:1304259875634942082>'
 };
 
 export const MAX_XP = 200_000_000;

diff --git a/src/lib/data/CollectionsExport.ts b/src/lib/data/CollectionsExport.ts
@@ -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',

diff --git a/src/lib/data/buyables/buyables.ts b/src/lib/data/buyables/buyables.ts
@@ -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,