External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-28 06:22:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Axebane Guardian - Fixed netMana hadling.

Browse source
This commit is contained in:
LevelX2 2014-08-29 17:52:37 +02:00
parent ce20eb545e
commit 28057fff80
4 changed files with 49 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Mage/src/mage/abilities/effects/common/DynamicManaEffect.java
View file

@ -31,7 +31,10 @@ import mage.Mana;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.choices.ChoiceColor;
import mage.constants.Outcome;
import mage.game.Game;
import mage.players.Player;
/**
*
@ -70,7 +73,7 @@ public class DynamicManaEffect extends BasicManaEffect {
@Override
public boolean apply(Game game, Ability source) {
computeMana(game, source);
computeMana(false, game, source);
game.getPlayer(source.getControllerId()).getManaPool().addMana(computedMana, game, source);
return true;
}
@ -83,7 +86,7 @@ public class DynamicManaEffect extends BasicManaEffect {
return super.getText(mode) + " for each " + amount.getMessage();
}
public Mana computeMana(Game game, Ability source){
public Mana computeMana(boolean netMana ,Game game, Ability source){
this.computedMana.clear();
int count = amount.calculate(game, source, this);
if (mana.getBlack() > 0) {
@ -96,6 +99,33 @@ public class DynamicManaEffect extends BasicManaEffect {
computedMana.setRed(count);
} else if (mana.getWhite() > 0) {
computedMana.setWhite(count);
} else if (mana.getAny() > 0) {
if (netMana) {
computedMana.setAny(count);
} else {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
for(int i = 0; i < count; i++){
ChoiceColor choiceColor = new ChoiceColor();
while (!controller.choose(Outcome.Benefit, choiceColor, game)) {
if (!controller.isInGame()) {
return computedMana;
}
}
if (choiceColor.getColor().isBlack()) {
computedMana.addBlack();
} else if (choiceColor.getColor().isBlue()) {
computedMana.addBlue();
} else if (choiceColor.getColor().isRed()) {
computedMana.addRed();
} else if (choiceColor.getColor().isGreen()) {
computedMana.addGreen();
} else if (choiceColor.getColor().isWhite()) {
computedMana.addWhite();
}
}
}
}
} else {
computedMana.setColorless(count);
}

2
Mage/src/mage/abilities/mana/DynamicManaAbility.java
View file

@ -88,6 +88,6 @@ public class DynamicManaAbility extends ManaAbility {
if (game == null) {
return new Mana();
}
return new Mana(manaEffect.computeMana(game, this));
return new Mana(manaEffect.computeMana(true, game, this));
}
}