Remove Revenants Command and Activity

Move revenants into the normal minionKill/monsterActivity files, this will help streamline wildy slayer.

Allows quantity to be defined for revenants now.
Adds salve amulet boost, which is huge for revs.
Changed salve/blackmask/dragon hunter boosts to check for equipped gear if wilderness activties.

prisma/migrations/migration_lock.toml

@@ -0,0 +1,3 @@
+# Please do not edit this file manually
+# It should be added in your version-control system (i.e. Git)
+provider = "postgresql"

prisma/schema.prisma

@@ -896,7 +896,6 @@ enum activity_type_enum {
   BigChompyBirdHunting
   DarkAltar
   Trekking
-  Revenants
   PestControl
   VolcanicMine
   KourendFavour

src/lib/Task.ts

@@ -69,7 +69,6 @@ import { buryingTask } from '../tasks/minions/PrayerActivity/buryingActivity';
 import { offeringTask } from '../tasks/minions/PrayerActivity/offeringActivity';
 import { scatteringTask } from '../tasks/minions/PrayerActivity/scatteringActivity';
 import { questingTask } from '../tasks/minions/questingActivity';
-import { revenantsTask } from '../tasks/minions/revenantsActivity';
 import { runecraftTask } from '../tasks/minions/runecraftActivity';
 import { sawmillTask } from '../tasks/minions/sawmillActivity';
 import { shootingStarTask } from '../tasks/minions/shootingStarsActivity';
@@ -150,7 +149,6 @@ export const tasks: MinionTask[] = [
 	motherlodeMiningTask,
 	runecraftTask,
 	sawmillTask,
-	revenantsTask,
 	woodcuttingTask,
 	wealthChargeTask,
 	tokkulShopTask,

src/lib/minions/data/killableMonsters/revs.ts

@@ -1,5 +1,5 @@
 import { Time } from 'e';
-import { Monsters } from 'oldschooljs';
+import { Bank, Monsters } from 'oldschooljs';
 
 import { KillableMonster } from '../../types';
 
@@ -8,132 +8,188 @@ export const revenantMonsters: KillableMonster[] = [
 		id: Monsters.RevenantCyclops.id,
 		name: Monsters.RevenantCyclops.name,
 		aliases: Monsters.RevenantCyclops.aliases,
-		timeToFinish: Time.Second * 50,
+		timeToFinish: Time.Second * 82,
 		table: Monsters.RevenantCyclops,
 		wildy: true,
 		difficultyRating: 9,
 		qpRequired: 0,
-		pkActivityRating: 6,
-		pkBaseDeathChance: 5
+		pkActivityRating: 9,
+		pkBaseDeathChance: 8,
+		itemCost: {
+			itemCost: new Bank().add('Blighted super restore (4)', 1),
+			qtyPerMinute: 0.17,
+			alternativeConsumables: [{ itemCost: new Bank().add('Prayer potion (4)', 1), qtyPerMinute: 0.17 }]
+		},
+		canBePked: true
 	},
 	{
 		id: Monsters.RevenantDarkBeast.id,
 		name: Monsters.RevenantDarkBeast.name,
 		aliases: Monsters.RevenantDarkBeast.aliases,
-		timeToFinish: Time.Second * 70,
+		timeToFinish: Time.Second * 114,
 		table: Monsters.RevenantDarkBeast,
 		wildy: true,
 		difficultyRating: 9,
 		qpRequired: 0,
 		pkActivityRating: 9,
-		pkBaseDeathChance: 4
+		pkBaseDeathChance: 8,
+		itemCost: {
+			itemCost: new Bank().add('Blighted super restore (4)', 1),
+			qtyPerMinute: 0.17,
+			alternativeConsumables: [{ itemCost: new Bank().add('Prayer potion (4)', 1), qtyPerMinute: 0.17 }]
+		},
+		canBePked: true
 	},
 	{
 		id: Monsters.RevenantDemon.id,
 		name: Monsters.RevenantDemon.name,
 		aliases: Monsters.RevenantDemon.aliases,
-		timeToFinish: Time.Second * 50,
+		timeToFinish: Time.Second * 82,
 		table: Monsters.RevenantDemon,
 		wildy: true,
 		difficultyRating: 9,
 		qpRequired: 0,
-		pkActivityRating: 6,
-		pkBaseDeathChance: 5
+		pkActivityRating: 9,
+		pkBaseDeathChance: 8,
+		itemCost: {
+			itemCost: new Bank().add('Blighted super restore (4)', 1),
+			qtyPerMinute: 0.17,
+			alternativeConsumables: [{ itemCost: new Bank().add('Prayer potion (4)', 1), qtyPerMinute: 0.17 }]
+		},
+		canBePked: true
 	},
 	{
 		id: Monsters.RevenantDragon.id,
 		name: Monsters.RevenantDragon.name,
 		aliases: Monsters.RevenantDragon.aliases,
-		timeToFinish: Time.Second * 90,
+		timeToFinish: Time.Second * 147,
 		table: Monsters.RevenantDragon,
 		wildy: true,
 		difficultyRating: 9,
 		qpRequired: 0,
-		pkActivityRating: 8,
-		pkBaseDeathChance: 7
+		pkActivityRating: 9,
+		pkBaseDeathChance: 8,
+		itemCost: {
+			itemCost: new Bank().add('Blighted super restore (4)', 1),
+			qtyPerMinute: 0.17,
+			alternativeConsumables: [{ itemCost: new Bank().add('Prayer potion (4)', 1), qtyPerMinute: 0.17 }]
+		},
+		canBePked: true
 	},
 	{
 		id: Monsters.RevenantGoblin.id,
 		name: Monsters.RevenantGoblin.name,
 		aliases: Monsters.RevenantGoblin.aliases,
-		timeToFinish: Time.Second * 25,
+		timeToFinish: Time.Second * 41,
 		table: Monsters.RevenantGoblin,
 		wildy: true,
 		difficultyRating: 9,
 		qpRequired: 0,
-		pkActivityRating: 5,
-		pkBaseDeathChance: 5
+		pkActivityRating: 8,
+		pkBaseDeathChance: 8,
+		canBePked: true
 	},
 	{
 		id: Monsters.RevenantHellhound.id,
 		name: Monsters.RevenantHellhound.name,
 		aliases: Monsters.RevenantHellhound.aliases,
-		timeToFinish: Time.Second * 55,
+		timeToFinish: Time.Second * 90,
 		table: Monsters.RevenantHellhound,
 		wildy: true,
 		difficultyRating: 9,
 		qpRequired: 0,
-		pkActivityRating: 6,
-		pkBaseDeathChance: 5
+		pkActivityRating: 9,
+		pkBaseDeathChance: 8,
+		itemCost: {
+			itemCost: new Bank().add('Blighted super restore (4)', 1),
+			qtyPerMinute: 0.17,
+			alternativeConsumables: [{ itemCost: new Bank().add('Prayer potion (4)', 1), qtyPerMinute: 0.17 }]
+		},
+		canBePked: true
 	},
 	{
 		id: Monsters.RevenantHobgoblin.id,
 		name: Monsters.RevenantHobgoblin.name,
 		aliases: Monsters.RevenantHobgoblin.aliases,
-		timeToFinish: Time.Second * 45,
+		timeToFinish: Time.Second * 74,
 		table: Monsters.RevenantHobgoblin,
 		wildy: true,
 		difficultyRating: 9,
 		qpRequired: 0,
-		pkActivityRating: 5,
-		pkBaseDeathChance: 5
+		pkActivityRating: 9,
+		pkBaseDeathChance: 8,
+		itemCost: {
+			itemCost: new Bank().add('Blighted super restore (4)', 1),
+			qtyPerMinute: 0.17,
+			alternativeConsumables: [{ itemCost: new Bank().add('Prayer potion (4)', 1), qtyPerMinute: 0.17 }]
+		},
+		canBePked: true
 	},
 	{
 		id: Monsters.RevenantImp.id,
 		name: Monsters.RevenantImp.name,
 		aliases: Monsters.RevenantImp.aliases,
-		timeToFinish: Time.Second * 20,
+		timeToFinish: Time.Second * 33,
 		table: Monsters.RevenantImp,
 		wildy: true,
 		difficultyRating: 9,
 		qpRequired: 0,
-		pkActivityRating: 4,
-		pkBaseDeathChance: 3
+		pkActivityRating: 8,
+		pkBaseDeathChance: 8,
+		canBePked: true
 	},
 	{
 		id: Monsters.RevenantKnight.id,
 		name: Monsters.RevenantKnight.name,
 		aliases: Monsters.RevenantKnight.aliases,
-		timeToFinish: Time.Second * 75,
+		timeToFinish: Time.Second * 123,
 		table: Monsters.RevenantKnight,
 		wildy: true,
 		difficultyRating: 9,
 		qpRequired: 0,
-		pkActivityRating: 8,
-		pkBaseDeathChance: 6
+		pkActivityRating: 9,
+		pkBaseDeathChance: 8,
+		itemCost: {
+			itemCost: new Bank().add('Blighted super restore (4)', 1),
+			qtyPerMinute: 0.17,
+			alternativeConsumables: [{ itemCost: new Bank().add('Prayer potion (4)', 1), qtyPerMinute: 0.17 }]
+		},
+		canBePked: true
 	},
 	{
 		id: Monsters.RevenantOrk.id,
 		name: Monsters.RevenantOrk.name,
 		aliases: Monsters.RevenantOrk.aliases,
-		timeToFinish: Time.Second * 65,
+		timeToFinish: Time.Second * 106,
 		table: Monsters.RevenantOrk,
 		wildy: true,
 		difficultyRating: 9,
 		qpRequired: 0,
-		pkActivityRating: 7,
-		pkBaseDeathChance: 6
+		pkActivityRating: 9,
+		pkBaseDeathChance: 8,
+		itemCost: {
+			itemCost: new Bank().add('Blighted super restore (4)', 1),
+			qtyPerMinute: 0.17,
+			alternativeConsumables: [{ itemCost: new Bank().add('Prayer potion (4)', 1), qtyPerMinute: 0.17 }]
+		},
+		canBePked: true
 	},
 	{
 		id: Monsters.RevenantPyrefiend.id,
 		name: Monsters.RevenantPyrefiend.name,
 		aliases: Monsters.RevenantPyrefiend.aliases,
-		timeToFinish: Time.Second * 40,
+		timeToFinish: Time.Second * 65,
 		table: Monsters.RevenantPyrefiend,
 		wildy: true,
 		difficultyRating: 9,
 		qpRequired: 0,
-		pkActivityRating: 7,
-		pkBaseDeathChance: 5
+		pkActivityRating: 9,
+		pkBaseDeathChance: 8,
+		itemCost: {
+			itemCost: new Bank().add('Blighted super restore (4)', 1),
+			qtyPerMinute: 0.17,
+			alternativeConsumables: [{ itemCost: new Bank().add('Prayer potion (4)', 1), qtyPerMinute: 0.17 }]
+		},
+		canBePked: true
 	}
 ];

src/lib/types/minions.ts

@@ -129,16 +129,6 @@ export interface MonsterActivityTaskOptions extends ActivityTaskOptions {
 	hasWildySupplies?: boolean;
 }
 
-export interface RevenantOptions extends ActivityTaskOptions {
-	type: 'Revenants';
-	monsterID: number;
-	quantity: number;
-	died: boolean;
-	fakeDuration: number;
-	usingPrayerPots: boolean;
-	skulled: boolean;
-	style: 'melee' | 'range' | 'mage';
-}
 export interface ClueActivityTaskOptions extends ActivityTaskOptions {
 	type: 'ClueCompletion';
 
@@ -574,7 +564,6 @@ export type ActivityTaskData =
 	| MiningActivityTaskOptions
 	| MotherlodeMiningActivityTaskOptions
 	| PlunderActivityTaskOptions
-	| RevenantOptions
 	| SmithingActivityTaskOptions
 	| SmeltingActivityTaskOptions
 	| TiaraRunecraftActivityTaskOptions

src/lib/util/minionStatus.ts

@@ -1,6 +1,5 @@
 import { toTitleCase } from '@oldschoolgg/toolkit';
 import { increaseNumByPercent, reduceNumByPercent } from 'e';
-import { Monsters } from 'oldschooljs';
 import { SkillsEnum } from 'oldschooljs/dist/constants';
 
 import { collectables } from '../../mahoji/lib/abstracted_commands/collectCommand';
@@ -64,7 +63,6 @@ import {
 	PickpocketActivityTaskOptions,
 	PlunderActivityTaskOptions,
 	RaidsOptions,
-	RevenantOptions,
 	RunecraftActivityTaskOptions,
 	SawmillActivityTaskOptions,
 	ScatteringActivityTaskOptions,
@@ -545,13 +543,6 @@ export function minionStatus(user: MUser) {
 		case 'Trekking': {
 			return `${name} is currently Temple Trekking. ${formattedDuration}`;
 		}
-		case 'Revenants': {
-			const data = currentTask as RevenantOptions;
-			const durationRemaining = data.finishDate - data.duration + data.fakeDuration - Date.now();
-			return `${data.skulled ? `${Emoji.OSRSSkull} ` : ''} ${name} is currently killing ${data.quantity}x ${
-				Monsters.get(data.monsterID)!.name
-			} in the wilderness. If they don't die, the trip should take ${formatDuration(durationRemaining)}.`;
-		}
 		case 'PestControl': {
 			const data = currentTask as MinigameActivityTaskOptionsWithNoChanges;
 			return `${name} is currently doing ${data.quantity} games of Pest Control. ${formattedDuration}`;

src/lib/util/repeatStoredTrip.ts

@@ -44,7 +44,6 @@ import {
 	PickpocketActivityTaskOptions,
 	PuroPuroActivityTaskOptions,
 	RaidsOptions,
-	RevenantOptions,
 	RunecraftActivityTaskOptions,
 	SawmillActivityTaskOptions,
 	ScatteringActivityTaskOptions,
@@ -451,12 +450,6 @@ export const tripHandlers = {
 			}
 		})
 	},
-	[activity_type_enum.Revenants]: {
-		commandName: 'k',
-		args: (data: RevenantOptions) => ({
-			name: autocompleteMonsters.find(i => i.id === data.monsterID)?.name ?? data.monsterID.toString()
-		})
-	},
 	[activity_type_enum.RoguesDenMaze]: {
 		commandName: 'minigames',
 		args: () => ({