merge

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/getting-started/bingo.mdx

@@ -0,0 +1,82 @@
+---
+title: "OSB Bingo #3"
+sidebar:
+  order: 4
+---
+import Time from "../../../components/Time.astro";
+
+Start Date: <Time time="2024-10-25 12:00:00 UTC"/>
+
+Finish Date: <Time time="2024-11-8 12:00:00 UTC"/>
+
+We are hosting the 3rd OSB Bingo! You can compete for a chance of winning some GP, and a guaranteed chance of getting a trophy.
+
+## Information
+- When completing tiles, the bot automatically tracks and handles it for you. Your team "shares" tiles, so if one person completes a tile, it counts for the whole team.
+- Ironmen can join teams and participate, no entry free is required, but they will not be eligible for item/GP rewards.
+- Each player pays a 250m entry fee (when joining a team) which goes into the prize pool.
+
+## How to Join
+1. Gather 4 friends (for a team of 5), OR find people from our server to make a team.
+1. Ensure all 5 people have the 250m entry free, and are ready to confirm.
+1. Use this command in the main discord server: [[/bingo make_team bingo\:OSB Bingo #3]], and everyone click the confirm button.
+
+## Bingo Channels
+- Receive info/announcements/updates about the bingo: [[# bingo-info:1039869985989861466]]
+- Discuss the bingo: [[# bingo-discussion:1039870142651301979]]
+- Look for a team: [[# bingo-looking-4-team:1149907771937001522]]
+
+## Prizes
+
+You can see the actual GP prize pool with the bingo command.
+
+- 1st Place team - 55% of GP Prize Pool, Bingo Winner role
+- 2nd Place team - 30% of GP Prize Pool
+- 3rd Place team - 15% of GP Prize Pool
+
+*More rewards may be added later*
+
+## Trophies
+
+You can earn a Trophy (an item you get in your bank) by your performance. You get each one either by being in a certain percentile, or guaranteed if you complete a certain number of tiles.
+
+- Bronze - 100% - Guaranteed at 1 Tile
+- Iron - top 75% - Guaranteed at 5 Tiles
+- Steel - top 50% - Guaranteed at 8 Tiles
+- Mithril - top 40% - Guaranteed at 12 Tiles
+- Adamant - top 20% - Guaranteed at 16 Tiles
+- Rune - top 10% - Guaranteed at 22 Tiles
+- Dragon - top 5% - Guaranteed at 28 Tiles
+
+[[osbbingo3.png]]
+
+## Tiles
+
+1. Receive A Skilling Pet - Receive Any Pet From The Skilling Pet CL (No Exclusions)
+1. Receive Any Nightmare Orb - Receive Any of The Following - Eldritch Orb, Volatile Orb, Harmonised Orb
+1. Receive Any Sigil From The Corporeal Beast - Receive Any of The Following - Spectral Sigil, Arcane Sigil, Elysian Sigil
+1. Receive All 3 Voidwaker Items - Receive All of The Following - Voidwaker Gem, Voidwaker Blade, Voidwaker Hilt
+1. Receive A Revenant Weapon - Receive Any of The Following - Craws Bow (u), Thammaron's Sceptre (u), Viggora's Chainmace (u)
+1. Receive Any Mutagen From Zulrah - Receive Any of The Following - Tanzanite Mutagen, Magma Mutagen
+1. Receive One Piece of Ancestral Robes From CoX - Receive Any of The Following - Ancestral Hat, Ancestral Robe Top, Ancestral Robe Bottom
+1. Receive One Unique Weapon From ToB - Receive Any of The Following - Scythe of vitur (uncharged), Ghrazi rapier, Sanguinesti staff (uncharged)
+1. Receive Both A Cursed Phalanx and Osmumtens Fang From ToA - Receive All of The Following Items - Cursed Phalanx, Osmumtens Fang
+1. Receive 10k Mahogany Logs -  Receive 10,000 Mahogany Logs From Skilling or PvM
+1. Receive 50 Brimstone Keys - Receive 50 Brimstone Keys From Konar Slayer Tasks
+1. Receive Hydra's Heart, Fang and Eye - Receive All of The Following - Hydra Heart, Hydra Fang, Hydra Eye
+1. Receive A Gnome Scarf - Receive a Gnome Scarf From The Gnome Restaurant Minigame
+1. Receive Every Champion Scroll - Receive All of The Following - Earth warrior champion scroll, Ghoul champion scroll, Giant champion scroll, Goblin champion scroll, Hobgoblin champion scroll, Imp champion scroll, Jogre champion scroll, Lesser demon champion scroll, Skeleton champion scroll, Zombie champion scroll
+1. Receive A Ring of Endurance -  Receive a Ring of Endurance (Uncharged) From Hallowed Sepulchre
+1. Create A Dt2 Ring From Scratch - You Must Obtain All Pieces for 1 Ring and Create 1 Ring
+1. Create a Odium or Malediction Ward From Scratch - You Must Obtain All Pieces for 1 Ward and Create 1 Ward
+1. Receive a Crystal Tool Seed - Receive A Crystal Tool Seed From Zalcano
+1. Receive Elder Chaos Hood / Top / Robe - Receive All of The Following - Elder Chaos Hood, Elder Chaos Top, Elder Chaos Robe
+1. Receive a Dragon Warhammer - Receive A Dragon Warhammer From Lizardman Shamans
+1. Receive One of Big Bass / Big Swordfish / Big Shark - Receive Either a Big Bass, Big Swordfish or Big Shark From Fishing
+1. Receive a Visage Drop - Receive Any of The Following - Draconic Visage, Skeletal Visage, Wyvern Visage
+1. Receive Any Unique Seed From The Gauntlet - Receive Any of The Following - Crystal Weapon Seed, Crystal Armour Seed, Enhanced Crystal Weapon Seed
+1. Receive Sunfire Fanatic Helm / Cuirass / Chausses - Receive All of The Following - Sunfire Fanatic Helm, Sunfire Fanatic Cuirass, Sunfire Fanatic Chausses
+1. Receive One Araxyte Fang - From Araxxor
+1. Receive a Boss Pet - Receive Any of The Following -  Pet dagannoth supreme, Pet dagannoth prime, Pet dagannoth rex, Pet kree'arra, Pet general graardor, Pet zilyana, Pet k'ril tsutsaroth, Baby mole, Prince black dragon, Kalphite princess, Pet smoke devil, Pet kraken, Pet dark core, Pet snakeling, Venenatis spiderling, Callisto cub, Vet'ion jr., Scorpia's offspring, Hellpuppy, Olmlet, Noon, Vorki, Lil' zik, Ikkle hydra, Sraracha, Little nightmare, Nexling, Tumeken's guardian, Muphin, Wisp, Butch, Lil'viathan, Baron, Nid, Scurry
+1. Receive a Boss Jar - Receive Any Jar (Excluding Jar or Darkness + Jar of Miasma)
+1. Receive a Tormented Demon Unique - Receive Any of The Following - Burning Claw or Tormented Synapse

docs/src/content/docs/getting-started/wiki.md

@@ -50,6 +50,11 @@ This section shows ways you can format things
 
 Any colon needs a backslash before it (I'm not sure yet how to make it so this isnt needed.)
 
+### Discord Channels
+
+`[[# bingo-looking-4-team:1149907771937001522]]`
+[[# bingo-looking-4-team:1149907771937001522]]
+
 ### Skills
 
 `[[agility:55]] [[strength:44,000 XP]] [[qp:5]]`
@@ -222,9 +227,9 @@ This is an automatically generated list of pages with possible issues to be look
 
 [/bso/Skills/crafting.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/crafting.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. `<td>`)
 
-[/bso/Skills/Divination/efficient-divination-training.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/Divination/efficient-divination-training.md): Doesnt use the new command formatting
+[/bso/Skills/divination/efficient-divination-training.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/divination/efficient-divination-training.md): Doesnt use the new command formatting
 
-[/bso/Skills/Divination/README.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/Divination/README.md): Doesnt use the new command formatting
+[/bso/Skills/divination/README.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/divination/README.md): Doesnt use the new command formatting
 
 [/bso/Skills/Dungeoneering Training/dg-rewards.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/Dungeoneering%20Training/dg-rewards.md): Doesnt use the new command formatting
 
@@ -242,19 +247,19 @@ This is an automatically generated list of pages with possible issues to be look
 
 [/bso/Skills/hunter.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/hunter.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. `<td>`)
 
-[/bso/Skills/Invention/efficient-disassembling-to-99.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/Invention/efficient-disassembling-to-99.md): Doesnt use the new command formatting
+[/bso/Skills/invention/efficient-disassembling-to-99.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/invention/efficient-disassembling-to-99.md): Doesnt use the new command formatting
 
-[/bso/Skills/Invention/README.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/Invention/README.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. `<td>`)
+[/bso/Skills/invention/README.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/invention/README.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. `<td>`)
 
 [/bso/Skills/mining.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/mining.md): Doesnt use the new command formatting
 
 [/bso/Skills/prayer.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Skills/prayer.md): Doesnt use the new command formatting
 
 [/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
 

docs/src/content/docs/osb/Activities/brimhaven-agility-arena.md

@@ -2,43 +2,42 @@
 title: "Brimhaven Agility Arena"
 ---
 
-An alternative form of agility training is to use the agility arena. This minigame can be quite rewarding, providing agility arena tickets which can be turned in for additional agility xp, a graceful recolour, herbs, and even a Pirate's hook!
+The **Brimhaven Agility Arena** offers an alternative form of Agility training. In this minigame, players earn **agility arena tickets**, which can be exchanged for additional Agility experience. Rewards also include **Brimhaven vouchers**, which can be used for a graceful recolor, herbs, or even a Pirate's hook!
 
-To start brimhaven agility arena, simply type:
+To start Brimhaven Agility Arena, simply type:
 
-- `/minigames agility_arena start`
+- [[/minigames agility_arena start]]
 
-### Boosts
+## Boosts
 
-While there are no boosts for speed or minion learning, the following do apply:
+While there are no boosts for speed or minion learning, the following bonuses apply:
 
-- Completion of Karamja Medium diary
-  - Provides a 10% boost to xp when spending your tickets on xp
-- Completion of Karamja Elite diary
-  - Provides a 10% increase to tickets received
+- Completion of **Karamja Medium** diary or higher:
+  - Provides 10% extra Agility experience.
+  - Grants a 10% experience bonus when turning in agility arena tickets.
+- Completion of **Karamja Elite** diary:
+  - Grants a 10% chance of receiving double agility arena tickets.
 
-### Rewards
+## Rewards
 
-You can spend your tickets on the items below using the following command:
+You can exchange agility arena tickets for [[agility:345 XP]] each ([[agility:379.5 XP]] with the Karamja Medium diary or higher).
 
-`/minigames agility_arena buy item: [itemName]`
+To claim experience for tickets, use:
 
-| **Reward**          | **Arena ticket cost** | **XP per ticket** |
-| ------------------- | :-------------------: | :---------------: |
-| Agility XP          |           1           |        240        |
-| Agility XP          |          10           |        248        |
-| Agility XP          |          25           |        260        |
-| Agility XP          |          100          |        280        |
-| Agility XP          |         1000          |        320        |
-| Toadflax            |           3           |        N/A        |
-| Snapdragon          |          10           |        N/A        |
-| Pirate's hook       |          800          |        N/A        |
-| Recolor (see below) |          250          |        N/A        |
+- [[/minigames agility_arena xp quantity\:1/10/25/100/1000]]
 
 ### Brimhaven Graceful Set
 
-- To create a full set of Brimhaven graceful, use the following command:
-  - `/minigames agility_arena recolor`
-- This requires 250 agility arena tickets and a full set of the original graceful.
-- The set cannot be created piece by piece, rather it is created entirely in 1 command.
-- It also cannot be reverted back to the original graceful so it is advised to keep this set for last if you are wanting to complete all graceful sets.
+- Recolor a full set of Graceful using **250 Brimhaven vouchers**:
+  - [[/minigames agility_arena buy item\:Graceful outfit Recolour]]
+- Requires a complete Graceful set and is applied all at once. The recolor cannot be undone.
+
+### Additional Rewards
+
+- Use **Brimhaven vouchers** to purchase the following items:
+  - [[/minigames agility_arena buy item\:item_name]]
+- Available items include:
+  - [[Toadflax]] for 3 Brimhaven vouchers
+  - [[Snapdragon]] for 10 Brimhaven vouchers
+  - [[Pirate's hook]] for 800 Brimhaven vouchers
+  - [[Amylase pack]] for 60 Brimhaven vouchers

docs/src/plugins/items.ts

@@ -19,7 +19,13 @@ export function remarkItems(options: any) {
 			if (matches.length === 0) return;
 
 			for (const match of matches) {
-				if (imageExtensions.some(ext => match.endsWith(ext))) {
+				if (match.startsWith('#')) {
+					const [channelName, messageID] = match.split(':');
+					const html = `<a class="discord_channel" href="discord://discord.com/channels/342983479501389826/${messageID}" target="_blank">${channelName}</a>`;
+					node.value = node.value.replace(`[[${match}]]`, html);
+					node.type = 'html';
+					continue;
+				} else if (imageExtensions.some(ext => match.endsWith(ext))) {
 					node.type = 'html';
 					const html = `<img src="/images/${match}" alt="${match}" />`;
 					node.value = node.value.replace(`[[${match}]]`, html);

docs/src/styles/main.css

@@ -498,4 +498,24 @@ sl-sidebar-state-persist > ul > li:nth-child(3) > details > summary > svg {
 
 #starlight__sidebar .group-label {
   text-transform: capitalize;
+}
+
+.discord_channel {
+  font-size: 16px;
+  font-weight: 500;
+  background: #35373c;
+  width: max-content;
+  padding: 3px 10px;
+  font-size: 13.4px;
+  color: #81868f!important;
+  display: flex;
+  align-items: center;
+  border-radius: 4px;
+  text-decoration: none;
+
+  &:hover {
+    color: rgb(192, 192, 192)!important;
+    cursor: pointer;
+     background: rgb(50, 50, 55);
+  }
 }

prisma/schema.prisma

@@ -130,6 +130,7 @@ model ClientStorage {
   nmz_cost                     Json     @default("{}") @db.Json
   toa_cost                     Json     @default("{}") @db.Json
   toa_loot                     Json     @default("{}") @db.Json
+  ourania_loot                 Json     @default("{}") @db.Json
   colo_cost                    Json     @default("{}") @db.Json
   colo_loot                    Json     @default("{}") @db.Json
 
@@ -465,6 +466,7 @@ enum XpGainSource {
   OfferingBones
   TempleTrekking
   DarkAltar
+  OuraniaAltar
   MotherlodeMine
   Birdhouses
   GuardiansOfTheRift
@@ -898,6 +900,7 @@ enum activity_type_enum {
   MageArena2
   BigChompyBirdHunting
   DarkAltar
+  OuraniaAltar
   Trekking
   Revenants
   PestControl

src/lib/Task.ts

@@ -74,6 +74,7 @@ import { monsterTask } from '../tasks/minions/monsterActivity';
 import { motherlodeMiningTask } from '../tasks/minions/motherlodeMineActivity';
 import { myNotesTask } from '../tasks/minions/myNotesActivity';
 import { nexTask } from '../tasks/minions/nexActivity';
+import ouraniaAltarTask from '../tasks/minions/ouraniaAltarActivity';
 import { pickpocketTask } from '../tasks/minions/pickpocketActivity';
 import { questingTask } from '../tasks/minions/questingActivity';
 import { runecraftTask } from '../tasks/minions/runecraftActivity';
@@ -144,6 +145,7 @@ const tasks: MinionTask[] = [
 	cookingTask,
 	craftingTask,
 	darkAltarTask,
+	ouraniaAltarTask,
 	enchantingTask,
 	farmingTask,
 	firemakingTask,

src/lib/data/Collections.ts

@@ -53,6 +53,7 @@ import {
 	cluesMasterRareCL,
 	cluesMediumCL,
 	cluesSharedCL,
+	colossalWyrmAgilityCL,
 	commanderZilyanaCL,
 	corporealBeastCL,
 	crazyArchaeologistCL,
@@ -909,6 +910,10 @@ export const allCollectionLogs: ICollection = {
 				kcActivity: 'BigChompyBirdHunting',
 				items: chompyBirdsCL
 			},
+			'Colossal Wyrm Agility': {
+				alias: ['colossal wyrm agility', 'colo agility', 'wyrm agility'],
+				items: colossalWyrmAgilityCL
+			},
 			'Creature Creation': {
 				items: creatureCreationCL
 			},

src/lib/data/CollectionsExport.ts

@@ -1597,6 +1597,16 @@ export const chompyBirdsCL = resolveItems([
 	'Chompy bird hat (expert ogre dragon archer)',
 	'Chompy bird hat (expert dragon archer)'
 ]);
+export const colossalWyrmAgilityCL = resolveItems([
+	'Colossal wyrm teleport scroll',
+	'Calcified acorn',
+	'Varlamore graceful hood',
+	'Varlamore graceful top',
+	'Varlamore graceful legs',
+	'Varlamore graceful gloves',
+	'Varlamore graceful boots',
+	'Varlamore graceful cape'
+]);
 export const creatureCreationCL = resolveItems([
 	'Tea flask',
 	'Plain satchel',

src/lib/data/buyables/buyables.ts

@@ -261,10 +261,29 @@ const sepulchreBuyables: Buyable[] = [
 		name: 'Dark acorn',
 		outputItems: new Bank({ 'Dark acorn': 1 }),
 		itemCost: new Bank({ 'Hallowed mark': 3000 })
+	}
+];
+
+const colossalWyrmAgilityBuyables: Buyable[] = [
+	{
+		name: 'Amylase pack (Colossal Wyrm Agility)',
+		outputItems: new Bank({ 'Amylase pack': 1 }),
+		itemCost: new Bank({ Termites: 100 })
+	},
+	{
+		name: 'Colossal wyrm teleport scroll',
+		outputItems: new Bank({ 'Colossal wyrm teleport scroll': 1 }),
+		itemCost: new Bank({ Termites: 40 })
+	},
+	{
+		name: 'Graceful crafting kit',
+		outputItems: new Bank({ 'Graceful crafting kit': 1 }),
+		itemCost: new Bank({ Termites: 650 })
 	},
 	{
-		name: 'Dark squirrel',
-		itemCost: new Bank({ 'Dark acorn': 1, 'Giant squirrel': 1 })
+		name: 'Calcified acorn',
+		outputItems: new Bank({ 'Calcified acorn': 1 }),
+		itemCost: new Bank({ Termites: 900 })
 	}
 ];
 
@@ -814,9 +833,9 @@ const Buyables: Buyable[] = [
 		gpCost: 400
 	},
 	{
-		name: 'Amylase pack',
+		name: 'Amylase pack (Mark of grace)',
 		outputItems: new Bank({
-			'Amylase crystal': 100
+			'Amylase pack': 1
 		}),
 		itemCost: new Bank({ 'Mark of grace': 10 })
 	},
@@ -1106,7 +1125,8 @@ const Buyables: Buyable[] = [
 	...guardiansOfTheRiftBuyables,
 	...toaCapes,
 	...mairinsMarketBuyables,
-	...forestryBuyables
+	...forestryBuyables,
+	...colossalWyrmAgilityBuyables
 ];
 
 for (const [chompyHat, qty] of chompyHats) {