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

Fix: fixed MayFlashSac

Browse Source
This commit is contained in:
Hanmac
2018-05-05 18:47:20 +02:00
parent 0033edbeda
commit 87b8ac38f2
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/GameActionUtil.java
View File

@@ -201,10 +201,9 @@ public final class GameActionUtil {
} else { } else {
sb.append(host); sb.append(host);
} }
}
if (o.getAbility().hasParam("MayPlayText")) { if (o.getAbility().hasParam("MayPlayText")) {
sb.append(" (").append(o.getAbility().getParam("MayPlayText")).append(")"); sb.append(" (").append(o.getAbility().getParam("MayPlayText")).append(")");
}
} }
sb.append(o.toString(false)); sb.append(o.toString(false));
newSA.setDescription(sb.toString()); newSA.setDescription(sb.toString());

7
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -3042,6 +3042,7 @@ public class CardFactoryUtil {
SpellAbility saDelay = AbilityFactory.getAbility(strDelay, card); SpellAbility saDelay = AbilityFactory.getAbility(strDelay, card);
saDelay.setAdditionalAbility("Execute", (AbilitySub) AbilityFactory.getAbility(strSac, card)); saDelay.setAdditionalAbility("Execute", (AbilitySub) AbilityFactory.getAbility(strSac, card));
final Trigger trigger = TriggerHandler.parseTrigger(strTrig.toString(), card, intrinsic); final Trigger trigger = TriggerHandler.parseTrigger(strTrig.toString(), card, intrinsic);
trigger.setOverridingAbility(saDelay);
inst.addTrigger(trigger); inst.addTrigger(trigger);
} }
} }
@@ -4285,9 +4286,9 @@ public class CardFactoryUtil {
effect = "Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ " + k[1] effect = "Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ " + k[1]
+ " | Description$ CARDNAME can't be blocked " + getTextForKwCantBeBlockedByType(keyword); + " | Description$ CARDNAME can't be blocked " + getTextForKwCantBeBlockedByType(keyword);
} else if (keyword.equals("MayFlashSac")) { } else if (keyword.equals("MayFlashSac")) {
effect = "Mode$ Continuous | EffectZone$ All | Affected$ Card.Self " effect = "Mode$ Continuous | EffectZone$ All | Affected$ Card.Self | Secondary$ True"
+ " | MayPlay$ True | MayPlayWithFlash$ True | AffectedZone$ Exile,Graveyard,Hand,Library,Stack " + " | MayPlay$ True | MayPlayWithFlash$ True | MayPlayText$ Sacrifice at the next cleanup step"
+ " | Description$ " + inst.getReminderText(); + " | AffectedZone$ Exile,Graveyard,Hand,Library,Stack | Description$ " + inst.getReminderText();
} }
if (effect != null) { if (effect != null) {

1
forge-game/src/main/java/forge/game/spellability/Spell.java
View File

@@ -23,7 +23,6 @@ import forge.card.CardStateName;
import forge.game.Game; import forge.game.Game;
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.CardUtil; import forge.game.card.CardUtil;
import forge.game.cost.Cost; import forge.game.cost.Cost;
import forge.game.cost.CostPayment; import forge.game.cost.CostPayment;