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

- A different approach to remedying the broken Play Effect problem (uses a dedicated SVar on a SpellAbility).

Browse Source
This commit is contained in:
Agetian
2017-06-21 13:33:11 +00:00
parent 8f2aa095ce
commit 70a6032e68
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,13 +107,16 @@ public abstract class Spell extends SpellAbility implements java.io.Serializable
|| this.getRestrictions().isInstantSpeed()
|| activator.hasKeyword("You may cast nonland cards as though they had flash.")
|| card.hasStartOfKeyword("You may cast CARDNAME as though it had flash.")
|| this.hasSVar("IsCastFromPlayEffect")
|| (card.isFaceDown() && !card.getZone().is(ZoneType.Battlefield) && card.getState(CardStateName.Original).getType().isInstant()))) {
return false;
}
if (!this.getRestrictions().canPlay(card, this)) {
if (!this.hasSVar("IsCastFromPlayEffect")) {
return false;
}
}
// for uncastables like lotus bloom, check if manaCost is blank (except for morph spells)
if (!isCastFaceDown() && isBasicSpell() && card.getState(card.isFaceDown() ? CardStateName.Original : card.getCurrentStateName()).getManaCost().isNoCost()) {

6
forge-gui/src/main/java/forge/player/HumanPlay.java
View File

@@ -63,10 +63,6 @@ public class HumanPlay {
* a {@link forge.game.spellability.SpellAbility} object.
*/
public final static boolean playSpellAbility(final PlayerControllerHuman controller, final Player p, SpellAbility sa) {
return playSpellAbility(controller, p, sa, false);
}
public final static boolean playSpellAbility(final PlayerControllerHuman controller, final Player p, SpellAbility sa, boolean fromPlayEffect) {
FThreads.assertExecutedByEdt(false);
if (sa == controller.getGame().PLAY_LAND_SURROGATE) {
@@ -87,7 +83,7 @@ public class HumanPlay {
}
// extra play check (unless the card is cast from a play effect)
if (!(fromPlayEffect || sa.canPlay())) {
if (!sa.canPlay()) {
return false;
}

3
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1506,7 +1506,8 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
@Override
public boolean playSaFromPlayEffect(final SpellAbility tgtSA) {
return HumanPlay.playSpellAbility(this, player, tgtSA, true);
tgtSA.setSVar("IsCastFromPlayEffect", "True");
return HumanPlay.playSpellAbility(this, player, tgtSA);
}
@Override