Merge branch 'master' into ashSanctifierFix2

data/bso_items.json

@@ -1617,7 +1617,39 @@
 	"73222": "Offhand dice plushie",
 	"73223": "Tidal collector (i)",
 	"73224": "Pernix components",
+	"73250": "Sinister crate (s7)",
+	"73251": "Sinister crate key (s7)",
+	"73252": "Mumpkin",
+	"73253": "Mumpkin (demonic)",
+	"73254": "Mumpkin (pumpkin)",
+	"73255": "Mumpkin (dead)",
+	"73256": "Puzzle box (kuro)",
+	"73257": "Pumpkinhead boxhat",
+	"73258": "White hween mask",
+	"73259": "Deathless victims",
+	"73260": "Pumpkin cloak",
+	"73261": "Venomous cloak",
+	"73262": "Bloody cloak",
+	"73263": "Purple cloak",
+	"73264": "Dark cloak",
+	"73265": "White cloak",
+	"73266": "Pumpkin sweater",
+	"73267": "Sinister sweater",
+	"73268": "Pumpkin carving knife",
+	"73270": "Deathtouched tart",
+	"73271": "Jack-o-lantern",
+	"73272": "Zombie cow plushie",
+	"73273": "Pumpkin parasol",
+	"73274": "Halloween cracker",
+	"73275": "Monster in a backpack",
+	"73276": "Vampyric hween mask",
+	"73277": "Demonic hween mask",
+	"73278": "Zombie hween mask",
+	"73279": "Heirloom pumpkin",
+	"73301": "Spookling token",
+	"73302": "Miniature pumpkin head",
 	"88888": "Bucket of dung",
+	"88889": "Polterpup",
 	"121234": "Burnt celebratory cake",
 	"121521": "Celebratory cake with candle",
 	"122001": "Lit celebratory cake",

docs/src/content/docs/bso/Miscelleanous/Events.md

@@ -1,7 +1,35 @@
 ---
-title: "Events"
+title: "Holiday Events"
 ---
 
+## Halloween 2024
+
+### Main Event
+
+To do the main event, use [[/halloween check]] to start, and receive a [[Pumpkin carving knife]] and pumpkin seeds, then plant/harvest the seeds to grow pumpkins. You have a chance at getting special Heirloom pumpkins, then use your knife on them to create jack-o-lanterns. Use [[/halloween hand_in]] to hand in your jack-o-lanterns, and have a chance at receiving a [[Halloween cracker]].
+
+If you run out of seeds, you can buy more.
+
+#### Rewards
+
+[[Halloween cracker]]: Received at a 1/10 chance when handing in a jack-o-lantern.
+
+The [[Mumpkin]] pet is received at a rare chance when harvesting pumpkins, it can be metamorphed into: [[Mumpkin (demonic)]] [[Mumpkin (dead)]] [[Mumpkin (pumpkin)]]
+
+### Side Event
+
+To start, any trip, regardless of duration, has a 1/3 chance to trigger the event. Once you get the event start messeage (Pumpkinhead chatbox), you are given a Spookling token.
+
+When completing trips, for every minute, there is a 1 in 12 chance to get a 'trick or treat' point. If you get at least one point, there is a 55% chance of getting a trick, otherwise it's a 'treat.' Trick vs treat doesn't affect pet chance, but only treats can also give you Halloween candy. Themed > messsages differ between tricks and treats, and there are a few different messages for being lucky enough to get the pet also.
+
+Pet drop rate is 1 per 80 trick or treat points (~20 hours) Each pet on CL makes the next one 5x rarer. You also get 1 Spookling token for each trick or treat point. (1 in 12 per minute, or ~5 per hour on average).
+
+You can "cash in" the Spookling tokens by going to /k Pumpkinhead to claim his head, in the form of a Miniature pumpkin head. The cost is 100 Spookling tokens, with a max of 3 heads purchasable. ~25 > hours per head
+
+### Halloween cracker
+
+Received from handing in jack-o-lanterns, and opened with [[/open]] - it gives a random unique item when opened.
+
 ## Halloween 2021
 
 ### Prerequisites

