Merge branch 'master' into addedNidToCL

.github/workflows/integration_tests.yml

@@ -15,7 +15,9 @@ jobs:
   test:
     runs-on: ubuntu-latest
     timeout-minutes: 10
-
+    concurrency:
+      group: ${{ github.ref_name }}-integrationtests
+      cancel-in-progress: true
     steps:
       - name: Checkout Project
         uses: actions/checkout@v4

.github/workflows/unit_tests.yml

@@ -20,7 +20,9 @@ jobs:
       matrix:
         node_version: [20.15.0]
         os: [ubuntu-latest]
-
+    concurrency:
+      group: ${{ github.ref_name }}-unittests
+      cancel-in-progress: true
     steps:
       - name: Checkout Project
         uses: actions/checkout@v4

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({

docs/package.json

@@ -12,7 +12,7 @@
 	"dependencies": {
 		"@astrojs/check": "^0.9.3",
 		"@astrojs/starlight": "^0.28.2",
-		"astro": "^4.15.3",
+		"astro": "^4.16.1",
 		"markdown-it": "^14.1.0",
 		"sharp": "^0.32.5",
 		"typescript": "^5.6.2",

docs/src/components/Footer.astro

@@ -5,11 +5,8 @@ const editURL = Astro.props.editUrl?.toString();
 ---
 
 <footer class="sl-flex">
-
 	{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>}
+	{editURL && <a href={editURL} target="_blank" rel="noopener noreferrer" class="edit_this_page">Edit this page</a>}
 </footer>
 
 <style>

docs/src/components/Time.astro

@@ -0,0 +1,15 @@
+---
+const time = Astro.props.time;
+---
+
+<time>{new Date(time).toLocaleString()}</time>
+
+<style>
+    time {
+      background-color: var(--sl-color-accent);
+      color: var(--sl-color-white);
+      padding: 2px 5px;
+      border-radius: 5px;
+      font-size: 12px;
+    }
+</style>

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

@@ -2,8 +2,6 @@
 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.
 
 ## Trip boosting Pets

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

@@ -2,10 +2,18 @@
 title: "Balthazar's Big Bonanza"
 ---
 
-You can start this minigame with the command `/bsominigames balthazars_big_bonanza start`
+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.
 
-### Rewards
+## Rewards
 
-<table><thead><tr><th width="166">Reward</th><th>Source</th></tr></thead><tbody><tr><td>Spectator Clothes</td><td>3 unowned items per trip to Balthazar's Big Bonanza <strong>only if you have a Igne tame free.</strong> If you have multiple Igne tames then you always have a free tame. There are 22 unique items in total.</td></tr><tr><td>Giant's hand</td><td>1/5 chance to receive from a trip.</td></tr><tr><td>Ringmaster set</td><td>500 Circus tickets</td></tr><tr><td>Clown set</td><td>200 Circus tickets</td></tr><tr><td>Acrobat set</td><td>50 Circus tickets</td></tr><tr><td>Circus Tickets</td><td>You will receive a random amount of tickets based on your Agility, Ranged and Thieving levels. This is calculated as:<br><code>Max tickets = Agility level + Ranged level + (Thieving level / 3). (280 max)</code><br><code>Min tickets = (Max tickets/2). Can't be more than 120.</code><br>i.e. A random amount between 120-280 at 120 all, 113-231 at 99 all, and 2-3 for level 1 all.</td></tr><tr><td>XP</td><td>Agility, Range and Thieving xp scaled based on your level</td></tr></tbody></table>
+| Reward            | Source                                                                                                                                                                                                                                                                                                                                              |
+| ----------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Spectator Clothes | 3 unowned items per trip to Balthazar's Big Bonanza only if you have a Igne tame free. If you have multiple Igne tames then you always have a free tame. There are 22 unique items in total.                                                                                                                                                        |
+| Giant's hand      | 1/5 chance to receive from a trip.                                                                                                                                                                                                                                                                                                                  |
+| Ringmaster set    | 500 Circus tickets                                                                                                                                                                                                                                                                                                                                  |
+| Clown set         | 200 Circus tickets                                                                                                                                                                                                                                                                                                                                  |
+| Acrobat set       | 50 Circus tickets                                                                                                                                                                                                                                                                                                                                   |
+| Circus Tickets    | You will receive a random amount of tickets based on your Agility, Ranged and Thieving levels. This is calculated as:Max tickets = Agility level + Ranged level + (Thieving level / 3). (280 max)Min tickets = (Max tickets/2). Can't be more than 120.i.e. A random amount between 120-280 at 120 all, 113-231 at 99 all, and 2-3 for level 1 all. |
+| XP                | Agility, Range and Thieving xp scaled based on your level                                                                                                                                                                                                                                                                                           |

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

@@ -2,7 +2,7 @@
 title: "Baxtorian Bathhouses"
 ---
 
-You can start this minigame through `/bsominigames baxtorian_bathhouses start`
+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.
 
@@ -14,7 +14,22 @@ In this minigame, you play the role of a Boiler and Herbalist. Your job is to he
 
 There are multiple species that are served in this minigame, each with their own preferences.
 
-<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>
+| Species           | Preference   |
+| ----------------- | ------------ |
+| Fairy             | Magical      |
+| Monkey            | Vitalizing   |
+| Goblin            | Caustic      |
+| Imp               | Unholy       |
+| Giant             | Invigorating |
+| Fiend             | Soothing     |
+| Troll             | Soothing     |
+| Ogre              | Healing      |
+| Gargoyle          | Caustic      |
+| TzHaar            | Healing      |
+| Wyvern            | Vitalizing   |
+| Abyssal Creatures | Magical      |
+| Dragons           | Invigorating |
+| Demons            | Unholy       |
 
 ## Requirements
 

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

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

docs/src/content/docs/bso/Monsters/polypore-dungeon.md

@@ -2,10 +2,6 @@
 title: "Polypore Dungeon"
 ---
 
-# Polypore Dungeon
-
-### Polypore Dungeon
-
 The Polypore Dungeon is a new location within BSO that contains several monsters which all have a requirement of 82 Dungeoneering to kill. All monsters listed under this heading **must** be killed with magic, and require the use of Neem Oil to be killed.
 
 - Fungal Rodent: Drops the Mycelium Visor Web, along with varying amounts of Swamp Tar, Swamp Toads, Chaos Runes, Polypore Spores, Limpwurt Roots, Grifolic Flake, Neem Drupe, and an assortment of random grimy herbs.

docs/src/content/docs/bso/Skills/Dungeoneering Training/dg-rewards.md → docs/src/content/docs/bso/Skills/Dungeoneering.md

@@ -1,23 +1,63 @@
 ---
-title: "Dungeoneering Rewards"
+title: "Dungeoneering"
 ---
 
+## Starting Out
+
+There are 7 floors. Each floor requires +20 DG lvl to the last and increasingly higher stats in other skills, especially combat.
+
+[[/dg start]] to start training dungeoneering. You can only do a floor for which you have the required stats, it will automatically pick the highest floor you can do.
+
+[[/dg buy item\:]] to buy a reward.
+
+[[/dg stats]] to see your tokens, max floor, and shard boosts
+
+While doing dungeoneering in dungeons of Floor 5+, you have a chance of getting a tradeable Gorajan shard. You can combine 2 of these with a nex armour piece to make a gorajan armour piece, using smithing.
+
+Whilst doing floor 7 there is a 1/20k per minute chance of obtaining a gorajan bonecrusher (u). I.e. if you do a trip that lasts 1 hour 4 minutes, you would have 64 rolls at 1/20k to receive it.
+
+You recieve dungeoneering tokens at a rate of xp/40
+
+## Boosts
+
+- Scroll of Teleportation - 15%
+- Dungeoneering Cape - 5% if you have Scroll of Teleportation
+- Dungeoneering Master Cape - 10% if you have Scroll of Teleportation (does not stack with Dungeoneering cape)
+- Gorajan armour - 6% per completed set
+- Party Size - 5% for every person in a mass starting from a party of 2 to a limit of 25%
+
+You receive less XP if doing a floor lower than your max floor.
+
+Dungeoneering boosts, excluding party size, are divided by the number of players in the mass.
+
+### Gorajan Shard chance boost (individual only)
+
+- Ring of luck - 5%
+- lvl 99 Dungeoneering - 30%
+- Master Dungeoneering Cape - 2x (does not stack with the 30% from having lvl 99)
+
+## Methods
+
+The best way to train dungeoneering is to use xp lamps to lvl 100 and then train on the best floor you can do with as many people as you can.
+
+## Rewards
+
 ### Buyable Boosts/Utility
 
 | Item                    | Token Cost | Boost                                                                               |
 | ----------------------- | ---------- | ----------------------------------------------------------------------------------- |
 | Scroll of life          | 400,000    | 15% less seeds used when farming                                                    |
 | Scroll of efficiency    | 400,000    | 15% of bars saved when doing smithing                                               |
-| Scroll of farming\*     | 400,000    | +2 extra farming patches to all types                                               |
+| Scroll of farming       | 400,000    | +2 extra farming patches to all types                                               |
 | Scroll of cleansing     | 400,000    | Currently does not provide any boost/utility                                        |
 | Scroll of dexterity     | 400,000    | 15% extra output in crafting                                                        |
 | Scroll of teleportation | 400,000    | 15% (divided by team size) boost to dungeoneering                                   |
 | Scroll of mystery       | 500,000    | 1/5 chance at receiving a mystery box when training dungeoneering                   |
 | Scroll of proficiency   | 900,000    | 15% of planks saved in construction                                                 |
-| Scroll of longevity\*   | 800,000    | 2x increase to slayer task quantities                                               |
-| Scroll of the hunt\*    | 800,000    | Gives 2x higher chances of impling spawns, and +4 higher limit on birdhouses (4->8) |
+| Scroll of longevity     | 800,000    | 2x increase to slayer task quantities                                               |
+| Scroll of the hunt      | 800,000    | Gives 2x higher chances of impling spawns, and +4 higher limit on birdhouses (4->8) |
 
-\[\*]Important: Only the scroll of farming, longevity and hunt are currently tradeable/useable. To enable these scrolls you must `/minion use item:[Scroll name]`, you can only do this once. All other scrolls work passively while stored in the bank.
+_Only the scroll of farming, longevity and hunt are tradeable/useable. To enable these scrolls you must [[/minion use item\:]], you can only do this once. All other scrolls work passively while stored in the bank_
 
 ### Buyable Gear
 

docs/src/content/docs/bso/Skills/divination/README.md → docs/src/content/docs/bso/Skills/divination.md

@@ -1,6 +1,5 @@
 ---
 title: "Divination"
-description: /divination harvest_memories
 ---
 
 ## Memory Harvesting in Divination

docs/src/content/docs/bso/Skills/invention/README.md → docs/src/content/docs/bso/Skills/invention.md

@@ -82,3 +82,29 @@ Master capes give a 5% junk chance reduction for a group relating to their skill
 | Invention master cape       | 5% faster disassembly  |
 | Invention master cape       | 5% extra materials     |
 | Inventor's outfit           | 4% xp boost            |
+
+## Efficient Training
+
+This guides purpose is to serve as a quick guide to reach level 99 Invention. It is not the absolute fastest way to level 99. Nor is it the most efficient for getting a variety of materials. I recommend you reach level 99/120 first using this guide and then figure out what inventions you want to aim for.
+
+Consider getting the inventor's outfit from [Tinkering Workshop](../../minigames/tinkering-workshop.md) at some point, for 4% bonus XP.
+
+- Level 1 - 11: 652 Potato seed
+- Level 11 - 26: 933 Opal bolt tips
+- Level 26 - 35: 553 Jade bolt tips
+- Level 35 - 40: 367 Jug of wine
+- Level 40 - 42: 201 Jug of wine
+- Level 42 - 45: 298 Curry tree seed
+- Level 45 - 50: 727 Curry tree seed
+- Level 50 - 55: 887 Gold bar
+- Level 55 - 60: 1,221 Zulrah's scales
+- Level 60 - 65: 1,723 Yew logs
+- Level 65 - 70: 2,457 Diamond bolt tips
+- Level 70 - 75: 3,507 Black Chinchompa
+- Level 75 - 80: 5,089 Magic logs
+- At level 80 disassemble 5-8 Dwarven Bars, research Metallic material until you unlock the Dwarven Toolkit blueprint, and invent the Dwarven Toolkit.
+- Level 80 - 85: 7,389 Shark
+- Level 85 - 91: 13,762 Mithril bar
+- Level 91 - 95: 13,137 Manta ray
+- Level 95 - 99: 18,030 Adamantite bar
+- Level 99 - 120: The best xp/hr for the rest of your invention career will be disassembling level 99 items. Those being: Rocktail, Raw Rocktail, Elder Bow, Runite Bar. However this will not get you the variety of materials you need to power all of the amazing inventions.