changes

prisma/schema.prisma

@@ -134,6 +134,8 @@ model ClientStorage {
   nmz_cost                     Json     @default("{}") @db.Json
   toa_cost                     Json     @default("{}") @db.Json
   toa_loot                     Json     @default("{}") @db.Json
+  colo_cost                    Json     @default("{}") @db.Json
+  colo_loot                    Json     @default("{}") @db.Json
 
   grand_exchange_is_locked Boolean @default(false)
   grand_exchange_total_tax BigInt  @default(0)
@@ -737,11 +739,11 @@ model UserStats {
   high_gambles             Int @default(0)
   honour_points            Int @default(0)
 
-  slayer_task_streak        Int @default(0)
-  slayer_wildy_task_streak  Int @default(0)
-  slayer_superior_count     Int @default(0)
-  slayer_unsired_offered    Int @default(0)
-  slayer_chewed_offered     Int @default(0)
+  slayer_task_streak       Int @default(0)
+  slayer_wildy_task_streak Int @default(0)
+  slayer_superior_count    Int @default(0)
+  slayer_unsired_offered   Int @default(0)
+  slayer_chewed_offered    Int @default(0)
 
   tob_cost        Json @default("{}")
   tob_loot        Json @default("{}")
@@ -765,6 +767,11 @@ model UserStats {
 
   forestry_event_completions_bank Json @default("{}") @db.Json
 
+  colo_cost      Json @default("{}") @db.Json
+  colo_loot      Json @default("{}") @db.Json
+  colo_kc_bank   Json @default("{}") @db.Json
+  colo_max_glory Int?
+
   @@map("user_stats")
 }
 
@@ -945,6 +952,7 @@ enum activity_type_enum {
   CamdozaalFishing
   CamdozaalMining
   CamdozaalSmithing
+  Colosseum
 }
 
 enum xp_gains_skill_enum {

src/lib/Task.ts

@@ -11,6 +11,7 @@ import { camdozaalSmithingTask } from '../tasks/minions/camdozaalActivity/camdoz
 import { castingTask } from '../tasks/minions/castingActivity';
 import { clueTask } from '../tasks/minions/clueActivity';
 import { collectingTask } from '../tasks/minions/collectingActivity';
+import { colosseumTask } from '../tasks/minions/colosseumActivity';
 import { combatRingTask } from '../tasks/minions/combatRingActivity';
 import { constructionTask } from '../tasks/minions/constructionActivity';
 import { cookingTask } from '../tasks/minions/cookingActivity';
@@ -183,7 +184,8 @@ export const tasks: MinionTask[] = [
 	specificQuestTask,
 	camdozaalMiningTask,
 	camdozaalSmithingTask,
-	camdozaalFishingTask
+	camdozaalFishingTask,
+	colosseumTask
 ];
 
 export async function processPendingActivities() {

src/lib/colosseum.ts

@@ -1,9 +1,34 @@
-import { calcPercentOfNum, calcWhatPercent, clamp, percentChance, randFloat, randInt, sumArr, Time } from 'e';
+import {
+	calcPercentOfNum,
+	calcWhatPercent,
+	clamp,
+	objectEntries,
+	objectValues,
+	percentChance,
+	randInt,
+	sumArr,
+	Time
+} from 'e';
 import { Bank, LootTable } from 'oldschooljs';
+import { EquipmentSlot } from 'oldschooljs/dist/meta/types';
 
+import { userStatsBankUpdate } from '../mahoji/mahojiSettings';
+import { GearSetupType } from './gear/types';
+import { trackLoot } from './lootTrack';
 import { GeneralBank, GeneralBankType } from './structures/GeneralBank';
+import { ItemBank, Skills } from './types';
+import { ColoTaskOptions } from './types/minions';
 import { assert } from './util';
-import { averageBank, exponentialPercentScale, formatDuration } from './util/smallUtils';
+import addSubTaskToActivityTask from './util/addSubTaskToActivityTask';
+import resolveItems from './util/resolveItems';
+import {
+	averageBank,
+	exponentialPercentScale,
+	formatDuration,
+	formatSkillRequirements,
+	itemNameFromID
+} from './util/smallUtils';
+import { updateBankSetting } from './util/updateBankSetting';
 
 interface Wave {
 	waveNumber: number;
@@ -12,12 +37,6 @@ interface Wave {
 	table: LootTable;
 }
 
-interface Handicap {
-	name: string;
-	effect: string;
-	tier?: number;
-}
-
 const waves: Wave[] = [
 	{
 		waveNumber: 1,
@@ -271,11 +290,16 @@ const calculateLootForWave = (wave: Wave) => {
 function calculateDeathChance(kc: number, waveNumber: number): number {
 	const cappedKc = Math.min(Math.max(kc, 0), 1000);
 
-	const baseChance = 75;
+	const baseChance = 65;
 	const kcReduction = Math.min(90, 90 * (1 - Math.exp(-0.1 * cappedKc))); // Steep reduction for the first few kc
 	const waveIncrease = waveNumber * 1.5;
 
-	const deathChance = Math.max(1, Math.min(99, baseChance - kcReduction + waveIncrease));
+	let newChance = baseChance - kcReduction + waveIncrease;
+	if (kc > 0) {
+		newChance /= 10;
+	}
+
+	const deathChance = Math.max(1, Math.min(80, newChance));
 
 	return deathChance;
 }
@@ -296,6 +320,8 @@ interface ColosseumResult {
 	maxGlory: number;
 	addedWaveKCBank: ColosseumWaveBank;
 	debugMessages: string[];
+	fakeDuration: number;
+	realDuration: number;
 }
 
 const startColosseumRun = (options: { kcBank: ColosseumWaveBank; chosenWaveToStop: number }): ColosseumResult => {
@@ -314,15 +340,19 @@ const startColosseumRun = (options: { kcBank: ColosseumWaveBank; chosenWaveToSto
 
 	const addedWaveKCBank = new ColosseumWaveBank();
 
+	let realDuration = 0;
+	const fakeDuration = 12 * (Time.Minute * 3.5);
+
 	let maxGlory = 0;
 	for (const wave of waves) {
+		realDuration += Time.Minute * 3.5;
 		const kc = options.kcBank.amount(wave.waveNumber) ?? 0;
 		const kcSkill = waveKCSkillBank.amount(wave.waveNumber) ?? 0;
 		const wavePerformance = exponentialPercentScale((totalKCSkillPercent + kcSkill) / 2);
 		const glory = randInt(calcPercentOfNum(wavePerformance, ourMaxGlory), ourMaxGlory);
 		maxGlory = Math.max(glory, maxGlory);
-		const deathChance = calculateDeathChance(kc, wave.waveNumber);
-		// console.log({ expSkill, wavePerformance, totalKCSkillPercent });
+		let deathChance = calculateDeathChance(kc, wave.waveNumber);
+		// deathChance = reduceNumByPercent(deathChance, clamp(kc * 3, 1, 50));
 
 		debugMessages.push(`Wave ${wave.waveNumber} at ${kc}KC death chance: ${deathChance}%`);
 		if (percentChance(deathChance)) {
@@ -331,7 +361,9 @@ const startColosseumRun = (options: { kcBank: ColosseumWaveBank; chosenWaveToSto
 				loot: null,
 				maxGlory: 0,
 				addedWaveKCBank,
-				debugMessages
+				debugMessages,
+				fakeDuration,
+				realDuration
 			};
 		}
 		addedWaveKCBank.add(wave.waveNumber);
@@ -343,7 +375,9 @@ const startColosseumRun = (options: { kcBank: ColosseumWaveBank; chosenWaveToSto
 				loot: bank,
 				maxGlory,
 				addedWaveKCBank,
-				debugMessages
+				debugMessages,
+				fakeDuration,
+				realDuration
 			};
 		}
 	}
@@ -352,11 +386,12 @@ const startColosseumRun = (options: { kcBank: ColosseumWaveBank; chosenWaveToSto
 };
 
 function simulateColosseumRuns() {
-	const totalSimulations = 200;
+	const totalSimulations = 500;
 	let totalAttempts = 0;
 	let totalDeaths = 0;
 	const totalLoot = new Bank();
 	const finishAttemptAmounts = [];
+	let totalDuration = 0;
 
 	for (let i = 0; i < totalSimulations; i++) {
 		let attempts = 0;
@@ -369,8 +404,8 @@ function simulateColosseumRuns() {
 			attempts++;
 			const stopAt = waves[waves.length - 1].waveNumber;
 			const result = startColosseumRun({ kcBank, chosenWaveToStop: stopAt });
+			totalDuration += result.realDuration;
 			kcBank.add(result.addedWaveKCBank);
-			// console.log(result.debugMessages.join(', '));
 			if (result.diedAt === null) {
 				if (result.loot) runLoot.add(result.loot);
 				done = true;
@@ -384,14 +419,14 @@ function simulateColosseumRuns() {
 		totalAttempts += attempts;
 		totalDeaths += deaths;
 		totalLoot.add(runLoot);
-		console.log(runLoot.toString());
 	}
 
 	const averageAttempts = totalAttempts / totalSimulations;
 	const averageDeaths = totalDeaths / totalSimulations;
 
 	finishAttemptAmounts.sort((a, b) => a - b);
 
+	console.log(`Avg duration: ${formatDuration(totalDuration / totalSimulations)}`);
 	console.log(`Total simulations: ${totalSimulations}`);
 	console.log(
 		`Average attempts to beat wave 12: ${averageAttempts}. ${formatDuration(
@@ -404,3 +439,121 @@ function simulateColosseumRuns() {
 }
 
 simulateColosseumRuns();
+
+export async function colosseumCommand(user: MUser, channelID: string) {
+	if (user.minionIsBusy) {
+		return `${user.usernameOrMention} is busy`;
+	}
+
+	const skillReqs: Skills = {
+		attack: 90,
+		strength: 90,
+		defence: 90,
+		prayer: 80,
+		ranged: 90,
+		magic: 94,
+		hitpoints: 90
+	};
+
+	if (!user.hasSkillReqs(skillReqs)) {
+		return `You need ${formatSkillRequirements(skillReqs)} to enter the Colosseum.`;
+	}
+
+	const requiredItems: Partial<Record<GearSetupType, Partial<Record<EquipmentSlot, number[]>>>> = {
+		melee: {
+			head: resolveItems(['Torva full helm', 'Neitiznot faceguard', 'Justiciar faceguard']),
+			cape: resolveItems(['Infernal cape', 'Fire cape']),
+			neck: resolveItems(['Amulet of blood fury']),
+			body: resolveItems(['Torva platebody', 'Bandos chestplate']),
+			legs: resolveItems(['Torva platelegs', 'Bandos tassets']),
+			feet: resolveItems(['Primordial boots']),
+			ring: resolveItems(['Ultor ring', 'Berserker ring (i)']),
+			'2h': resolveItems(['Scythe of vitur'])
+		},
+		range: {
+			cape: resolveItems(["Dizana's quiver", "Ava's assembler"]),
+			head: resolveItems(['Masori mask (f)', 'Masori mask', 'Armadyl helmet']),
+			neck: resolveItems(['Necklace of anguish']),
+			body: resolveItems(['Masori body (f)', 'Masori body', 'Armadyl chestplate']),
+			legs: resolveItems(['Masori chaps (f)', 'Masori chaps', 'Armadyl chainskirt']),
+			feet: resolveItems(['Pegasian boots']),
+			ring: resolveItems(['Venator ring', 'Archers ring (i)']),
+			ammo: resolveItems(['Dragon arrow']),
+			'2h': resolveItems(['Twisted bow'])
+		}
+	};
+
+	const meleeWeapons = resolveItems(['Scythe of vitur', 'Blade of saeldor (c)']);
+	const rangeWeapons = resolveItems(['Twisted bow', 'Bow of faerdhinen (c)']);
+
+	for (const [gearType, gearNeeded] of objectEntries(requiredItems)) {
+		const gear = user.gear[gearType];
+		if (!gearNeeded) continue;
+		for (const items of objectValues(gearNeeded)) {
+			if (!items) continue;
+			if (!items.some(g => gear.hasEquipped(g))) {
+				return `You need one of these equipped in your ${gearType} setup to enter the Colosseum: ${items
+					.map(itemNameFromID)
+					.join(', ')}.`;
+			}
+		}
+	}
+
+	if (!meleeWeapons.some(i => user.gear.melee.hasEquipped(i))) {
+		return `You need one of these equipped in your melee setup to enter the Colosseum: ${meleeWeapons
+			.map(itemNameFromID)
+			.join(', ')}.`;
+	}
+
+	if (!rangeWeapons.some(i => user.gear.range.hasEquipped(i))) {
+		return `You need one of these equipped in your melee setup to enter the Colosseum: ${rangeWeapons
+			.map(itemNameFromID)
+			.join(', ')}.`;
+	}
+
+	const cost = new Bank()
+		.add('Saradomin brew(4)', 6)
+		.add('Super restore(4)', 8)
+		.add('Super combat potion(4)')
+		.add('Bastion potion(4)');
+
+	if (!user.owns(cost)) {
+		return `You need ${cost} to attempt the Colosseum.`;
+	}
+
+	const res = startColosseumRun({
+		kcBank: new ColosseumWaveBank((await user.fetchStats({ colo_kc_bank: true })).colo_kc_bank as ItemBank),
+		chosenWaveToStop: 12
+	});
+
+	await updateBankSetting('colo_cost', cost);
+	await userStatsBankUpdate(user.id, 'colo_cost', cost);
+	await trackLoot({
+		totalCost: cost,
+		id: 'colo',
+		type: 'Minigame',
+		changeType: 'cost',
+		users: [
+			{
+				id: user.id,
+				cost
+			}
+		]
+	});
+	await user.removeItemsFromBank(cost);
+
+	await addSubTaskToActivityTask<ColoTaskOptions>({
+		userID: user.id,
+		channelID,
+		duration: res.realDuration,
+		type: 'Colosseum',
+		fakeDuration: res.fakeDuration,
+		maxGlory: res.maxGlory,
+		diedAt: res.diedAt ?? undefined,
+		loot: res.loot?.bank
+	});
+
+	return `${user.minionName} is now attempting the Colosseum. They will finish in around ${formatDuration(
+		res.fakeDuration
+	)}, unless they die early. Removed ${cost}.`;
+}

src/lib/structures/GeneralBank.ts

@@ -41,6 +41,10 @@ export class GeneralBank<T extends string | number> {
 		this.validate();
 	}
 
+	get _bank() {
+		return this.bank;
+	}
+
 	clone(): GeneralBank<T> {
 		return new GeneralBank<T>({
 			allowedKeys: this.allowedKeys ? Array.from(this.allowedKeys) : undefined,

src/lib/types/minions.ts

@@ -449,6 +449,14 @@ export interface TheatreOfBloodTaskOptions extends ActivityTaskOptionsWithUsers
 	solo?: boolean;
 }
 
+export interface ColoTaskOptions extends ActivityTaskOptions {
+	type: 'Colosseum';
+	fakeDuration: number;
+	diedAt?: number;
+	loot?: ItemBank;
+	maxGlory: number;
+}
+
 type UserID = string;
 type Points = number;
 type RoomIDsDiedAt = number[];
@@ -600,4 +608,5 @@ export type ActivityTaskData =
 	| FightCavesActivityTaskOptions
 	| ActivityTaskOptionsWithQuantity
 	| MinigameActivityTaskOptionsWithNoChanges
-	| CutLeapingFishActivityTaskOptions;
+	| CutLeapingFishActivityTaskOptions
+	| ColoTaskOptions;