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

simplify to IntPlusDynamicValue

Browse source
This commit is contained in:
xenohedron 2023-08-26 01:34:49 -04:00
parent 70bf68a5a4
commit abe19e4723
6 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/cards/c/ConcertedDefense.java
View file

@ -1,9 +1,8 @@
package mage.cards.c;
import mage.abilities.dynamicvalue.AdditiveDynamicValue;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.IntPlusDynamicValue;
import mage.abilities.dynamicvalue.common.PartyCount;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.common.CounterUnlessPaysEffect;
import mage.abilities.hint.common.PartyCountHint;
import mage.cards.CardImpl;
@ -19,7 +18,7 @@ import java.util.UUID;
*/
public final class ConcertedDefense extends CardImpl {
private static final DynamicValue xValue = new AdditiveDynamicValue(PartyCount.instance, StaticValue.get(1));
private static final DynamicValue xValue = new IntPlusDynamicValue(1, PartyCount.instance);
public ConcertedDefense(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{U}");

5
Mage.Sets/src/mage/cards/e/EpiphanyAtTheDrownyard.java
View file

@ -1,9 +1,8 @@
package mage.cards.e;
import mage.abilities.dynamicvalue.AdditiveDynamicValue;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.IntPlusDynamicValue;
import mage.abilities.dynamicvalue.common.ManacostVariableValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.common.RevealAndSeparatePilesEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
@ -18,7 +17,7 @@ import java.util.UUID;
*/
public final class EpiphanyAtTheDrownyard extends CardImpl {
private static final DynamicValue xValue = new AdditiveDynamicValue(ManacostVariableValue.REGULAR, StaticValue.get(1));
private static final DynamicValue xValue = new IntPlusDynamicValue(1, ManacostVariableValue.REGULAR);
public EpiphanyAtTheDrownyard(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{U}");

7
Mage.Sets/src/mage/cards/f/FoodFight.java
View file

@ -5,10 +5,9 @@ import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.dynamicvalue.AdditiveDynamicValue;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.IntPlusDynamicValue;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.effects.common.continuous.GainAbilityAllEffect;
import mage.abilities.hint.Hint;
@ -37,7 +36,7 @@ public final class FoodFight extends CardImpl {
private static final DynamicValue countFoodFight = new PermanentsOnBattlefieldCount(filter);
private static final Hint hint = new ValueHint("Food Fight you control", countFoodFight);
private static final DynamicValue xValue = new AdditiveDynamicValue(StaticValue.get(1), countFoodFight);
private static final DynamicValue xValue = new IntPlusDynamicValue(1, countFoodFight);
public FoodFight(UUID ownerId, CardSetInfo setInfo) {
@ -71,4 +70,4 @@ public final class FoodFight extends CardImpl {
public FoodFight copy() {
return new FoodFight(this);
}
}
}

5
Mage.Sets/src/mage/cards/s/SeaGateRestoration.java
View file

@ -2,10 +2,9 @@ package mage.cards.s;
import mage.abilities.common.AsEntersBattlefieldAbility;
import mage.abilities.costs.common.PayLifeCost;
import mage.abilities.dynamicvalue.AdditiveDynamicValue;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.IntPlusDynamicValue;
import mage.abilities.dynamicvalue.common.CardsInControllerHandCount;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.TapSourceUnlessPaysEffect;
import mage.abilities.effects.common.continuous.MaximumHandSizeControllerEffect;
@ -23,7 +22,7 @@ import java.util.UUID;
*/
public final class SeaGateRestoration extends ModalDoubleFacedCard {
private static final DynamicValue xValue = new AdditiveDynamicValue(CardsInControllerHandCount.instance, StaticValue.get(1));
private static final DynamicValue xValue = new IntPlusDynamicValue(1, CardsInControllerHandCount.instance);
public SeaGateRestoration(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo,

5
Mage.Sets/src/mage/cards/s/SpellStutter.java
View file

@ -1,9 +1,8 @@
package mage.cards.s;
import mage.abilities.dynamicvalue.AdditiveDynamicValue;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.IntPlusDynamicValue;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.common.CounterUnlessPaysEffect;
import mage.abilities.hint.Hint;
import mage.abilities.hint.ValueHint;
@ -23,7 +22,7 @@ public final class SpellStutter extends CardImpl {
private static final DynamicValue faerieCount =
new PermanentsOnBattlefieldCount(new FilterControlledPermanent(SubType.FAERIE));
private static final DynamicValue xValue = new AdditiveDynamicValue(StaticValue.get(2), faerieCount);
private static final DynamicValue xValue = new IntPlusDynamicValue(2, faerieCount);
private static final Hint hint = new ValueHint("Faeries controlled", faerieCount);

5
Mage.Sets/src/mage/cards/w/WelcomeToSweettooth.java
View file

@ -1,10 +1,9 @@
package mage.cards.w;
import mage.abilities.common.SagaAbility;
import mage.abilities.dynamicvalue.AdditiveDynamicValue;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.IntPlusDynamicValue;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.effects.common.counter.AddCountersTargetEffect;
import mage.abilities.hint.Hint;
@ -29,7 +28,7 @@ public final class WelcomeToSweettooth extends CardImpl {
private static final DynamicValue numberFood =
new PermanentsOnBattlefieldCount(StaticFilters.FILTER_CONTROLLED_FOOD);
private static final DynamicValue xValue = new AdditiveDynamicValue(StaticValue.get(1), numberFood);
private static final DynamicValue xValue = new IntPlusDynamicValue(1, numberFood);
private static final Hint hint = new ValueHint("Controlled Foods", numberFood);