Uncharge glory

prisma/schema.prisma

@@ -888,6 +888,7 @@ enum activity_type_enum {
   Casting
   GloryCharging
   WealthCharging
+  GloryUncharging
   BarbarianAssault
   AgilityArena
   ChampionsChallenge

src/lib/Task.ts

@@ -21,7 +21,7 @@
 import { firemakingTask } from '../tasks/minions/firemakingActivity';
 import { fishingTask } from '../tasks/minions/fishingActivity';
 import { fletchingTask } from '../tasks/minions/fletchingActivity';
-import { gloryChargingTask } from '../tasks/minions/gloryChargingActivity';
+import { gloryChargingTask, gloryUnchargingTask } from '../tasks/minions/gloryChargingActivity';
 import { groupoMonsterTask } from '../tasks/minions/groupMonsterActivity';
 import { herbloreTask } from '../tasks/minions/herbloreActivity';
 import { aerialFishingTask } from '../tasks/minions/HunterActivity/aerialFishingActivity';
@@ -145,6 +145,7 @@
 	fishingTask,
 	fletchingTask,
 	gloryChargingTask,
+	gloryUnchargingTask,
 	groupoMonsterTask,
 	herbloreTask,
 	fletchingTask,
@@ -213,7 +214,7 @@
 	return activities;
 }
 export async function syncActivityCache() {
 	const tasks = await prisma.activity.findMany({ where: { completed: false } });
 
 	minionActivityCache.clear();
 	for (const task of tasks) {
@@ -238,7 +239,7 @@
 	}
 
 	const task = tasks.find(i => i.type === activity.type)!;
 	if (!task) {
 		throw new Error('Missing task');
 	}
 

src/lib/types/minions.ts

@@ -22,6 +22,7 @@ export interface ActivityTaskOptionsWithNoChanges extends ActivityTaskOptions {
 		| 'Wintertodt'
 		| 'Cyclops'
 		| 'GloryCharging'
+		| 'GloryUncharging'
 		| 'WealthCharging'
 		| 'BarbarianAssault'
 		| 'AgilityArena'
@@ -56,6 +57,7 @@ export interface ActivityTaskOptionsWithQuantity extends ActivityTaskOptions {
 		| 'DriftNet'
 		| 'WealthCharging'
 		| 'GloryCharging'
+		| 'GloryUncharging'
 		| 'AerialFishing'
 		| 'FishingTrawler'
 		| 'CamdozaalFishing'

src/lib/util/minionStatus.ts

@@ -127,7 +127,7 @@
 		case 'Agility': {
 			const data = currentTask as AgilityActivityTaskOptions;
 
 			const course = Agility.Courses.find(course => course.name === data.courseID);
 
 			return `${name} is currently running ${data.quantity}x ${course!.name} laps. ${formattedDuration} Your ${
 				Emoji.Agility
@@ -137,7 +137,7 @@
 		case 'Cooking': {
 			const data = currentTask as CookingActivityTaskOptions;
 
 			const cookable = Cooking.Cookables.find(cookable => cookable.id === data.cookableID);
 
 			return `${name} is currently cooking ${data.quantity}x ${cookable!.name}. ${formattedDuration} Your ${
 				Emoji.Cooking
@@ -147,7 +147,7 @@
 		case 'Fishing': {
 			const data = currentTask as FishingActivityTaskOptions;
 
 			const fish = Fishing.Fishes.find(fish => fish.id === data.fishID);
 
 			return `${name} is currently fishing ${data.quantity}x ${fish!.name}. ${formattedDuration} Your ${
 				Emoji.Fishing
@@ -157,7 +157,7 @@
 		case 'Mining': {
 			const data = currentTask as MiningActivityTaskOptions;
 
 			const ore = Mining.Ores.find(ore => ore.id === data.oreID);
 
 			return `${name} is currently mining ${ore!.name}. ${
 				data.fakeDurationMax === data.fakeDurationMin
@@ -187,7 +187,7 @@
 		case 'Smelting': {
 			const data = currentTask as SmeltingActivityTaskOptions;
 
 			const bar = Smithing.Bars.find(bar => bar.id === data.barID);
 
 			return `${name} is currently smelting ${data.quantity}x ${bar!.name}. ${formattedDuration} Your ${
 				Emoji.Smithing
@@ -207,7 +207,7 @@
 		case 'Offering': {
 			const data = currentTask as OfferingActivityTaskOptions;
 
 			const bones = Prayer.Bones.find(bones => bones.inputId === data.boneID);
 
 			return `${name} is currently offering ${data.quantity}x ${bones!.name}. ${formattedDuration} Your ${
 				Emoji.Prayer
@@ -217,7 +217,7 @@
 		case 'Burying': {
 			const data = currentTask as BuryingActivityTaskOptions;
 
 			const bones = Prayer.Bones.find(bones => bones.inputId === data.boneID);
 
 			return `${name} is currently burying ${data.quantity}x ${bones!.name}. ${formattedDuration} Your ${
 				Emoji.Prayer
@@ -227,7 +227,7 @@
 		case 'Scattering': {
 			const data = currentTask as ScatteringActivityTaskOptions;
 
 			const ashes = Prayer.Ashes.find(ashes => ashes.inputId === data.ashID);
 
 			return `${name} is currently scattering ${data.quantity}x ${ashes!.name}. ${formattedDuration} Your ${
 				Emoji.Prayer
@@ -483,6 +483,11 @@
 			return `${name} is currently charging ${data.quantity}x inventories of glories at the Fountain of Rune. ${formattedDuration}`;
 		}
 
+		case 'GloryUncharging': {
+			const data = currentTask as ActivityTaskOptionsWithQuantity;
+			return `${name} is currently uncharging ${data.quantity}x glories. ${formattedDuration}`;
+		}
+
 		case 'WealthCharging': {
 			const data = currentTask as ActivityTaskOptionsWithQuantity;
 			return `${name} is currently charging ${data.quantity}x inventories of rings of wealth at the Fountain of Rune. ${formattedDuration}`;

src/lib/util/repeatStoredTrip.ts

@@ -313,6 +313,12 @@ export const tripHandlers = {
 		commandName: 'activities',
 		args: (data: ActivityTaskOptionsWithQuantity) => ({ charge: { item: 'glory', quantity: data.quantity } })
 	},
+	[activity_type_enum.GloryUncharging]: {
+		commandName: 'activities',
+		args: (data: ActivityTaskOptionsWithQuantity) => ({
+			charge: { item: 'unchargeglory', quantity: data.quantity }
+		})
+	},
 	[activity_type_enum.GnomeRestaurant]: {
 		commandName: 'minigames',
 		args: () => ({ gnome_restaurant: { start: {} } })

src/lib/util/taskGroupFromActivity.ts

@@ -33,6 +33,7 @@ export function taskGroupFromActivity(type: activity_type_enum): ActivityGroup {
 		case 'Enchanting':
 		case 'Casting':
 		case 'GloryCharging':
+		case 'GloryUncharging':
 		case 'WealthCharging':
 		case 'Collecting':
 		case 'BlastFurnace':

src/mahoji/commands/activities.ts

@@ -18,7 +18,7 @@ import { butlerCommand } from '../lib/abstracted_commands/butlerCommand';
 import { camdozaalCommand } from '../lib/abstracted_commands/camdozaalCommand';
 import { castCommand } from '../lib/abstracted_commands/castCommand';
 import { championsChallengeCommand } from '../lib/abstracted_commands/championsChallenge';
-import { chargeGloriesCommand } from '../lib/abstracted_commands/chargeGloriesCommand';
+import { chargeGloriesCommand, unchargeGloriesCommand } from '../lib/abstracted_commands/chargeGloriesCommand';
 import { chargeWealthCommand } from '../lib/abstracted_commands/chargeWealthCommand';
 import { chompyHuntClaimCommand, chompyHuntCommand } from '../lib/abstracted_commands/chompyHuntCommand';
 import { collectables, collectCommand } from '../lib/abstracted_commands/collectCommand';
@@ -222,6 +222,10 @@ export const activitiesCommand: OSBMahojiCommand = {
 						{
 							name: 'Ring of wealth',
 							value: 'wealth'
+						},
+						{
+							name: 'Uncharge amulet of glory',
+							value: 'unchargeglory'
 						}
 					]
 				},
@@ -594,6 +598,9 @@ export const activitiesCommand: OSBMahojiCommand = {
 		if (options.charge?.item === 'wealth') {
 			return chargeWealthCommand(user, channelID, options.charge.quantity);
 		}
+		if (options.charge?.item === 'unchargeglory') {
+			return unchargeGloriesCommand(user, channelID, options.charge.quantity);
+		}
 		if (options.fight_caves) {
 			return fightCavesCommand(user, channelID);
 		}

src/mahoji/lib/abstracted_commands/chargeGloriesCommand.ts

@@ -65,3 +65,47 @@ export async function chargeGloriesCommand(user: MUser, channelID: string, quant
 		hasDiary ? ' 3x Boost for Wilderness Elite diary.' : ''
 	}`;
 }
+
+export async function unchargeGloriesCommand(user: MUser, channelID: string, quantity: number | undefined) {
+	const userBank = user.bank;
+
+	const unchargeGloriesTime = Time.Second * 2;
+
+	const maxTripLength = calcMaxTripLength(user, 'GloryUncharging');
+
+	const amountHas = userBank.amount('Amulet of glory(6)');
+
+	const max = Math.min(amountHas, Math.floor(maxTripLength / unchargeGloriesTime));
+
+	if (!quantity) quantity = Math.floor(max);
+	if (quantity > max) quantity = max;
+	if (quantity === 0) return "You don't have any Amulet of glory (6) to uncharge.";
+
+	const duration = quantity * unchargeGloriesTime;
+
+	if (duration > maxTripLength) {
+		return `${user.minionName} can't go on trips longer than ${formatDuration(
+			maxTripLength
+		)}, try a lower quantity. The highest amount of inventories of glories you can uncharge is ${Math.floor(
+			maxTripLength / unchargeGloriesTime
+		)}.`;
+	}
+
+	if (userBank.amount('Amulet of glory (6)') < quantity) {
+		return `You don't have enough ${quantity}x Amulet of glory (6).`;
+	}
+
+	await addSubTaskToActivityTask<ActivityTaskOptionsWithQuantity>({
+		userID: user.id,
+		channelID: channelID.toString(),
+		quantity,
+		duration,
+		type: 'GloryUncharging'
+	});
+
+	await user.removeItemsFromBank(new Bank().add('Amulet of glory (6)', quantity));
+
+	return `${user.minionName} is now uncharging ${quantity} Amulet of glory (6), it'll take around ${formatDuration(
+		duration
+	)} to finish. Removed ${quantity}x Amulet of glory (6) from your bank.`;
+}

src/tasks/minions/gloryChargingActivity.ts

@@ -56,3 +56,23 @@ export const gloryChargingTask: MinionTask = {
 		handleTripFinish(user, channelID, str, undefined, data, loot);
 	}
 };
+
+export const gloryUnchargingTask: MinionTask = {
+	type: 'GloryUncharging',
+	async run(data: ActivityTaskOptionsWithQuantity) {
+		const { quantity, userID, channelID } = data;
+		const user = await mUserFetch(userID);
+		let loot = new Bank().add('Amulet of glory', quantity);
+
+		const amnt = loot.amount('Amulet of glory');
+
+		const str = `${user}, ${user.minionName} finished uncharging ${amnt} Amulets of glory (6).`;
+
+		await transactItems({
+			userID: user.id,
+			collectionLog: false,
+			itemsToAdd: loot
+		});
+		handleTripFinish(user, channelID, str, undefined, data, loot);
+	}
+};