Eagle Tame Fixes (#5718)

oldschoolgg · Feb 25, 2024 · 2b59c5d · 2b59c5d
1 parent 8c2db37
commit 2b59c5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/mahoji/commands/tames.ts b/src/mahoji/commands/tames.ts
@@ -1604,7 +1604,8 @@ async function tameClueCommand(user: MUser, channelID: string, inputName: string
 		return 'You need to have all your STASH units built and full for your tame to do Grandmaster clues.';
 	}
 
-	if (!user.owns(cost)) {
+	if (!user.owns(cost) || (costSavedByDemonicJibwings !== null && !user.owns(costSavedByDemonicJibwings))) {
+		if (costSavedByDemonicJibwings) cost.add(costSavedByDemonicJibwings);
 		return `You need ${cost} to feed your Eagle for this trip.`;
 	}
 

diff --git a/src/tasks/tames/tameTasks.ts b/src/tasks/tames/tameTasks.ts
@@ -269,13 +269,14 @@ export async function runTameTask(activity: TameActivity, tame: Tame) {
 			}
 
 			if (clueTier.name === 'Master') {
-				const percentChanceOfGMC = mTame.hasEquipped('Divine ring') ? 3.5 : 1.5;
+				const hasDivineRing = mTame.hasEquipped('Divine ring');
+				const percentChanceOfGMC = hasDivineRing ? 3.5 : 1.5;
 				for (let i = 0; i < activityData.quantity; i++) {
 					if (percentChance(percentChanceOfGMC)) {
 						loot.add('Clue scroll (grandmaster)');
 					}
 				}
-				messages.push('2x GMC droprate for divine ring');
+				if (hasDivineRing) messages.push('2x GMC droprate for divine ring');
 			}
 
 			if (user.bitfield.includes(BitField.DisabledTameClueOpening)) {