external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 17:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Simisays
2022-10-05 23:23:13 +02:00
parent e87ae7b0ec
commit b36e9d76c1
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/ability/effects/MeldEffect.java
View File

@@ -6,12 +6,12 @@ import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card; import forge.game.card.Card;
import forge.game.card.CardCollection; import forge.game.card.CardCollection;
import forge.game.card.CardLists; import forge.game.card.CardLists;
import forge.game.event.GameEventCombatChanged;
import forge.game.card.CardPredicates; import forge.game.card.CardPredicates;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.zone.PlayerZoneBattlefield; import forge.game.zone.PlayerZoneBattlefield;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.game.event.GameEventCombatChanged;
import forge.util.Localizer; import forge.util.Localizer;
import java.util.Arrays; import java.util.Arrays;
@@ -47,12 +47,19 @@ public class MeldEffect extends SpellAbilityEffect {
} }
for (Card c : exiled) { for (Card c : exiled) {
boolean attacking = sa.hasParam("Attacking");
if (c.isToken() || c.getCloneOrigin() != null) { if (c.isToken() || c.getCloneOrigin() != null) {
// Neither of these things // Neither of these things
return; return;
} else if (!c.isInZone(ZoneType.Exile)) { } else if (!c.isInZone(ZoneType.Exile)) {
return; return;
} }
if (sa.hasParam("EntersTapped")) {
c.setTapped(true);
}
if (sa.hasParam("Attacking")) {
attacking = true;
}
} }
primary.changeToState(CardStateName.Meld); primary.changeToState(CardStateName.Meld);
@@ -62,9 +69,5 @@ public class MeldEffect extends SpellAbilityEffect {
game.getAction().changeZone(primary.getZone(), bf, primary, 0, sa); game.getAction().changeZone(primary.getZone(), bf, primary, 0, sa);
bf.addToMelded(secondary); bf.addToMelded(secondary);
if (sa.hasParam("Enters Tapped")) {
primary.setTapped(true);
}
} }
} }

1
forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java
View File

@@ -18,6 +18,7 @@
package forge.game.ability.effects; package forge.game.ability.effects;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import forge.util.Lang; import forge.util.Lang;

2
forge-gui/res/cardsfolder/upcoming/mishra_claimed_by_gix.txt
View File

@@ -6,7 +6,7 @@ K:Flying
K:First Strike K:First Strike
K:Lifelink K:Lifelink
T:Mode$ Phase | Phase$ End of Turn | IsPresent$ Card.Self+YouOwn | IsPresent2$ Creature.YouCtrl+YouOwn+namedPhyrexian Dragon Engine | ValidPlayer$ You | Execute$ Meld | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your end step, if you both own and control CARDNAME and a creature named Bruna, the Fading Light, exile them, then meld them into Brisela, Voice of Nightmares. T:Mode$ Phase | Phase$ End of Turn | IsPresent$ Card.Self+YouOwn | IsPresent2$ Creature.YouCtrl+YouOwn+namedPhyrexian Dragon Engine | ValidPlayer$ You | Execute$ Meld | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your end step, if you both own and control CARDNAME and a creature named Bruna, the Fading Light, exile them, then meld them into Brisela, Voice of Nightmares.
SVar:Meld:DB$ Meld | Name$ Mishra, Lost to Phyrexia | Primary$ Mishra, Claimed by Gix | Secondary$ Phyrexian Dragon Engine SVar:Meld:DB$ Meld | Name$ Mishra, Lost to Phyrexia | EntersTapped$ True | Attacking$ True | Primary$ Mishra, Claimed by Gix | Secondary$ Phyrexian Dragon Engine
DeckHints:Name$Phyrexian Dragon Engine DeckHints:Name$Phyrexian Dragon Engine
MeldPair:Phyrexian Dragon Engine MeldPair:Phyrexian Dragon Engine
AlternateMode:Meld AlternateMode:Meld