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

*Preliminary Mana replacement

Browse Source
This commit is contained in:
Hellfish
2013-08-18 20:08:03 +00:00
parent e55d5f8199
commit fded944458
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/forge/card/spellability/AbilityManaPart.java
View File

@@ -30,6 +30,7 @@ import forge.card.MagicColor;
import forge.card.mana.Mana; import forge.card.mana.Mana;
import forge.card.mana.ManaPool; import forge.card.mana.ManaPool;
import forge.card.trigger.TriggerType; import forge.card.trigger.TriggerType;
import forge.game.GameType;
import forge.game.player.Player; import forge.game.player.Player;
/** /**
@@ -105,6 +106,12 @@ public class AbilityManaPart implements java.io.Serializable {
public final void produceMana(final String produced, final Player player, SpellAbility sa) { public final void produceMana(final String produced, final Player player, SpellAbility sa) {
final Card source = this.getSourceCard(); final Card source = this.getSourceCard();
final ManaPool manaPool = player.getManaPool(); final ManaPool manaPool = player.getManaPool();
ColorSet CID = null;
if(player.getGame().getType() == GameType.Commander)
{
CID = player.getCommander().getRules().getColorIdentity();
}
//clear lastProduced //clear lastProduced
this.lastManaProduced.clear(); this.lastManaProduced.clear();
@@ -116,7 +123,17 @@ public class AbilityManaPart implements java.io.Serializable {
this.lastManaProduced.add(new Mana(MagicColor.COLORLESS, source, this)); this.lastManaProduced.add(new Mana(MagicColor.COLORLESS, source, this));
} }
else else
this.lastManaProduced.add(new Mana(MagicColor.fromName(c), source, this)); {
byte attemptedMana = MagicColor.fromName(c);
if(CID != null)
{
if(!CID.hasAnyColor(attemptedMana)) {
attemptedMana = MagicColor.COLORLESS;
}
}
this.lastManaProduced.add(new Mana(attemptedMana, source, this));
}
} }
// add the mana produced to the mana pool // add the mana produced to the mana pool