docs/src/content/docs/bso/changelog.md

@@ -6,6 +6,34 @@ sidebar:
 
 Generally only changes that are specific to BSO are included here, for a full list of OSB changes see the [OSB Changelog](/changelog).
 
+## 29/10/2024
+
+### [[gc]]
+
+- The halloween pet crate boost was incorrectly coded as 5x instead of 10x, this is now fixed so its 10x. You can roughly expect a crate every hour if using one (or more if you're an iron).
+- If you get the 10x hween pet boost, you now get a message saying that.
+
+### [[nwjgit]]
+
+- Made changes to skillcapes, so that higher-level capes always receive the perks of lower-level ones. E.g. Comp cape gives all master/skill-cape perks, expert capes gives all the master/skill-cape perks, etc.
+- OSB Changes: Finished Wyrm agility and cox trip repeating.
+
+## 28/10/2024
+
+### [[gc]]
+
+- You now have 10x higher crate droprates if you have any halloween pet equipped, they are: Kuro, Gregoyle, Mumpkin, Mumpkin (demonic), Mumpkin (pumpkin), Mumpkin (dead), Polterpup, Mini pumpkinhead, Mini mortimer, Casper, Cob.
+- Ironmen previously had a 3x bonus crate droprate, this has been increased to 6x.
+- The 2 new halloween pets have been added to the DC pets CL.
+- The new items have been desecretted, so they no longer are hidden from places, and the collection logs show.
+- You can now buy pumpkin seeds.
+
+[Added wiki page for the halloween event, click here to see](/bso/miscelleanous/events/#halloween-2024)
+
+### Turbo
+
+- Korulsi herbs can now be cleaned on harvest, like other herbs
+
 ## 26/10/2024
 
 ### [[gc]]

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

@@ -0,0 +1,32 @@
+---
+title: "Developing Guide"
+sidebar:
+  order: 9999
+lastUpdated: 2024-10-01T03:41:00.552Z
+---
+
+### Important Tips
+
+- I use [this link](https://github.com/oldschoolgg/oldschoolbot/pulls?q=is%3Aopen+is%3Apr+-label%3A%22Status%3A+Waiting+For+Changes%22+-label%3A%22Status%3A+Needs+Information%22++-label%3A%22Status%3A+WIP%22+) when reviewing PRs, if your PR has certain labels (like 'Waiting for changes', or 'Status:WP'), it will be excluded from my reviewing list, so update the labels of your PR as appropriate.
+- Run `yarn dev` before pushing commits to a PR, it will do everything you need (linting, building, testing, etc).
+- You need a test bot, and have it added to our testing server, and it's highly encouraged you do your testing there.
+- If you have any question or need help, ask in `#developers`, and you're welcome to ping @magnaboy.
+
+### Commands
+
+`yarn dev`: Run this before pushing/PRing, or just at any time if you want, it does almost everything you need: Update deps, generate prisma clients, build, update files, lint and test.
+
+`yarn watch`: Starts/runs your bot, and restarts it when you make changes.
+
+`yarn lint`: Run this if you only want to lint your code, and nothing else. (yarn dev runs this)
+
+`yarn test`: Run this if you only want to test your code, and nothing else (yarn dev runs this)
+
+### Spritesheet
+
+The spritesheet is a big image file containing most icons the bot uses for items, not all items are in it, if the bot need any that aren't in it, it will download them on demand.
+
+- To update the spritesheet, use `yarn spritesheet`. This will only have an effect if something has actually changed.
+- If new osrs items are being added, you first need to download [the new cache](https://github.com/runelite/static.runelite.net/archive/refs/heads/gh-pages.zip) and extract it so `/cache/item/icon` is in `tmp/icons` in the repo.
+- Must only be run on the master (osb) branch.
+- If new BSO items are added, the images should be put in the master branch in `src/lib/resources/images/bso_icons`, and the item names/ids in the `bso_items.json` file.

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

@@ -275,6 +275,8 @@ This is an automatically generated list of pages with possible issues to be look
 
 [/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
 
+[/getting-started/developing.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/getting-started/developing.md): Doesnt use the new command formatting
+
 [/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

docs/src/content/docs/osb/Bosses/inferno.md

@@ -2,8 +2,6 @@
 title: "Inferno"
 ---
 
-## Summary
-
 The Inferno is a very high level PVM activity. It has high gear requirements, consumes large amounts of expensive supplies, and attempts can take upwards of 2 hours.
 
 Similar to the Fight Caves, you are not guaranteed to complete The Inferno. Your success chance scales on your gear, number of attempts, and number of Zuk fights.
@@ -18,17 +16,15 @@ Tokkul can be spent at the [Tokkul shop](https://wiki.oldschool.gg/bosses/fight-
 
 To begin a trip into the inferno, use:
 
-- `/activities infernoaction: ``Start Inferno Trip`
+- `/activities inferno action:Start Inferno Trip`
 
 To view information on your previous attempts/KCs, use:
 
-- `/activities infernoaction: ``Check Inferno Stats`
+- `/activities inferno action:Check Inferno Stats`
 
 To gamble a cape for a chance at the Jal-nib-rek pet, use:
 
-- `/gamble capetype: ``infernal`
-
----
+- `/gamble cape type:infernal`
 
 ## Requirements
 
@@ -52,8 +48,6 @@ Twisted bow or Armadyl crossbow with ammo based on the weapon you're using (arro
 
 Runes for Ice barrage + Blood barrage (200 casts of blood barrage/hour and 100 casts of ice barrage/hour. Rune costs are reduced by having a Kodai wand equipped in your mage setup.)
 
----
-
 ## Boosts
 
 Boosts for the Inferno are split into two categories: speed and death chance. Speed boosts decrease the time required to complete the Inferno, and death chance boosts decrease your odds of dying before or during the Zuk fight.
@@ -82,15 +76,8 @@ Equipping an Elysian spirit shield in either range or mage (-5%)
 
 Equipping a Ring of suffering (i) in either range or mage (-4%)
 
-Equipping a Justiciar faceguard in range (-5%) \
- Equipping a Twisted bow in your range setup (instead of an ACB) (1.5% from Tbow VS 7.5% with ACB)
+Equipping a Justiciar faceguard in range (-5%)
 
-The number of attempts you've done, and the number of times you've fought Zuk greatly affect speed and death chance.
+Equipping a Twisted bow in your range setup (instead of an ACB) (1.5% from Tbow VS 7.5% with ACB)
 
----
-
-## Gear
-
-<figure><figcaption></figcaption></figure>
-
-Using this gear, along with dragon darts in your blowpipe, will give the maximum bonus for Inferno.
+The number of attempts you've done, and the number of times you've fought Zuk greatly affect speed and death chance.

docs/src/content/docs/osb/Raids/toa.mdx

@@ -27,7 +27,7 @@ Solo Tombs of Amascut requires 1 KC for every 10 levels of invocation. E.g. a 50
 
 ## Boosts
 
-At 250 kc you will have the minimum death chance possible. At 350 kc you will have the maximum speed boost possible.
+At 250 kc you will have the minimum death chance possible. At 350 attempts you will have the maximum speed boost possible.
 
 Specific items will give a hidden speed boost to your raids, these are:
 

docs/src/content/docs/osb/Skills/fishing/README.md

@@ -2,11 +2,9 @@
 title: "Fishing"
 ---
 
-# Fishing
+You can train Fishing using `/fish name:<fish> quantity:<quantity>`, for example `/fish name:Lobster quantity:100`
 
-You can train Fishing using `/fishname:<fish>quantity:<quantity>`, for example `/fishname:Lobsterquantity:100`
-
-Fishing bait is buyable with `/buyname: ``Fishing bait`.
+Fishing bait is buyable with `/buy name:Fishing bait`.
 
 Dark fishing bait and Raw Karambwanji aren't sold by the bot and can only be obtained by buying from other players or obtaining them yourself.
 

docs/src/content/docs/osb/Skills/runecrafting/README.md → docs/src/content/docs/osb/Skills/runecrafting.md

@@ -105,3 +105,31 @@ Blood runes and Soul runes can be crafted at the Dark Altar using [[/runecraft]]
 - 20% faster essence mining for Kourend Medium diary.
 - -20% penalty if you have no Graceful equipped.
 - -35% penalty if you have less than 73 Agility.
+
+## Fastest Route to 99:
+
+`/runecraft rune:Air Rune quantity:103` (until level 6) \
+`/runecraft rune:Mist Rune quantity:76` (until level 10) \
+`/runecraft rune:Dust Rune quantity:75` (until level 13) \
+`/runecraft rune:Mud Rune quantity:61` (until level 15) \
+`/runecraft rune:Smoke Rune quantity:164` (until level 19) \
+`/runecraft rune:Steam Rune quantity:232` (until level 23) \
+`/runecraft rune:Lava Rune` (repeat until 99)
+
+**Materials Needed:** 1,241,520 Pure essence and 1000-2000 Binding necklaces \
+1,240,800 Earth rune, 293 Water rune and 315 Air rune. Abyssal sire drops Binding necklaces in quantity's of 25. This assumes you have a staff providing infinite fire runes in your skilling setup.
+**For each lap of Lava runes:** 1 Earth talisman or 2 Astral rune + 7 Fire rune + 7 Water rune for Magic Imbue (lvl 82 magic), 1-2 charges Ring of dueling(8) and sometimes a dose of Stamina potion(4) is consumed.
+
+### Alternative Route to 99 (more profitable):
+
+`/runecraft rune:Air Rune quantity:17`\
+`/runecraft rune:Mind Rune quantity:56`\
+`/runecraft rune:Water Rune quantity:97`\
+`/runecraft rune:Earth Rune quantity:176`\
+`/runecraft rune:Fire Rune quantity:338`\
+`/runecraft rune:Body Rune quantity:4368`\
+`/runecraft rune:Astral Rune` - to 77\
+`/runecraft rune:Blood Rune` - to 90 (or 99)\
+`/runecraft rune:Soul Rune` - to whatever, this is best xp/hr at the Dark altar!
+
+**Materials needed:** 170,382 pure essence

docs/src/content/docs/osb/Skills/smithing/blast-furnace.md

@@ -2,7 +2,7 @@
 title: "Blast Furnace"
 ---
 
-The Blast Furnace can be used with the \*\*`blast_furnace:true` option in the `/smelt` command. For example `/smelt name:Gold bar blastfurnace:true`
+The Blast Furnace can be used with the `blast_furnace:true` option in the `/smelt` command. For example `/smelt name:Gold bar blastfurnace:true`
 
 The Blast Furnace costs 216,000 gp/hr to use, or 72,000 gp/hr if your minion is an ironman.
 

docs/src/content/docs/osb/Skills/smithing/giants-foundry.md

@@ -6,7 +6,7 @@ Look no further for amazing smithing xp and a use for those stacked up bars! You
 
 To start a trip of Giant's Foundry, use:
 
-- `/minigames giants_foundry startname: ``[alloyType]`
+- `/minigames giants_foundry start name:[alloyType]`
 
 ## Requirements
 
@@ -43,8 +43,6 @@ If you run the following command, you will see your overall foundry stats.
 
 - `/minigames giants_foundry stats`
 
-<figure><figcaption></figcaption></figure>
-
 Here you will see your total unique weapons made. There are 1,331 possible weapons to create, with each weapon having an equal chance to be created. The type of alloy does not affect the chances of which weapon will be made. This means that using lower tier bars is considerably more cost effective if you're wanting to collect all unique weapons. There is no CL for these weapons, it's purely just a statistic.
 
 ## XP/Hour

docs/src/content/docs/osb/Skills/woodcutting/README.md

@@ -2,10 +2,10 @@
 title: "Woodcutting"
 ---
 
-You can train Woodcutting using `/chopname:[logs]`. If no quantity is specified, it will default to a full trip. Using the powerchop option will result in no logs being obtained, but provides significantly faster woodcutting xp rates.
+You can train Woodcutting using `/chop name:[logs]`. If no quantity is specified, it will default to a full trip. Using the powerchop option will result in no logs being obtained, but provides significantly faster woodcutting xp rates.
 
-- `/chopname:Willow logsquantity:50`
-- `/chopname:Teak logspowerchop:true`
+- `/chop name:Willow logs quantity:50`
+- `/chop name:Teak logs powerchop:true`
 
 ## Axes
 

docs/src/content/docs/osb/Skills/woodcutting/forestry.md

@@ -10,15 +10,11 @@ This minigame is conducted passively while completing _almost any_ woodcutting t
 
 - There are no requirements for this activity
 
----
-
 ## Boosts
 
 - Regular woodcutting [axe boosts](./#axes)
 - 20% boost to Bird nests from [Twitcher's gloves](forestry.md#twitchers-gloves)
 
----
-
 ## Forestry Events
 
 There are 9 forestry events. Each one has an equal chance to spawn. The chance of a forestry event spawning is 1/20 for every minute of your trip (average of 1 event per 20 mins). Some events will give common items, bonus xp, or a unique CL item. All events will give between 250-500 Anima-infused bark.

docs/src/plugins/items.ts

@@ -83,7 +83,7 @@ export function remarkItems(options: any) {
 				);
 				const osbItem = Items.get(match) ?? Items.get(Number(match));
 				if (bsoItem) {
-					imageURL = `https://raw.githubusercontent.com/oldschoolgg/oldschoolbot/refs/heads/bso/src/lib/resources/images/bso_icons/${bsoItem[0]}.png`;
+					imageURL = `https://raw.githubusercontent.com/oldschoolgg/oldschoolbot/refs/heads/master/src/lib/resources/images/bso_icons/${bsoItem[0]}.png`;
 				} else if (osbItem) {
 					imageURL = `https://chisel.weirdgloop.org/static/img/osrs-sprite/${osbItem.id}.png`;
 					itemName = osbItem.name;

package.json

@@ -9,7 +9,7 @@
 		"dev": "yarn dev:stage1 && yarn dev:stage2 && yarn dev:stage3 && yarn dev:stage4",
 		"watch:tsc": "tsc -w -p src",
 		"buildandrun": "yarn build:esbuild && node --enable-source-maps dist",
-		"start": "echo 'yarn start is now the same as yarn watch' && yarn watch",
+		"start": "yarn watch",
 		"============SCRIPTS": "============",
 		"spritesheet": "tsx ./scripts/spritesheet.ts && yarn lint:biome",
 		"data": "concurrently \"tsx ./scripts/monster_table.ts\" && yarn lint",
@@ -18,7 +18,7 @@
 		"creatables": "tsx ./scripts/renderCreatablesFile.ts",
 		"generate:robochimp": "prisma generate --no-hints --schema prisma/robochimp.prisma",
 		"============BUILDING": "============",
-		"build": "tsx ./scripts/build.ts",
+		"build": "yarn build:esbuild",
 		"gen": "concurrently --raw \"prisma generate --no-hints\" \"yarn generate:robochimp\" && echo \"Generated Prisma Client\"",
 		"build:tsc": "tsc -p src",
 		"build:esbuild": "concurrently --raw \"yarn build:main\" \"yarn build:workers\"",