mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 19:58:00 +00:00
Mana Pool fixing, part one: Dark ritual and such no longer produce snow mana, Mana Pools no longer empty whenever a mana cost is successfully paid.
This commit is contained in:
@@ -60,7 +60,6 @@ abstract public class Ability_Mana extends SpellAbility implements java.io.Seria
|
||||
if(pain.contains(sourceCard.getName()) && !Mana.equals("1"))
|
||||
runcommands.add(new Command()
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
public void execute(){
|
||||
|
||||
AllZone.GameAction.getPlayerLife(getController()).subtractLife(1);
|
||||
|
||||
@@ -15986,9 +15986,9 @@ return land.size() > 1 && CardFactoryUtil.AI_isMainPhase();
|
||||
|
||||
public void resolve()
|
||||
{
|
||||
CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");
|
||||
Card mp = list.getCard(0);
|
||||
//CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
//list = list.getName("Mana Pool");
|
||||
Card mp = AllZone.ManaPool;//list.getCard(0);
|
||||
mp.addExtrinsicKeyword("ManaPool:R");
|
||||
mp.addExtrinsicKeyword("ManaPool:R");
|
||||
mp.addExtrinsicKeyword("ManaPool:R");
|
||||
@@ -16017,9 +16017,9 @@ return land.size() > 1 && CardFactoryUtil.AI_isMainPhase();
|
||||
private static final long serialVersionUID = -8579887529151755266L;
|
||||
public void resolve()
|
||||
{
|
||||
CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");
|
||||
Card mp = list.getCard(0);
|
||||
/*CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");*/
|
||||
Card mp = AllZone.ManaPool;//list.getCard(0);
|
||||
mp.addExtrinsicKeyword("ManaPool:B");
|
||||
mp.addExtrinsicKeyword("ManaPool:B");
|
||||
mp.addExtrinsicKeyword("ManaPool:B");
|
||||
@@ -16050,9 +16050,9 @@ return land.size() > 1 && CardFactoryUtil.AI_isMainPhase();
|
||||
{
|
||||
if (card.getController().equals(Constant.Player.Human))
|
||||
{
|
||||
CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");
|
||||
Card mp = list.getCard(0);
|
||||
//CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
//list = list.getName("Mana Pool");
|
||||
Card mp = AllZone.ManaPool;//list.getCard(0);
|
||||
|
||||
String color = new String();
|
||||
|
||||
|
||||
@@ -15055,9 +15055,9 @@ public class CardFactory_Creatures {
|
||||
{
|
||||
if (card.getController().equals(Constant.Player.Human))
|
||||
{
|
||||
CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");
|
||||
Card mp = list.getCard(0);
|
||||
/*CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");*/
|
||||
Card mp = AllZone.ManaPool;//list.getCard(0);
|
||||
|
||||
mp.addExtrinsicKeyword("ManaPool:W");
|
||||
mp.addExtrinsicKeyword("ManaPool:U");
|
||||
@@ -15084,9 +15084,9 @@ public class CardFactory_Creatures {
|
||||
private static final long serialVersionUID = -7073759752440531772L;
|
||||
public void resolve()
|
||||
{
|
||||
CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");
|
||||
Card mp = list.getCard(0);
|
||||
/*CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");*/
|
||||
Card mp = AllZone.ManaPool;//list.getCard(0);
|
||||
|
||||
PlayerZone play = AllZone.getZone(Constant.Zone.Play, card.getController());
|
||||
|
||||
@@ -15130,9 +15130,9 @@ public class CardFactory_Creatures {
|
||||
private static final long serialVersionUID = -9155272432379335551L;
|
||||
public void resolve()
|
||||
{
|
||||
CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");
|
||||
Card mp = list.getCard(0);
|
||||
/*CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");*/
|
||||
Card mp = AllZone.ManaPool;//list.getCard(0);
|
||||
|
||||
PlayerZone hum = AllZone.getZone(Constant.Zone.Play, Constant.Player.Human);
|
||||
PlayerZone comp = AllZone.getZone(Constant.Zone.Play, Constant.Player.Computer);
|
||||
|
||||
@@ -1764,9 +1764,9 @@ class CardFactory_Lands {
|
||||
private static final long serialVersionUID = -1631970749273122485L;
|
||||
public void resolve()
|
||||
{
|
||||
CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");
|
||||
Card mp = list.getCard(0);
|
||||
/*CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");*/
|
||||
Card mp = AllZone.ManaPool;//list.getCard(0);
|
||||
|
||||
CardList creats = new CardList(AllZone.getZone(Constant.Zone.Play, card.getController()).getCards());
|
||||
creats = creats.getType("Creature");
|
||||
@@ -1800,9 +1800,9 @@ class CardFactory_Lands {
|
||||
private static final long serialVersionUID = -9155272432379335551L;
|
||||
public void resolve()
|
||||
{
|
||||
CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");
|
||||
Card mp = list.getCard(0);
|
||||
/*CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");*/
|
||||
Card mp = AllZone.ManaPool;//list.getCard(0);
|
||||
|
||||
CardList arts = new CardList(AllZone.getZone(Constant.Zone.Play, card.getController()).getCards());
|
||||
arts = arts.getType("Artifact");
|
||||
@@ -1836,9 +1836,9 @@ class CardFactory_Lands {
|
||||
private static final long serialVersionUID = 6337899963974773375L;
|
||||
public void resolve()
|
||||
{
|
||||
CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");
|
||||
Card mp = list.getCard(0);
|
||||
/*CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");*/
|
||||
Card mp = AllZone.ManaPool;//list.getCard(0);
|
||||
|
||||
CardList ench = new CardList(AllZone.getZone(Constant.Zone.Play, card.getController()).getCards());
|
||||
ench = ench.getType("Enchantment");
|
||||
|
||||
@@ -1267,9 +1267,9 @@ public class GameActionUtil
|
||||
else if (color.equals("green"))
|
||||
color = "G";
|
||||
|
||||
CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
list = list.getName("Mana Pool");
|
||||
Card mp = list.getCard(0);
|
||||
//CardList list = new CardList(AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).getCards());
|
||||
//list = list.getName("Mana Pool");
|
||||
Card mp = AllZone.ManaPool;//list.getCard(0);
|
||||
|
||||
mp.addExtrinsicKeyword("ManaPool:"+ color);
|
||||
}
|
||||
|
||||
@@ -408,7 +408,7 @@ public class ManaPool extends Card
|
||||
public void paid(){
|
||||
if (!isSnow()) smp.paid();
|
||||
used.clear();
|
||||
has = "";//Arrays.fill(paid, 0);
|
||||
paid = "";//Arrays.fill(paid, 0);
|
||||
sortContents();
|
||||
}
|
||||
public void unpaid(){
|
||||
|
||||
Reference in New Issue
Block a user