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

fixed Heliod's Punishment (counters not removes after tap);

Browse source
This commit is contained in:
Oleg Agafonov 2020-01-14 09:34:41 +04:00
parent 11976b5c89
commit dae2c57c45
2 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/src/main/java/mage/utils/MageVersion.java
View file

@ -57,7 +57,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
} }
public String toString(boolean showBuildTime) { public String toString(boolean showBuildTime) {
// 1.4.32-betaV0 (build: time) // 1.4.32V1-beta2 (build: time)
String res = major + "." + minor + '.' + patch + minorPatch + editionInfo; String res = major + "." + minor + '.' + patch + minorPatch + editionInfo;
if (showBuildTime && !this.buildTime.isEmpty()) { if (showBuildTime && !this.buildTime.isEmpty()) {
res += " (build: " + this.buildTime + ")"; res += " (build: " + this.buildTime + ")";

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

@ -1,6 +1,5 @@
package mage.cards.h; package mage.cards.h;
import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
@ -14,22 +13,16 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.EnchantAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.AttachmentType; import mage.constants.*;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.SubLayer;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/** /**
*
* @author LevelX2 * @author LevelX2
*/ */
public final class HeliodsPunishment extends CardImpl { public final class HeliodsPunishment extends CardImpl {
@ -90,7 +83,7 @@ class HeliodsPunishmentLoseAllAbilitiesEnchantedEffect extends ContinuousEffectI
attachedTo.removeAllAbilities(source.getSourceId(), game); attachedTo.removeAllAbilities(source.getSourceId(), game);
HeliodsPunishmentEffect effect = new HeliodsPunishmentEffect(sourceEnchantment.getName()); HeliodsPunishmentEffect effect = new HeliodsPunishmentEffect(sourceEnchantment.getName());
Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost()); Ability ability = new SimpleActivatedAbility(effect, new TapSourceCost());
effect.setSourceEnchantment(sourceEnchantment); effect.setSourceEnchantment(sourceEnchantment.getId());
attachedTo.addAbility(ability, source.getSourceId(), game); attachedTo.addAbility(ability, source.getSourceId(), game);
} }
} }
@ -101,17 +94,17 @@ class HeliodsPunishmentLoseAllAbilitiesEnchantedEffect extends ContinuousEffectI
class HeliodsPunishmentEffect extends OneShotEffect { class HeliodsPunishmentEffect extends OneShotEffect {
Permanent sourceEnchantment; UUID sourceEnchantmentId;
public HeliodsPunishmentEffect(String sourceName) { public HeliodsPunishmentEffect(String sourceName) {
super(Outcome.Benefit); super(Outcome.Benefit);
this.staticText = "Remove a task counter from " + sourceName + ". Then if it has no task counters on it, destroy " + sourceName + "."; this.staticText = "Remove a task counter from " + sourceName + ". Then if it has no task counters on it, destroy " + sourceName + ".";
sourceEnchantment = null; sourceEnchantmentId = null;
} }
public HeliodsPunishmentEffect(final HeliodsPunishmentEffect effect) { public HeliodsPunishmentEffect(final HeliodsPunishmentEffect effect) {
super(effect); super(effect);
this.sourceEnchantment = effect.sourceEnchantment.copy(); this.sourceEnchantmentId = effect.sourceEnchantmentId;
} }
@Override @Override
@ -121,6 +114,7 @@ class HeliodsPunishmentEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Permanent sourceEnchantment = game.getPermanent(this.sourceEnchantmentId);
if (sourceEnchantment != null) { if (sourceEnchantment != null) {
if (sourceEnchantment.getCounters(game).getCount(CounterType.TASK) > 0) { if (sourceEnchantment.getCounters(game).getCount(CounterType.TASK) > 0) {
sourceEnchantment.removeCounters(CounterType.TASK.createInstance(1), game); sourceEnchantment.removeCounters(CounterType.TASK.createInstance(1), game);
@ -136,8 +130,8 @@ class HeliodsPunishmentEffect extends OneShotEffect {
return false; return false;
} }
public void setSourceEnchantment(Permanent sourceEnchantment) { public void setSourceEnchantment(UUID sourceEnchantment) {
this.sourceEnchantment = sourceEnchantment; this.sourceEnchantmentId = sourceEnchantment;
} }
} }