diff --git a/docs/src/content/docs/osb/Skills/fishing/README.md b/docs/src/content/docs/osb/Skills/fishing/README.md index 3d8b80582e..3a9eba7de0 100644 --- a/docs/src/content/docs/osb/Skills/fishing/README.md +++ b/docs/src/content/docs/osb/Skills/fishing/README.md @@ -53,61 +53,60 @@ Your minion can partake in the fishing trawler mini game using `/minigames fishi - \+50% amount of fish received for [Elite Ardougne Diary](../../miscellaneous/achievement-diaries.md#ardougne-diary-elite) [[embed.fishing.start]] -{/_ DO NOT EDIT - This section is auto-generated by the build script _/} - +{/* DO NOT EDIT - This section is auto-generated by the build script */} ## XP Rates -| Spot | XP/Hr | Powerfishing | Spirit Flakes | -| ----------------- | ---------- | ------------ | ------------- | -| Tuna/Swordfish | 133,000/hr | Yes | No | -| Barbarian fishing | 108,500/hr | Yes | No | -| Trout/Salmon | 94,000/hr | Yes | No | -| Barbarian fishing | 56,000/hr | No | No | -| Minnow | 54,500/hr | No | Yes | -| Minnow | 54,500/hr | No | No | -| Barbarian fishing | 53,000/hr | No | Yes | -| Trout/Salmon | 50,500/hr | No | No | -| Trout/Salmon | 47,500/hr | No | Yes | -| Karambwan | 47,500/hr | Yes | No | -| Karambwan | 43,500/hr | No | No | -| Tuna/Swordfish | 43,000/hr | No | No | -| Tuna/Swordfish | 42,500/hr | No | Yes | -| Karambwan | 42,500/hr | No | Yes | -| Dark crab | 41,000/hr | No | Yes | -| Dark crab | 40,500/hr | Yes | No | -| Dark crab | 40,000/hr | No | No | -| Monkfish | 37,500/hr | Yes | No | -| Infernal eel | 37,500/hr | Yes | No | -| Monkfish | 36,500/hr | No | No | -| Infernal eel | 36,500/hr | No | Yes | -| Monkfish | 36,000/hr | No | Yes | -| Infernal eel | 36,000/hr | No | No | -| Lobster | 33,000/hr | Yes | No | -| Lobster | 32,000/hr | No | No | -| Lobster | 31,500/hr | No | Yes | -| Cave eel | 28,000/hr | Yes | No | -| Mackerel/Cod/Bass | 27,000/hr | Yes | No | -| Cave eel | 26,500/hr | No | No | -| Mackerel/Cod/Bass | 25,500/hr | No | No | -| Cave eel | 25,500/hr | No | Yes | -| Mackerel/Cod/Bass | 25,000/hr | No | Yes | -| Sardine/Herring | 24,500/hr | Yes | No | -| Pike | 24,500/hr | Yes | No | -| Pike | 24,000/hr | No | No | -| Pike | 23,500/hr | No | Yes | -| Shark | 23,000/hr | No | No | -| Shrimps/Anchovies | 22,500/hr | Yes | No | -| Sardine/Herring | 22,500/hr | No | No | -| Shark | 22,500/hr | Yes | No | -| Shark | 22,000/hr | No | Yes | -| Sardine/Herring | 21,500/hr | No | Yes | -| Shrimps/Anchovies | 20,000/hr | No | Yes | -| Shrimps/Anchovies | 20,000/hr | No | No | -| Anglerfish | 19,000/hr | Yes | No | -| Anglerfish | 19,000/hr | No | No | -| Anglerfish | 18,500/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 _/} +| Spot | XP/Hr | Powerfishing | Spirit Flakes | +| --- | --- | --- | --- | +| Tuna/Swordfish | 133,500/hr | Yes | No | +| Barbarian fishing | 109,000/hr | Yes | No | +| Trout/Salmon | 94,000/hr | Yes | No | +| Barbarian fishing | 56,000/hr | No | No | +| Minnow | 55,000/hr | No | Yes | +| Minnow | 54,500/hr | No | No | +| Barbarian fishing | 53,000/hr | No | Yes | +| Trout/Salmon | 50,000/hr | No | No | +| Trout/Salmon | 48,500/hr | No | Yes | +| Karambwan | 46,500/hr | Yes | No | +| Tuna/Swordfish | 43,000/hr | No | No | +| Karambwan | 42,500/hr | No | No | +| Tuna/Swordfish | 42,000/hr | No | Yes | +| Karambwan | 41,500/hr | No | Yes | +| Dark crab | 40,500/hr | No | No | +| Dark crab | 40,000/hr | Yes | No | +| Dark crab | 40,000/hr | No | Yes | +| Monkfish | 39,000/hr | Yes | No | +| Infernal eel | 37,500/hr | No | Yes | +| Infernal eel | 37,500/hr | No | No | +| Infernal eel | 37,000/hr | Yes | No | +| Monkfish | 36,500/hr | No | Yes | +| Monkfish | 36,500/hr | No | No | +| Lobster | 32,000/hr | Yes | No | +| Lobster | 32,000/hr | No | No | +| Lobster | 31,000/hr | No | Yes | +| Cave eel | 27,500/hr | Yes | No | +| Mackerel/Cod/Bass | 27,000/hr | Yes | No | +| Cave eel | 26,500/hr | No | No | +| Mackerel/Cod/Bass | 25,500/hr | No | No | +| Cave eel | 25,500/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 | 23,500/hr | No | No | +| Pike | 23,000/hr | No | Yes | +| Shrimps/Anchovies | 22,500/hr | Yes | No | +| Sardine/Herring | 22,500/hr | No | No | +| Shark | 22,500/hr | Yes | No | +| Sardine/Herring | 21,500/hr | No | Yes | +| Shark | 21,500/hr | No | No | +| Shark | 21,000/hr | No | Yes | +| Shrimps/Anchovies | 20,500/hr | No | No | +| Shrimps/Anchovies | 20,000/hr | No | Yes | +| Anglerfish | 19,000/hr | Yes | No | +| Anglerfish | 18,500/hr | No | Yes | +| Anglerfish | 18,500/hr | No | No | +| 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/src/tasks/minions/fishingActivity.ts b/src/tasks/minions/fishingActivity.ts index cb63f8b9d1..772ea7068c 100644 --- a/src/tasks/minions/fishingActivity.ts +++ b/src/tasks/minions/fishingActivity.ts @@ -50,6 +50,7 @@ export function determineFishingResult({ const updateBank = new UpdateBank(); const fishingLevel = gearBank.skillsAsLevels.fishing; const minnowRange = determineMinnowRange(fishingLevel); + const messages: string[] = []; let totalXP = 0; let totalOtherXP = 0; @@ -76,7 +77,9 @@ export function determineFishingResult({ const anglerBoost = determineAnglerBoost({ gearBank }); if (anglerBoost > 0) { - updateBank.xpBank.add('fishing', (updateBank.xpBank.amount('fishing') * anglerBoost) / 100); + const bonusXP = (updateBank.xpBank.amount('fishing') * anglerBoost) / 100; + updateBank.xpBank.add('fishing', bonusXP); + messages.push(`**Bonus XP:** ${bonusXP.toFixed(1)} (+${anglerBoost.toFixed(1)}%) XP for angler`); } if (spot.name === 'Minnow') { @@ -124,7 +127,8 @@ export function determineFishingResult({ return { updateBank, - totalCatches + totalCatches, + messages }; } @@ -168,7 +172,7 @@ export const fishingTask: MinionTask = { const fishLvl = user.skillLevel(SkillsEnum.Fishing); const fish = Fishing.Fishes.find(fish => fish.name === fishID)!; - const { updateBank, totalCatches } = determineFishingResult({ + const { updateBank, totalCatches, messages } = determineFishingResult({ gearBank: user.gearBank, spot: fish, spiritFlakesToRemove: flakesToRemove, @@ -187,6 +191,10 @@ export const fishingTask: MinionTask = { str += `\nYou received ${updateResult.itemTransactionResult?.itemsAdded}.`; } + if (messages.length > 0) { + str += `\n${messages.join(', ')}.`; + } + if (updateBank.itemLootBank.has(EItem.HERON)) { str += "\nYou have a funny feeling you're being followed..."; globalClient.emit(