diff --git a/Mage.Sets/src/mage/cards/a/AnjeFalkenrath.java b/Mage.Sets/src/mage/cards/a/AnjeFalkenrath.java index 9d0e2834dd0..70c8b6c5a06 100644 --- a/Mage.Sets/src/mage/cards/a/AnjeFalkenrath.java +++ b/Mage.Sets/src/mage/cards/a/AnjeFalkenrath.java @@ -83,7 +83,7 @@ class AnjeFalkenrathTriggeredAbility extends TriggeredAbilityImpl { if (card == null) { return false; } - return card.getAbilities(game).stream().anyMatch(ability -> ability instanceof MadnessAbility); + return card.getAbilities(game).containsClass(MadnessAbility.class); } @Override diff --git a/Mage.Sets/src/mage/cards/b/BloodSun.java b/Mage.Sets/src/mage/cards/b/BloodSun.java index 227b656eaf9..0a9e2dd853a 100644 --- a/Mage.Sets/src/mage/cards/b/BloodSun.java +++ b/Mage.Sets/src/mage/cards/b/BloodSun.java @@ -1,6 +1,8 @@ package mage.cards.b; +import java.util.ArrayList; +import java.util.List; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; @@ -70,7 +72,13 @@ class BloodSunEffect extends ContinuousEffectImpl { for (Permanent permanent : game.getState().getBattlefield().getActivePermanents(StaticFilters.FILTER_LANDS, player.getId(), source.getSourceId(), game)) { switch (layer) { case AbilityAddingRemovingEffects_6: - permanent.getAbilities().removeIf(ability -> ability.getAbilityType() != AbilityType.MANA); + List toRemove = new ArrayList<>(); + permanent.getAbilities().forEach(a -> { + if (a.getAbilityType() != AbilityType.MANA) { + toRemove.add(a); + } + }); + permanent.removeAbilities(toRemove, source.getSourceId(), game); break; } } diff --git a/Mage.Sets/src/mage/cards/b/BronzehideLion.java b/Mage.Sets/src/mage/cards/b/BronzehideLion.java index a1f7fa245bd..5726a08cb07 100644 --- a/Mage.Sets/src/mage/cards/b/BronzehideLion.java +++ b/Mage.Sets/src/mage/cards/b/BronzehideLion.java @@ -133,17 +133,14 @@ class BronzehideLionContinuousEffect extends ContinuousEffectImpl { if (game.getState().getZoneChangeCounter(source.getSourceId()) > zoneChangeCounter) { discard(); } - MageObject sourceObject = game.getPermanent(source.getSourceId()); + Permanent sourceObject = game.getPermanent(source.getSourceId()); if (sourceObject == null) { sourceObject = game.getPermanentEntering(source.getSourceId()); } if (sourceObject == null) { return false; } - if (!(sourceObject instanceof Permanent)) { - return true; - } - Permanent lion = (Permanent) sourceObject; + Permanent lion = sourceObject; switch (layer) { case TypeChangingEffects_4: lion.getCardType().clear(); @@ -158,7 +155,7 @@ class BronzehideLionContinuousEffect extends ContinuousEffectImpl { toRemove.add(ability); } } - lion.getAbilities(game).removeAll(toRemove); + lion.removeAbilities(toRemove, source.getSourceId(), game); lion.getSpellAbility().getTargets().clear(); lion.getSpellAbility().getEffects().clear(); diff --git a/Mage.Sets/src/mage/cards/c/CastThroughTime.java b/Mage.Sets/src/mage/cards/c/CastThroughTime.java index 1693ae89d58..14b0171384f 100644 --- a/Mage.Sets/src/mage/cards/c/CastThroughTime.java +++ b/Mage.Sets/src/mage/cards/c/CastThroughTime.java @@ -89,7 +89,7 @@ class GainReboundEffect extends ContinuousEffectImpl { private void addReboundAbility(Card card, Game game) { if (CastThroughTime.filter.match(card, game)) { - boolean found = card.getAbilities(game).stream().anyMatch(ability -> ability instanceof ReboundAbility); + boolean found = card.getAbilities(game).containsClass(ReboundAbility.class); if (!found) { Ability ability = new ReboundAbility(); game.getState().addOtherAbility(card, ability); diff --git a/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java b/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java index e5c70512b6b..53dd4fb3647 100644 --- a/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java +++ b/Mage.Sets/src/mage/cards/d/DanceOfTheDead.java @@ -240,9 +240,7 @@ class DanceOfTheDeadChangeAbilityEffect extends ContinuousEffectImpl implements abilityToRemove = ability; } } - if (abilityToRemove != null) { - permanent.getAbilities().remove(abilityToRemove); - } + permanent.removeAbility(abilityToRemove, source.getSourceId(), game); permanent.addAbility(newAbility, source.getSourceId(), game); return true; } diff --git a/Mage.Sets/src/mage/cards/d/DeadlyRecluse.java b/Mage.Sets/src/mage/cards/d/DeadlyRecluse.java index b39c37d9dc4..4c5d0420b49 100644 --- a/Mage.Sets/src/mage/cards/d/DeadlyRecluse.java +++ b/Mage.Sets/src/mage/cards/d/DeadlyRecluse.java @@ -22,8 +22,12 @@ public final class DeadlyRecluse extends CardImpl { this.subtype.add(SubType.SPIDER); this.power = new MageInt(1); - this.toughness = new MageInt(2); + this.toughness = new MageInt(2); + + // Reach (This creature can block creatures with flying.) this.addAbility(ReachAbility.getInstance()); + + // Deathtouch (Any amount of damage this deals to a creature is enough to destroy it.) this.addAbility(DeathtouchAbility.getInstance()); } diff --git a/Mage.Sets/src/mage/cards/f/FlameSweep.java b/Mage.Sets/src/mage/cards/f/FlameSweep.java index 5fb3d7b6c20..6b27948005b 100644 --- a/Mage.Sets/src/mage/cards/f/FlameSweep.java +++ b/Mage.Sets/src/mage/cards/f/FlameSweep.java @@ -51,8 +51,6 @@ enum FlameSweepPredicate implements ObjectPlayerPredicate ability.getClass().equals(FlyingAbility.class) - )); + && object.getAbilities(game).containsClass(FlyingAbility.class)); } } \ No newline at end of file diff --git a/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java b/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java index 3c6124c9463..7565cfdca9d 100644 --- a/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java +++ b/Mage.Sets/src/mage/cards/m/MeliraSylvokOutcast.java @@ -149,7 +149,7 @@ class MeliraSylvokOutcastEffect3 extends ContinuousEffectImpl { Set opponents = game.getOpponents(source.getControllerId()); for (Permanent perm : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game)) { if (opponents.contains(perm.getControllerId())) { - perm.getAbilities().remove(InfectAbility.getInstance()); + perm.removeAbility(InfectAbility.getInstance(), source.getSourceId(), game); } } return true; diff --git a/Mage.Sets/src/mage/cards/s/ShoalSerpent.java b/Mage.Sets/src/mage/cards/s/ShoalSerpent.java index 8769d560813..73a060cff2e 100644 --- a/Mage.Sets/src/mage/cards/s/ShoalSerpent.java +++ b/Mage.Sets/src/mage/cards/s/ShoalSerpent.java @@ -67,7 +67,7 @@ class ShoalSerpentEffect extends ContinuousEffectImpl { switch (layer) { case AbilityAddingRemovingEffects_6: if (sublayer == SubLayer.NA) { - permanent.getAbilities().removeIf(entry -> entry.getId().equals(DefenderAbility.getInstance().getId())); + permanent.removeAbility(DefenderAbility.getInstance(), source.getSourceId(), game); } break; } diff --git a/Mage.Sets/src/mage/cards/w/WishfulMerfolk.java b/Mage.Sets/src/mage/cards/w/WishfulMerfolk.java index 09ce7ad9110..0badf53c393 100644 --- a/Mage.Sets/src/mage/cards/w/WishfulMerfolk.java +++ b/Mage.Sets/src/mage/cards/w/WishfulMerfolk.java @@ -68,7 +68,7 @@ class WishfulMerfolkEffect extends ContinuousEffectImpl { switch (layer) { case AbilityAddingRemovingEffects_6: if (sublayer == SubLayer.NA) { - permanent.getAbilities().removeIf(entry -> entry.getId().equals(DefenderAbility.getInstance().getId())); + permanent.removeAbility(DefenderAbility.getInstance(), source.getSourceId(), game); } break; case TypeChangingEffects_4: diff --git a/Mage/src/main/java/mage/abilities/Abilities.java b/Mage/src/main/java/mage/abilities/Abilities.java index 0d1000d1720..cbceb72bc34 100644 --- a/Mage/src/main/java/mage/abilities/Abilities.java +++ b/Mage/src/main/java/mage/abilities/Abilities.java @@ -2,9 +2,12 @@ package mage.abilities; import java.io.Serializable; +import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.UUID; +import java.util.function.Predicate; + import mage.abilities.keyword.ProtectionAbility; import mage.abilities.mana.ActivatedManaAbilityImpl; import mage.constants.Zone; @@ -255,7 +258,8 @@ public interface Abilities extends List, Serializable { boolean containsAll(Abilities abilities); /** - * Searches this set of abilities for the existence of the give class + * Searches this set of abilities for the existence of the given class + * Warning, it doesn't work with inherited classes (e.g. it's not equal to instanceOf command) * * @param classObject * @return True if the passed in class is also in this set of abilities. @@ -271,4 +275,13 @@ public interface Abilities extends List, Serializable { Abilities copy(); String getValue(); + + @Deprecated // use permanent.removeAbility instead + boolean remove(Object o); + + @Deprecated // use permanent.removeAbility instead + boolean removeAll(Collection c); + + @Deprecated // use permanent.removeAbility instead + boolean removeIf(Predicate filter); } diff --git a/Mage/src/main/java/mage/abilities/AbilitiesImpl.java b/Mage/src/main/java/mage/abilities/AbilitiesImpl.java index 15c1da82706..d46348ac008 100644 --- a/Mage/src/main/java/mage/abilities/AbilitiesImpl.java +++ b/Mage/src/main/java/mage/abilities/AbilitiesImpl.java @@ -232,7 +232,8 @@ public class AbilitiesImpl extends ArrayList implements Ab if (ability.getId().equals(test.getId())) { return true; } - if (ability.getOriginalId().equals(test.getId())) { + if (ability.getOriginalId().equals(test.getOriginalId())) { + // on ability resolve: engine creates ability's copy and generates newId(), so you must use originalId to find that ability in card later return true; } if (ability instanceof MageSingleton && test instanceof MageSingleton && ability.getRule().equals(test.getRule())) { @@ -243,7 +244,7 @@ public class AbilitiesImpl extends ArrayList implements Ab } @Override - public boolean containsRule(T ability) { + public boolean containsRule(T ability) { // TODO: remove return stream().anyMatch(rule -> rule.getRule().equals(ability.getRule())); } @@ -262,7 +263,7 @@ public class AbilitiesImpl extends ArrayList implements Ab } @Override - public boolean containsKey(UUID abilityId) { + public boolean containsKey(UUID abilityId) { // TODO: remove return stream().anyMatch(ability -> abilityId.equals(ability.getId())); } diff --git a/Mage/src/main/java/mage/abilities/Ability.java b/Mage/src/main/java/mage/abilities/Ability.java index dd5b811f84f..a1ebe909d03 100644 --- a/Mage/src/main/java/mage/abilities/Ability.java +++ b/Mage/src/main/java/mage/abilities/Ability.java @@ -522,4 +522,11 @@ public interface Ability extends Controllable, Serializable { Ability addCustomOutcome(Outcome customOutcome); Outcome getCustomOutcome(); + + /** + * For mtg's instances search, see rules example in 112.10b + * @param ability + * @return + */ + boolean isSameInstance(Ability ability); } diff --git a/Mage/src/main/java/mage/abilities/AbilityImpl.java b/Mage/src/main/java/mage/abilities/AbilityImpl.java index 6edcbfc98a7..f09b94f6164 100644 --- a/Mage/src/main/java/mage/abilities/AbilityImpl.java +++ b/Mage/src/main/java/mage/abilities/AbilityImpl.java @@ -938,6 +938,10 @@ public abstract class AbilityImpl implements Ability { @Override public boolean hasSourceObjectAbility(Game game, MageObject source, GameEvent event) { + // if source object have this ability + // uses for ability.isInUseableZone + // replacement and other continues effects can be without source, but active (must return true) + MageObject object = source; // for singleton abilities like Flying we can't rely on abilities' source because it's only once in continuous effects // so will use the sourceId of the object itself that came as a parameter if it is not null @@ -949,16 +953,10 @@ public abstract class AbilityImpl implements Ability { } if (object != null) { if (object instanceof Permanent) { - if (!((Permanent) object).getAbilities(game).contains(this)) { - return false; - } - return ((Permanent) object).isPhasedIn(); - } else if (object instanceof Card) { - return ((Card) object).getAbilities(game).contains(this); - } else if (!object.getAbilities().contains(this)) { // not sure which object it can still be - // check if it's an ability that is temporary gained to a card - Abilities otherAbilities = game.getState().getAllOtherAbilities(this.getSourceId()); - return otherAbilities != null && otherAbilities.contains(this); + return object.hasAbility(this, game) && ((Permanent) object).isPhasedIn(); + } else { + // cards and other objects + return object.hasAbility(this, game); } } return true; @@ -1264,4 +1262,17 @@ public abstract class AbilityImpl implements Ability { public Outcome getCustomOutcome() { return this.customOutcome; } + + @Override + public boolean isSameInstance(Ability ability) { + // same instance (by mtg rules) = same object, ID or class+text (you can't check class only cause it can be different by params/text) + if (ability == null) { + return false; + } + + return (this == ability) + || (this.getId().equals(ability.getId())) + || (this.getOriginalId().equals(ability.getOriginalId())) + || (this.getClass() == ability.getClass() && this.getRule(true).equals(ability.getRule(true))); + } } diff --git a/Mage/src/main/java/mage/abilities/common/LicidAbility.java b/Mage/src/main/java/mage/abilities/common/LicidAbility.java index f37f715e263..7963a7808c3 100644 --- a/Mage/src/main/java/mage/abilities/common/LicidAbility.java +++ b/Mage/src/main/java/mage/abilities/common/LicidAbility.java @@ -130,7 +130,8 @@ class LicidContinuousEffect extends ContinuousEffectImpl { } } } - licid.getAbilities(game).removeAll(toRemove); + licid.removeAbilities(toRemove, source.getSourceId(), game); + Ability ability = new EnchantAbility("creature"); ability.setRuleAtTheTop(true); licid.addAbility(ability, source.getSourceId(), game); diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/CreaturesCantGetOrHaveAbilityEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CreaturesCantGetOrHaveAbilityEffect.java index 51fb06870df..6ea1aabfbed 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/CreaturesCantGetOrHaveAbilityEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/CreaturesCantGetOrHaveAbilityEffect.java @@ -45,9 +45,7 @@ public class CreaturesCantGetOrHaveAbilityEffect extends ContinuousEffectImpl { if (controller != null) { for (Permanent permanent : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { if (permanent != null) { - while (permanent.getAbilities().remove(ability)) { - // repeat as long as ability can be removed - } + permanent.removeAbility(ability, source.getSourceId(), game); } } return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAllEffect.java index f9a6f40117b..dc8daf168c9 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAllEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAllEffect.java @@ -85,9 +85,7 @@ public class LoseAbilityAllEffect extends ContinuousEffectImpl { for (Iterator it = affectedObjectList.iterator(); it.hasNext();) { // filter may not be used again, because object can have changed filter relevant attributes but still geets boost Permanent perm = it.next().getPermanentOrLKIBattlefield(game); //LKI is neccessary for "dies triggered abilities" to work given to permanets (e.g. Showstopper) if (perm != null) { - for (Ability ability : ability) { - perm.getAbilities().removeIf(entry -> entry.getId().equals(ability.getId())); - } + perm.removeAbilities(ability, source.getSourceId(), game); } else { it.remove(); if (affectedObjectList.isEmpty()) { @@ -99,9 +97,7 @@ public class LoseAbilityAllEffect extends ContinuousEffectImpl { for (Permanent perm : game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game)) { if (!(excludeSource && perm.getId().equals(source.getSourceId()))) { System.out.println(game.getTurn() + ", " + game.getPhase() + ": " + "remove from size " + perm.getAbilities().size()); - for (Ability ability : ability) { - perm.getAbilities().removeIf(entry -> entry.getId().equals(ability.getId())); - } + perm.removeAbilities(ability, source.getSourceId(), game); } } // still as long as the prev. permanent is known to the LKI (e.g. Mikaeus, the Unhallowed) so gained dies triggered ability will trigger @@ -111,9 +107,7 @@ public class LoseAbilityAllEffect extends ContinuousEffectImpl { Permanent perm = (Permanent) mageObject; if (!(excludeSource && perm.getId().equals(source.getSourceId()))) { if (filter.match(perm, source.getSourceId(), source.getControllerId(), game)) { - for (Ability ability : ability) { - perm.getAbilities().removeIf(entry -> entry.getId().equals(ability.getId())); - } + perm.removeAbilities(ability, source.getSourceId(), game); } } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAttachedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAttachedEffect.java index 9c43b5c4c3c..5007c454949 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAttachedEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityAttachedEffect.java @@ -43,12 +43,7 @@ public class LoseAbilityAttachedEffect extends ContinuousEffectImpl { if (equipment != null && equipment.getAttachedTo() != null) { Permanent creature = game.getPermanent(equipment.getAttachedTo()); if (creature != null) { - while (creature.getAbilities().contains(ability)) { - if (!creature.getAbilities().remove(ability)) { - // Something went wrong - ability has an other id? - logger.warn("ability" + ability.getRule() + "couldn't be removed."); - } - } + creature.removeAbility(ability, source.getSourceId(), game); } } return true; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java index 44f6031387c..108f6f90544 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityOrAnotherAbilityTargetEffect.java @@ -63,13 +63,9 @@ public class LoseAbilityOrAnotherAbilityTargetEffect extends LoseAbilityTargetEf if (player.choose(outcome, chooseAbility, game)) { String chosenAbility = chooseAbility.getChoice(); if (chosenAbility.equals(ability.getRule())) { - while (permanent.getAbilities().contains(ability)) { - permanent.getAbilities().remove(ability); - } + permanent.removeAbility(ability, source.getSourceId(), game); } else if (chosenAbility.equals(ability2.getRule())) { - while (permanent.getAbilities().contains(ability2)) { - permanent.getAbilities().remove(ability2); - } + permanent.removeAbility(ability2, source.getSourceId(), game); } } else { return false; diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilitySourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilitySourceEffect.java index 6f5d03f33b2..f55e2fea5ab 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilitySourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilitySourceEffect.java @@ -56,10 +56,7 @@ public class LoseAbilitySourceEffect extends ContinuousEffectImpl { public boolean apply(Game game, Ability source) { Permanent permanent = game.getPermanent(source.getSourceId()); if (permanent != null) { - // 112.10 - while (permanent.getAbilities().remove(ability)) { - - } + permanent.removeAbility(ability, source.getSourceId(), game); } return true; } diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityTargetEffect.java index f8fa800f084..a3195035c38 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseAbilityTargetEffect.java @@ -45,18 +45,7 @@ public class LoseAbilityTargetEffect extends ContinuousEffectImpl { public boolean apply(Game game, Ability source) { Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source)); if (permanent != null) { - if (ability instanceof MageSingleton) { - while (permanent.getAbilities().contains(ability)) { - permanent.getAbilities().remove(ability); - } - } else { - for (Iterator iter = permanent.getAbilities().iterator(); iter.hasNext();) { - Ability ab = iter.next(); - if (ab.getClass().equals(ability.getClass())) { - iter.remove(); - } - } - } + permanent.removeAbility(ability, source.getSourceId(), game); } return true; } diff --git a/Mage/src/main/java/mage/cards/Card.java b/Mage/src/main/java/mage/cards/Card.java index 81a6877abbb..3bb996652b8 100644 --- a/Mage/src/main/java/mage/cards/Card.java +++ b/Mage/src/main/java/mage/cards/Card.java @@ -26,6 +26,10 @@ public interface Card extends MageObject { void setOwnerId(UUID ownerId); + /** + * For cards: return all basic and dynamic abilities + * For permanents: return all basic and dynamic abilities + */ Abilities getAbilities(Game game); void setSpellAbility(SpellAbility ability); diff --git a/Mage/src/main/java/mage/game/permanent/Permanent.java b/Mage/src/main/java/mage/game/permanent/Permanent.java index da45f0341bb..52933239222 100644 --- a/Mage/src/main/java/mage/game/permanent/Permanent.java +++ b/Mage/src/main/java/mage/game/permanent/Permanent.java @@ -154,15 +154,16 @@ public interface Permanent extends Card, Controllable { String getValue(GameState state); - @Deprecated - void addAbility(Ability ability, Game game); - void addAbility(Ability ability, UUID sourceId, Game game); void addAbility(Ability ability, UUID sourceId, Game game, boolean createNewId); void removeAllAbilities(UUID sourceId, Game game); + void removeAbility(Ability abilityToRemove, UUID sourceId, Game game); + + void removeAbilities(List abilitiesToRemove, UUID sourceId, Game game); + void addLoyaltyUsed(); boolean canLoyaltyBeUsed(Game game); diff --git a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java index cee725a145d..fcc676c0890 100644 --- a/Mage/src/main/java/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/main/java/mage/game/permanent/PermanentImpl.java @@ -351,62 +351,70 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { @Override public Abilities getAbilities() { - return abilities; + return super.getAbilities(); } @Override public Abilities getAbilities(Game game) { - return abilities; - } - - /** - * @param ability - * @param game - */ - @Override - public void addAbility(Ability ability, Game game) { - if (!abilities.containsKey(ability.getId())) { - Ability copyAbility = ability.copy(); - copyAbility.setControllerId(controllerId); - copyAbility.setSourceId(objectId); - if (game != null) { - game.getState().addAbility(copyAbility, this); - } - abilities.add(copyAbility); - } + return super.getAbilities(game); } @Override public void addAbility(Ability ability, UUID sourceId, Game game) { - addAbility(ability, sourceId, game, true); + addAbility(ability, sourceId, game, false); } @Override + @Deprecated // use addAbility(Ability ability, UUID sourceId, Game game) instead public void addAbility(Ability ability, UUID sourceId, Game game, boolean createNewId) { + // singleton abilities -- only one instance + // other abilities -- any amount of instances + // TODO: no needs in createNewId, so move code to addAbility(Ability ability, UUID sourceId, Game game) if (!abilities.containsKey(ability.getId())) { Ability copyAbility = ability.copy(); - if (createNewId) { - copyAbility.newId(); // needed so that source can get an ability multiple times (e.g. Raging Ravine) - } + copyAbility.newId(); // needed so that source can get an ability multiple times (e.g. Raging Ravine) copyAbility.setControllerId(controllerId); copyAbility.setSourceId(objectId); + // triggered abilities must be added to the state().triggers + // still as long as the prev. permanent is known to the LKI (e.g. Showstopper) so gained dies triggered ability will trigger game.getState().addAbility(copyAbility, sourceId, this); abilities.add(copyAbility); - } else if (!createNewId) { - // triggered abilities must be added to the state().triggerdAbilities - // still as long as the prev. permanent is known to the LKI (e.g. Showstopper) so gained dies triggered ability will trigger - if (!game.getBattlefield().containsPermanent(this.getId())) { - Ability copyAbility = ability.copy(); - copyAbility.setControllerId(controllerId); - copyAbility.setSourceId(objectId); - game.getState().addAbility(copyAbility, sourceId, this); - } } } @Override public void removeAllAbilities(UUID sourceId, Game game) { - getAbilities().clear(); + // can't use getAbilities() here -- cause it's can be auto-generated list potentially + // TODO: what about triggered abilities? See addAbility above -- triggers adds to GameState + abilities.clear(); + } + + @Override + public void removeAbility(Ability abilityToRemove, UUID sourceId, Game game) { + if (abilityToRemove == null) { + return; + } + + // 112.10b Effects that remove an ability remove all instances of it. + List toRemove = new ArrayList<>(); + abilities.forEach(a -> { + if (a.isSameInstance(abilityToRemove)) { + toRemove.add(a); + } + }); + + // can't use getAbilities() here -- cause it's can be auto-generated list potentially + // TODO: what about triggered abilities? See addAbility above -- triggers adds to GameState + toRemove.forEach(r -> abilities.remove(r)); + } + + @Override + public void removeAbilities(List abilitiesToRemove, UUID sourceId, Game game){ + if (abilitiesToRemove == null) { + return; + } + + abilitiesToRemove.forEach(a -> removeAbility(a, sourceId, game)); } @Override @@ -728,7 +736,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent { game.fireEvent(new GameEvent(EventType.GAINED_CONTROL, objectId, objectId, controllerId)); return true; - } else if (isCopy()) {// Because the previous copied abilities can be from another controller chnage controller in any case for abilities + } else if (isCopy()) {// Because the previous copied abilities can be from another controller - change controller in any case for abilities this.getAbilities(game).setControllerId(controllerId); game.getContinuousEffects().setController(objectId, controllerId); }