* cleanups

This commit is contained in:
jendave
2011-08-06 05:01:45 +00:00
parent 9224760313
commit e40557888e
4 changed files with 7 additions and 10 deletions

View File

@@ -17152,8 +17152,8 @@ public class CardFactory implements NewConstants {
CardList DoublingSeasons = new CardList(play.getCards()); CardList DoublingSeasons = new CardList(play.getCards());
DoublingSeasons = DoublingSeasons.getName("Doubling Season"); DoublingSeasons = DoublingSeasons.getName("Doubling Season");
PlayerZone_ComesIntoPlay.SimultaneousEntry = true; PlayerZone_ComesIntoPlay.SimultaneousEntry = true;
double Count = DoublingSeasons.size(); int Count = DoublingSeasons.size();
Count = 5 * Math.pow(2,Count); Count = 5 * (int)Math.pow(2,Count);
for(int i = 0; i < Count; i++) { for(int i = 0; i < Count; i++) {
if(i + 1 == Count) PlayerZone_ComesIntoPlay.SimultaneousEntry = false; if(i + 1 == Count) PlayerZone_ComesIntoPlay.SimultaneousEntry = false;
Card Copy = copyCardintoNew(getTargetCard()); Card Copy = copyCardintoNew(getTargetCard());

View File

@@ -2598,7 +2598,7 @@ public class CardFactory_Creatures {
else PlayLand = AllZone.GameInfo.getComputerCanPlayNumberOfLands(); else PlayLand = AllZone.GameInfo.getComputerCanPlayNumberOfLands();
return (AllZone.GameAction.isCardInZone(card, play) && library.get(0).getType().contains("Land") && PlayLand > 0) return (AllZone.GameAction.isCardInZone(card, play) && library.get(0).getType().contains("Land") && PlayLand > 0)
&& (AllZone.Stack.size() == 0) && AllZone.GameAction.getLastPlayerToDraw() == card.getController(); && (AllZone.Stack.size() == 0) && AllZone.GameAction.getLastPlayerToDraw().equals(card.getController());
} }
}; };
ability.setStackDescription(card.getController() + " - plays land from top of library."); ability.setStackDescription(card.getController() + " - plays land from top of library.");

View File

@@ -156,9 +156,8 @@ public class ComputerUtil
{ {
land.remove(sa.getSourceCard()); land.remove(sa.getSourceCard());
} }
ManaCost cost = new ManaCost(sa.getManaCost());
// Beached - Delete old // Beached - Delete old
cost = AllZone.GameAction.GetSpellCostChange(sa); ManaCost cost = AllZone.GameAction.GetSpellCostChange(sa);
if(cost.isPaid()) if(cost.isPaid())
return true; return true;
// Beached - Delete old // Beached - Delete old
@@ -229,8 +228,7 @@ public class ComputerUtil
{ {
land.remove(sa.getSourceCard()); land.remove(sa.getSourceCard());
} }
ManaCost cost = new ManaCost(sa.getManaCost()); ManaCost cost = AllZone.GameAction.GetSpellCostChange(sa);
cost = AllZone.GameAction.GetSpellCostChange(sa);
// Beached - Delete old // Beached - Delete old
if(cost.isPaid()) if(cost.isPaid())
return; return;

View File

@@ -747,8 +747,7 @@ public class GameAction {
PlayerZone grave = AllZone.getZone(c); PlayerZone grave = AllZone.getZone(c);
grave.remove(c); grave.remove(c);
Card crd = new Card(); Card crd = AllZone.CardFactory.getCard(c.getName(), c.getOwner());
crd = AllZone.CardFactory.getCard(c.getName(), c.getOwner());
ownerPlay.add(crd); ownerPlay.add(crd);
crd.addCounter(Counters.M1M1, 1); crd.addCounter(Counters.M1M1, 1);