oldschoolgg · gc · Dec 10, 2023 · Oct 13, 2023 · Oct 14, 2023 · Oct 14, 2023
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -482,6 +482,9 @@ enum XpGainSource {
   MahoganyHomes
   AerialFishing
   CleaningHerbsWhileFarming
+  CamdozaalMining
+  CamdozaalSmithing
+  CamdozaalFishing
 }
 
 model XPGain {
@@ -920,6 +923,9 @@ enum activity_type_enum {
   UnderwaterAgilityThieving
   StrongholdOfSecurity
   SpecificQuest
+  CamdozaalFishing
+  CamdozaalMining
+  CamdozaalSmithing
 }
 
 enum xp_gains_skill_enum {

diff --git a/src/lib/Task.ts b/src/lib/Task.ts
@@ -3,6 +3,9 @@
 import { agilityTask } from '../tasks/minions/agilityActivity';
 import { alchingTask } from '../tasks/minions/alchingActivity';
 import { butlerTask } from '../tasks/minions/butlerActivity';
+import { camdozaalFishingTask } from '../tasks/minions/camdozaalActivity/camdozaalFishingActivity';
+import { camdozaalMiningTask } from '../tasks/minions/camdozaalActivity/camdozaalMiningActivity';
+import { camdozaalSmithingTask } from '../tasks/minions/camdozaalActivity/camdozaalSmithingActivity';
 import { castingTask } from '../tasks/minions/castingActivity';
 import { clueTask } from '../tasks/minions/clueActivity';
 import { collectingTask } from '../tasks/minions/collectingActivity';
@@ -179,11 +182,14 @@
 	underwaterAgilityThievingTask,
 	strongholdTask,
 	specificQuestTask,
-	halloweenTask
+	halloweenTask,
+	camdozaalMiningTask,
+	camdozaalSmithingTask,
+	camdozaalFishingTask
 ];
 
 export async function syncActivityCache() {
 	const tasks = await prisma.activity.findMany({ where: { completed: false } });

 	minionActivityCache.clear();
 	for (const task of tasks) {
@@ -200,7 +206,7 @@
 	}

 	const task = tasks.find(i => i.type === activity.type)!;
 	if (!task) {
 		throw new Error('Missing task');
 	}


diff --git a/src/lib/data/creatablesTable.txt b/src/lib/data/creatablesTable.txt
@@ -1848,4 +1848,8 @@
 ║ Sturdy harness                                  │ 45x Steel nails, 3x Adamantite bar, 2x Rope, 1x Log brace                                                                                                                            │ 1x Sturdy harness                                                                                                                                                                    │ 0       ║
 ╟─────────────────────────────────────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┼─────────╢
 ║ Clothes pouch                                   │ 1x Thread, 1x Leather, 1x Clothes pouch blueprint                                                                                                                                    │ 1x Clothes pouch                                                                                                                                                                     │ 0       ║
+╟─────────────────────────────────────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┼─────────╢
+║ Barronite mace                                  │ 1,500x Barronite shards, 1x Barronite head, 1x Barronite handle, 1x Barronite guard                                                                                                  │ 1x Barronite mace                                                                                                                                                                    │ 0       ║
+╟─────────────────────────────────────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┼──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┼─────────╢
+║ Imcando hammer                                  │ 1,500x Barronite shards, 1x Imcando hammer (broken)                                                                                                                                  │ 1x Imcando hammer                                                                                                                                                                    │ 0       ║
 ╚═════════════════════════════════════════════════╧══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╧══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════╧═════════╝
diff --git a/src/lib/data/createables.ts b/src/lib/data/createables.ts
@@ -595,6 +595,26 @@ const hunterClothing: Createable[] = [
 	}
 ];
 
+const camdozaalItems: Createable[] = [
+	{
+		name: 'Barronite mace',
+		inputItems: new Bank({
+			'Barronite handle': 1,
+			'Barronite guard': 1,
+			'Barronite head': 1,
+			'Barronite shards': 1500
+		}),
+		outputItems: new Bank({ 'Barronite mace	': 1 }),
+		noCl: false
+	},
+	{
+		name: 'Imcando hammer',
+		inputItems: new Bank({ 'Imcando hammer (broken)': 1, 'Barronite shards': 1500 }),
+		outputItems: new Bank({ 'Imcando hammer': 1 }),
+		noCl: false
+	}
+];
+
 const metamorphPets: Createable[] = [
 	{
 		name: 'Midnight',
@@ -2347,7 +2367,8 @@ const Createables: Createable[] = [
 	...swampBarkCreatables,
 	...dtCreatables,
 	...caCreatables,
-	...forestryCreatables
+	...forestryCreatables,
+	...camdozaalItems
 ];
 
 export default Createables;
diff --git a/src/lib/minions/data/killableMonsters/camdozaalMonsters.ts b/src/lib/minions/data/killableMonsters/camdozaalMonsters.ts
@@ -0,0 +1,49 @@
+import { Time } from 'e';
+import { Monsters } from 'oldschooljs';
+
+import { KillableMonster } from '../../types';
+
+export const camdozaalMonsters: KillableMonster[] = [
+	{
+		id: Monsters.FlawedGolem.id,
+		name: Monsters.FlawedGolem.name,
+		aliases: Monsters.FlawedGolem.aliases,
+		timeToFinish: Time.Second * 15,
+		table: Monsters.FlawedGolem,
+		wildy: false,
+		difficultyRating: 0,
+		qpRequired: 17
+	},
+	{
+		id: Monsters.MindGolem.id,
+		name: Monsters.MindGolem.name,
+		aliases: Monsters.MindGolem.aliases,
+		timeToFinish: Time.Second * 18,
+		table: Monsters.MindGolem,
+		wildy: false,
+		difficultyRating: 1,
+		qpRequired: 17
+	},
+	{
+		id: Monsters.BodyGolem.id,
+		name: Monsters.BodyGolem.name,
+		aliases: Monsters.BodyGolem.aliases,
+		timeToFinish: Time.Second * 22,
+		table: Monsters.BodyGolem,
+		wildy: false,
+		difficultyRating: 1,
+		qpRequired: 17
+	},
+	{
+		id: Monsters.ChaosGolem.id,
+		name: Monsters.ChaosGolem.name,
+		aliases: Monsters.ChaosGolem.aliases,
+		timeToFinish: Time.Second * 30,
+		table: Monsters.ChaosGolem,
+		wildy: false,
+		difficultyRating: 2,
+		qpRequired: 17
+	}
+];
+
+export default camdozaalMonsters;
diff --git a/src/lib/minions/data/killableMonsters/index.ts b/src/lib/minions/data/killableMonsters/index.ts
@@ -9,6 +9,7 @@ import resolveItems, { deepResolveItems } from '../../../util/resolveItems';
 import { KillableMonster } from '../../types';
 import { NIGHTMARES_HP } from './../../../constants';
 import bosses from './bosses';
+import { camdozaalMonsters } from './camdozaalMonsters';
 import { chaeldarMonsters } from './chaeldarMonsters';
 import { creatureCreationCreatures } from './creatureCreation';
 import { konarMonsters } from './konarMonsters';
@@ -26,6 +27,7 @@ const killableMonsters: KillableMonster[] = [
 	...chaeldarMonsters,
 	...konarMonsters,
 	...krystiliaMonsters,
+	...camdozaalMonsters,
 	...mazchnaMonsters,
 	...nieveMonsters,
 	...turaelMonsters,

diff --git a/src/lib/skilling/skills/mining.ts b/src/lib/skilling/skills/mining.ts
@@ -259,6 +259,20 @@ const MotherlodeMine: Ore = {
 	petChance: 247_200
 };
 
+// Uses determineMiningTime function, therefore Ore object and id -1
+const CamdozaalMine: Ore = {
+	level: 14,
+	xp: -1,
+	id: -1,
+	name: 'Barronite rocks',
+	respawnTime: 3,
+	bankingTime: 20,
+	slope: 0.082_71,
+	intercept: 30.872,
+	petChance: 741_600,
+	clueScrollChance: 741_600
+};
+
 const prospectorItems: { [key: number]: number } = {
 	[itemID('Prospector helmet')]: 0.4,
 	[itemID('Prospector jacket')]: 0.8,
@@ -270,6 +284,7 @@ const Mining = {
 	aliases: ['mining'],
 	Ores: ores,
 	MotherlodeMine,
+	CamdozaalMine,
 	GemRockTable,
 	GraniteRockTable,
 	SandstoneRockTable,

diff --git a/src/lib/types/minions.ts b/src/lib/types/minions.ts
@@ -57,7 +57,10 @@ export interface ActivityTaskOptionsWithQuantity extends ActivityTaskOptions {
 		| 'WealthCharging'
 		| 'GloryCharging'
 		| 'AerialFishing'
-		| 'FishingTrawler';
+		| 'FishingTrawler'
+		| 'CamdozaalFishing'
+		| 'CamdozaalMining'
+		| 'CamdozaalSmithing';
 	quantity: number;
 }
 

diff --git a/src/lib/util/minionStatus.ts b/src/lib/util/minionStatus.ts
@@ -129,7 +129,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
@@ -139,7 +139,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
@@ -149,7 +149,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
@@ -159,7 +159,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
@@ -189,7 +189,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
@@ -209,7 +209,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
@@ -219,7 +219,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
@@ -229,7 +229,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
@@ -370,6 +370,18 @@
 			return `${name} is currently fighting cyclopes in the Warriors' Guild. ${formattedDuration}`;
 		}
 
+		case 'CamdozaalFishing': {
+			return `${name} is currently Fishing in the Ruins of Camdozaal. ${formattedDuration}`;
+		}
+
+		case 'CamdozaalMining': {
+			return `${name} is currently Mining in the Ruins of Camdozaal. ${formattedDuration}`;
+		}
+
+		case 'CamdozaalSmithing': {
+			return `${name} is currently Smithing in the Ruins of Camdozaal. ${formattedDuration}`;
+		}
+
 		case 'Sepulchre': {
 			const data = currentTask as SepulchreActivityTaskOptions;
 

diff --git a/src/lib/util/repeatStoredTrip.ts b/src/lib/util/repeatStoredTrip.ts
@@ -153,6 +153,24 @@ export const tripHandlers = {
 			warriors_guild: { action: 'tokens', quantity: data.quantity }
 		})
 	},
+	[activity_type_enum.CamdozaalMining]: {
+		commandName: 'activities',
+		args: (data: ActivityTaskOptionsWithQuantity) => ({
+			camdozaal: { action: 'mining', quantity: data.quantity }
+		})
+	},
+	[activity_type_enum.CamdozaalSmithing]: {
+		commandName: 'activities',
+		args: (data: ActivityTaskOptionsWithQuantity) => ({
+			camdozaal: { action: 'smithing', quantity: data.quantity }
+		})
+	},
+	[activity_type_enum.CamdozaalFishing]: {
+		commandName: 'activities',
+		args: (data: ActivityTaskOptionsWithQuantity) => ({
+			camdozaal: { action: 'fishing', quantity: data.quantity }
+		})
+	},
 	[activity_type_enum.BarbarianAssault]: {
 		commandName: 'minigames',
 		args: () => ({ barb_assault: { start: {} } })

diff --git a/src/mahoji/commands/activities.ts b/src/mahoji/commands/activities.ts
@@ -16,6 +16,7 @@ import { alchCommand } from '../lib/abstracted_commands/alchCommand';
 import { birdhouseCheckCommand, birdhouseHarvestCommand } from '../lib/abstracted_commands/birdhousesCommand';
 import { buryCommand } from '../lib/abstracted_commands/buryCommand';
 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';
@@ -113,6 +114,27 @@ export const activitiesCommand: OSBMahojiCommand = {
 				}
 			]
 		},
+		{
+			type: ApplicationCommandOptionType.Subcommand,
+			name: 'camdozaal',
+			description: 'Send your minion to do activities inside the Ruins of Camdozaal',
+			options: [
+				{
+					type: ApplicationCommandOptionType.String,
+					name: 'action',
+					description: 'Start mining, smithing, or fishing inside the Ruins of Camdozaal',
+					choices: ['mining', 'smithing', 'fishing'].map(i => ({ name: i, value: i })),
+					required: true
+				},
+				{
+					type: ApplicationCommandOptionType.Integer,
+					name: 'quantity',
+					description: 'The quantity you want to do (optional).',
+					required: false,
+					min_value: 1
+				}
+			]
+		},
 		{
 			type: ApplicationCommandOptionType.Subcommand,
 			name: 'collect',
@@ -501,6 +523,7 @@ export const activitiesCommand: OSBMahojiCommand = {
 		chompy_hunt?: { action: 'start' | 'claim' };
 		champions_challenge?: {};
 		warriors_guild?: { action: string; quantity?: number };
+		camdozaal?: { action: string; quantity?: number };
 		collect?: { item: string; quantity?: number; no_stams?: boolean };
 		quest?: {
 			name?: string;
@@ -573,6 +596,9 @@ export const activitiesCommand: OSBMahojiCommand = {
 				options.warriors_guild.quantity
 			);
 		}
+		if (options.camdozaal) {
+			return camdozaalCommand(user, channelID, options.camdozaal.action, options.camdozaal.quantity);
+		}
 		if (options.collect) {
 			return collectCommand(
 				user,