External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge fix

Browse source
This commit is contained in:
theelk801 2025-06-02 17:26:49 -04:00
parent 5f59e45302
commit 9fd4374639
7 changed files with 10 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage.Sets/src/mage/cards/e/ExtraplanarLens.java
View file

@ -9,8 +9,11 @@ import mage.abilities.mana.TriggeredManaAbility;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterLandPermanent;
import mage.constants.AbilityWord;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.filter.StaticFilters;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ManaEvent;

1
Mage.Sets/src/mage/cards/i/InvasiveSurgery.java
View file

@ -4,7 +4,6 @@ import mage.abilities.Ability;
import mage.abilities.condition.common.DeliriumCondition;
import mage.abilities.dynamicvalue.common.CardTypesInGraveyardCount;
import mage.abilities.effects.common.search.SearchTargetGraveyardHandLibraryForCardNameAndExileEffect;
import mage.abilities.hint.common.CardTypesInGraveyardHint;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;

10
Mage.Sets/src/mage/cards/m/MechanizedProduction.java
View file

@ -1,24 +1,20 @@
package mage.cards.m;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.condition.Condition;
import mage.abilities.decorator.ConditionalOneShotEffect;
import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.AttachEffect;
import mage.abilities.effects.common.CreateTokenCopyTargetEffect;
import mage.abilities.effects.common.WinGameSourceControllerEffect;
import mage.abilities.keyword.EnchantAbility;
import mage.abilities.triggers.BeginningOfUpkeepTriggeredAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.constants.TargetController;
import mage.filter.StaticFilters;
import mage.filter.common.FilterArtifactPermanent;
import mage.filter.common.FilterControlledArtifactPermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.TargetPermanent;
@ -47,9 +43,7 @@ public final class MechanizedProduction extends CardImpl {
this.addAbility(new EnchantAbility(auraTarget));
// At the beginning of your upkeep, create a token that's a copy of enchanted artifact. Then if you control eight or more artifacts with the same name as one another, you win the game.
Ability ability = new BeginningOfUpkeepTriggeredAbility(
new MechanizedProductionEffect(), TargetController.YOU, false
);
Ability ability = new BeginningOfUpkeepTriggeredAbility(new MechanizedProductionEffect(), false);
ability.addEffect(new ConditionalOneShotEffect(
new WinGameSourceControllerEffect(), MechanizedProductionCondition.instance,
"Then if you control eight or more artifacts with the same name as one another, you win the game"

5
Mage.Sets/src/mage/cards/r/Remembrance.java
View file

@ -70,9 +70,4 @@ class RemembranceEffect extends OneShotEffect {
filter.add(new SharesNamePredicate(permanent));
return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true).apply(game, source);
}
@Override
public boolean isInUseableZone(Game game, MageObject sourceObject, GameEvent event) {
return TriggeredAbilityImpl.isInUseableZoneDiesTrigger(this, sourceObject, event, game);
}
}

4
Mage.Sets/src/mage/cards/s/SandsteppeWarRiders.java
View file

@ -2,13 +2,13 @@ package mage.cards.s;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.triggers.BeginningOfCombatTriggeredAbility;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.Effect;
import mage.abilities.effects.keyword.BolsterEffect;
import mage.abilities.hint.Hint;
import mage.abilities.hint.ValueHint;
import mage.abilities.keyword.TrampleAbility;
import mage.abilities.triggers.BeginningOfCombatTriggeredAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
@ -39,7 +39,7 @@ public final class SandsteppeWarRiders extends CardImpl {
// At the beginning of combat on your turn, bolster X, where X is the number of differently named artifact tokens you control.
this.addAbility(new BeginningOfCombatTriggeredAbility(
new BolsterEffect(SandsteppeWarRidersValue.instance), TargetController.YOU, false
new BolsterEffect(SandsteppeWarRidersValue.instance)
).addHint(SandsteppeWarRidersValue.getHint()));
}

2
Mage.Sets/src/mage/cards/t/TibaltsTrickery.java
View file

@ -89,7 +89,7 @@ class TibaltsTrickeryEffect extends OneShotEffect {
}
}
controller.moveCardsToExile(cardsToExile, source, game, true, source.getSourceId(),
CardUtil.createObjectRealtedWindowTitle(source, game, null));
CardUtil.createObjectRelatedWindowTitle(source, game, null));
if (cardToCast != null) {
if (controller.chooseUse(Outcome.PlayForFree, "Cast " + cardToCast.getLogName() + " for free?", source, game)) {
game.getState().setValue("PlayFromNotOwnHandZone" + cardToCast.getId(), Boolean.TRUE);

5
Mage.Sets/src/mage/cards/v/VerdantSuccession.java
View file

@ -50,11 +50,6 @@ public final class VerdantSuccession extends CardImpl {
public VerdantSuccession copy() {
return new VerdantSuccession(this);
}
@Override
public boolean isInUseableZone(Game game, MageObject sourceObject, GameEvent event) {
return TriggeredAbilityImpl.isInUseableZoneDiesTrigger(this, sourceObject, event, game);
}
}
class VerdantSuccessionEffect extends OneShotEffect {