From 5c2b98b3ffa4ddf8a295c43c46cf605e4d1df299 Mon Sep 17 00:00:00 2001
From: themrrobert <10122432+themrrobert@users.noreply.github.com>
Date: Sat, 24 Feb 2024 18:02:21 -0800
Subject: [PATCH] Eagle Tame Fixes

---
 src/mahoji/commands/tames.ts | 3 ++-
 src/tasks/tames/tameTasks.ts | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mahoji/commands/tames.ts b/src/mahoji/commands/tames.ts
index fc34e9c002..eb79c5b287 100644
--- 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
index f83d56f900..627e685a29 100644
--- 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)) {