fix barb str/agi xp

Arodab · Oct 19, 2024 · 7b13418 · 7b13418
1 parent a7f251b
commit 7b13418
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 24 deletions.
diff --git a/src/lib/skilling/skills/fishing.ts b/src/lib/skilling/skills/fishing.ts
@@ -369,32 +369,23 @@ const fishes: Fish[] = [
 				xp: 50,
 				intercept: 32 / 255,
 				slope: (192 - 32) / 255 / 98,
-				otherXP: {
-					[SkillsEnum.Strength]: 5, // Experience points for Strength
-					[SkillsEnum.Agility]: 5 // Experience points for Agility
-				}
+				otherXP: 5
 			},
 			{
 				id: itemID('Leaping salmon'),
 				level: 58,
 				xp: 70,
 				intercept: 16 / 255,
 				slope: (96 - 16) / 255 / 98,
-				otherXP: {
-					[SkillsEnum.Strength]: 6, // Experience points for Strength
-					[SkillsEnum.Agility]: 6 // Experience points for Agility
-				}
+				otherXP: 6
 			},
 			{
 				id: itemID('Leaping sturgeon'),
 				level: 70,
 				xp: 80,
 				intercept: 8 / 255,
 				slope: (64 - 8) / 255 / 98,
-				otherXP: {
-					[SkillsEnum.Strength]: 7, // Experience points for Strength
-					[SkillsEnum.Agility]: 7 // Experience points for Agility
-				}
+				otherXP: 7
 			}
 		],
 

diff --git a/src/lib/skilling/types.ts b/src/lib/skilling/types.ts
@@ -1,6 +1,6 @@
 import type { Bank, Item, LootTable } from 'oldschooljs';
 
-import type { Skills } from '../../lib/types';
+//import type { Skills } from '../../lib/types';
 import type { Emoji } from '../constants';
 import type { QuestID } from '../minions/data/quests';
 import type { SlayerTaskUnlocksEnum } from '../slayer/slayerUnlocks';
@@ -116,7 +116,7 @@ export interface FishInSpot {
 	xp: number;
 	intercept: number;
 	slope: number;
-	otherXP?: Omit<Skills, 'fishing'>;
+	otherXP?: number; // Omit<Skills, 'fishing'>;
 	/**
 	 * Items that have a tertiary chance to drop from catching one of these fish, i.e "Big swordfish" from swordfish.
 	 *

diff --git a/src/mahoji/commands/fish.ts b/src/mahoji/commands/fish.ts
@@ -110,7 +110,6 @@ function determineFishingTime({
 		probabilities[0] = harpoonBoost * (adjustedIntercept + (effFishLvl - 1) * adjustedSlope);
 	}
 
-	console.log(probabilities);
 	let ticksPerRoll = fish.ticksPerRoll!;
 	let lostTicks = fish.lostTicks!;
 	let bankingTime = fish.bankingTime;

diff --git a/src/tasks/minions/fishingActivity.ts b/src/tasks/minions/fishingActivity.ts
@@ -1,4 +1,5 @@
-import { objectEntries, randInt, sumArr } from 'e';
+import { randInt, sumArr } from 'e';
+//import { objectEntries, randInt, sumArr } from 'e';
 import { EItem } from 'oldschooljs';
 import { z } from 'zod';
 
@@ -50,16 +51,14 @@ export function determineFishingResult({
 	const fishingLevel = gearBank.skillsAsLevels.fishing;
 	const minnowRange = determineMinnowRange(fishingLevel);
 	let totalXP = 0;
+	let totalOtherXP = 0;
 
 	for (const { fish, quantity, loot } of fishingSpotResults) {
 		totalXP += quantity * fish.xp;
-		console.log(totalXP);
 		updateBank.itemLootBank.add(fish.id, loot);
 
-		if ('otherXP' in fish && fish.otherXP) {
-			for (const [skillName, xp] of objectEntries(fish.otherXP)) {
-				updateBank.xpBank.add(skillName, quantity * xp!);
-			}
+		if ('otherXP' in fish) {
+			totalOtherXP += quantity * fish.otherXP!;
 		}
 
 		if (fish.tertiary) {
@@ -70,6 +69,10 @@ export function determineFishingResult({
 		}
 	}
 	updateBank.xpBank.add('fishing', totalXP);
+	if (totalOtherXP > 0) {
+		updateBank.xpBank.add('strength', totalOtherXP);
+		updateBank.xpBank.add('agility', totalOtherXP);
+	}
 
 	const anglerBoost = determineAnglerBoost({ gearBank });
 	if (anglerBoost > 0) {
@@ -137,7 +140,8 @@ export function temporaryFishingDataConvert(fish: Fish, Qty: number[], loot: num
 					level: subfish.level,
 					intercept: subfish.intercept!,
 					slope: subfish.slope!,
-					xp: subfish.xp
+					xp: subfish.xp,
+					otherXP: subfish.otherXP ?? 0
 				},
 				quantity: Qty[i],
 				loot: loot[i]
@@ -163,7 +167,7 @@ export const fishingTask: MinionTask = {
 		const user = await mUserFetch(userID);
 		const fishLvl = user.skillLevel(SkillsEnum.Fishing);
 		const fish = Fishing.Fishes.find(fish => fish.name === fishID)!;
-		console.log('test');
+
 		const { updateBank, totalCatches } = determineFishingResult({
 			gearBank: user.gearBank,
 			spot: fish,
@@ -178,7 +182,7 @@ export const fishingTask: MinionTask = {
 		}
 
 		let str = `${user}, ${user.minionName} finished fishing ${totalCatches} ${fish.name}. You received ${updateBank.xpBank}.`;
-		console.log(Qty);
+
 		if (loot[0]) {
 			str += `\nYou received ${updateResult.itemTransactionResult?.itemsAdded}.`;
 		}