diff --git a/src/lib/skilling/skills/fishing.ts b/src/lib/skilling/skills/fishing.ts
index 859c2f636d..9517b6580c 100644
--- a/src/lib/skilling/skills/fishing.ts
+++ b/src/lib/skilling/skills/fishing.ts
@@ -1,239 +1,400 @@
+import { sumArr } from 'e';
 import { Emoji } from '../../constants';
+import type { GearBank } from '../../structures/GearBank';
+import { EItem } from 'oldschooljs';
 import itemID from '../../util/itemID';
 import type { Fish } from '../types';
 import { SkillsEnum } from '../types';
 
 const fishes: Fish[] = [
 	{
-		level: 1,
-		xp: 10,
-		id: itemID('Raw shrimps'),
-		name: 'Shrimps',
+		name: 'Shrimps/Anchovies',
+		subfishes: [
+			{
+				id: itemID('Raw shrimps'),
+				level: 1,
+				xp: 10,
+				intercept: 0.1373, // catch chance for fish 1 at lvl 1
+				slope: 0.0083
+			},
+			{
+				id: itemID('Raw anchovies'),
+				level: 15,
+				xp: 40,
+				intercept: 0.0937,
+				slope: 0.0042
+			}
+		],
+
 		petChance: 435_165,
-		timePerFish: 3.6,
-		clueScrollChance: 870_330
+		clueScrollChance: 435_165,
+		lostTicks: 0.1, // percentage of ticks spent moving/dropping,
+		bankingTime: 30,
+		ticksPerRoll: 6
 	},
 	{
-		level: 5,
-		xp: 20,
-		id: itemID('Raw sardine'),
-		name: 'Sardine',
-		petChance: 528_000,
+		name: 'Sardine/Herring',
+		subfishes: [
+			{
+				id: itemID('Raw sardine'),
+				level: 5,
+				xp: 20,
+				intercept: 0.1267,
+				slope: 0.0064
+			},
+			{
+				id: itemID('Raw herring'),
+				level: 10,
+				xp: 30,
+				intercept: 0.1273,
+				slope: 0.0038
+			}
+		],
+
 		bait: itemID('Fishing bait'),
-		timePerFish: 3.6,
-		clueScrollChance: 1_056_000
+		petChance: 528_000,
+		clueScrollChance: 528_000,
+		lostTicks: 0.1,
+		bankingTime: 30,
+		ticksPerRoll: 5
 	},
 	{
-		level: 5,
-		xp: 20,
-		id: itemID('Raw karambwanji'),
 		name: 'Karambwanji',
+		subfishes: [
+			{
+				id: itemID('Raw karambwanji'),
+				level: 5,
+				xp: 5,
+				intercept: 0.3945,
+				slope: 0.006
+			}
+		],
+
 		petChance: 443_697,
 		qpRequired: 15,
-		timePerFish: 3.6,
-		clueScrollChance: 443_697
-	},
-	{
-		level: 10,
-		xp: 30,
-		id: itemID('Raw herring'),
-		name: 'Herring',
-		petChance: 528_000,
-		bait: itemID('Fishing bait'),
-		timePerFish: 3.6,
-		clueScrollChance: 1_056_000
+		clueScrollChance: 443_697,
+		lostTicks: 0.01,
+		bankingTime: 0,
+		ticksPerRoll: 6
 	},
 	{
-		level: 15,
-		xp: 40,
-		id: itemID('Raw anchovies'),
-		name: 'Anchovies',
-		petChance: 435_165,
-		timePerFish: 7,
-		clueScrollChance: 870_330
-	},
-	{
-		level: 16,
-		xp: 20,
-		id: itemID('Raw mackerel'),
-		name: 'Mackerel',
+		name: 'Mackerel/Cod/Bass',
+		subfishes: [
+			{
+				id: itemID('Raw mackerel'),
+				level: 16,
+				xp: 20,
+				intercept: 0.0645,
+				slope: 0.0023
+			},
+			{
+				id: itemID('Raw cod'),
+				level: 23,
+				xp: 45,
+				intercept: 0.0173,
+				slope: 0.0021
+			},
+			{
+				id: itemID('Raw bass'),
+				level: 46,
+				xp: 100,
+				intercept: 0.0156,
+				slope: 0.0015,
+				tertiary: { chance: 1000, id: itemID('Big bass') }
+			}
+		],
+
 		petChance: 382_609,
-		timePerFish: 3.6,
-		clueScrollChance: 1_147_827
+		clueScrollChance: 382_609,
+		lostTicks: 0.1,
+		bankingTime: 25,
+		ticksPerRoll: 6
 	},
 	{
-		level: 20,
-		xp: 50,
-		id: itemID('Raw trout'),
-		name: 'Trout',
+		name: 'Trout/Salmon',
+		subfishes: [
+			{
+				id: itemID('Raw trout'),
+				level: 20,
+				xp: 50,
+				intercept: 0.0174,
+				slope: 0.0075
+			},
+			{
+				id: itemID('Raw salmon'),
+				level: 30,
+				xp: 70,
+				intercept: 0.0683,
+				slope: 0.0032
+			}
+		],
+
 		petChance: 461_808,
 		bait: itemID('Feather'),
-		timePerFish: 4.5,
-		clueScrollChance: 923_616
-	},
-	{
-		level: 23,
-		xp: 45,
-		id: itemID('Raw cod'),
-		name: 'Cod',
-		petChance: 382_609,
-		timePerFish: 5,
-		clueScrollChance: 1_147_827
+		clueScrollChance: 461_808,
+		lostTicks: 0.1,
+		bankingTime: 30,
+		ticksPerRoll: 5
 	},
 	{
-		level: 25,
-		xp: 60,
-		id: itemID('Raw pike'),
 		name: 'Pike',
+		subfishes: [
+			{
+				id: itemID('Raw pike'),
+				level: 25,
+				xp: 60,
+				intercept: 0.0685,
+				slope: 0.0032
+			}
+		],
+
 		petChance: 305_792,
 		bait: itemID('Fishing bait'),
-		timePerFish: 6,
-		clueScrollChance: 305_792
+		clueScrollChance: 305_792,
+		lostTicks: 0.1,
+		bankingTime: 30,
+		ticksPerRoll: 5
 	},
 	{
-		level: 30,
-		xp: 70,
-		id: itemID('Raw salmon'),
-		name: 'Salmon',
-		petChance: 461_808,
-		bait: itemID('Feather'),
-		timePerFish: 5.04,
-		clueScrollChance: 923_616
-	},
-	{
-		level: 35,
-		xp: 80,
-		id: itemID('Raw tuna'),
-		name: 'Tuna',
-		petChance: 128_885,
-		timePerFish: 9.6,
-		clueScrollChance: 257_770
+		name: 'Tuna/Swordfish',
+		alias: ['sword, sf'],
+		subfishes: [
+			{
+				id: itemID('Raw tuna'),
+				level: 35,
+				xp: 80,
+				intercept: 0.0326,
+				slope: 0.0023
+			},
+			{
+				id: itemID('Raw swordfish'),
+				level: 50,
+				xp: 100,
+				intercept: 0.0196,
+				slope: 0.0018,
+				tertiary: { chance: 2500, id: itemID('Big swordfish') }
+			}
+		],
+
+		petChance: 257_770,
+		clueScrollChance: 257_770,
+		lostTicks: 0.1,
+		bankingTime: 25,
+		ticksPerRoll: 6
 	},
 	{
-		level: 38,
-		xp: 80,
-		id: itemID('Raw cave eel'),
 		name: 'Cave eel',
-		timePerFish: 12.6
+		subfishes: [
+			{
+				id: itemID('Raw cave eel'),
+				level: 38,
+				xp: 80,
+				intercept: 0.19,
+				slope: 0.0013
+			}
+		],
+
+		petChance: 257_770,
+		clueScrollChance: 257_770,
+		lostTicks: 0.1,
+		bankingTime: 40,
+		ticksPerRoll: 5
 	},
 	{
-		level: 40,
-		xp: 90,
-		id: itemID('Raw lobster'),
 		name: 'Lobster',
+		alias: ['lobs'],
+		subfishes: [
+			{
+				id: itemID('Raw lobster'),
+				level: 40,
+				xp: 90,
+				intercept: 0.0247,
+				slope: 0.0036
+			}
+		],
+
 		petChance: 116_129,
-		timePerFish: 11,
-		clueScrollChance: 116_129
-	},
-	{
-		level: 46,
-		xp: 100,
-		id: itemID('Raw bass'),
-		name: 'Bass',
-		petChance: 382_609,
-		timePerFish: 10.3,
-		bigFish: itemID('Big bass'),
-		bigFishRate: 1000,
-		clueScrollChance: 1_147_827
+		clueScrollChance: 116_129,
+		lostTicks: 0.1,
+		bankingTime: 25,
+		ticksPerRoll: 6
 	},
 	{
-		level: 50,
-		xp: 100,
-		id: itemID('Raw swordfish'),
-		name: 'Swordfish',
-		alias: ['sword'],
-		petChance: 128_885,
-		timePerFish: 11,
-		bigFish: itemID('Big swordfish'),
-		bigFishRate: 2500,
-		clueScrollChance: 257_770
-	},
-	{
-		level: 62,
-		xp: 120,
-		id: itemID('Raw monkfish'),
 		name: 'Monkfish',
 		alias: ['monk'],
+		subfishes: [
+			{
+				id: itemID('Raw monkfish'),
+				level: 62,
+				xp: 120,
+				intercept: 0.19,
+				slope: 0.0017
+			}
+		],
+
 		petChance: 138_583,
 		qpRequired: 100,
-		timePerFish: 13.5,
-		clueScrollChance: 138_583
+		clueScrollChance: 138_583,
+		lostTicks: 0.13,
+		bankingTime: 20,
+		ticksPerRoll: 6
 	},
 	{
-		level: 65,
-		xp: 50,
-		id: itemID('Raw karambwan'),
 		name: 'Karambwan',
+		alias: ['karam'],
+		subfishes: [
+			{
+				id: itemID('Raw karambwan'),
+				level: 65,
+				xp: 50,
+				intercept: 0.021,
+				slope: 0.0062
+			}
+		],
+
 		petChance: 170_874,
 		bait: itemID('Raw karambwanji'),
-		timePerFish: 4.5,
-		clueScrollChance: 170_874
+		clueScrollChance: 170_874,
+		lostTicks: 0.01, // fishing spots never moves
+		bankingTime: 25,
+		ticksPerRoll: 4
 	},
 	{
-		level: 76,
-		xp: 110,
-		id: itemID('Raw shark'),
 		name: 'Shark',
+		alias: ['shark'],
+		subfishes: [
+			{
+				id: itemID('Raw shark'),
+				level: 76,
+				xp: 110,
+				intercept: 0.0102,
+				slope: 0.0015,
+				tertiary: { chance: 5000, id: itemID('Big shark') }
+			}
+		],
+
 		petChance: 82_243,
-		timePerFish: 30,
-		bigFish: itemID('Big shark'),
-		bigFishRate: 5000,
-		clueScrollChance: 82_243
+		clueScrollChance: 82_243,
+		lostTicks: 0.1,
+		bankingTime: 25,
+		ticksPerRoll: 6
+	},
+	{
+		name: 'Infernal eel',
+		subfishes: [
+			{
+				id: itemID('Infernal eel'),
+				level: 80,
+				xp: 95,
+				intercept: 0.1253,
+				slope: 0.0025
+			}
+		],
+
+		petChance: 160_000,
+		bait: itemID('Fishing bait'),
+		clueScrollChance: 165_000,
+		lostTicks: 0.13,
+		bankingTime: 0,
+		ticksPerRoll: 5
 	},
 	{
-		level: 82,
-		xp: 120,
-		id: itemID('Raw anglerfish'),
 		name: 'Anglerfish',
 		alias: ['angler'],
+		subfishes: [
+			{
+				id: itemID('Raw anglerfish'),
+				level: 82,
+				xp: 120,
+				intercept: 0.0096,
+				slope: 0.0014
+			}
+		],
+
 		petChance: 78_649,
 		bait: itemID('Sandworms'),
 		qpRequired: 40,
-		timePerFish: 18.75,
-		clueScrollChance: 78_649
+		clueScrollChance: 78_649,
+		lostTicks: 0.1,
+		bankingTime: 30,
+		ticksPerRoll: 5
 	},
 	{
-		level: 82,
-		xp: 26.1,
-		id: itemID('Minnow'),
 		name: 'Minnow',
 		alias: ['minnows'],
+		subfishes: [
+			{
+				id: itemID('Minnow'),
+				level: 82,
+				xp: 26.1,
+				intercept: -0.569, // no info on catch chance
+				slope: 0.0153 // handpicked to match wiki rates
+			}
+		],
+
 		petChance: 977_778,
 		qpRequired: 1,
-		timePerFish: 2.14,
-		clueScrollChance: 977_778
+		clueScrollChance: 977_778,
+		lostTicks: 0.33,
+		bankingTime: 0, // stackable
+		ticksPerRoll: 2
 	},
 	{
-		level: 85,
-		xp: 130,
-		id: itemID('Raw dark crab'),
 		name: 'Dark crab',
 		alias: ['crab', 'dark'],
+		subfishes: [
+			{
+				id: itemID('Raw dark crab'),
+				level: 85,
+				xp: 130,
+				intercept: 0.023,
+				slope: 0.0014
+			}
+		],
+
 		petChance: 149_434,
 		bait: itemID('Dark fishing bait'),
-		timePerFish: 11.7,
-		clueScrollChance: 149_434
+		clueScrollChance: 149_434,
+		lostTicks: 0.1,
+		bankingTime: 0,
+		ticksPerRoll: 6
 	},
 	{
-		level: 48,
-		xp: 130,
-		id: itemID('Leaping trout'),
 		name: 'Barbarian fishing',
 		alias: ['barb', 'barbarian'],
+		subfishes: [
+			{
+				id: itemID('Leaping trout'),
+				level: 48,
+				xp: 50,
+				intercept: 32 / 255,
+				slope: (192 - 32) / 255 / 98,
+				otherXP: 5
+			},
+			{
+				id: itemID('Leaping salmon'),
+				level: 58,
+				xp: 70,
+				intercept: 16 / 255,
+				slope: (96 - 16) / 255 / 98,
+				otherXP: 6
+			},
+			{
+				id: itemID('Leaping sturgeon'),
+				level: 70,
+				xp: 80,
+				intercept: 8 / 255,
+				slope: (64 - 8) / 255 / 98,
+				otherXP: 7
+			}
+		],
+
 		petChance: 426_954,
 		bait: itemID('Feather'),
-		timePerFish: 3,
-		clueScrollChance: 1_280_862
-	},
-	{
-		level: 80,
-		xp: 95,
-		id: itemID('Infernal eel'),
-		name: 'Infernal eel',
-		petChance: 160_000,
-		bait: itemID('Fishing bait'),
-		timePerFish: 12.4,
-		clueScrollChance: 165_000
+		clueScrollChance: 426_954,
+		lostTicks: 0.09,
+		bankingTime: 40,
+		ticksPerRoll: 5
 	}
 ];
 
@@ -277,6 +438,34 @@ const camdozaalFishes: Fish[] = [
 	}
 ];
 
+export const anglerItemsArr = [
+	{
+		id: EItem.ANGLER_HAT,
+		boost: 0.4
+	},
+
+	{
+		id: EItem.ANGLER_TOP,
+		boost: 0.8
+	},
+
+	{
+		id: EItem.ANGLER_WADERS,
+		boost: 0.6
+	},
+
+	{
+		id: EItem.ANGLER_BOOTS,
+		boost: 0.2
+	}
+] as const;
+
+export function determineAnglerBoost({ gearBank }: { gearBank: GearBank }) {
+	const equippedPieces = anglerItemsArr.filter(item => gearBank.hasEquipped(item.id));
+	if (equippedPieces.length === 4) return 2.5;
+	return sumArr(equippedPieces.map(item => item.boost));
+}
+
 const anglerItems: { [key: number]: number } = {
 	[itemID('Angler hat')]: 0.4,
 	[itemID('Angler top')]: 0.8,