mirror of
https://github.com/correl/mage.git
synced 2025-01-11 11:05:23 +00:00
* Commander - Fixed that Snow-Covered lands were restricted to 1.
This commit is contained in:
parent
826005c945
commit
de366fe835
3 changed files with 16 additions and 21 deletions
|
@ -34,8 +34,8 @@
|
|||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<source>1.6</source>
|
||||
<target>1.6</target>
|
||||
<source>1.7</source>
|
||||
<target>1.7</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
|
|
@ -114,8 +114,9 @@ public class Commander extends DeckValidator {
|
|||
valid = false;
|
||||
}
|
||||
|
||||
List<String> basicLandNames = new ArrayList<String>(Arrays.asList("Forest", "Island", "Mountain", "Swamp", "Plains"));
|
||||
Map<String, Integer> counts = new HashMap<String, Integer>();
|
||||
List<String> basicLandNames = new ArrayList<>(Arrays.asList("Forest", "Island", "Mountain", "Swamp", "Plains",
|
||||
"Snow-Covered Forest", "Snow-Covered Island", "Snow-Covered Mountain", "Snow-Covered Swamp", "Snow-Covered Plains"));
|
||||
Map<String, Integer> counts = new HashMap<>();
|
||||
countCards(counts, deck.getCards());
|
||||
countCards(counts, deck.getSideboard());
|
||||
for (Map.Entry<String, Integer> entry: counts.entrySet()) {
|
||||
|
|
|
@ -28,17 +28,14 @@
|
|||
package mage.sets.zendikar;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import mage.abilities.Ability;
|
||||
import mage.abilities.common.EntersBattlefieldAbility;
|
||||
import mage.abilities.common.LandfallAbility;
|
||||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.constants.CardType;
|
||||
import mage.constants.Outcome;
|
||||
import mage.constants.Rarity;
|
||||
import mage.abilities.Ability;
|
||||
import mage.abilities.SpellAbility;
|
||||
import mage.abilities.common.EntersBattlefieldAbility;
|
||||
import mage.abilities.common.LandfallAbility;
|
||||
import mage.abilities.effects.EntersBattlefieldEffect;
|
||||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.constants.Zone;
|
||||
import mage.counters.CounterType;
|
||||
import mage.game.Game;
|
||||
|
@ -87,13 +84,10 @@ class EternityVesselEffect extends OneShotEffect {
|
|||
Permanent vessel = game.getPermanent(source.getSourceId());
|
||||
Player you = game.getPlayer(source.getControllerId());
|
||||
if (vessel != null && you != null) {
|
||||
Object obj = getValue(EntersBattlefieldEffect.SOURCE_CAST_SPELL_ABILITY);
|
||||
if (obj != null && obj instanceof SpellAbility) {
|
||||
int amount = you.getLife();
|
||||
if (amount > 0) {
|
||||
vessel.addCounters(CounterType.CHARGE.createInstance(amount), game);
|
||||
return true;
|
||||
}
|
||||
int amount = you.getLife();
|
||||
if (amount > 0) {
|
||||
vessel.addCounters(CounterType.CHARGE.createInstance(amount), game);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
@ -108,7 +102,7 @@ class EternityVesselEffect extends OneShotEffect {
|
|||
class EternityVesselEffect2 extends OneShotEffect {
|
||||
public EternityVesselEffect2() {
|
||||
super(Outcome.Benefit);
|
||||
staticText = "you may have your life total become the number of charge counters on Eternity Vessel";
|
||||
staticText = "you may have your life total become the number of charge counters on {this}";
|
||||
}
|
||||
|
||||
public EternityVesselEffect2(final EternityVesselEffect2 effect) {
|
||||
|
@ -130,4 +124,4 @@ class EternityVesselEffect2 extends OneShotEffect {
|
|||
public EternityVesselEffect2 copy() {
|
||||
return new EternityVesselEffect2(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue