Merge branch 'master' into bowfaArrows

.gitattributes

@@ -25,22 +25,10 @@ AUTHORS text
 *.jpeg binary
 *.gif binary
 *.ico binary
-*.mov binary
-*.mp4 binary
-*.mp3 binary
-*.flv binary
-*.fla binary
-*.swf binary
 *.gz binary
 *.zip binary
-*.7z binary
 *.ttf binary
 *.eot binary
 *.woff binary
-*.pyc binary
-*.pdf binary
-
-*.ttf     -text diff
-*.eot     -text diff
-*.woff    -text diff
-*.woff2   -text diff
+*.webp binary 
+*.woff2 binary 

.github/workflows/unit_tests.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
       - name: Checkout Project
         uses: actions/checkout@v4
-      - run: corepack enable &&  corepack install
+      - run: corepack enable && corepack install
       - name: Use Node.js ${{ matrix.node_version }}
         uses: actions/setup-node@v4
         with:
@@ -36,15 +36,13 @@ jobs:
           path: node_modules
           key: ${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/yarn.lock') }}
       - name: Install Dependencies
-        run: yarn --immutable
+        run: yarn remove zlib-sync && yarn install
       - name: Copy Configuration
         run: |
           pushd src &&
           cp config.example.ts config.ts &&
           popd && cp .env.test .env
       - name: Generate Prisma Clients
         run: yarn gen
-      - name: Build
-        run: yarn build:tsc
       - name: Test
         run: yarn test:ci:unit

biome.json

@@ -5,9 +5,12 @@
 	},
 	"files": {
 		"maxSize": 10000000,
-		"ignore": ["node_modules", "dist", "coverage", "profiling", "logs", "icon_cache"],
+		"ignore": ["node_modules", "dist", "coverage", "profiling", "logs", "icon_cache", ".astro", ".yarn"],
 		"include": ["**/*.ts", "**/*.mts", "**/*.json", "**/*.test.ts", "**/*.mdx", "**/*.md", "**/*.mjs", "**/*.cjs"]
 	},
+	"vcs": {
+		"defaultBranch": "master"
+	},
 	"linter": {
 		"enabled": true,
 		"rules": {

docs/astro.config.mjs

@@ -5,9 +5,13 @@ import { remarkItems } from './src/plugins/items';
 
 // https://astro.build/config
 export default defineConfig({
+	experimental: {
+		clientPrerender: true
+	},
 	markdown: {
 		remarkPlugins: [remarkItems],
-		smartypants: false
+		smartypants: false,
+		syntaxHighlight: false
 	},
 	integrations: [
 		starlight({
@@ -30,6 +34,9 @@ export default defineConfig({
 }`
 				}
 			],
+			editLink: {
+				baseUrl: 'https://github.com/oldschoolgg/oldschoolbot/edit/master/docs/'
+			},
 			sidebar: [
 				{
 					label: 'Getting Started',

docs/src/components/Footer.astro

@@ -1,12 +1,12 @@
 ---
 import { getAuthors } from "../plugins/authors";
 const authors = (await getAuthors(`src/content/docs/${Astro.props.id}`));
+const editURL = Astro.props.editUrl?.toString();
 ---
 
 <footer class="sl-flex">
-
-<div class="credits-list">{authors.map(name => <div class="credit">{name}</div>)}</div>
-
+	{authors.length > 0 && <div class="credits-list">Editors: {authors.map(name => <div class="credit">{name}</div>)}</div>}
+	{editURL && <a href={editURL} target="_blank" rel="noopener noreferrer" class="edit_this_page">Edit this page</a>}
 </footer>
 
 <style>

docs/src/content/docs/bso/Custom Items/dyes.md

@@ -1,10 +1,7 @@
 ---
 title: "Dyes"
-description: Dyes are custom items that cosmetically enhance various items
 ---
 
-# Dyes
-
 Dyes can be used on certain items by using the `/create` command. This process is irreversible, permanently turns items untradeable, and removes the dye.
 
 Ice, blood, shadow, and third age dyes can only be obtained from grandmaster caskets. Monkey dyes can be obtained from catching chimplings, encountering special monkeys during [Mad Marimbo's Monkey Rumble](../minigames/mad-marimbos-monkey-rumble/), or by buying them from the minigame's shop. Dungeoneering dyes can be purchased from the dungeoneering shop. Squid dye can be obtained from [Sea Kraken](../bso-custom-killables/demi-bosses/sea-kraken.md). Volcanic dyes can be obtained from [Moktang](../bso-custom-killables/bosses/moktang.md). Oceanic Dyes can be obtained from [Depths of Atlantis.](../bso-custom-killables/raids/depths-of-atlantis-doa.md)
@@ -81,9 +78,8 @@ Ice, blood, shadow, and third age dyes can only be obtained from grandmaster cas
 
 ## Squid dye
 
-|                    |                |     |
-| ------------------ | -------------- | --- |
 | Required item name | Dyed item name |     |
+| ------------------ | -------------- | --- |
 | Seer               | Black swan     |     |
 
 ## Volcanic Dye

docs/src/content/docs/bso/Custom Items/implings.md

@@ -2,14 +2,12 @@
 title: "Implings"
 ---
 
-# Implings
-
 On top of the regular implings you can get, there are 4 more you can get in BSO:
 
 **Infernal impling:** (requires 94 hunter) Drops TzHaar-related items, 1 in 1 million chance of Uncut onyx
 
 **Chimpling:** (requires 95 hunter and a magic banana) It can drop seeds, TMB's, GMC's, and the very rare monkey egg.\
-A single magic banana is consumed per catch and can be obtained by casting the `/activities enchant name:Banana spell`. This requires a regular banana (which can be farmed or created by casting bones to bananas) and a special enchant banana spell scroll which can be obtained from the [Monkey Rumble minigame](https://bso-wiki.oldschool.gg/minigames/mad-marimbos-monkey-rumble).
+A single magic banana is consumed per catch and can be obtained by casting the `/activities enchant name:Banana spell`. This requires a regular banana (which can be farmed or created by casting bones to bananas) and a special enchant banana spell scroll which can be obtained from the [Monkey Rumble minigame](/minigames/mad-marimbos-monkey-rumble).
 
 | Item                      | Rate   |
 | ------------------------- | ------ |

docs/src/content/docs/bso/Custom Items/index.md

@@ -4,7 +4,7 @@ title: "Custom Items"
 
 ### First Age
 
-First Age equipment is obtained at a very rare rate from [Grandmaster Caskets](https://bso-wiki.oldschool.gg/custom-items/grandmaster-clues)
+First Age equipment is obtained at a very rare rate from [Grandmaster Caskets](/custom-items/grandmaster-clues)
 
 |                    |                     |
 | ------------------ | ------------------- |
@@ -95,7 +95,7 @@ Dragonbone Equipment is an ornamental version of normal Dragon and Infinity equi
 
 **Deathtouched Dart**
 
-Deathtouched Darts can be obtained from [Grandmaster Caskets](https://bso-wiki.oldschool.gg/custom-items/grandmaster-clues), and are used to cause any one `/k` trip to return instantly.
+Deathtouched Darts can be obtained from [Grandmaster Caskets](/custom-items/grandmaster-clues), and are used to cause any one `/k` trip to return instantly.
 
 **Lamps**
 

docs/src/content/docs/bso/Custom Items/pets.md

@@ -4,7 +4,7 @@ title: "Pets"
 
 # Pets
 
-There are pets exclusive to BSO that provide unique and powerful perks and are rare drops from certain activities. These custom pets must equipped using `/gear pet equip:`**`name`**\` and in most cases, only one pet's effect can be active at once. All pets with a per minute drop rate can only be obtained on trips that are at least 20 minute long.
+There are pets exclusive to BSO that provide unique and powerful perks and are rare drops from certain activities. These custom pets must equipped using `/gear pet equip:name`\*\*\` and in most cases, only one pet's effect can be active at once. All pets with a per minute drop rate can only be obtained on trips that are at least 20 minute long.
 
 ## Trip boosting Pets
 
@@ -19,7 +19,7 @@ There are pets exclusive to BSO that provide unique and powerful perks and are r
 | Zak        | Increases maximum trip length by 40%                                                                                                                                                                                    | 1/6,500 minutes of Smelting(not obtainable from blast furnace, requires 10 QP) |
 | Takon      | 4x Smithing boost (not smelting, does not stack with <a href="equippables/#dwarven-tools">Dwarven greathammer</a>)<br>15% speed boost at Giants Foundry                                                                 | 1/600† from CoX                                                                |
 | Obis       | 2x Zalcano Boost2x Runecraft boost (uses 3x essence)Brings back random runes (non-PvM trips only)                                                                                                                       | 1/5,000 minutes of Runecrafting                                                |
-| Wilvus     | Brings back pickpocket loot, including <a href="https://bso-wiki.oldschool.gg/skills/thieving#custom-content-and-boosts">Thieves' Armband</a>2x thieving boost                                                          | 1/2,000 minutes of Thieving                                                    |
+| Wilvus     | Brings back pickpocket loot, including <a href="/skills/thieving#custom-content-and-boosts">Thieves' Armband</a>2x thieving boost                                                                                       | 1/2,000 minutes of Thieving                                                    |
 
 †These pets increase in rarity based on how many you have. For every pet you have in your cl the pet gets rarer
 
@@ -85,8 +85,7 @@ No Voidling equip and no magic master cape equipped: 1/6 - 1/7 regular speed.
 {% endtab %}
 {% endtabs %}
 
-Notes:\
-\*Smokey does not have to be equipped for this perk.\
+Notes:\*Smokey does not have to be equipped for this perk.\
 ±Invention provides this perk in the form of [RoboFlappy](../skills/invention/#inventions).
 
 <details>

docs/src/content/docs/bso/Custom Items/skilling-outfits.md

@@ -4,15 +4,15 @@ title: "Skilling outfits"
 
 ### Blacksmith Equipment
 
-The Blacksmith set is obtainable from Blacksmith Crates, which drop at a rate of 1/60 from [King Goldemar](../../bso-custom-killables/bosses/king-goldemar.md), or from mystery boxes. You can receive duplicates before finishing the set. The full set is required to smith dwarven equipment and tools. When the full set is equipped, a 10% xp boost is given when smithing and when smelting bars at the blast furnace.
+The Blacksmith set is obtainable from Blacksmith Crates, which drop at a rate of 1/60 from King Goldemar, or from mystery boxes. You can receive duplicates before finishing the set. The full set is required to smith dwarven equipment and tools. When the full set is equipped, a 10% xp boost is given when smithing and when smelting bars at the blast furnace.
 
 ### Master Runecraft
 
 Obtained from the ourania Delivery Service minigame.
 
 ### Master Farmer Outfit
 
-The Master Farmer outfit is craftable with 110 Crafting using Ent hides dropped from [Treebeard](../../bso-custom-killables/demi-bosses/treebeard.md). The outfit gives +3 extra maximum patches, for every type of patch. This stacks with the +2 patches from the Scroll of farming. It does not have to be equipped.
+The Master Farmer outfit is craftable with 110 Crafting using Ent hides dropped from Treebeard. The outfit gives +3 extra maximum patches, for every type of patch. This stacks with the +2 patches from the Scroll of farming. It does not have to be equipped.
 
 | Piece                | Ent Hide Needed |
 | -------------------- | --------------- |

docs/src/content/docs/bso/Minigames/balthazars-big-bonanza.md

@@ -2,8 +2,6 @@
 title: "Balthazar's Big Bonanza"
 ---
 
-# Balthazar's Big Bonanza
-
 You can start this minigame with the command `/bsominigames balthazars_big_bonanza start`
 
 This minigame can be done once a week. A trip takes around 15 minutes.

docs/src/content/docs/bso/Minigames/baxtorian-bathhouses.md

@@ -2,10 +2,6 @@
 title: "Baxtorian Bathhouses"
 ---
 
-# Baxtorian Bathhouses
-
-### Overview
-
 You can start this minigame through `/bsominigames baxtorian_bathhouses start`
 
 In this minigame, you play the role of a Boiler and Herbalist. Your job is to heat the water, and infuse it with herbs to give the water special properties.
@@ -20,15 +16,15 @@ There are multiple species that are served in this minigame, each with their own
 
 <table><thead><tr><th>Species</th><th>Preference</th><th data-hidden></th></tr></thead><tbody><tr><td>Fairy</td><td>Magical</td><td></td></tr><tr><td>Monkey</td><td>Vitalizing</td><td></td></tr><tr><td>Goblin</td><td>Caustic</td><td></td></tr><tr><td>Imp</td><td>Unholy</td><td></td></tr><tr><td>Giant</td><td>Invigorating</td><td></td></tr><tr><td>Fiend</td><td>Soothing</td><td></td></tr><tr><td>Troll</td><td>Soothing</td><td></td></tr><tr><td>Ogre</td><td>Healing</td><td></td></tr><tr><td>Gargoyle</td><td>Caustic</td><td></td></tr><tr><td>TzHaar</td><td>Healing</td><td></td></tr><tr><td>Wyvern</td><td>Vitalizing</td><td></td></tr><tr><td>Abyssal Creatures</td><td>Magical</td><td></td></tr><tr><td>Dragons</td><td>Invigorating</td><td></td></tr><tr><td>Demons</td><td>Unholy</td><td></td></tr></tbody></table>
 
-### Requirements
+## Requirements
 
 You will need 50 Herblore and 50 Firemaking for this minigame. As stated above, the type of ores and logs that you use are dependent on the selected tier. You will also use herbs of any kind, which you may select.
 
-### Boosts
+## Boosts
 
 You will receive a 20% reduction in used logs and ores if you have an idle Ignecarus Tame. You will also receive a 5% boost for having a Firemaking master cape.
 
-### Rewards
+## Rewards
 
 From the minigame, outside of unique items, you will receive varying amounts of Firemaking xp, Herblore xp, and random rewards (tips).
 

docs/src/content/docs/bso/Minigames/emerged-zuk-inferno.md

@@ -2,11 +2,9 @@
 title: "Emerged Zuk Inferno"
 ---
 
-# Emerged Zuk Inferno
-
 The **Emerged Zuk Inferno** is a new, harder version of the Inferno, where Zuk emerges from the lava, and engages you in a melee fight, and you have to truly kill him in his final form, to win. This is endgame, high-level, costly content, which has heavy requirements, but some very exclusive rewards, which are untradeable.
 
-You can do it using: `/activities inferno action:Start Inferno Trip emerged:True`
+You can do it using: [[/activities inferno action:Start Inferno Trip emerged:true]]
 
 ## Requirements
 

docs/src/content/docs/bso/Minigames/fishing-contest.md

@@ -17,7 +17,7 @@ Daily fishing trip that always takes 1 minute and 41 seconds and resets at 00:00
 #### Upgrades
 
 - **Crystal fishing rod:** Catches 1 extra fish per Fishing Contest trip. It is made with a contest rod and a crystal tool seed.
-  - `/create`**`item:`**`crystal fishing rod`
+  - `/create`\*\*`item:crystal fishing rod`
 - **Tackle boxes:** Dropped from Fishing Contest trips when the Fishing level requirement is met. Tackle boxes increase the amount of fish caught per Fishing Contest trip by 1 per tier. They also increase the trip length of all other fishing trips by 1 minute per tier.
   - _Beginner's tackle box:_ Tier 0, no level requirement.
   - _Basic tackle box:_ Tier 1, Level 75 required.

docs/src/content/docs/bso/Minigames/fist-of-guthix.md

@@ -2,8 +2,6 @@
 title: "Fist of Guthix"
 ---
 
-# Fist of Guthix
-
 You can start this miningame with the command `/bsominigames fist_of_guthix start.`\
 Each game awards 15 fist of guthix tokens. (30 with flappy)
 

docs/src/content/docs/bso/Minigames/guthixian-cache.md

@@ -2,8 +2,6 @@
 title: "Guthixian Cache"
 ---
 
-# Guthixian Cache
-
 A daily divination minigame with the following features:
 
 - **Frequency:** Once per UTC day.

docs/src/content/docs/bso/Minigames/inferno.md

@@ -2,8 +2,6 @@
 title: "Inferno"
 ---
 
-# Inferno
-
 See [OSB Wiki](https://wiki.oldschool.gg/bosses/inferno) for general information.
 
 ### BSO Specific Boosts

docs/src/content/docs/bso/Minigames/mmmr.md

@@ -6,10 +6,10 @@ Monkey Rumble is a minigame where you wear a greegree to turn into a monkey, and
 
 ### Quickstart Guide
 
-1. ` /buy`` `` `**`name:`**`M'speak amulet`
-2. ` /gear equip`` `` `**`gear_setup:`**` Misc`` `` `**`item:`**`M'speak amulet`
-3. ` /buy`` `` `**`name:`**`Beginner rumble greegree`
-4. ` /gear equip`` `` `**`gear_setup:`**` Misc`` `` `**`item:`**`Beginner rumble greegree`
+1. ` /buy`` name:M'speak amulet`
+2. ` /gear equip`` gear_setup: Misc`` item:M'speak amulet`
+3. ` /buy`` name:Beginner rumble greegree`
+4. ` /gear equip`` gear_setup: Misc`` item:Beginner rumble greegree`
 5. Make sure you have some fruit, for your monkey-form to eat!
 6. `/bsominigames monkey_rumble start`
 
@@ -53,14 +53,14 @@ Monkey Rumble is a minigame where you wear a greegree to turn into a monkey, and
 **Marimbo statue**
 
 - A statue you can place in your PoH, as a garden decoration. It has a chance of being dropped by purple monkeys after obtaining a tier 5 rumble greegree.
-- You can place it in your PoH using /` poh build`` `` `**`name:`**`Marimbo statue`
+- You can place it in your PoH using [[/poh build name:Marimbo statue]]
 
 **Banana enchantment scroll**
 
 - Bought from the reward shop or obtained from chimplings.
 - Allows you to enchant bananas into magic bananas, cannot cast this spell without it.
-- ` /minion use`` `` `**`item:`**`Banana enchantment scroll`
-- ` /activities enchant`` `` `**`name:`**`Banana`
+- ` /minion use item:Banana enchantment scroll`
+- ` /activities enchant name:Banana`
 
 **Chimplings**
 
@@ -75,7 +75,7 @@ Monkey Rumble is a minigame where you wear a greegree to turn into a monkey, and
 
 ## Monkey Rumble Store
 
-Use command `/buy name:[Item name]` to access the Monkey Rumble Store.
+Use command [[/buy name:item]] to access the Monkey Rumble Store.
 
 Items to be bought:
 

docs/src/content/docs/bso/Minigames/ourania-delivery-service-ods.md

@@ -2,8 +2,6 @@
 title: "Ourania Delivery Service (ODS)"
 ---
 
-# Ourania Delivery Service (ODS)
-
 The ODS is like the Gnome Restaurant, except instead of delivering food, you craft runes and then deliver them to Wizards in need.
 
 It's a pretty simple activity to do, the only requirement is that you have Pure essence to craft the runes with.

docs/src/content/docs/bso/Minigames/shades-of-mortton.md

@@ -3,8 +3,6 @@ title: "Shades of Mort'ton"
 description: "BSO only content: Necromancer Kit, Shade Skull, Gary"
 ---
 
-# Shades of Mort'ton
-
 [The OSB Shades of Mort'ton article](https://app.gitbook.com/s/-Mahgm23KyzkWDlt2oqz/minigames/shades-of-mortton) describes the minigame and standard content around it.
 
 | Item                                                                                                                             | Source                                                                         |

docs/src/content/docs/bso/Minigames/stealing-creation.md

@@ -2,8 +2,6 @@
 title: "Stealing Creation"
 ---
 
-# Stealing Creation
-
 You can start this miningame with the command `/bsominigames stealing_creation start.`\
 Each game awards 5 stealing creation tokens (10 with [Flappy](../custom-items/pets.md#perks)).
 

docs/src/content/docs/bso/Minigames/tinkering-workshop.md

@@ -2,8 +2,6 @@
 title: "Tinkering Workshop"
 ---
 
-# Tinkering Workshop
-
 You can start this miningame with the command `/bsominigames tinkering_workshop start`.
 
 Tinkering Workshop is an invention minigame, where you can tinker with materials. You get XP and the invention skilling outfit and materials bag.