Skip to content

Commit

Permalink
Merge branch 'oldschoolgg:master' into cluefix3
Browse files Browse the repository at this point in the history
  • Loading branch information
DayV-git authored Nov 26, 2024
2 parents 90a1c30 + 3ac0ba7 commit 8c03e0f
Show file tree
Hide file tree
Showing 28 changed files with 416 additions and 215 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{js,ts}]
[*.{js,ts,.astro,.md,.tsx,.jsx}]
charset = utf-8
indent_style = tab
indent_size = 4
Binary file added docs/public/images/huey.webp
Binary file not shown.
77 changes: 77 additions & 0 deletions docs/src/components/Update.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
---
const {firstHash, secondHash, isNew,date} = Astro.props;
---
<div class="update_root">
<div class="update">
{isNew ? <div class="new_badge pill">
New
</div> : null}
<div class="github_link pill">
Released {date}
</div>

<div class="github_link pill">
<a target="_blank" href={`https://github.com/oldschoolgg/oldschoolbot/compare/${firstHash}...${secondHash}`}>
<svg aria-hidden="true" class="github_icon" width="17" height="17" viewBox="0 0 24 24" fill="currentColor">
<path d="M12 .3a12 12 0 0 0-3.8 23.38c.6.12.83-.26.83-.57L9 21.07c-3.34.72-4.04-1.61-4.04-1.61-.55-1.39-1.34-1.76-1.34-1.76-1.08-.74.09-.73.09-.73 1.2.09 1.83 1.24 1.83 1.24 1.08 1.83 2.81 1.3 3.5 1 .1-.78.42-1.31.76-1.61-2.67-.3-5.47-1.33-5.47-5.93 0-1.31.47-2.38 1.24-3.22-.14-.3-.54-1.52.1-3.18 0 0 1-.32 3.3 1.23a11.5 11.5 0 0 1 6 0c2.28-1.55 3.29-1.23 3.29-1.23.64 1.66.24 2.88.12 3.18a4.65 4.65 0 0 1 1.23 3.22c0 4.61-2.8 5.63-5.48 5.92.42.36.81 1.1.81 2.22l-.01 3.29c0 .31.2.69.82.57A12 12 0 0 0 12 .3Z"></path>
</svg>
</a>
</div>

</div>
</div>


<style>
.update_root:not(.update_root:first-of-type) {
padding-top: 100px;
}

.update {
display: flex;
gap: 2px;
flex-direction: row;
align-items: center;
align-content: center;
font-size: 12px;
margin-top: 5px!important;
padding-top: 5px;
padding-bottom: 10px;
> * {margin: 0!important;}
}

.pill {
padding: 3px 7px;
display: flex;
border-radius: 10px;
font-weight: bold;
min-height: 15px;
line-height: 15px;
color: #8c8c8c!important;
}

.github_link {
color: #c0c0c0;
display: flex;
align-items: center;
justify-content: center;

.github_icon {
width: 15px;
height: 15px;
}

a {
text-decoration: none!important;
color: unset;
}
}

.new_badge {
background-color: #db3d3d;
color: white!important;
width: max-content;
font-weight: bold;
font-size: 13px;
}
</style>
31 changes: 31 additions & 0 deletions docs/src/content/docs/getting-started/FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,34 @@ Here's an example: `/create dharoks armour set` to turn items into a set, or `/u
The bot says it needs permission to ‘Manage messages’ in order to use a command. ### How do I do this?

Server settings > Roles > Old School Bot (The auto assigned one) > Turn `Manage Messages` on.

### How do I create a Ornate Jewellery Box?

_The recharge spell has a minimum quantity of 25, so we'll be creating 25 of the dragonstone items (26 for RoW)._

Bolt of cloth `/buy name:Bolt of cloth`

Gold Leaf `/buy name:Gold leaf quantity:3`

Ring of Dueling `/craft name:Emerald ring quantity:20` \
`/activities enchant name:Emerald ring quantity:20`

Games necklace(8) `/craft name:Sapphire necklace quantity:20` \
`/activities enchant name:Sapphire necklac equantity:20`

Skills necklace(4) `/craft name:Dragon necklacequantity:25` \
`/activities enchant name:Dragon necklacequantity:25` \
`/activities cast spell:Recharge Skills Necklace quantity:1`

Combat Bracelet(4) `/craft name:Dragonstone braceletquantity:25` \
`/activities enchant name:Dragonstone bracelet quantity:25` \
`/activities castspell:Recharge Combat Bracelet quantity:1`

Ring of wealth (5) `/craft name:Dragonstone ringquantity:26` \
`/activities enchant name:Dragonstone ringquantity:26` \
`/activities charge item:Ring of wealthquantity:1`

