Merge origin/master

This commit is contained in:
LevelX2 2016-09-16 17:28:37 +02:00
commit 39b01378cc
2 changed files with 4 additions and 2 deletions

View file

@ -65,7 +65,8 @@ public class CombustibleGearhulk extends CardImpl {
// When Combustible Gearhulk enters the battlefield, target opponent may have you draw three cards. If the player doesn't, put the top three cards of your library into your graveyard, then Combustible Gearhulk deals damage to that player equal to the total converted mana cost of those cards.
EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new CombustibleGearhulkEffect(), false);
ability.addTarget(new TargetOpponent());
ability.addTarget(new TargetOpponent(false));
this.addAbility(ability);
}
@ -83,6 +84,7 @@ class CombustibleGearhulkEffect extends OneShotEffect {
public CombustibleGearhulkEffect() {
super(Outcome.AIDontUseIt);
staticText = "target opponent may have you draw three cards. If the player doesn't, put the top three cards of your library into your graveyard, then {this} deals damage to that player equal to the total converted mana cost of those cards";
}
public CombustibleGearhulkEffect(final CombustibleGearhulkEffect effect) {

View file

@ -31,7 +31,7 @@ import java.util.UUID;
/**
*
* @author anonymous
* @author spjspj
*/
public class CombustibleGearhulk extends mage.sets.kaladesh.CombustibleGearhulk {