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

Merge branch 'decks' into 'master'

Browse Source 
Revert Comment out some currently unsupported cards in Commander precons

See merge request core-developers/forge!5289
This commit is contained in:
Michael Kamensky
2021-09-04 18:44:43 +00:00
parent d36c7677d7 50a1cf3a8f
commit 72d802dc19
17 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-core/src/main/java/forge/card/CardRulesPredicates.java
View File

@@ -270,7 +270,6 @@ public final class CardRulesPredicates {
return new PredicateSuperType(type, isEqual); return new PredicateSuperType(type, isEqual);
} }
/** /**
* Checks for color. * Checks for color.
* *

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

@@ -166,7 +166,6 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
Map<AbilityKey, Object> moveParams = Maps.newEnumMap(AbilityKey.class); Map<AbilityKey, Object> moveParams = Maps.newEnumMap(AbilityKey.class);
if (destination == ZoneType.Battlefield) { if (destination == ZoneType.Battlefield) {
if (sa.hasAdditionalAbility("AnimateSubAbility")) { if (sa.hasAdditionalAbility("AnimateSubAbility")) {
// need LKI before Animate does apply // need LKI before Animate does apply
moveParams.put(AbilityKey.CardLKI, CardUtil.getLKICopy(c)); moveParams.put(AbilityKey.CardLKI, CardUtil.getLKICopy(c));

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

@@ -1,6 +1,5 @@
package forge.game.ability.effects; package forge.game.ability.effects;
import java.util.List; import java.util.List;
import forge.game.ability.AbilityUtils; import forge.game.ability.AbilityUtils;

1
forge-game/src/main/java/forge/game/card/TokenCreateTable.java
View File

@@ -89,7 +89,6 @@ public class TokenCreateTable extends ForwardingTable<Player, Card, Integer> {
result += c.getValue(); result += c.getValue();
} }
return result; return result;
} }
} }

2
forge-gui/res/quest/commanderprecons/Built from Scratch (2018).dck
View File

@@ -32,7 +32,7 @@ Name=Built from Scratch (2018)
1 Great Furnace|CM2 1 Great Furnace|CM2
1 Hoard-Smelter Dragon|CM2 1 Hoard-Smelter Dragon|CM2
1 Ichor Wellspring|CM2 1 Ichor Wellspring|CM2
#1 Impact Resonance|CM2 1 Impact Resonance|CM2
1 Incite Rebellion|CM2 1 Incite Rebellion|CM2
1 Ingot Chewer|CM2 1 Ingot Chewer|CM2
1 Jalum Tome|CM2 1 Jalum Tome|CM2

2
forge-gui/res/quest/commanderprecons/Built from Scratch.dck
View File

@@ -32,7 +32,7 @@ Name=Built from Scratch
1 Great Furnace|C14 1 Great Furnace|C14
1 Hoard-Smelter Dragon|C14 1 Hoard-Smelter Dragon|C14
1 Ichor Wellspring|C14 1 Ichor Wellspring|C14
#1 Impact Resonance|C14 1 Impact Resonance|C14
1 Incite Rebellion|C14 1 Incite Rebellion|C14
1 Ingot Chewer|C14 1 Ingot Chewer|C14
1 Jalum Tome|C14 1 Jalum Tome|C14

2
forge-gui/res/quest/commanderprecons/Entropic Uprising.dck
View File

@@ -83,6 +83,6 @@ Name=Entropic Uprising
1 Curtains' Call|C16 1 Curtains' Call|C16
1 Parting Thoughts|C16 1 Parting Thoughts|C16
1 Grave Upheaval|C16 1 Grave Upheaval|C16
#1 Cruel Entertainment|C16 1 Cruel Entertainment|C16
1 Treacherous Terrain|C16 1 Treacherous Terrain|C16
1 Ash Barrens|C16 1 Ash Barrens|C16

2
forge-gui/res/quest/commanderprecons/Feline Ferocity.dck
View File

@@ -77,7 +77,7 @@ Name=Feline Ferocity
1 Soul's Majesty|C17 1 Soul's Majesty|C17
1 Spirit of the Hearth|C17 1 Spirit of the Hearth|C17
1 Staff of Nin|C17 1 Staff of Nin|C17
#1 Stalking Leonin|C17 1 Stalking Leonin|C17
1 Stirring Wildwood|C17 1 Stirring Wildwood|C17
1 Sunspear Shikari|C17 1 Sunspear Shikari|C17
1 Swiftfoot Boots|C17 1 Swiftfoot Boots|C17