mirror of
https://github.com/magefree/mage.git
synced 2025-12-26 05:22:02 -08:00
Additional fixes for getNetMana from #6132, added TODO task for next mana improves;
This commit is contained in:
parent
13cb86d69f
commit
f5ef16c8cf
4 changed files with 98 additions and 23 deletions
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
package mage.abilities.effects.mana;
|
||||
|
||||
import mage.Mana;
|
||||
|
|
@ -10,10 +9,10 @@ import mage.game.Game;
|
|||
import mage.game.permanent.Permanent;
|
||||
import mage.players.Player;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author LevelX2
|
||||
*/
|
||||
public class AddManaOfAnyTypeProducedEffect extends ManaEffect {
|
||||
|
|
@ -36,6 +35,16 @@ public class AddManaOfAnyTypeProducedEffect extends ManaEffect {
|
|||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Mana> getNetMana(Game game, Ability source) {
|
||||
ArrayList<Mana> netMana = new ArrayList<>();
|
||||
Mana types = (Mana) this.getValue("mana"); // TODO: will not work until TriggeredManaAbility fix (see TriggeredManaAbilityMustGivesExtraManaOptions test)
|
||||
if (types != null) {
|
||||
netMana.add(types.copy());
|
||||
}
|
||||
return netMana;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mana produceMana(Game game, Ability source) {
|
||||
Permanent permanent = game.getPermanent(getTargetPointer().getFirst(game, source));
|
||||
|
|
@ -45,6 +54,9 @@ public class AddManaOfAnyTypeProducedEffect extends ManaEffect {
|
|||
return null;
|
||||
}
|
||||
Mana types = (Mana) this.getValue("mana");
|
||||
if (types == null) {
|
||||
return null;
|
||||
}
|
||||
Choice choice = new ChoiceColor(true);
|
||||
choice.getChoices().clear();
|
||||
choice.setMessage("Pick the type of mana to produce");
|
||||
|
|
@ -102,11 +114,6 @@ public class AddManaOfAnyTypeProducedEffect extends ManaEffect {
|
|||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<Mana> getNetMana(Game game, Ability source) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AddManaOfAnyTypeProducedEffect copy() {
|
||||
return new AddManaOfAnyTypeProducedEffect(this);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue