Tidy and refactor

prisma/schema.prisma

@@ -895,7 +895,6 @@ enum activity_type_enum {
   AgilityArena
   ChampionsChallenge
   AerialFishing
-  CrystalImpling
   DriftNet
   MahoganyHomes
   GnomeRestaurant

src/lib/Task.ts

@@ -26,7 +26,6 @@ import { groupoMonsterTask } from '../tasks/minions/groupMonsterActivity';
 import { herbloreTask } from '../tasks/minions/herbloreActivity';
 import { aerialFishingTask } from '../tasks/minions/HunterActivity/aerialFishingActivity';
 import { birdHouseTask } from '../tasks/minions/HunterActivity/birdhouseActivity';
-import { crystalImplingTask } from '../tasks/minions/HunterActivity/crystalImplingActivity';
 import { driftNetTask } from '../tasks/minions/HunterActivity/driftNetActivity';
 import { hunterTask } from '../tasks/minions/HunterActivity/hunterActivity';
 import { mageArenaTwoTask } from '../tasks/minions/mageArena2Activity';
@@ -182,8 +181,7 @@ export const tasks: MinionTask[] = [
 	specificQuestTask,
 	camdozaalMiningTask,
 	camdozaalSmithingTask,
-	camdozaalFishingTask,
-	crystalImplingTask
+	camdozaalFishingTask
 ];
 
 export async function processPendingActivities() {

src/lib/implings.ts

@@ -117,8 +117,7 @@ export function handlePassiveImplings(user: MUser, data: ActivityTaskData) {
 			activity_type_enum.Construction,
 			activity_type_enum.TombsOfAmascut,
 			activity_type_enum.DriftNet,
-			activity_type_enum.UnderwaterAgilityThieving,
-			activity_type_enum.CrystalImpling
+			activity_type_enum.UnderwaterAgilityThieving
 		].includes(data.type)
 	)
 		return null;

src/lib/types/minions.ts

@@ -279,14 +279,6 @@ export interface HunterActivityTaskOptions extends ActivityTaskOptions {
 	usingStaminaPotion: boolean;
 }
 
-export interface CrystalImplingActivityTaskOptions extends ActivityTaskOptions {
-	type: 'CrystalImpling';
-	creatureName: string;
-	quantity: number;
-	usingHuntPotion: boolean;
-	usingStaminaPotion: boolean;
-}
-
 export interface AlchingActivityTaskOptions extends ActivityTaskOptions {
 	type: 'Alching';
 	itemID: number;
@@ -606,5 +598,4 @@ export type ActivityTaskData =
 	| FightCavesActivityTaskOptions
 	| ActivityTaskOptionsWithQuantity
 	| MinigameActivityTaskOptionsWithNoChanges
-	| CutLeapingFishActivityTaskOptions
-	| CrystalImplingActivityTaskOptions;
+	| CutLeapingFishActivityTaskOptions;

src/lib/util/activityInArea.ts

@@ -3,6 +3,7 @@ import { Monsters } from 'oldschooljs';
 import {
 	ActivityTaskData,
 	AgilityActivityTaskOptions,
+	HunterActivityTaskOptions,
 	MonsterActivityTaskOptions,
 	PickpocketActivityTaskOptions
 } from '../types/minions';
@@ -37,6 +38,12 @@ const WorldLocationsChecker = [
 			) {
 				return true;
 			}
+			if (
+				activity.type === 'Hunter' &&
+				(activity as HunterActivityTaskOptions).creatureName === 'Crystal impling'
+			) {
+				return true;
+			}
 
 			return false;
 		}

src/lib/util/minionStatus.ts

@@ -435,10 +435,6 @@ export function minionStatus(user: MUser) {
 			return `${name} is currently hunting ${data.quantity}x ${creature!.name}. ${formattedDuration}`;
 		}
 
-		case 'CrystalImpling': {
-			return `${name} is currently hunting crystal implings. ${formattedDuration}`;
-		}
-
 		case 'Birdhouse': {
 			return `${name} is currently doing a bird house run. ${formattedDuration}`;
 		}

src/lib/util/repeatStoredTrip.ts

@@ -21,7 +21,6 @@ import {
 	ConstructionActivityTaskOptions,
 	CookingActivityTaskOptions,
 	CraftingActivityTaskOptions,
-	CrystalImplingActivityTaskOptions,
 	CutLeapingFishActivityTaskOptions,
 	DarkAltarOptions,
 	EnchantingActivityTaskOptions,
@@ -348,15 +347,6 @@ export const tripHandlers = {
 			stamina_potions: data.usingStaminaPotion
 		})
 	},
-	[activity_type_enum.CrystalImpling]: {
-		commandName: 'hunt',
-		args: (data: CrystalImplingActivityTaskOptions) => ({
-			name: data.creatureName,
-			quantity: data.quantity,
-			hunter_potion: data.usingHuntPotion,
-			stamina_potions: data.usingStaminaPotion
-		})
-	},
 	[activity_type_enum.Inferno]: {
 		commandName: 'activities',
 		args: () => ({ inferno: { action: 'start' } })

src/mahoji/commands/hunt.ts

@@ -15,7 +15,6 @@ import { formatDuration, itemID } from '../../lib/util';
 import addSubTaskToActivityTask from '../../lib/util/addSubTaskToActivityTask';
 import { calcMaxTripLength } from '../../lib/util/calcMaxTripLength';
 import { updateBankSetting } from '../../lib/util/updateBankSetting';
-import { crystalImplingCommand } from '../lib/abstracted_commands/crystalImplingCommand';
 import { OSBMahojiCommand } from '../lib/util';
 import { userHasGracefulEquipped } from '../mahojiSettings';
 
@@ -119,14 +118,10 @@ export const huntCommand: OSBMahojiCommand = {
 			}
 		}
 
+		let crystalImpling = false;
+
 		if (creature.name === 'Crystal impling') {
-			return crystalImplingCommand({
-				user,
-				quantity: options.quantity,
-				stamina_potions: options.stamina_potions,
-				hunter_potions: options.hunter_potion,
-				channelID: channelID.toString()
-			});
+			crystalImpling = true;
 		}
 
 		// Reduce time if user is experienced hunting the creature, every hour become 1% better to a cap of 10% or 20% if tracking technique.
@@ -169,7 +164,13 @@ export const huntCommand: OSBMahojiCommand = {
 		const maxTripLength = calcMaxTripLength(user, 'Hunter');
 
 		let { quantity } = options;
-		if (!quantity) quantity = Math.floor(maxTripLength / ((catchTime * Time.Second) / traps));
+		if (!quantity) {
+			if (crystalImpling) {
+				quantity = Math.floor(maxTripLength / Time.Minute);
+			} else {
+				quantity = Math.floor(maxTripLength / ((catchTime * Time.Second) / traps));
+			}
+		}
 
 		let duration = Math.floor(((quantity * catchTime) / traps) * Time.Second);
 
@@ -267,9 +268,9 @@ export const huntCommand: OSBMahojiCommand = {
 			type: 'Hunter'
 		});
 
-		let response = `${user.minionName} is now ${creature.huntTechnique} ${quantity}x ${
-			creature.name
-		}, it'll take around ${formatDuration(duration)} to finish.`;
+		let response = `${user.minionName} is now ${crystalImpling ? 'hunting' : `${creature.huntTechnique}`} ${
+			crystalImpling ? '' : `${quantity}x `
+		}${creature.name}, it'll take around ${formatDuration(duration)} to finish.`;
 
 		if (boosts.length > 0) {
 			response += `\n\n**Boosts:** ${boosts.join(', ')}.`;