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

- Moved Commander to Constructed match setup.

Browse Source 
- Variants menu removed
This commit is contained in:
moomarc
2014-02-20 17:04:13 +00:00
parent 8edd870602
commit 3b571cb7ec
10 changed files with 187 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,7 @@ import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import forge.GameCommand;
import forge.card.CardCharacteristicName;
import forge.card.CardType;
@@ -1481,7 +1482,7 @@ public class GameAction {
p1.drawCards(p1.getMaxHandSize());
}
performMulligans(first, gameType == GameType.Commander);
performMulligans(first, game.getRules().hasAppliedVariant(GameType.Commander));
if (game.isGameOver()) { break; } // conceded during "mulligan" prompt
game.setAge(GameStage.Play);

2
forge-game/src/main/java/forge/game/cost/CostAddMana.java
View File

@@ -71,7 +71,7 @@ public class CostAddMana extends CostPart {
Card source = sa.getHostCard();
ColorSet cid = null;
if (ai.getGame().getRules().getGameType() == GameType.Commander) {
if (ai.getGame().getRules().hasAppliedVariant(GameType.Commander)) {
cid = ai.getCommander().getRules().getColorIdentity();
}
ArrayList<Mana> manaProduced = new ArrayList<Mana>();

4
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -21,6 +21,7 @@ import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import forge.card.MagicColor;
import forge.card.mana.ManaCost;
import forge.game.*;
@@ -2112,8 +2113,7 @@ public class Player extends GameEntity implements Comparable<Player> {
return this.loseConditionMet(GameLossReason.Poisoned, null);
}
if(game.getRules().getGameType() == GameType.Commander)
{
if (game.getRules().hasAppliedVariant(GameType.Commander)) {
Map<Card,Integer> cmdDmg = getCommanderDamage();
for(Card c : cmdDmg.keySet())
{

2
forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
View File

@@ -130,7 +130,7 @@ public class AbilityManaPart implements java.io.Serializable {
}
ColorSet CID = null;
if (player.getGame().getRules().getGameType() == GameType.Commander) {
if (player.getGame().getRules().hasAppliedVariant(GameType.Commander)) {
CID = player.getCommander().getRules().getColorIdentity();
}
//clear lastProduced