Merge branch 'master' into mining_fix

oldschoolgg · Oct 31, 2024 · cac228f · cac228f
2 parents 62cd093 + 8585a6b
commit cac228f
Show file tree

Hide file tree

Showing 19 changed files with 653 additions and 81 deletions.
diff --git a/docs/src/content/docs/bso/changelog.md b/docs/src/content/docs/bso/changelog.md
@@ -6,6 +6,18 @@ 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]]

diff --git a/docs/src/content/docs/getting-started/wiki.md b/docs/src/content/docs/getting-started/wiki.md
@@ -291,8 +291,12 @@ 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
+
 [/osb/Activities/hallowed-sepulchre.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/hallowed-sepulchre.md): Doesnt use the new command formatting
 
 [/osb/Activities/mage-training-arena.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Activities/mage-training-arena.md): Doesnt use the new command formatting
@@ -421,8 +425,6 @@ This is an automatically generated list of pages with possible issues to be look
 
 [/osb/Skills/firemaking.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Skills/firemaking.md): Doesnt use the new command formatting
 
-[/osb/Skills/fishing/aerial-fishing.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Skills/fishing/aerial-fishing.md): Doesnt use the new command formatting
-
 [/osb/Skills/fishing/drift-net-fishing.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Skills/fishing/drift-net-fishing.md): Doesnt use the new command formatting
 
 [/osb/Skills/fishing/fishing-training.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Skills/fishing/fishing-training.md): Doesnt use the new command formatting
@@ -453,11 +455,7 @@ This is an automatically generated list of pages with possible issues to be look
 
 [/osb/Skills/prayer.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Skills/prayer.md): Doesnt use the new command formatting
 
