Merge branch 'master' into fletch-sepulchre

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

@@ -4,6 +4,71 @@ sidebar:
   order: 3
 ---
 
+## Update 13/11/2024 [[4fbfe429e9a1bdf817175cf497177e47fefc6be6...e03afd628fd7e1aa460acc417d822c2d697f9087]]
+
+- Hacktoberfest has finished, and everyone has been sent out their custom merch and other prizes! Thank you to all who participated.
+- OSB Bingo #3 has finished! Read the page for it for more information: [OSB Bingo #3](/osb/miscelleanous/bingo/#osb-bingo-3-finished)
+
+### [[gc]]
+
+- Lowered the food cost for araxytes
+- The BiS amulet for nightmare is now the [[Amulet of rancour]]
+
+### [[00justas]]
+
+- Added Nid to the pets CL
+- Allow buying genie lamps with frog tokens
+- You can now create these items: [[Strange skull]] [[Skull sceptre]] [[Runed sceptre]] [[Skull sceptre(i)]]
+
+### [[DayV-git]]
+
+- Fix araxxor boss task requirements
+- Allow buying genie lamps with frog tokens
+- Fixed a bug with agility-alching sometimes picking the wrong item
+- Improved the formatting of some messages
+- Allow global gear presets equip command to use similar items
+- The bot now shows loot as pictures when using implings in [[/clue]]
+- Fixed wildy rev weapon boost
+- Added total kc and kc/h to tempoross/wintertodt return message
+- Added task and catacomb modifiers to [[/kill]] simulation command
+- Added missing Graceful creates / reverts (Add Brimhaven and Dark graceful revert and individual item reverts for Brimhaven, Dark and Varlamore - same as every other graceful recolour)
+- Solo nex drops now are spoilered if you get a purple
+- Superiors now always drop brimstone keys on konar tasks
+
+### [[Felris]]
+
+- Added error message when trying to use twitcher gloves without having them equipped
+- Added boost to zulrah for zul-andra teleports (uses 1 tele per 4 kills for a 10% boost)
+- Added boost to cerberus for keymaster teleports (uses 1 tele per 10 kills for a 10% boost)
+- Added boost to tormented demons for Guthixian temple teleports (uses 1 tele per 20 kills for a 10% boost)
+- Added boost to revs for Guthixian temple teleports (uses 1 tele per 20 kills for a 5% boost)
+- You can now create a Corrupted Youngllef from a Youngllef if you have atleast 1 CG kc
+- Added [Armoured zombie](https://oldschool.runescape.wiki/w/Armoured_zombie) as a killable monster
+  - Added Broken zombie axe to misc CL page
+  - Added [[Zombie axe]] to [[/create]]
+
+### [[nwjgit]]
+
+- Updated the wyrm agility pet droprate
+- Add the ability to create [[Forester's ration]]
+- Fixed ash sanctifier not giving proper XP and removing ashes
+
+### [[Lajnux]]
+
+- Balanced the construction xp/hr rates (Some things are slower/faster now)
+- Updated/fixed some mining code
+
+### [[TastyPumPum]]
+
+- Added the combat achievements for all 4 DT2 bosses
+
+### [[DarkWorldsArtist]]
+
+- Added [Crab](https://oldschool.runescape.wiki/w/Crab) killable monster
+  - Added [[Fresh crab claw]] [[Fresh crab shell]] to misc CL
+  - Added [[Diving apparatus]] [[Fishbowl helmet]] to [[/buy]]
+  - Added [[Crab helmet]] [[Crab claw]] to [[/create]]
+
 ## Update 16/10/2024 [[68b130088f5e365ec2a341cae48bc5b353ccc2ff...4fbfe429e9a1bdf817175cf497177e47fefc6be6]]
 
 Bingo! We are running the 3rd official OSB bingo. See the [Bingo Page](/getting-started/bingo) for information.

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
 
@@ -269,8 +269,6 @@ This is an automatically generated list of pages with possible issues to be look
 
 [/bso/Tames/monkey-tame.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/bso/Tames/monkey-tame.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. `<td>`)
 
-[/getting-started/bingo.mdx](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/getting-started/bingo.mdx): Doesnt use the new command formatting
-
 [/getting-started/BSO.mdx](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/getting-started/BSO.mdx): Doesnt use the new command formatting
 
 [/getting-started/changelog.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/getting-started/changelog.md): Doesnt use the new command formatting
@@ -279,8 +277,6 @@ This is an automatically generated list of pages with possible issues to be look
 
 [/getting-started/FAQ.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/getting-started/FAQ.md): Doesnt use the new command formatting
 
-[/getting-started/hackertoberfest.mdx](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/getting-started/hackertoberfest.mdx): Doesnt use the new command formatting
-
 [/getting-started/ironman-mode.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/getting-started/ironman-mode.md): Doesnt use the new command formatting
 
 [/getting-started/randomizer.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/getting-started/randomizer.md): Doesnt use the new command formatting
@@ -365,7 +361,7 @@ This is an automatically generated list of pages with possible issues to be look
 
 [/osb/Miscelleanous/achievement-diaries.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Miscelleanous/achievement-diaries.md): Doesnt use the new command formatting
 
-[/osb/Miscelleanous/bingo.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Miscelleanous/bingo.md): Doesnt use the new command formatting
+[/osb/Miscelleanous/bingo.mdx](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Miscelleanous/bingo.mdx): Doesnt use the new command formatting
 
 [/osb/Miscelleanous/buyables.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Miscelleanous/buyables.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. `<td>`)
 
@@ -379,6 +375,8 @@ This is an automatically generated list of pages with possible issues to be look
 
 [/osb/Miscelleanous/god-capes.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Miscelleanous/god-capes.md): Doesnt use the new command formatting
 
+[/osb/Miscelleanous/hackertoberfest.mdx](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Miscelleanous/hackertoberfest.mdx): Doesnt use the new command formatting
+
 [/osb/Miscelleanous/music-cape.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Miscelleanous/music-cape.md): Doesnt use the new command formatting
 
 [/osb/Miscelleanous/nightmare-zone.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Miscelleanous/nightmare-zone.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. `<td>`)

docs/src/content/docs/getting-started/bingo.mdx → docs/src/content/docs/osb/Miscelleanous/bingo.mdx

@@ -1,43 +1,88 @@
 ---
-title: "OSB Bingo #3"
-sidebar:
-  order: 4
+title: "Bingo"
 ---
-import Time from "../../../components/Time.astro";
+import Time from "../../../../components/Time.astro";
 
-Start Date: <Time time="2024-10-25 12:00:00 UTC"/>
+You can run community bingo's using the `/bingo` command, and the bot will automatically handle all of it for you.
 
-Finish Date: <Time time="2024-11-8 12:00:00 UTC"/>
+## Notes
+
+- Ironmen can join bingos for free. They cannot be given GP prizes, or create bingos.
+- Upon the bingo finishing, the creator of the bingo needs to do `/bingo finalize` to receive the GP pool. The creator of the bingo is responsible for handing out the GP, based on whatever split you have decided. You do not need to finalize the bingo on time, the bingo will automatically finish at the exact second it needs to, the finalize command just does some final things, and hands out the gp.
+- A person can participate in several bingos at once.
+- Bingos are private to the server they were made in. In other words, you can only join it from that server. Global bingos are limited to the official bingos. However, for any bingo, the commands/trips the players do (to get loot) can be done anywhere.
+
+## Creating a Bingo
+
+To create a bingo, you need to input the following things:
+
+- Title
+- Duration in days(7 = 7 days)
+- Start Date unix seconds. Use [https://hammertime.cyou/?tz=Etc%2FGMT](https://hammertime.cyou/?tz=Etc%2FGMT) to find this number. It's the last in the list, and is just a plain number that looks like this: `1695859800`. This indicates the exact time at which your bingo starts.
+- Ticket price: The ticket price per person. Each person must pay this when making their team. If the team disbands, the GP is refunded.
+- Team size: Size of the teams.
+- Organizers: people who are allowed to manage the bingo (Add tiles, etc)
+
+## Managing your Bingo
 
-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.
+Commands for managing the bingo are in `/bingo manage`. You can add/remove tiles, add extra GP to the prize pool, and more.
 
-## 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.
+### Adding Tiles
 
-## 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.
+You can add tiles in 2 ways.
 
-## 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]]
+1. Add global tiles. You can select global tiles to add, which are tiles that are premade for you to use.
+2. Add custom tiles. You can add 2 kinds of tiles. AND tiles, OR tiles. Example:
+   1. `add_tile:coal+egg+trout` Adds a tile where you have to receive a coal, egg AND trout.
+   2. `add_tile:coal|egg|trout` Adds a tile where you have to receive a coal, or egg, or a trout.
 
-## Prizes
+## OSB Bingo #3 (Finished)
 
+Start Date: <Time time="2024-10-25 12:00:00 UTC"/>
+
+Finish Date: <Time time="2024-11-8 12:00:00 UTC"/>
+OSB Bingo #3  has finished!
+
+**1st**: @vKoko @delman @Merisorax  @Huśtajdupa  @Prztynkinista
+(Prize Pool 22.825b)
+
+**2nd** Place @Ironici @Ecto @TheItchIsReal @CrankItUp @drunkenbeer
+(Prize Pool 12.450b)
+
+**3rd:** @papi @ImZ @Southernz @yekzerr @mikehunt
+(Prize Pool 6.225b)
+
+The Below Winner is the OSB Bingo #3 MvP which has won the following:
+- 2b Coins
+- 1m Sunfire Splinters
+- 2 x Scythe of Vitur (uncharged)
+- 3k Vial of Blood
+- 2 x Ancestral Robes Set
+- Justiciar Armour Set
+- Ghrazi Rapier
+- 2 x Sanguinesti Staff (uncharged)
+- 2 x Kodai Wand
+- 2 x Dragon Claws
+- Spectral Spirit Shield
+- Thammarons Sceptre (u)
+- Zaryte Crossbow
+Donated by Loot Game Event Team
+
+**MvP:** Garousse with 13!!! Solo Tiles
+
+<details>
+<summary>Prizes</summary>
 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*
+</details>
 
-## Trophies
-
+<details>
+<summary>Trophies</summary>
 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
@@ -47,11 +92,10 @@ You can earn a Trophy (an item you get in your bank) by your performance. You ge
 - Adamant - top 20% - Guaranteed at 16 Tiles
 - Rune - top 10% - Guaranteed at 22 Tiles
 - Dragon - top 5% - Guaranteed at 28 Tiles
+</details>
 
-[[osbbingo3.png]]
-
-## Tiles
-
+<details>
+<summary>Tiles</summary>
 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
@@ -80,3 +124,4 @@ You can earn a Trophy (an item you get in your bank) by your performance. You ge
 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
+</details>

docs/src/content/docs/osb/Skills/mining.md

@@ -114,7 +114,7 @@ The only other thing unidentified minerals can be used to purchase are:
 | [[440]] | 58,000 | No |
 | [[442]] | 58,000 | Yes |
 | [[442]] | 53,000 | No |
-| [[453]] | 45,000 | Yes |
+| [[453]] | 44,000 | Yes |
 | [[444]] | 42,000 | Yes |
 | [[444]] | 40,000 | No |
 | [[453]] | 38,000 | No |
@@ -131,9 +131,9 @@ The only other thing unidentified minerals can be used to purchase are:
 | [[436]] | 19,000 | No |
 | [[438]] | 19,000 | No |
 | [[451]] | 13,000 | Yes |
+| [[451]] | 13,000 | No |
 | [[21622]] | 13,000 | Yes |
 | [[21622]] | 13,000 | No |
-| [[451]] | 12,000 | No |
 | [[434]] | 11,000 | Yes |
 | [[24706]] | 10,000 | Yes |
 | [[24706]] | 10,000 | No |

docs/src/plugins/authors.ts

@@ -14,8 +14,12 @@ const authors: Author[] = [
 	{ gitIDs: ['Arodab'], displayName: 'Arodab' },
 	{ gitIDs: ['DaughtersOfNyx'], displayName: 'Keres', avatar: 'DaughtersOfNyx.webp' },
 	{ gitIDs: ['TastyPumPum'], displayName: 'TastyPumPum', avatar: 'tasty.webp' },
-	{ gitIDs: ['00justas'], displayName: '00justas' },
-	{ gitIDs: ['themrrobert'], displayName: 'Cyr' }
+	{ gitIDs: ['00justas'], displayName: 'Justas' },
+	{ gitIDs: ['themrrobert'], displayName: 'Cyr' },
+	{ gitIDs: ['DayV-git'], displayName: 'DayV', avatar: 'dayv.webp' },
+	{ gitIDs: ['Felris'], displayName: 'Felris', avatar: 'felris.webp' },
+	{ gitIDs: ['Lajnux'], displayName: 'Fishy', avatar: 'fishy.webp' },
+	{ gitIDs: ['DarkWorldsArtist'], displayName: 'DarkWorldsArtist', avatar: 'dark.webp' }
 ];
 export const authorsMap = new Map<string, Author>();
 

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#7094eb4a53e5301fb401adadb25f6993448b1c83",
+		"oldschooljs": "git+https://github.com/oldschoolgg/oldschooljs.git#7deb56970f6458aed87f314dd18da6916a0e732c",
 		"p-queue": "^6.6.2",
 		"piscina": "^4.7.0",
 		"postgres": "^3.4.4",