github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Heavenly Blademaster - Fixed attachment movement logic. Fixed tooltip text.

Browse source
This commit is contained in:
LevelX2 2018-08-17 15:18:23 +02:00
parent c09eb506de
commit a3ffddcbdd
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Mage.Sets/src/mage/cards/h/HeavenlyBlademaster.java
View file

@ -11,14 +11,14 @@ import mage.abilities.dynamicvalue.common.AuraAttachedCount;
import mage.abilities.dynamicvalue.common.EquipmentAttachedCount; import mage.abilities.dynamicvalue.common.EquipmentAttachedCount;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect;
import mage.constants.SubType;
import mage.abilities.keyword.FlyingAbility;
import mage.abilities.keyword.DoubleStrikeAbility; import mage.abilities.keyword.DoubleStrikeAbility;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.SubType;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
@ -65,7 +65,7 @@ public final class HeavenlyBlademaster extends CardImpl {
new BoostControlledEffect( new BoostControlledEffect(
totalAmount, totalAmount, Duration.WhileOnBattlefield, totalAmount, totalAmount, Duration.WhileOnBattlefield,
StaticFilters.FILTER_PERMANENT_CREATURES, true StaticFilters.FILTER_PERMANENT_CREATURES, true
) ).setText("Other creatures you control get +1/+1 for each Aura and Equipment attached to {this}")
)); ));
} }
@ -93,8 +93,7 @@ class HeavenlyBlademasterEffect extends OneShotEffect {
public HeavenlyBlademasterEffect() { public HeavenlyBlademasterEffect() {
super(Outcome.Benefit); super(Outcome.Benefit);
this.staticText = "you may attach any number " staticText = "you may attach any number of Auras and Equipment you control to it";
+ "of Auras and Equipment you control to it";
} }
public HeavenlyBlademasterEffect(final HeavenlyBlademasterEffect effect) { public HeavenlyBlademasterEffect(final HeavenlyBlademasterEffect effect) {
@ -108,9 +107,9 @@ class HeavenlyBlademasterEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(source.getSourceId()); Permanent sourcePermanent = game.getPermanent(source.getSourceId());
Player player = game.getPlayer(source.getControllerId()); Player player = game.getPlayer(source.getControllerId());
if (permanent == null || player == null) { if (sourcePermanent == null || player == null) {
return false; return false;
} }
Target target = new TargetPermanent(0, Integer.MAX_VALUE, filter, true); Target target = new TargetPermanent(0, Integer.MAX_VALUE, filter, true);
@ -122,7 +121,18 @@ class HeavenlyBlademasterEffect extends OneShotEffect {
).filter( ).filter(
attachment -> attachment != null attachment -> attachment != null
).forEachOrdered((attachment) -> { ).forEachOrdered((attachment) -> {
attachment.attachTo(permanent.getId(), game); if (!sourcePermanent.cantBeAttachedBy(attachment, game)) {
if (attachment.getAttachedTo() != sourcePermanent.getId()) {
if (attachment.getAttachedTo() != null) {
Permanent fromPermanent = game.getPermanent(attachment.getAttachedTo());
if (fromPermanent != null) {
fromPermanent.removeAttachment(attachment.getId(), game);
}
}
}
sourcePermanent.addAttachment(attachment.getId(), game);
game.informPlayers(attachment.getLogName() + " was attached to " + sourcePermanent.getLogName());
}
}); });
return true; return true;
} }