merge

oldschoolgg · Oct 29, 2024 · 89f88f5 · 89f88f5
1 parent 0f5affb
commit 89f88f5
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 41 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
 
@@ -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
@@ -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
@@ -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
 

diff --git a/src/lib/minions/data/killableMonsters/low.ts b/src/lib/minions/data/killableMonsters/low.ts
@@ -184,20 +184,20 @@ const killableMonsters: KillableMonster[] = [
 		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']),
-    },
+		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'])
+	}
 ];
 
 export default killableMonsters;
diff --git a/src/lib/skilling/skills/crafting/craftables/misc.ts b/src/lib/skilling/skills/crafting/craftables/misc.ts
@@ -246,29 +246,29 @@ const Misc: Craftable[] = [
 		inputItems: new Bank().add('Ball of wool').add('Rabbit foot'),
 		tickRate: 2
 	},
-    {
+	{
 		name: 'Amulet of rancour',
 		id: itemID('Amulet of rancour'),
 		level: 86,
 		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
+	{
+		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
 	}
 ];
 

diff --git a/tests/unit/snapshots/bank.OSB.png b/tests/unit/snapshots/bank.OSB.png
diff --git a/tests/unit/snapshots/banksnapshots.test.ts.snap b/tests/unit/snapshots/banksnapshots.test.ts.snap
@@ -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,

diff --git a/tests/unit/snapshots/chatHead.OSB.png b/tests/unit/snapshots/chatHead.OSB.png
diff --git a/tests/unit/snapshots/cl.OSB.png b/tests/unit/snapshots/cl.OSB.png
diff --git a/tests/unit/snapshots/clsnapshots.test.ts.snap b/tests/unit/snapshots/clsnapshots.test.ts.snap
@@ -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)
@@ -721,6 +721,8 @@ Forestry legs
 Forestry top
 Fox whistle
 Fremennik kilt
+Fresh crab claw
+Fresh crab shell
 Frog slippers
 Frog token
 Frozen cache

diff --git a/tests/unit/snapshots/cox.OSB.png b/tests/unit/snapshots/cox.OSB.png
diff --git a/tests/unit/snapshots/poh.OSB.png b/tests/unit/snapshots/poh.OSB.png
diff --git a/tests/unit/snapshots/toa.OSB.png b/tests/unit/snapshots/toa.OSB.png