mirror of
https://github.com/magefree/mage.git
synced 2026-01-25 12:49:39 -08:00
Merge
This commit is contained in:
commit
f55e3a88dd
4 changed files with 7 additions and 2 deletions
|
|
@ -218,7 +218,7 @@ public class ProteanHydra extends CardImpl<ProteanHydra> {
|
|||
|
||||
@Override
|
||||
public boolean checkTrigger(GameEvent event, Game game) {
|
||||
if (event.getType() == EventType.END_TURN_STEP_PRE && event.getPlayerId().equals(this.controllerId)) {
|
||||
if (event.getType() == EventType.END_TURN_STEP_PRE) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ import mage.Constants.CardType;
|
|||
import mage.Constants.Rarity;
|
||||
import mage.MageInt;
|
||||
import mage.abilities.common.SimpleStaticAbility;
|
||||
import mage.abilities.keyword.InfectAbility;
|
||||
import mage.abilities.keyword.ProtectionAbility;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterArtifactCard;
|
||||
|
|
@ -52,6 +53,7 @@ public class TelJiladFallen extends CardImpl<TelJiladFallen> {
|
|||
this.color.setGreen(true);
|
||||
this.power = new MageInt(3);
|
||||
this.toughness = new MageInt(1);
|
||||
this.addAbility(InfectAbility.getInstance());
|
||||
this.addAbility(new ProtectionAbility(new FilterArtifactCard("artifacts")));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@ class OranRiefTheVastwoodEffect extends OneShotEffect<OranRiefTheVastwoodEffect>
|
|||
FilterPermanent filter = new FilterPermanent();
|
||||
filter.getCardType().add(CardType.CREATURE);
|
||||
filter.getColor().setGreen(true);
|
||||
filter.setUseColor(true);
|
||||
for (Permanent permanent: game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game)) {
|
||||
if (permanent.getTurnsOnBattlefield() == 0) {
|
||||
permanent.addCounters(new PlusOneCounter());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue