github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-28 03:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

begin modifying target adjustment implementations

Browse source
This commit is contained in:
Evan Kranzler 2018-09-17 10:47:39 -04:00
parent 8bcf95d996
commit 9b94b618cd
2 changed files with 36 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Mage/src/main/java/mage/cards/CardImpl.java
View file

@ -352,6 +352,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
// } // }
@Override @Override
public void adjustTargets(Ability ability, Game game) { public void adjustTargets(Ability ability, Game game) {
ability.adjustTargets(game);
int xValue; int xValue;
TargetPermanent oldTargetPermanent; TargetPermanent oldTargetPermanent;
FilterPermanent permanentFilter; FilterPermanent permanentFilter;
@ -361,14 +362,14 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
case NONE: case NONE:
break; break;
case X_CMC_EQUAL_PERM: case X_CMC_EQUAL_PERM:
xValue = ability.getManaCostsToPay().getX(); // xValue = ability.getManaCostsToPay().getX();
oldTargetPermanent = (TargetPermanent) ability.getTargets().get(0); // oldTargetPermanent = (TargetPermanent) ability.getTargets().get(0);
minTargets = oldTargetPermanent.getMinNumberOfTargets(); // minTargets = oldTargetPermanent.getMinNumberOfTargets();
maxTargets = oldTargetPermanent.getMaxNumberOfTargets(); // maxTargets = oldTargetPermanent.getMaxNumberOfTargets();
permanentFilter = oldTargetPermanent.getFilter().copy(); // permanentFilter = oldTargetPermanent.getFilter().copy();
permanentFilter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue)); // permanentFilter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue));
ability.getTargets().clear(); // ability.getTargets().clear();
ability.getTargets().add(new TargetPermanent(minTargets, maxTargets, permanentFilter, false)); // ability.getTargets().add(new TargetPermanent(minTargets, maxTargets, permanentFilter, false));
break; break;
case X_TARGETS: case X_TARGETS:
xValue = ability.getManaCostsToPay().getX(); xValue = ability.getManaCostsToPay().getX();

27
Mage/src/main/java/mage/target/targetadjustment/XCMCPermanentAdjuster.java Normal file
View file

@ -0,0 +1,27 @@
package mage.target.targetadjustment;
import mage.abilities.Ability;
import mage.constants.ComparisonType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
import mage.game.Game;
import mage.target.TargetPermanent;
/**
*
* @author TheElk801
*/
public class XCMCPermanentAdjuster implements TargetAdjuster {
@Override
public void adjustTargets(Ability ability, Game game) {
int xValue = ability.getManaCostsToPay().getX();
TargetPermanent oldTargetPermanent = (TargetPermanent) ability.getTargets().get(0);
int minTargets = oldTargetPermanent.getMinNumberOfTargets();
int maxTargets = oldTargetPermanent.getMaxNumberOfTargets();
FilterPermanent permanentFilter = oldTargetPermanent.getFilter().copy();
permanentFilter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue));
ability.getTargets().clear();
ability.getTargets().add(new TargetPermanent(minTargets, maxTargets, permanentFilter, false));
}
}