Amulet of glory(4) `/craft name:Dragonstone amulet (u)quantity:25` \
`/craft name:Dragonstone amuletquantity:25` \
`/activities enchant name:Dragonstone amuletquantity:25` \
`/activities castspell:Recharge Gloryquantity:1`
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,61 @@
title: "Changelog"
sidebar:
order: 3
tableOfContents: false
---
import Update from '../../../components/Update.astro';

## Update 13/11/2024 [[4fbfe429e9a1bdf817175cf497177e47fefc6be6...e03afd628fd7e1aa460acc417d822c2d697f9087]]
<Update date="26/11/2024" firstHash="4ccf60f038be9a7251cc7f4f9c66f4b181948ab3" secondHash="bc2e2ce8065c2edd5ca9966c9802a7df6c9da596" isNew />

**Clue scrolls** have received several updates/changes in this update, view our [Clue Scrolls](/osb/clues/#implings) page for updated information.

### [[Arodab]]

- Rebalanced clue scroll speeds to more closely match OSRS rates
- Beginner, Easy, Medium, Elite clues got a fairly significant buff (are now faster to complete)
- Added some more boosts, see the [Clue Scrolls](/osb/clues/#boosts) page to see all boosts
- You can now get a larger boost from your minions experience doing clues

### [[gc]]

- You can now stack clue scrolls, view the clue scrolls page for more information. Although the bot lets you stack clues in your bank, we are just emulating the mechanic of clue juggling. In other words, your minion keeps the clues in your bank juggled, allowing you to hold them - and your minion can only juggle a maximum of 100 clues. If you receive more clues while at the limit of 100 clues, your minion will drop the lowest tier ones you have to fit higher tier ones (e.g. it will drop an easy clue to pick up an elite clue).
- Boosts to clue scrolls now apply *per clue* instead of to the entire trip, allowing you to complete more clues per trip.
- *'Engine Changes:'* I have integrated the packages we use into the main repo as a monorepo, with the simple explanation being it makes it easier for myself and others to add new things, like bosses.
- The Pharaoh's sceptre is now tradeable

#### The Hueycoatl
[[huey.webp]]

The Hueycoatl boss can now be killed using [[/k]]!

The combat achievements, collection log, and pet have all been added.

To see the boosts, requirements and all information on the boss, see our [The Hueycoatl on Monster Page](/osb/monsters/#the-hueycoatl)

### [[themrrobert]]

- Fixed an issue where black masks (and other items) became unequippable

### [[DayV-git]]

- Added [[Book of the dead]] to [[/buy]]
- Improved the messages the bot shows for ammo/charge usage in [[/k]]
- Removed the max quantity of killing 1 Skotizo per trip (as clues can now stack)
- Added nightmare wiki page
- Ensure repeat trips remember your chosen combat methods
- Fix xp received from cannoning
- Prevent cannoning in catacombs
- Fixed a bug with the clue stacking update

### [[TastyPumPum]]

- Fixed the messaging/formatting of the mining command

### [[Luunae]]

- Fixed/improved some wiki pages

<Update date="13/11/2024" firstHash="4fbfe429e9a1bdf817175cf497177e47fefc6be6" secondHash="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)

Expand All @@ -22,7 +73,7 @@ sidebar:

### [[DayV-git]]

- Fix araxxor boss task requirements
- Fix araxxor boss task requidrements
- Allow buying genie lamps with frog tokens
- Fixed a bug with agility-alching sometimes picking the wrong item
- Improved the formatting of some messages
Expand Down Expand Up @@ -69,7 +120,7 @@ sidebar:
- Added [[Diving apparatus]] [[Fishbowl helmet]] to [[/buy]]
- Added [[Crab helmet]] [[Crab claw]] to [[/create]]

## Update 16/10/2024 [[68b130088f5e365ec2a341cae48bc5b353ccc2ff...4fbfe429e9a1bdf817175cf497177e47fefc6be6]]
<Update date="16/10/2024" firstHash="68b130088f5e365ec2a341cae48bc5b353ccc2ff" secondHash="4fbfe429e9a1bdf817175cf497177e47fefc6be6" />

Bingo! We are running the 3rd official OSB bingo. See the [Bingo Page](/getting-started/bingo) for information.

Expand Down Expand Up @@ -121,7 +172,7 @@ Bingo! We are running the 3rd official OSB bingo. See the [Bingo Page](/getting-
- Updated agility xp/hr rates based on the osrs update (buffed)
- Added [[Clue scroll (elite)]] drop to Araxxor

## Update 9/10/2024 [[8de72b2de5a275497c67123904a280981415c553...68b130088f5e365ec2a341cae48bc5b353ccc2ff]]
<Update date="9/10/2024" firstHash="8de72b2de5a275497c67123904a280981415c553" secondHash="68b130088f5e365ec2a341cae48bc5b353ccc2ff" />

### Hacktoberfest

Expand Down Expand Up @@ -150,7 +201,7 @@ I am running our own Hacktoberfest! Check out the [Hacktoberfest](/getting-start
- The [[Emberlight]], [[Scorching bow]] and [[Purging staff]] weapons now act as demonbane weapons.
- [[Emberlight]] boosts at all demon mobs, Scorching Bow, Purging Staff and Burning Claws only affect TDs (with the exception of Scorching Bow also being BIS at K'ril)

## Update 6/10/2024
##

We now have a new wiki at https://wiki.oldschool.gg/, and the BSO Wiki is now combined together with the OSB wiki. Many pages are out of date, I'm trying to update pages when I have time. Currently, the only way to contribute to the new wiki is by editing files in [this folder on github](https://github.com/oldschoolgg/oldschoolbot/tree/master/docs/src/content/docs).

Expand Down
12 changes: 5 additions & 7 deletions docs/src/content/docs/getting-started/wiki.md
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ This is an automatically generated list of pages with possible issues to be look

[/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
[/getting-started/changelog.mdx](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/getting-started/changelog.mdx): 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

Expand All @@ -287,8 +287,6 @@ This is an automatically generated list of pages with possible issues to be look

[/index.mdx](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/index.mdx): Doesnt use the new command formatting

[/osb/Activities/aerial-fishing.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/aerial-fishing.md): Doesnt use the new command formatting

[/osb/Activities/fountain-of-rune.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/fountain-of-rune.md): Doesnt use the new command formatting

[/osb/Activities/guardians-of-the-rift.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/guardians-of-the-rift.md): Doesnt use the new command formatting
Expand All @@ -301,8 +299,6 @@ This is an automatically generated list of pages with possible issues to be look

[/osb/Activities/motherlode-mine.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/motherlode-mine.md): Doesnt use the new command formatting

[/osb/Activities/shooting-stars.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/shooting-stars.md): Doesnt use the new command formatting

[/osb/Activities/volcanic-mine.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/volcanic-mine.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. `<td>`)

[/osb/Activities/wintertodt.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/wintertodt.md): Doesnt use the new command formatting
Expand All @@ -313,8 +309,12 @@ This is an automatically generated list of pages with possible issues to be look

[/osb/Bosses/nex.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Bosses/nex.md): Doesnt use the new command formatting

[/osb/Bosses/the-nightmare.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Bosses/the-nightmare.md): Doesnt use the new command formatting

[/osb/Bosses/wildy.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Bosses/wildy.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. `<td>`)

[/osb/clues.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/clues.md): Doesnt use the new command formatting

[/osb/combat-achievements.mdx](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/combat-achievements.mdx): Doesnt use the new command formatting

[/osb/Getting Started/advanced-resources.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Getting%20Started/advanced-resources.md): Doesnt use the new command formatting
Expand All @@ -325,8 +325,6 @@ This is an automatically generated list of pages with possible issues to be look

[/osb/Getting Started/beginner-guide.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Getting%20Started/beginner-guide.md): Doesnt use the new command formatting

[/osb/Getting Started/clues.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Getting%20Started/clues.md): Doesnt use the new command formatting, Contains unintended HTML (e.g. `<td>`)

[/osb/Getting Started/combat-skills.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Getting%20Started/combat-skills.md): Doesnt use the new command formatting

[/osb/Getting Started/gear.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Getting%20Started/gear.md): Doesnt use the new command formatting
Expand Down
4 changes: 2 additions & 2 deletions docs/src/content/docs/osb/Activities/aerial-fishing.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ title: "Aerial Fishing"

Requirements: 35 Hunter, 43 fishing.

You can start aerial fishing with either `/activities aerial_fishing`
You can start aerial fishing with either [[/activities aerial_fishing]]

You can purchase buyables via `/buy name:[itemName]`
You can purchase buyables via [[/buy name\:[itemName]]]

You can sell Golden Tenches for 100 Molch pearls via [[/sell items\:golden tench]]

Expand Down
8 changes: 4 additions & 4 deletions docs/src/content/docs/osb/Activities/fountain-of-rune.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ You can use the Fountain of Rune to charge Rings of wealth and Amulets of glory.

To charge at the Fountain of Rune, use the following command:

- `/activities charge item:[Amulet of glory/Ring of wealth]`
- [[/activities charge item\:[Amulet of glory/Ring of wealth]]]

**Note:** quantity refers to 1 inventory (1 invent = 26 items)

Expand All @@ -17,13 +17,13 @@ To charge at the Fountain of Rune, use the following command:

### Charging Glories

- Amulet of glory(6) are only used in the [Gnome Restaurant](https://wiki.oldschool.gg/minigames/gnome-restaurant) minigame.
- Amulet of glory(6) are only used in the [Gnome Restaurant](https://wiki.oldschool.gg/osb/minigames/gnome-restaurant) minigame.
- Gnome Restaurant is currently the only way to remove charges from a glory.
- If you want to create Amulet of glory(4), use the `/activities cast spell:recharge glory` command. However, these are not used in Gnome restaurant and are only used to create the Ornate jewelley box in your POH.
- If you want to create Amulet of glory(4), use the [[/activities cast spell\:recharge glory]] command. However, these are not used in Gnome restaurant and are only used to create the Ornate jewelley box in your POH.

### Amulet of Eternal Glory

- You can obtain this amulet at a 1/25,000 chance when charging glories here.
- Possessing the stats for the Wilderness elite diary provides a 3x speed boost.
- It is **not recommended** to charge glories unless you have this unlocked.
- Currently, the only use of the Eternal glory is at the [Gnome Restaurant](https://wiki.oldschool.gg/minigames/gnome-restaurant) minigame.
- Currently, the only use of the Eternal glory is at the [Gnome Restaurant](https://wiki.oldschool.gg/osb/minigames/gnome-restaurant) minigame.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Mining xp scales with mined fragments.

**Raiments of the eye** outfit will boost the number of runes created during the minigame.

- 10% extra runes for each piece or 60% extra runes for the full outfit _(MUSTbe equipped in skilling)_
- 10% extra runes for each piece or 60% extra runes for the full outfit _(MUST be equipped in skilling)_
- This extra runes effect also applies to other runes outside of GOTR

**Fragments**
Expand Down
10 changes: 5 additions & 5 deletions docs/src/content/docs/osb/Activities/hallowed-sepulchre.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Most of the boosts will come from items purchased from the shop.

## Hallowed Sepulchre Shop

The following items can be purchased with hallowed marks by using the `/buy` command.
The following items can be purchased with hallowed marks by using the [[/buy]] command.

| **Item** | **Hallowed marks required** | **Uses** |
| ---------------------- | :-------------------------: | ------------------------------------------- |
Expand All @@ -49,7 +49,7 @@ The following items can be purchased with hallowed marks by using the `/buy` com
| Dark dye | 300 | Used to dye graceful |
| Dark acorn | 3,000 | Used to transmogrify the Dark squirrel pet. |

- If you have obtained a Giant Squirrel agility pet, you can `/buyname: ``Dark squirrel` after purchasing the dark acorn from the shop to transmogrify the pet. Be advised that you **CANNOT**revert the dark squirrel.
- If you have obtained a Giant Squirrel agility pet, you can [[/buy name\: Dark squirrel]] after purchasing the dark acorn from the shop to transmogrify the pet. Be advised that you **CANNOT** revert the dark squirrel.

## Mysterious Pages

Expand All @@ -61,8 +61,8 @@ You **cannot** revert Dark graceful! If you are trying to obtain all graceful se

- The dark graceful set can be acquired through purchasing the dark dye from the shop. It requires a full set of the base graceful and 1 dark dye per piece.
- To create the set, simply type:
- `/createitem:Dark graceful [piece]` - piece by piece
- `/createitem:Dark graceful` - whole set in one command
- [[/create item\:Dark graceful [piece]]] - piece by piece
- [[/create item\:Dark graceful]] - whole set in one command
- You need 6 dark dyes to create the full set, totaling 1800 hallowed marks.

## **Strange Old Lockpick**
Expand All @@ -87,7 +87,7 @@ The Ring of endurance also provides boosts to several activities within the bot.

To create the charged Ring of endurance, use the following command:

- `/createitem:Ring of endurance`
- [[/create item\:Ring of endurance]]
- Requires 125 Stamina potion(4)

The boosts apply to the following activities:
Expand Down
6 changes: 3 additions & 3 deletions docs/src/content/docs/osb/Activities/mage-training-arena.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ title: "Mage Training Arena"

Your minion can train magic in the Mage Training Arena and buy all the regular rewards such as infinity gear, wands, and the mages book.

To start a trip, use `/minigames mage_training_arena start`
To start a trip, use [[/minigames mage_training_arena start]]

To check your points, use `/minigames mage_training_arena points`
To check your points, use [[/minigames mage_training_arena points]]

The Mage Training Arena is combined into 1 room, and 1 set of points. A single room costs 45 fire-, 20 nature-, 18 cosmic- and 14 law runes. Each room takes 14 minutes to complete and awards 23 Pizazz points (100/hr). Training in the Mage Training Arena grants between 23,750-26,250 magic XP/hr.

### Rewards

Rewards can be bought using `/minigames mage_training_arena buy`
Rewards can be bought using [[/minigames mage_training_arena buy]]

Rewards take approximately the same amount of time to get. Earning 5659 Pizazz points to buy one of every item from the rewards shop, takes approximately 56½ hours.

Expand Down
Loading

0 comments on commit 8c03e0f

Please sign in to comment.