github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7049 from jmharmon/master

Browse source 
[ZNR] Fixed Ashaya and Cleric of Life's Blood
This commit is contained in:
Oleg Agafonov 2020-09-06 23:01:17 +02:00 committed by GitHub
commit a1cf037628
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Mage.Sets/src/mage/cards/a/AshayaSoulOfTheWild.java
View file

@ -17,9 +17,7 @@ import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.TokenPredicate; import mage.filter.predicate.permanent.TokenPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player;
import java.util.List;
import java.util.UUID; import java.util.UUID;
/** /**
@ -66,6 +64,7 @@ class AshayaSoulOfTheWildEffect extends ContinuousEffectImpl {
public AshayaSoulOfTheWildEffect() { public AshayaSoulOfTheWildEffect() {
super(Duration.WhileOnBattlefield, Outcome.Neutral); super(Duration.WhileOnBattlefield, Outcome.Neutral);
staticText = "Nontoken creatures you control are Forest lands in addition to their other types"; staticText = "Nontoken creatures you control are Forest lands in addition to their other types";
this.dependencyTypes.add(DependencyType.BecomeForest);
} }
public AshayaSoulOfTheWildEffect(final AshayaSoulOfTheWildEffect effect) { public AshayaSoulOfTheWildEffect(final AshayaSoulOfTheWildEffect effect) {
@ -79,35 +78,22 @@ class AshayaSoulOfTheWildEffect extends ContinuousEffectImpl {
@Override @Override
public boolean apply(Layer layer, SubLayer subLayer, Ability source, Game game) { public boolean apply(Layer layer, SubLayer subLayer, Ability source, Game game) {
Player you = game.getPlayer(source.getControllerId()); for (Permanent land : game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) {
List<Permanent> creatures = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game);
if (you != null) {
for (Permanent creature : creatures) {
if (creature != null) {
switch (layer) { switch (layer) {
case TypeChangingEffects_4: case TypeChangingEffects_4:
creature.addCardType(CardType.LAND); // land abilities are intrinsic, so add them here, not in layer 6
creature.getSubtype(game).add(SubType.FOREST); if (!land.hasSubtype(SubType.FOREST, game)) {
land.getSubtype(game).add(SubType.FOREST);
if (!land.getAbilities(game).containsClass(GreenManaAbility.class)) {
land.addAbility(new GreenManaAbility(), source.getSourceId(), game);
}
}
land.addCardType(CardType.LAND);
break; break;
case AbilityAddingRemovingEffects_6:
boolean flag = false;
for (Ability ability : creature.getAbilities(game)) {
if (ability instanceof GreenManaAbility) {
flag = true;
break;
}
}
if (!flag) {
creature.addAbility(new GreenManaAbility(), source.getSourceId(), game);
}
break;
}
} }
} }
return true; return true;
} }
return false;
}
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
@ -116,6 +102,6 @@ class AshayaSoulOfTheWildEffect extends ContinuousEffectImpl {
@Override @Override
public boolean hasLayer(Layer layer) { public boolean hasLayer(Layer layer) {
return layer == Layer.TypeChangingEffects_4 || layer == Layer.AbilityAddingRemovingEffects_6; return layer == Layer.TypeChangingEffects_4;
} }
} }

2
Mage.Sets/src/mage/cards/c/ClericOfLifesBond.java
View file

@ -96,7 +96,7 @@ class ClericOfLifesBondCounterTriggeredAbility extends TriggeredAbilityImpl {
@Override @Override
public String getRule() { public String getRule() {
return "When you gain life for the first time each turn, put a +1/+1 counter on {this}."; return "Whenever you gain life for the first time each turn, put a +1/+1 counter on {this}.";
} }
@Override @Override