-[/osb/Skills/runecrafting/guardians-of-the-rift.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Skills/runecrafting/guardians-of-the-rift.md): Doesnt use the new command formatting
-
-[/osb/Skills/runecrafting/README.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Skills/runecrafting/README.md): Doesnt use the new command formatting
-
-[/osb/Skills/runecrafting/runecrafting-training.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Skills/runecrafting/runecrafting-training.md): Doesnt use the new command formatting
+[/osb/Skills/runecrafting.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Skills/runecrafting.md): Doesnt use the new command formatting
 
 [/osb/Skills/slayer/README.md](https://github.com/oldschoolgg/oldschoolbot/blob/master/docs/src/content/docs/osb/Skills/slayer/README.md): Doesnt use the new command formatting
 

diff --git a/docs/src/content/docs/osb/Raids/toa.mdx b/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:
 

diff --git a/docs/src/content/docs/osb/combat-achievements.mdx b/docs/src/content/docs/osb/combat-achievements.mdx
@@ -304,6 +304,8 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier
 | Dagannoth Supreme | Rapid Succession | 1 in 30 chance per kill |
 | Demonic Gorilla | If Gorillas Could Fly | 1x Demonic Gorilla KC |
 | Demonic Gorilla | Hitting Them Where It Hurts | 1 in 1 chance per kill |
+| Duke Sucellus | Duke Sucellus Speed-Trialist | 1 in 5 chance per kill |
+| Duke Sucellus | Duke Sucellus Adept | 1x Duke Sucellus KC |
 | General Graardor | Ourg Freezer II | 1 in 20 chance per kill |
 | General Graardor | General Graardor Veteran | 100x General Graardor KC |
 | Giant Mole | Hard Hitter | 1 in 20 chance per kill |
@@ -332,12 +334,17 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier
 | Scorpia | Scorpia Veteran | 25x Scorpia KC |
 | Skotizo | Demon Evasion | 1 in 10 chance per kill |
 | Skotizo | Up for the Challenge | 1 in 1 chance per kill |
+| The Leviathan | Leviathan Adept | 1x The Leviathan KC |
+| The Leviathan | Leviathan Speed-Trialist | 1 in 5 chance per kill |
 | The Mimic | Mimic Veteran | 1x Mimic KC |
 | The Nightmare | Nightmare Veteran | 25x The Nightmare KC |
 | The Nightmare | Explosion! | 1 in 25 chance per kill |
 | The Nightmare | Nightmare (5-Scale) Speed-Trialist | 1 in 45 chance per kill |
 | The Nightmare | Nightmare (Solo) Speed-Trialist | 1 in 10 chance per kill |
 | The Nightmare | Sleep Tight | 1 in 1 chance per kill |
+| The Whisperer | Whisperer Speed-Trialist | 1 in 5 chance per kill |
+| The Whisperer | Tentacular | 1 in 5 chance per kill |
+| The Whisperer | Whisperer Adept | 1x The Whisperer KC |
 | Theatre of Blood | Theatre of Blood Veteran | 25x Theatre of Blood KC. |
 | Theatre of Blood: Entry Mode | Chally Time | 1 in 2 chance per kill |
 | Theatre of Blood: Entry Mode | Nylocas, On the Rocks | 1 in 15 chance per kill |
@@ -373,6 +380,8 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier
 | TzTok-Jad | Fight Caves Veteran | 1x TzTok-Jad KC |
 | TzTok-Jad | A Near Miss! | 1 in 3 chance per kill |
 | TzTok-Jad | Facing Jad Head-on | 1 in 1 chance per kill |
+| Vardorvis | Vardorvis Speed-Trialist | 1 in 5 chance per kill |
+| Vardorvis | Vardorvis Adept | 1x Vardorvis KC |
 | Venenatis | Venenatis Veteran | 20x Venenatis KC |
 | Vet'ion | Vet'eran | 20x Vet'ion KC |
 | Vorkath | Vorkath Veteran | 50x Vorkath KC |
@@ -443,6 +452,10 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier
 | Crystalline Hunllef | Perfect Crystalline Hunllef | 1 in 20 chance per kill |
 | Crystalline Hunllef | Gauntlet Speed-Chaser | 1 in 25 chance per kill |
 | Crystalline Hunllef | Defence Doesn't Matter | 1 in 25 chance per kill |
+| Duke Sucellus | Cold Feet | 1 in 20 chance per kill |
+| Duke Sucellus | Duke Sucellus Speed-Chaser | 1 in 40 chance per kill |
+| Duke Sucellus | Perfect Duke Sucellus | 1 in 100 chance per kill |
+| Duke Sucellus | Duke Sucellus Master | 50x Duke Sucellus KC |
 | Grotesque Guardians | Perfect Grotesque Guardians II | 1 in 35 chance per kill |
 | Grotesque Guardians | Grotesque Guardians Speed-Chaser | 1 in 25 chance per kill |
 | Grotesque Guardians | ... 'til Dawn | 20x Grotesque Guardians KC |
@@ -468,10 +481,17 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier
 | Phosani's Nightmare | Crush Hour | 1 in 33 chance per kill |
 | Phosani's Nightmare | Dreamland Express | 1 in 33 chance per kill |
 | Skotizo | Precise Positioning | 1 in 1 chance per kill |
+| The Leviathan | Serpentine Solo | 1 in 20 chance per kill |
+| The Leviathan | Leviathan Master | 50x The Leviathan KC |
+| The Leviathan | Leviathan Speed-Chaser | 1 in 40 chance per kill |
+| The Leviathan | Perfect Leviathan | 1 in 100 chance per kill |
 | The Nightmare | Perfect Nightmare | 1 in 33 chance per kill |
 | The Nightmare | Nightmare (5-Scale) Speed-Chaser | 1 in 33 chance per kill |
 | The Nightmare | Nightmare Master | 50x The Nightmare KC |
 | The Nightmare | Nightmare (Solo) Speed-Chaser | 1 in 33 chance per kill |
+| The Whisperer | Whisperer Master | 50x The Whisperer KC |
+| The Whisperer | Whisperer Speed-Chaser | 1 in 40 chance per kill |
+| The Whisperer | Perfect Whisperer | 1 in 100 chance per kill |
 | Theatre of Blood | Perfect Xarpus | 1 in 50 chance per kill |
 | Theatre of Blood | Theatre (5-Scale) Speed-Chaser | 1 in 40 chance per kill |
 | Theatre of Blood | Perfect Verzik | 1 in 50 chance per kill |
@@ -518,6 +538,10 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier
 | TzTok-Jad | Denying the Healers | 1 in 25 chance per kill |
 | TzTok-Jad | Fight Caves Master | 5x TzTok-Jad KC |
 | TzTok-Jad | Fight Caves Speed-Chaser | 1 in 7 chance per kill |
+| Vardorvis | Vardorvis Speed-Chaser | 1 in 40 chance per kill |
+| Vardorvis | Vardorvis Master | 50x Vardorvis KC |
+| Vardorvis | Budget Cutter | 1 in 20 chance per kill |
+| Vardorvis | Perfect Vardorvis | 1 in 100 chance per kill |
 | Vorkath | The Walk | 1 in 33 chance per kill |
 | Vorkath | Extended Encounter | 10x Vorkath KC |
 | Vorkath | Dodging the Dragon | 1 in 33 chance per kill |
@@ -555,6 +579,9 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier
 | Corrupted Hunllef | Corrupted Gauntlet Grandmaster | 50x Corrupted Gauntlet KC. |
 | Corrupted Hunllef | Wolf Puncher II | 1 in 15 chance per kill |
 | Crystalline Hunllef | Gauntlet Speed-Runner | 1 in 35 chance per kill |
+| Duke Sucellus | Duke Sucellus Sleeper | 1x Duke Sucellus (Awakened) KC |
+| Duke Sucellus | Duke Sucellus Speed-Runner | 1 in 150 chance per kill |
+| Duke Sucellus | Mirror Image | 1 in 100 chance per kill |
 | General Graardor | Ourg Killer | 15x General Graardor KC |
 | General Graardor | Defence Matters | 1 in 80 chance per kill |
 | General Graardor | Keep Away | 1 in 33 chance per kill |
@@ -572,10 +599,16 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier
 | Phosani's Nightmare | Perfect Phosani's Nightmare | 1 in 33 chance per kill |
 | Phosani's Nightmare | Can't Wake Up | 5x Phosani's Nightmare KC |
 | Phosani's Nightmare | Phosani's Grandmaster | 25x Phosani's Nightmare KC |
+| The Leviathan | Leviathan Speed-Runner | 1 in 150 chance per kill |
+| The Leviathan | Leviathan Sleeper | 1x The Leviathan (Awakened) KC |
+| The Leviathan | Unconventional | 1 in 100 chance per kill |
 | The Nightmare | Terrible Parent | 1 in 22 chance per kill |
 | The Nightmare | Nightmare (Solo) Speed-Runner | 1 in 30 chance per kill |
 | The Nightmare | A Long Trip | 1 in 33 chance per kill |
 | The Nightmare | Nightmare (5-Scale) Speed-Runner | 1 in 22 chance per kill |
+| The Whisperer | Whispered | 1x The Whisperer (Awakened) KC |
+| The Whisperer | Whisperer Speed-Runner | 1 in 150 chance per kill |
+| The Whisperer | Dark Memories | 1 in 100 chance per kill |
 | Theatre of Blood | Theatre (4-Scale) Speed-Runner | 1 in 39 chance per kill |
 | Theatre of Blood | Theatre of Blood Grandmaster | 150x Theatre of Blood KC. |
 | Theatre of Blood | Perfect Theatre | 1 in 80 chance per kill |
@@ -621,6 +654,9 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier
 | TzTok-Jad | No Time for a Drink | 1 in 15 chance per kill |
 | TzTok-Jad | Fight Caves Speed-Runner | 1 in 33 chance per kill |
 | TzTok-Jad | Denying the Healers II | 1 in 22 chance per kill |
+| Vardorvis | Vardorvis Speed-Runner | 1 in 150 chance per kill |
+| Vardorvis | Vardorvis Sleeper | 1x Vardorvis (Awakened) KC |
+| Vardorvis | Axe Enthusiast | 1 in 100 chance per kill |
 | Vorkath | The Fremennik Way | 1 in 1 chance per kill |
 | Vorkath | Vorkath Speed-Runner | 1 in 55 chance per kill |
 | Vorkath | Faithless Encounter | 1 in 15 chance per kill |

diff --git a/scripts/wiki.ts b/scripts/wiki.ts
@@ -423,7 +423,10 @@ function wikiIssues() {
 	}
 
 	const markdown = new Markdown();
-	const grouped = groupBy(issues, i => i.filePath.replaceAll('\\', '/'));
+	const grouped = groupBy(
+		issues.sort((a, b) => a.filePath.localeCompare(b.filePath)),
+		i => i.filePath.replaceAll('\\', '/')
+	);
 	for (const [file, issues] of Object.entries(grouped).sort((a, b) => a[0].localeCompare(b[0]))) {
 		markdown.addLine(
 			`[${file.replace('docs/src/content/docs', '')}](https://github.com/oldschoolgg/oldschoolbot/blob/master/${file.replaceAll(' ', '%20')}): ${issues.map(i => i.description).join(', ')}`

diff --git a/src/lib/combat_achievements/elite.ts b/src/lib/combat_achievements/elite.ts
@@ -1623,5 +1623,108 @@ export const eliteCombatAchievements: CombatAchievement[] = [
 				[Monsters.TormentedDemon.id]: 1
 			}
 		})
+	},
+	{
+		id: 1140,
+		name: 'Leviathan Adept',
+		desc: 'Kill the Leviathan once.',
+		type: 'kill_count',
+		monster: 'The Leviathan',
+		requirements: new Requirements().add({
+			kcRequirement: {
+				[Monsters.TheLeviathan.id]: 1
+			}
+		})
+	},
+	{
+		id: 1141,
+		name: 'Leviathan Speed-Trialist',
+		desc: 'Kill the Leviathan in less than 1:50 without a slayer task.',
+		type: 'speed',
+		monster: 'The Leviathan',
+		rng: {
+			chancePerKill: 5,
+			hasChance: isCertainMonsterTrip(Monsters.TheLeviathan.id)
+		}
+	},
+	{
+		id: 1142,
+		name: 'Whisperer Speed-Trialist',
+		desc: 'Kill the Whisperer in less than 3:00 without a slayer task.',
+		type: 'speed',
+		monster: 'The Whisperer',
+		rng: {
+			chancePerKill: 5,
+			hasChance: isCertainMonsterTrip(Monsters.TheWhisperer.id)
+		}
+	},
+	{
+		id: 1143,
+		name: 'Tentacular',
+		desc: 'Kill the Whisperer whilst only being on the Arceuus spellbook.',
+		type: 'restriction',
+		monster: 'The Whisperer',
+		rng: {
+			chancePerKill: 5,
+			hasChance: isCertainMonsterTrip(Monsters.TheWhisperer.id)
+		}
+	},
+	{
+		id: 1144,
+		name: 'Whisperer Adept',
+		desc: 'Kill the Whisperer once.',
+		type: 'kill_count',
+		monster: 'The Whisperer',
+		requirements: new Requirements().add({
+			kcRequirement: {
+				[Monsters.TheWhisperer.id]: 1
+			}
+		})
+	},
+	{
+		id: 1145,
+		name: 'Vardorvis Speed-Trialist',
+		desc: 'Kill Vardorvis in less than 1:15 minutes without a slayer task.',
+		type: 'speed',
+		monster: 'Vardorvis',
+		rng: {
+			chancePerKill: 5,
+			hasChance: isCertainMonsterTrip(Monsters.Vardorvis.id)
+		}
+	},
+	{
+		id: 1146,
+		name: 'Vardorvis Adept',
+		desc: 'Kill Vardorvis once.',
+		type: 'kill_count',
+		monster: 'Vardorvis',
+		requirements: new Requirements().add({
+			kcRequirement: {
+				[Monsters.Vardorvis.id]: 1
+			}
+		})
+	},
+	{
+		id: 1147,
+		name: 'Duke Sucellus Speed-Trialist',
+		desc: 'Kill Duke Sucellus in less than 1:45 minutes without a slayer task.',
+		type: 'speed',
+		monster: 'Duke Sucellus',
+		rng: {
+			chancePerKill: 5,
+			hasChance: isCertainMonsterTrip(Monsters.DukeSucellus.id)
+		}
+	},
+	{
+		id: 1148,
+		name: 'Duke Sucellus Adept',
+		desc: 'Kill Duke Sucellus once.',
+		type: 'kill_count',
+		monster: 'Duke Sucellus',
+		requirements: new Requirements().add({
+			kcRequirement: {
+				[Monsters.DukeSucellus.id]: 1
+			}
+		})
 	}
 ];