External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-26 05:22:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[MIC] Implemented Curse of Unbinding

Browse source
This commit is contained in:
Evan Kranzler 2021-09-20 20:57:37 -04:00
parent f3eef7eafd
commit 541511692e
9 changed files with 133 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Mage/src/main/java/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
View file

@ -14,8 +14,8 @@ import mage.target.targetpointer.FixedTarget;
*/
public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
private TargetController targetController;
private boolean setTargetPointer;
private final TargetController targetController;
private final boolean setTargetPointer;
protected String ruleTrigger;
public BeginningOfUpkeepTriggeredAbility(Effect effect, TargetController targetController, boolean isOptional) {
@ -59,30 +59,20 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
switch (targetController) {
case YOU:
boolean yours = event.getPlayerId().equals(this.controllerId);
if (yours && setTargetPointer) {
if (getTargets().isEmpty()) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
}
if (yours && setTargetPointer && getTargets().isEmpty()) {
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return yours;
case NOT_YOU:
boolean notYours = !event.getPlayerId().equals(this.controllerId);
if (notYours && setTargetPointer) {
if (getTargets().isEmpty()) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
}
if (notYours && setTargetPointer && getTargets().isEmpty()) {
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return notYours;
case OPPONENT:
if (game.getPlayer(this.controllerId).hasOpponent(event.getPlayerId(), game)) {
if (setTargetPointer && getTargets().isEmpty()) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return true;
}
@ -91,9 +81,7 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
case ACTIVE:
case EACH_PLAYER:
if (setTargetPointer && getTargets().isEmpty()) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return true;
case CONTROLLER_ATTACHED_TO:
@ -102,16 +90,23 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
Permanent attachedTo = game.getPermanent(attachment.getAttachedTo());
if (attachedTo != null && attachedTo.isControlledBy(event.getPlayerId())) {
if (setTargetPointer && getTargets().isEmpty()) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return true;
}
}
break;
case ENCHANTED:
Permanent permanent = getSourcePermanentIfItStillExists(game);
if (permanent == null || !game.isActivePlayer(permanent.getAttachedTo())) {
break;
}
if (setTargetPointer && getTargets().isEmpty()) {
this.getEffects().setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return true;
default:
throw new UnsupportedOperationException("Value for targetController not supported: " + targetController.toString());
throw new UnsupportedOperationException("Value for targetController not supported: " + targetController);
}
return false;
}
@ -133,6 +128,8 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl {
return "At the beginning of each upkeep, " + generateZoneString();
case CONTROLLER_ATTACHED_TO:
return "At the beginning of the upkeep of enchanted creature's controller, " + generateZoneString();
case ENCHANTED:
return "At the beginning of enchanted player's upkeep, " + generateZoneString();
}
return "";
}

18
Mage/src/main/java/mage/constants/TargetController.java
View file

@ -1,12 +1,11 @@
package mage.constants;
import mage.cards.Card;
import mage.filter.predicate.ObjectPlayer;
import mage.filter.predicate.ObjectPlayerPredicate;
import mage.filter.predicate.ObjectSourcePlayer;
import mage.filter.predicate.ObjectSourcePlayerPredicate;
import mage.game.Controllable;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import java.util.UUID;
@ -26,6 +25,7 @@ public enum TargetController {
CONTROLLER_ATTACHED_TO,
NEXT,
EACH_PLAYER,
ENCHANTED,
SOURCE_TARGETS;
private final OwnerPredicate ownerPredicate;
@ -50,7 +50,7 @@ public enum TargetController {
return controllerPredicate;
}
public static class OwnerPredicate implements ObjectPlayerPredicate<ObjectPlayer<Card>> {
public static class OwnerPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePlayer<Card>> {
private final TargetController targetOwner;
@ -59,7 +59,7 @@ public enum TargetController {
}
@Override
public boolean apply(ObjectPlayer<Card> input, Game game) {
public boolean apply(ObjectSourcePlayer<Card> input, Game game) {
Card card = input.getObject();
UUID playerId = input.getPlayerId();
if (card == null || playerId == null) {
@ -83,6 +83,9 @@ public enum TargetController {
return true;
}
break;
case ENCHANTED:
Permanent permanent = game.getPermanent(input.getSourceId());
return permanent != null && input.getObject().isOwnedBy(permanent.getAttachedTo());
case ANY:
return true;
}
@ -140,7 +143,7 @@ public enum TargetController {
}
}
public static class ControllerPredicate implements ObjectPlayerPredicate<ObjectPlayer<Controllable>> {
public static class ControllerPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePlayer<Controllable>> {
private final TargetController controller;
@ -149,7 +152,7 @@ public enum TargetController {
}
@Override
public boolean apply(ObjectPlayer<Controllable> input, Game game) {
public boolean apply(ObjectSourcePlayer<Controllable> input, Game game) {
Controllable object = input.getObject();
UUID playerId = input.getPlayerId();
@ -180,6 +183,9 @@ public enum TargetController {
return true;
}
break;
case ENCHANTED:
Permanent permanent = game.getPermanent(input.getSourceId());
return permanent != null && input.getObject().isControlledBy(permanent.getAttachedTo());
case ANY:
return true;
}

19
Mage/src/main/java/mage/filter/predicate/permanent/EnchantPlayerControlsPredicate.java
View file

@ -1,19 +0,0 @@
package mage.filter.predicate.permanent;
import mage.filter.predicate.ObjectSourcePlayer;
import mage.filter.predicate.ObjectSourcePlayerPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
/**
* @author TheElk801
*/
public enum EnchantPlayerControlsPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePlayer<Permanent>> {
instance;
@Override
public boolean apply(ObjectSourcePlayer<Permanent> input, Game game) {
Permanent permanent = game.getPermanent(input.getSourceId());
return permanent != null && input.getObject().isControlledBy(permanent.getAttachedTo());
}
}