Solis & Clue Tame

prisma/schema.prisma

@@ -187,8 +187,6 @@ model ClientStorage {
 
   xmas_ironman_food_bank Json @default("{}") @db.Json
 
-  divination_is_released Boolean @default(false)
-
   @@map("clientStorage")
 }
 
@@ -757,6 +755,14 @@ model Tame {
 
   total_cost Json @default("{}") @db.Json
 
+  demonic_jibwings_saved_cost Json @default("{}") @db.JsonB
+  third_age_jibwings_loot     Json @default("{}") @db.JsonB
+  abyssal_jibwings_loot       Json @default("{}") @db.JsonB
+  implings_loot               Json @default("{}") @db.JsonB
+
+  last_activity_date   DateTime? @db.Timestamp(6)
+  levels_from_egg_feed Int?
+
   tame_activity TameActivity[]
 
   @@index([user_id])

src/lib/MUser.ts

@@ -1,11 +1,12 @@
 import { userMention } from '@discordjs/builders';
 import { UserError } from '@oldschoolgg/toolkit/dist/lib/UserError';
-import { Prisma, User, UserStats, xp_gains_skill_enum } from '@prisma/client';
+import { Prisma, TameActivity, User, UserStats, xp_gains_skill_enum } from '@prisma/client';
 import { calcWhatPercent, objectEntries, randArrItem, sumArr, Time, uniqueArr } from 'e';
 import { Bank } from 'oldschooljs';
 import { EquipmentSlot, Item } from 'oldschooljs/dist/meta/types';
 
 import { timePerAlch } from '../mahoji/lib/abstracted_commands/alchCommand';
+import { getParsedStashUnits } from '../mahoji/lib/abstracted_commands/stashUnitsCommand';
 import { userStatsUpdate } from '../mahoji/mahojiSettings';
 import { addXP } from './addXP';
 import { GodFavourBank, GodName } from './bso/divineDominion';
@@ -420,7 +421,7 @@
 
 		for (const setup of Object.values(this.gear)) {
 			for (const equipped of Object.values(setup)) {
 				if (equipped?.item) {
 					bank.add(equipped.item, equipped.quantity);
 				}
 			}
@@ -615,10 +616,10 @@
 			}
 			const scales = Math.ceil((10 / 3) * dart[1]);
 			const rawBlowpipeData = this.blowpipe;
 			if (!this.allItemsOwned.has('Toxic blowpipe') || !rawBlowpipeData) {
 				throw new UserError("You don't have a Toxic blowpipe.");
 			}
 			if (!rawBlowpipeData.dartID || !rawBlowpipeData.dartQuantity) {
 				throw new UserError('You have no darts in your Toxic blowpipe.');
 			}
 			if (rawBlowpipeData.dartQuantity < dart[1]) {
@@ -628,7 +629,7 @@
 					)}s in your Toxic blowpipe, you need ${dart[1]}, but you have only ${rawBlowpipeData.dartQuantity}.`
 				);
 			}
 			if (!rawBlowpipeData.scales || rawBlowpipeData.scales < scales) {
 				throw new UserError(
 					`You don't have enough Zulrah's scales in your Toxic blowpipe, you need ${scales} but you have only ${rawBlowpipeData.scales}.`
 				);
@@ -769,7 +770,7 @@
 
 	private buildPaintedItems(): Map<number, number> {
 		const rawPaintedItems = this.user.painted_items_tuple;
 		if (!rawPaintedItems) return new Map();
 		return new Map(rawPaintedItems as [number, number][]);
 	}
 
@@ -780,7 +781,7 @@
 
 	async getGodFavour(): Promise<GodFavourBank> {
 		let { god_favour_bank: currentFavour } = await this.fetchStats({ god_favour_bank: true });
 		if (!currentFavour) {
 			return {
 				Zamorak: 0,
 				Armadyl: 0,
@@ -842,7 +843,7 @@
 		);
 		const track = mysteriousTrailTracks.find(i => i.id === trackID)!;
 		const step = track.steps[currentStepID - 1];
 		if (!step) {
 			throw new Error(`No step for ${currentStepID} ${this.id}`);
 		}
 		return {
@@ -900,13 +901,13 @@
 			return resetBackground();
 		}
 		if (background.id === 1) return;
 		if (background.storeBitField && this.user.store_bitfield.includes(background.storeBitField)) {
 			return;
 		}
 		if (background.perkTierNeeded && this.perkTier() >= background.perkTierNeeded) {
 			return;
 		}
 		if (background.bitfield && this.bitfield.includes(background.bitfield)) {
 			return;
 		}
 		if (!background.storeBitField && !background.perkTierNeeded && !background.bitfield && !background.owners) {
@@ -956,6 +957,11 @@
 		return { refundBank };
 	}
 
+	async fetchStashUnits() {
+		const units = await getParsedStashUnits(this.id);
+		return units;
+	}
+
 	async validateEquippedGear() {
 		let itemsUnequippedAndRefunded = new Bank();
 		for (const [gearSetupName, gearSetup] of Object.entries(this.gear) as [GearSetupType, GearSetup][]) {
@@ -1000,6 +1006,32 @@
 			itemsUnequippedAndRefunded
 		};
 	}
+
+	async fetchTames() {
+		const tames = await prisma.tame.findMany({
+			where: {
+				user_id: this.id
+			}
+		});
+		return tames.map(t => new MTame(t));
+	}
+
+	async fetchActiveTame(): Promise<{ tame: null; activity: null } | { activity: TameActivity | null; tame: MTame }> {
+		if (!this.user.selected_tame) {
+			return {
+				tame: null,
+				activity: null
+			};
+		}
+		const tame = await prisma.tame.findFirst({ where: { id: this.user.selected_tame } });
+		if (!tame) {
+			throw new Error('No tame found for selected tame.');
+		}
+		const activity = await prisma.tameActivity.findFirst({
+			where: { user_id: this.id, tame_id: tame.id, completed: false }
+		});
+		return { activity, tame: new MTame(tame) };
+	}
 }
 declare global {
 	export type MUser = MUserClass;

src/lib/bankImage.ts

@@ -254,7 +254,9 @@ const forcedShortNameMap = new Map<number, string>([
 	[i('Sanguinesti staff (uncharged)'), 'Unch.'],
 	[i('Scythe of vitur (uncharged)'), 'Unch.'],
 	[i('Holy scythe of vitur (uncharged)'), 'Unch.'],
-	[i('Sanguine scythe of vitur (uncharged)'), 'Unch.']
+	[i('Sanguine scythe of vitur (uncharged)'), 'Unch.'],
+
+	[i('Atomic energy'), 'Atomic']
 ]);
 
 for (const energy of divinationEnergies) {

src/lib/bso/divination.ts

@@ -8,6 +8,10 @@ import { hasUnlockedAtlantis } from '../util';
 import getOSItem from '../util/getOSItem';
 import itemID from '../util/itemID';
 
+export function calcEnergyPerMemory(energy: DivinationEnergy) {
+	return (120 - energy.level) / 150;
+}
+
 export const divinationEnergies = [
 	{
 		level: 1,
@@ -230,9 +234,20 @@ export const divinationEnergies = [
 			return null;
 		}
 	}
-];
+] as const;
+
+export function calcAtomicEnergy(energy: DivinationEnergy): number {
+	let qty = Math.ceil(Math.pow(1 - calcEnergyPerMemory(energy), 3.5) * 250);
+	if (energy.type === 'Ancient') {
+		qty *= 2;
+	}
+	return qty;
+}
+
+export type DivinationEnergy = (typeof divinationEnergies)[number];
 
 for (const energy of divinationEnergies) {
+	// @ts-ignore Ignore
 	energy.boonEnergyCost = energy.level * 50;
 }
 

src/lib/compCape.ts

@@ -4,7 +4,6 @@ import { calcWhatPercent, objectEntries, sumArr } from 'e';
 import { writeFileSync } from 'fs';
 import { Bank, Items } from 'oldschooljs';
 
-import { tameFeedableItems } from '../mahoji/commands/tames';
 import { getPOH } from '../mahoji/lib/abstracted_commands/pohCommand';
 import { divinationEnergies } from './bso/divination';
 import { ClueTiers } from './clues/clueTiers';
@@ -166,7 +165,7 @@ import { herbloreCL } from './skilling/skills/herblore/mixables';
 import { smithingCL } from './skilling/skills/smithing/smithables';
 import { slayerUnlockableRewards } from './slayer/slayerUnlocks';
 import { RequirementFailure, Requirements } from './structures/Requirements';
-import { TameSpeciesID, TameType } from './tames';
+import { tameFeedableItems, TameSpeciesID } from './tames';
 import { ItemBank } from './types';
 import { itemID, itemNameFromID } from './util';
 import resolveItems from './util/resolveItems';
@@ -695,7 +694,9 @@ const tameRequirements = new Requirements()
 		name: 'Feed a Monkey tame all items that provide a boost',
 		has: async ({ user }) => {
 			const tames = await user.getTames();
-			const itemsToBeFed = tameFeedableItems.filter(i => i.tameSpeciesCanBeFedThis.includes(TameType.Gatherer));
+			const itemsToBeFed = tameFeedableItems.filter(i =>
+				i.tameSpeciesCanBeFedThis.includes(TameSpeciesID.Monkey)
+			);
 
 			const oneTameHasAll = tames
 				.filter(t => t.species.id === TameSpeciesID.Monkey)
@@ -715,7 +716,7 @@ const tameRequirements = new Requirements()
 		name: 'Feed a Igne tame all items that provide a boost',
 		has: async ({ user }) => {
 			const tames = await user.getTames();
-			const itemsToBeFed = tameFeedableItems.filter(i => i.tameSpeciesCanBeFedThis.includes(TameType.Combat));
+			const itemsToBeFed = tameFeedableItems.filter(i => i.tameSpeciesCanBeFedThis.includes(TameSpeciesID.Igne));
 
 			const oneTameHasAll = tames
 				.filter(t => t.species.id === TameSpeciesID.Igne)

src/lib/constants.ts

@@ -322,7 +322,8 @@ export enum BitField {
 	HasLuminousBoon = 223,
 	HasIncandescentBoon = 224,
 	HasVibrantBoon = 225,
-	HasAncientBoon = 226
+	HasAncientBoon = 226,
+	DisabledTameClueOpening = 227
 }
 
 interface BitFieldData {
@@ -515,6 +516,11 @@ export const BitFieldData: Record<BitField, BitFieldData> = {
 		name: 'Disable Item Contract donations',
 		protected: false,
 		userConfigurable: true
+	},
+	[BitField.DisabledTameClueOpening]: {
+		name: 'Disable Eagle Tame Opening Caskets',
+		protected: false,
+		userConfigurable: true
 	}
 } as const;