From f951920ebe357ce1388d41498a6ac30a5c30b043 Mon Sep 17 00:00:00 2001 From: Arodab Date: Sat, 19 Oct 2024 14:06:24 -0300 Subject: [PATCH] wiki --- .../content/docs/osb/Skills/fishing/README.md | 62 +++++++++---------- scripts/wiki.ts | 15 ++--- src/lib/skilling/skills/fishing.ts | 2 +- src/mahoji/commands/fish.ts | 10 +-- 4 files changed, 45 insertions(+), 44 deletions(-) diff --git a/docs/src/content/docs/osb/Skills/fishing/README.md b/docs/src/content/docs/osb/Skills/fishing/README.md index 22cd69a3d0..2160a2447d 100644 --- a/docs/src/content/docs/osb/Skills/fishing/README.md +++ b/docs/src/content/docs/osb/Skills/fishing/README.md @@ -59,57 +59,55 @@ Your minion can partake in the fishing trawler mini game using `/minigames fishi | Spot | XP/Hr | Powerfishing | Spirit Flakes | | ----------------- | ---------- | ------------ | ------------- | +| Tuna/Swordfish | 133,500/hr | Yes | No | | Barbarian fishing | 109,000/hr | Yes | No | -| Tuna/Swordfish | 104,000/hr | Yes | No | | Trout/Salmon | 95,000/hr | Yes | No | | Barbarian fishing | 56,000/hr | No | No | -| Minnow | 54,500/hr | Yes | No | | Minnow | 54,500/hr | No | Yes | | Minnow | 54,500/hr | No | No | -| Barbarian fishing | 52,500/hr | No | Yes | -| Trout/Salmon | 50,000/hr | No | No | -| Trout/Salmon | 49,000/hr | No | Yes | +| Barbarian fishing | 53,500/hr | No | Yes | +| Trout/Salmon | 49,500/hr | No | No | +| Trout/Salmon | 47,500/hr | No | Yes | | Karambwan | 46,500/hr | Yes | No | +| Tuna/Swordfish | 44,000/hr | No | No | +| Tuna/Swordfish | 43,000/hr | No | Yes | | Karambwan | 43,000/hr | No | No | | Karambwan | 41,500/hr | No | Yes | +| Dark crab | 40,500/hr | No | Yes | +| Dark crab | 40,000/hr | Yes | No | +| Dark crab | 39,500/hr | No | No | +| Monkfish | 38,500/hr | Yes | No | | Infernal eel | 38,000/hr | Yes | No | -| Monkfish | 37,500/hr | Yes | No | | Infernal eel | 37,500/hr | No | Yes | -| Monkfish | 36,500/hr | No | Yes | -| Monkfish | 36,500/hr | No | No | -| Infernal eel | 36,500/hr | No | No | -| Tuna/Swordfish | 34,000/hr | No | No | -| Tuna/Swordfish | 33,000/hr | No | Yes | -| Lobster | 32,500/hr | Yes | No | -| Lobster | 31,500/hr | No | No | -| Lobster | 31,000/hr | No | Yes | -| Mackerel/Cod/Bass | 28,000/hr | Yes | No | +| Infernal eel | 37,500/hr | No | No | +| Monkfish | 37,000/hr | No | No | +| Monkfish | 36,000/hr | No | Yes | +| Lobster | 32,000/hr | Yes | No | +| Lobster | 32,000/hr | No | Yes | +| Lobster | 32,000/hr | No | No | | Cave eel | 28,000/hr | Yes | No | -| Mackerel/Cod/Bass | 27,000/hr | No | No | -| Cave eel | 26,000/hr | No | No | -| Cave eel | 25,500/hr | No | Yes | +| Mackerel/Cod/Bass | 27,000/hr | Yes | No | +| Cave eel | 26,500/hr | No | No | +| Mackerel/Cod/Bass | 26,000/hr | No | No | +| Cave eel | 26,000/hr | No | Yes | | Mackerel/Cod/Bass | 25,000/hr | No | Yes | | Pike | 25,000/hr | Yes | No | | Sardine/Herring | 24,500/hr | Yes | No | -| Pike | 24,500/hr | No | No | +| Pike | 24,000/hr | No | No | | Pike | 23,500/hr | No | Yes | | Shrimps/Anchovies | 23,000/hr | Yes | No | +| Shark | 23,000/hr | Yes | No | | Sardine/Herring | 22,500/hr | No | No | -| Sardine/Herring | 22,000/hr | No | Yes | +| Shark | 22,000/hr | No | Yes | +| Shark | 22,000/hr | No | No | +| Sardine/Herring | 21,500/hr | No | Yes | | Shrimps/Anchovies | 20,500/hr | No | No | | Shrimps/Anchovies | 20,000/hr | No | Yes | -| Karambwanji | 19,000/hr | Yes | No | -| Karambwanji | 19,000/hr | No | Yes | -| Karambwanji | 19,000/hr | No | No | -| Anglerfish | 19,000/hr | Yes | No | -| Dark crab | 19,000/hr | No | Yes | -| Dark crab | 19,000/hr | No | No | -| Anglerfish | 18,500/hr | No | Yes | -| Anglerfish | 18,500/hr | No | No | -| Dark crab | 18,500/hr | Yes | No | -| Shark | 16,500/hr | Yes | No | -| Shark | 16,500/hr | No | Yes | -| Shark | 16,000/hr | No | No | +| Anglerfish | 19,500/hr | Yes | No | +| Anglerfish | 19,000/hr | No | No | +| Anglerfish | 18,000/hr | No | Yes | +| Karambwanji | 4,500/hr | No | Yes | +| Karambwanji | 4,500/hr | No | No | {/_ DO NOT EDIT - This section is auto-generated by the build script _/} [[embed.fishing.end]] diff --git a/scripts/wiki.ts b/scripts/wiki.ts index f0bcc06a4d..d0bc8cbeb0 100644 --- a/scripts/wiki.ts +++ b/scripts/wiki.ts @@ -465,7 +465,7 @@ function fishingXPHr() { for (const spiritFlakes of [true, false]) { const cmd = determineFishingTrip({ hasWildyEliteDiary: true, - baseMaxTripLength: Time.Hour * 30, + baseMaxTripLength: Time.Hour * 50, spot, gearBank, quantity: undefined, @@ -491,7 +491,7 @@ function fishingXPHr() { allFishingResults.sort((a, b) => b.xpHr - a.xpHr); allFishingResults = uniqueBy(allFishingResults, i => - [i.spot.id, i.cmd.isPowerfishing, i.cmd.isUsingSpiritFlakes, i.cmd.boosts].flat(100).join('|') + [i.spot.name, i.cmd.isPowerfishing, i.cmd.isUsingSpiritFlakes, i.cmd.boosts].flat(100).join('|') ); const markdown = new Markdown(); @@ -500,7 +500,7 @@ function fishingXPHr() { const table = new Table(); table.addHeader('Spot', 'XP/Hr', 'Powerfishing', 'Spirit Flakes'); - for (const { cmd, trip, xpHr, spot } of allFishingResults) { + for (const { cmd, xpHr, spot } of allFishingResults) { if (typeof cmd === 'string') throw new Error(cmd); table.addRow( spot.name, @@ -515,10 +515,11 @@ function fishingXPHr() { } async function wiki() { - renderQuestsMarkdown(); - rendeCoxMarkdown(); - wikiIssues(); - await Promise.all([renderCAMarkdown(), renderMonstersMarkdown()]); + //renderQuestsMarkdown(); + //rendeCoxMarkdown(); + //wikiIssues(); + fishingXPHr(); + //await Promise.all([renderCAMarkdown(), renderMonstdersMarkdown()]); process.exit(0); } diff --git a/src/lib/skilling/skills/fishing.ts b/src/lib/skilling/skills/fishing.ts index 86ab855fc4..524c9befd3 100644 --- a/src/lib/skilling/skills/fishing.ts +++ b/src/lib/skilling/skills/fishing.ts @@ -392,7 +392,7 @@ const fishes: Fish[] = [ petChance: 426_954, bait: itemID('Feather'), clueScrollChance: 426_954, - lostTicks: 0.1, + lostTicks: 0.09, bankingTime: 40, ticksPerRoll: 5 } diff --git a/src/mahoji/commands/fish.ts b/src/mahoji/commands/fish.ts index c1b39eb10a..f768c4725e 100644 --- a/src/mahoji/commands/fish.ts +++ b/src/mahoji/commands/fish.ts @@ -131,7 +131,7 @@ function determineFishingTime({ } else if (fish.name === 'Tuna/Swordfish') { if (isPowerfishing) { ticksPerRoll = 2; - lostTicks = 0.06; + lostTicks = 0.05; } } @@ -148,7 +148,6 @@ function determineFishingTime({ ticksElapsed += ticksPerRoll * (1 + lostTicks); - // Check if we've caught the required quantity if (catches.reduce((acc, curr) => acc + curr, 0) >= quantity) { break; } @@ -173,7 +172,6 @@ function determineFishingTime({ ticksElapsed += ticksPerRoll * (1 + lostTicks); - // Check if we've caught the required quantity if (catches.reduce((acc, curr) => acc + curr, 0) >= quantity) { break; } @@ -230,7 +228,11 @@ export function determineFishingTrip({ }) { let quantity = options.quantity ?? 3000; let isUsingSpiritFlakes = options.spirit_flakes ?? false; - const isPowerfishing = options.powerfish ?? false; + let isPowerfishing = options.powerfish ?? false; + + if (spot.name === 'Minnow' || spot.name === 'Karambwanji') { + isPowerfishing = false; // stackable fish + } if (isPowerfishing) { isUsingSpiritFlakes = false; }