From d35fd4aa29bb57468a599a29cf6c2fe085e9cd83 Mon Sep 17 00:00:00 2001
From: ssk97 <knipesteven@gmail.com>
Date: Sun, 14 Jan 2024 16:56:54 -0800
Subject: [PATCH] fix Armored Kincaller; Goblin Researcher (#11653)

* Armored Kincaller shouldn't trigger off of itself

* Goblin Researcher condition needs to check its watcher

* Lifegain text fix
---
 Mage.Sets/src/mage/cards/a/ArmoredKincaller.java | 2 ++
 Mage.Sets/src/mage/cards/g/GoblinResearcher.java | 2 +-
 Mage.Sets/src/mage/cards/g/Gristleback.java      | 4 +++-
 Mage.Sets/src/mage/cards/r/Respite.java          | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/a/ArmoredKincaller.java b/Mage.Sets/src/mage/cards/a/ArmoredKincaller.java
index 3750314f507..e200def7a2b 100644
--- a/Mage.Sets/src/mage/cards/a/ArmoredKincaller.java
+++ b/Mage.Sets/src/mage/cards/a/ArmoredKincaller.java
@@ -13,6 +13,7 @@ import mage.constants.Outcome;
 import mage.constants.SubType;
 import mage.filter.FilterCard;
 import mage.filter.FilterPermanent;
+import mage.filter.predicate.mageobject.AnotherPredicate;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.common.TargetCardInHand;
@@ -52,6 +53,7 @@ class ArmoredKincallerEffect extends OneShotEffect {
 
     static {
         filter.add(SubType.DINOSAUR.getPredicate());
+        filter2.add(AnotherPredicate.instance);
     }
 
     ArmoredKincallerEffect() {
diff --git a/Mage.Sets/src/mage/cards/g/GoblinResearcher.java b/Mage.Sets/src/mage/cards/g/GoblinResearcher.java
index de5a67c6f1e..d0dd8aeadc8 100644
--- a/Mage.Sets/src/mage/cards/g/GoblinResearcher.java
+++ b/Mage.Sets/src/mage/cards/g/GoblinResearcher.java
@@ -86,7 +86,7 @@ enum GoblinResearcherCondition implements Condition {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        return false;
+        return GoblinResearcherWatcher.checkPlayer(source, game);
     }
 }
 
diff --git a/Mage.Sets/src/mage/cards/g/Gristleback.java b/Mage.Sets/src/mage/cards/g/Gristleback.java
index 201865c1b82..27f5fc59105 100644
--- a/Mage.Sets/src/mage/cards/g/Gristleback.java
+++ b/Mage.Sets/src/mage/cards/g/Gristleback.java
@@ -31,7 +31,9 @@ public final class Gristleback extends CardImpl {
         this.addAbility(new BloodthirstAbility(1));
         
         // Sacrifice Gristleback: You gain life equal to Gristleback's power.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(new SourcePermanentPowerCount()), new SacrificeSourceCost()));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
+                new GainLifeEffect(new SourcePermanentPowerCount()).setText("You gain life equal to {this}'s power"),
+                new SacrificeSourceCost()));
     }
 
     private Gristleback(final Gristleback card) {
diff --git a/Mage.Sets/src/mage/cards/r/Respite.java b/Mage.Sets/src/mage/cards/r/Respite.java
index b66ac69b6f7..2b771a83087 100644
--- a/Mage.Sets/src/mage/cards/r/Respite.java
+++ b/Mage.Sets/src/mage/cards/r/Respite.java
@@ -23,7 +23,7 @@ public final class Respite extends CardImpl {
         this.getSpellAbility().addEffect(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true));
         
         // You gain 1 life for each attacking creature.
-        this.getSpellAbility().addEffect(new GainLifeEffect(new AttackingCreatureCount()));
+        this.getSpellAbility().addEffect(new GainLifeEffect(new AttackingCreatureCount()).setText("You gain 1 life for each attacking creature"));
     }
 
     private Respite(final Respite card) {