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

Merge branch 'newPerspectivesCyclingFix' into 'master'

Browse Source 
GameActionUtil: fix CyclingForZero

Closes #653

See merge request core-developers/forge!870
This commit is contained in:
Michael Kamensky
2018-08-21 16:21:16 +00:00
parent 858642510f ed04025b3b
commit 78a090dfd9
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,7 +174,8 @@ public final class GameActionUtil {
} }
if (sa.isCycling() && activator.hasKeyword("CyclingForZero")) { if (sa.isCycling() && activator.hasKeyword("CyclingForZero")) {
final SpellAbility newSA = sa.copyWithNoManaCost(); // set the cost to this directly to buypass non mana cost
final SpellAbility newSA = sa.copyWithDefinedCost("Discard<1/CARDNAME>");
newSA.setBasicSpell(false); newSA.setBasicSpell(false);
newSA.getMapParams().put("CostDesc", ManaCostParser.parse("0")); newSA.getMapParams().put("CostDesc", ManaCostParser.parse("0"));
// makes new SpellDescription // makes new SpellDescription

4
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -900,6 +900,10 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
return newSA; return newSA;
} }
public SpellAbility copyWithDefinedCost(String abCost) {
return copyWithDefinedCost(new Cost(abCost, isAbility()));
}
public boolean isTrigger() { public boolean isTrigger() {
return trigger; return trigger;
} }