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

1) cleanup some old unused code

Browse Source 
2) the WheneverKeyword code is hard enough to read without horribly odd indentation.  Just fixed indentation for that code.
This commit is contained in:
jendave
2011-08-06 14:06:02 +00:00
parent bf97b96c15
commit dbc5da267e
1 changed files with 141 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

208
src/forge/GameAction.java
View File

@@ -195,92 +195,7 @@ public class GameAction {
if( p != null ) p.remove(c); if( p != null ) p.remove(c);
if(!c.isToken()) lib.add(c); if(!c.isToken()) lib.add(c);
} }
/*
@Deprecated
public void discardRandom(Player player, SpellAbility sa) {
player.discardRandom(sa);
/*
Card[] c = AllZone.getZone(Constant.Zone.Hand, player).getCards();
if(c.length != 0) discard(CardUtil.getRandom(c), sa);
*
}*/
/*
@Deprecated
public void mill(Player player, int n)
{
player.mill(n);
/*
CardList lib = AllZoneUtil.getPlayerCardsInLibrary(player);
int max = Math.min(n, lib.size());
for(int i = 0; i < max; i++) {
AllZone.GameAction.moveToGraveyard(lib.get(i));
}
*
}
*/
/*
public void discard(Card c, SpellAbility sa)
{
if (sa!= null)
{
;
}
AllZone.GameAction.CheckWheneverKeyword(c,"DiscardsCard",null);
discard_nath(c);
discard_megrim(c);
if(AllZoneUtil.getPlayerCardsInPlay(c.getOwner(), "Necropotence").size() > 0){ // necro disrupts madness
exile(c);
return;
}
discard_madness(c);
if ((c.getKeyword().contains("If a spell or ability an opponent controls causes you to discard CARDNAME, put it onto the battlefield instead of putting it into your graveyard.") ||
c.getKeyword().contains("If a spell or ability an opponent controls causes you to discard CARDNAME, put it onto the battlefield with two +1/+1 counters on it instead of putting it into your graveyard."))
&& !c.getController().equals(sa.getSourceCard().getController()))
discard_PutIntoPlayInstead(c);
else if (c.getKeyword().contains("If a spell or ability an opponent controls causes you to discard CARDNAME, return it to your hand."))
;
else
moveToGraveyard(c);
}
*/
/*
@Deprecated
public void discardRandom(Player player, int numDiscard, SpellAbility sa) {
player.discardRandom(numDiscard, sa);
/*
for(int i = 0; i < numDiscard; i++) {
Card[] c = AllZone.getZone(Constant.Zone.Hand, player).getCards();
if(c.length != 0) discard(CardUtil.getRandom(c), sa);
}
}*/
/*
public void discard(Player player, int numDiscard, SpellAbility sa) {
if(player.isHuman()) AllZone.InputControl.setInput(CardFactoryUtil.input_discard(numDiscard, sa));
else {
for(int i = 0; i < numDiscard; i++)
AI_discard(sa);
}
}
*/
/*
@Deprecated
public void discardUnless(Player player, int numDiscard, String uType, SpellAbility sa) {
if(player.isHuman()) AllZone.InputControl.setInput(CardFactoryUtil.input_discardNumUnless(
numDiscard, uType, sa));
else AI_discardNumUnless(numDiscard, uType, sa);
}
*/
/*
public void discardHand(Player player, SpellAbility sa) {
PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, player);
CardList list = new CardList(hand.getCards());
discardRandom(player, list.size(), sa);
}
*/
public boolean AI_discardNumType(int numDiscard, String[] uTypes, SpellAbility sa) { public boolean AI_discardNumType(int numDiscard, String[] uTypes, SpellAbility sa) {
CardList hand = new CardList(); CardList hand = new CardList();
@@ -296,116 +211,6 @@ public class GameAction {
} }
return false; return false;
} }
/*
public void AI_discardNum(int numDiscard, SpellAbility sa) {
for(int i = 0; i < numDiscard; i++)
AI_discard(sa);
}*/
/*
@Deprecated
public void AI_discardNumUnless(int numDiscard, String uType, SpellAbility sa) {
CardList hand = new CardList();
hand.addAll(AllZone.getZone(Constant.Zone.Hand, AllZone.ComputerPlayer).getCards());
CardList tHand = hand.getType(uType);
if(tHand.size() > 0) {
CardListUtil.sortCMC(tHand);
tHand.reverse();
tHand.get(0).getController().discard(tHand.get(0), sa); //this got changed to doDiscard basically
return;
}
for(int i = 0; i < numDiscard; i++)
AllZone.ComputerPlayer.discard(sa);
}
*/
/*
public void AI_discard(SpellAbility sa) {
CardList hand = new CardList();
hand.addAll(AllZone.getZone(Constant.Zone.Hand, AllZone.ComputerPlayer).getCards());
if(hand.size() > 0) {
CardList blIP = new CardList();
blIP.addAll(AllZone.getZone(Constant.Zone.Play, AllZone.ComputerPlayer).getCards());
blIP = blIP.getType("Basic");
if(blIP.size() > 5) {
CardList blIH = hand.getType("Basic");
if(blIH.size() > 0) {
discard(blIH.get(CardUtil.getRandomIndex(blIH)), sa);
return;
}
CardListUtil.sortAttackLowFirst(hand);
CardListUtil.sortNonFlyingFirst(hand);
discard(hand.get(0), sa);
return;
} else {
CardListUtil.sortCMC(hand);
discard(hand.get(0), sa);
return;
}
}
}
*/
/*
public void handToLibrary(Player player, int numToLibrary, String libPos) {
if(player.isHuman()) {
if(libPos.equals("Top") || libPos.equals("Bottom")) libPos = libPos.toLowerCase();
else {
Object o = new Object();
String s = "card";
if(numToLibrary > 1) s += "s";
o = AllZone.Display.getChoice("Do you want to put the " + s
+ " on the top or bottom of your library?", new Object[] {"top", "bottom"});
libPos = o.toString();
}
AllZone.InputControl.setInput(CardFactoryUtil.input_putFromHandToLibrary(libPos, numToLibrary));
} else {
for(int i = 0; i < numToLibrary; i++) {
if(libPos.equals("Top") || libPos.equals("Bottom")) libPos = libPos.toLowerCase();
else {
Random r = new Random();
if(r.nextBoolean()) libPos = "top";
else libPos = "bottom";
}
AI_handToLibrary(libPos);
}
}
}
public void AI_handToLibrary(String libPos) {
CardList hand = new CardList();
hand.addAll(AllZone.getZone(Constant.Zone.Hand, AllZone.ComputerPlayer).getCards());
CardList blIP = new CardList();
blIP.addAll(AllZone.getZone(Constant.Zone.Play, AllZone.ComputerPlayer).getCards());
blIP = blIP.getType("Basic");
if(blIP.size() > 5) {
CardList blIH = hand.getType("Basic");
if(blIH.size() > 0) {
Card card = blIH.get(CardUtil.getRandomIndex(blIH));
AllZone.Computer_Hand.remove(card);
if(libPos.equals("top")) AllZone.Computer_Library.add(card, 0);
else AllZone.Computer_Library.add(card);
return;
}
CardListUtil.sortAttackLowFirst(hand);
CardListUtil.sortNonFlyingFirst(hand);
if(libPos.equals("top")) AllZone.Computer_Library.add(hand.get(0), 0);
else AllZone.Computer_Library.add(hand.get(0));
AllZone.Computer_Hand.remove(hand.get(0));
return;
} else {
CardListUtil.sortCMC(hand);
if(libPos.equals("top")) AllZone.Computer_Library.add(hand.get(0), 0);
else AllZone.Computer_Library.add(hand.get(0));
AllZone.Computer_Hand.remove(hand.get(0));
return;
}
}
*/
public void discard_nath(Card discardedCard) { public void discard_nath(Card discardedCard) {
final Player owner = discardedCard.getOwner(); final Player owner = discardedCard.getOwner();
@@ -471,7 +276,6 @@ public class GameAction {
final Ability cast = new Ability(madness, madness.getMadnessCost()) { final Ability cast = new Ability(madness, madness.getMadnessCost()) {
@Override @Override
public void resolve() { public void resolve() {
//moveToHand(madness);
if (madness.getOwner().isHuman()) if (madness.getOwner().isHuman())
AllZone.Human_Graveyard.remove(madness); AllZone.Human_Graveyard.remove(madness);
else else
@@ -581,7 +385,6 @@ public class GameAction {
GameActionUtil.executeCardStateEffects(); GameActionUtil.executeCardStateEffects();
GameActionUtil.stSetPT.execute(); GameActionUtil.stSetPT.execute();
//GameActionUtil.StaticEffectKeyword.execute();
GameActionUtil.stPump.execute(); GameActionUtil.stPump.execute();
//System.out.println("checking state effects"); //System.out.println("checking state effects");
@@ -681,12 +484,9 @@ public class GameAction {
} }
private void destroyLegendaryCreatures() { private void destroyLegendaryCreatures() {
//ArrayList<Card> a = PlayerZoneUtil.getCardType(AllZone.Human_Play, "Legendary");
//a.addAll(PlayerZoneUtil.getCardType(AllZone.Computer_Play, "Legendary"));
CardList a = AllZoneUtil.getTypeInPlay("Legendary"); CardList a = AllZoneUtil.getTypeInPlay("Legendary");
while(!a.isEmpty() && !AllZoneUtil.isCardInPlay("Mirror Gallery")) { while(!a.isEmpty() && !AllZoneUtil.isCardInPlay("Mirror Gallery")) {
//ArrayList<Card> b = getCardsNamed(a, (a.get(0)).getName());
CardList b = AllZoneUtil.getCardsInPlay(a.get(0).getName()); CardList b = AllZoneUtil.getCardsInPlay(a.get(0).getName());
a.remove(0); a.remove(0);
if(1 < b.size()) { if(1 < b.size()) {
@@ -2034,12 +1834,12 @@ public class GameAction {
choice = choice.getType(S_Amount); choice = choice.getType(S_Amount);
if(Source.getController().equals(AllZone.HumanPlayer)) { if(Source.getController().equals(AllZone.HumanPlayer)) {
AllZone.InputControl.setInput(CardFactoryUtil.Wheneverinput_sacrifice(ability, choice, "Select a " + S_Amount +" to sacrifice.",Proper_Resolve)); AllZone.InputControl.setInput(CardFactoryUtil.Wheneverinput_sacrifice(ability, choice, "Select a " + S_Amount +" to sacrifice.",Proper_Resolve));
} /**else { } /*else {
if(choice.size() > 5) { if(choice.size() > 5) {
sacrifice(choice.get(0)); sacrifice(choice.get(0));
Proper_Resolve.execute(); Proper_Resolve.execute();
} }
} **/ } */
} }
} else Proper_Resolve.execute(); } else Proper_Resolve.execute();
@@ -2055,7 +1855,7 @@ public class GameAction {
if(Zones.equals("Play") || Zones.equals("Any")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Battlefield, Source.getController()); if(Zones.equals("Play") || Zones.equals("Any")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Battlefield, Source.getController());
if(Zones.contains("Library")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Library, Source.getController()); if(Zones.contains("Library")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Library, Source.getController());
if(Zones.contains("Exiled")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Exile, Source.getController()); if(Zones.contains("Exiled")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Exile, Source.getController());
// if(Zones.contains("Sideboard")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Sideboard, Source.getController()); //if(Zones.contains("Sideboard")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Sideboard, Source.getController());
if(AllZone.GameAction.isCardInZone(Source,Required_Zone[0]) || Zones.equals("Any")) { if(AllZone.GameAction.isCardInZone(Source,Required_Zone[0]) || Zones.equals("Any")) {
if(Keyword_Details[7].equals("Yes_No")) { if(Keyword_Details[7].equals("Yes_No")) {
@@ -2094,7 +1894,7 @@ public class GameAction {
if(Zones.equals("Play") || Zones.equals("Any")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Battlefield, Source.getController()); if(Zones.equals("Play") || Zones.equals("Any")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Battlefield, Source.getController());
if(Zones.contains("Library")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Library, Source.getController()); if(Zones.contains("Library")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Library, Source.getController());
if(Zones.contains("Exiled")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Exile, Source.getController()); if(Zones.contains("Exiled")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Exile, Source.getController());
// if(Zones.contains("Sideboard")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Sideboard, Source.getController()); //if(Zones.contains("Sideboard")) Required_Zone[0] = AllZone.getZone(Constant.Zone.Sideboard, Source.getController());
if(AllZone.GameAction.isCardInZone(Source,Required_Zone[0]) || Zones.equals("Any")) { if(AllZone.GameAction.isCardInZone(Source,Required_Zone[0]) || Zones.equals("Any")) {
if(Keyword_Details[6].equals("ASAP")) { if(Keyword_Details[6].equals("ASAP")) {