External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 10:40:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix Armored Kincaller; Goblin Researcher (#11653)

Browse source 
* Armored Kincaller shouldn't trigger off of itself

* Goblin Researcher condition needs to check its watcher

* Lifegain text fix
This commit is contained in:
ssk97 2024-01-14 16:56:54 -08:00 • committed by GitHub
parent 5043ed62ab
commit d35fd4aa29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/a/ArmoredKincaller.java
View file

@ -13,6 +13,7 @@ import mage.constants.Outcome;
import mage.constants.SubType; import mage.constants.SubType;
import mage.filter.FilterCard; import mage.filter.FilterCard;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.AnotherPredicate;
import mage.game.Game; import mage.game.Game;
import mage.players.Player; import mage.players.Player;
import mage.target.common.TargetCardInHand; import mage.target.common.TargetCardInHand;
@ -52,6 +53,7 @@ class ArmoredKincallerEffect extends OneShotEffect {
static { static {
filter.add(SubType.DINOSAUR.getPredicate()); filter.add(SubType.DINOSAUR.getPredicate());
filter2.add(AnotherPredicate.instance);
} }
ArmoredKincallerEffect() { ArmoredKincallerEffect() {

2
Mage.Sets/src/mage/cards/g/GoblinResearcher.java
View file

@ -86,7 +86,7 @@ enum GoblinResearcherCondition implements Condition {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
return false; return GoblinResearcherWatcher.checkPlayer(source, game);
} }
} }

4
Mage.Sets/src/mage/cards/g/Gristleback.java
View file

@ -31,7 +31,9 @@ public final class Gristleback extends CardImpl {
this.addAbility(new BloodthirstAbility(1)); this.addAbility(new BloodthirstAbility(1));
// Sacrifice Gristleback: You gain life equal to Gristleback's power. // 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) { private Gristleback(final Gristleback card) {

2
Mage.Sets/src/mage/cards/r/Respite.java
View file

@ -23,7 +23,7 @@ public final class Respite extends CardImpl {
this.getSpellAbility().addEffect(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true)); this.getSpellAbility().addEffect(new PreventAllDamageByAllPermanentsEffect(Duration.EndOfTurn, true));
// You gain 1 life for each attacking creature. // 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) { private Respite(final Respite card) {