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

- Added Yavimaya Dryad and Thieve's Auction

Browse Source
This commit is contained in:
swordshine
2013-03-18 02:16:22 +00:00
parent f2560e5d0a
commit 10bae9c32c
5 changed files with 52 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/forge/card/ability/ai/ChangeZoneAi.java
View File

@@ -12,10 +12,10 @@ import forge.Card;
import forge.CardCharacteristicName;
import forge.CardLists;
import forge.CardPredicates;
import forge.CardPredicates.Presets;
import forge.Constant;
import forge.GameEntity;
import forge.Singletons;
import forge.CardPredicates.Presets;
import forge.card.ability.AbilityUtils;
import forge.card.ability.ApiType;
import forge.card.ability.SpellAbilityAi;
@@ -28,10 +28,10 @@ import forge.card.spellability.SpellAbility;
import forge.card.spellability.SpellPermanent;
import forge.card.spellability.Target;
import forge.game.GlobalRuleChange;
import forge.game.ai.ComputerUtil;
import forge.game.ai.ComputerUtilBlock;
import forge.game.ai.ComputerUtilCard;
import forge.game.ai.ComputerUtilCombat;
import forge.game.ai.ComputerUtil;
import forge.game.ai.ComputerUtilBlock;
import forge.game.ai.ComputerUtilCost;
import forge.game.ai.ComputerUtilMana;
import forge.game.phase.Combat;
@@ -424,7 +424,8 @@ public class ChangeZoneAi extends SpellAbilityAi {
* a {@link forge.CardList} object.
* @return a {@link forge.Card} object.
*/
private static Card basicManaFixing(final Player ai, final List<Card> list) { // Search for a Basic Land
private static Card basicManaFixing(final Player ai, final List<Card> list) { // Search for a
// Basic Land
final List<Card> combined = new ArrayList<Card>(ai.getCardsIn(ZoneType.Battlefield));
combined.addAll(ai.getCardsIn(ZoneType.Hand));
@@ -456,11 +457,6 @@ public class ChangeZoneAi extends SpellAbilityAi {
if (minType != null) {
result = CardLists.getType(list, minType);
}
// pick dual lands if available
if (Iterables.any(result, Predicates.not(CardPredicates.Presets.BASIC_LANDS))) {
result = CardLists.filter(result, Predicates.not(CardPredicates.Presets.BASIC_LANDS));
}
return result.get(0);
}
@@ -1177,7 +1173,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
} else if (origin.contains(ZoneType.Library)
&& (type.contains("Basic") || areAllBasics(type))) {
c = basicManaFixing(ai, fetchList);
} else if (ZoneType.Hand.equals(destination) && CardLists.getNotType(fetchList, "Creature").isEmpty()) {
} else if (ZoneType.Hand.equals(destination) && CardLists.getNotType(fetchList, "Creature").size() == 0) {
c = chooseCreature(ai, fetchList);
} else if (ZoneType.Battlefield.equals(destination) || ZoneType.Graveyard.equals(destination)) {
if (!activator.equals(ai) && sa.hasParam("GainControl")) {
@@ -1194,7 +1190,7 @@ public class ChangeZoneAi extends SpellAbilityAi {
// Does AI need a land?
List<Card> hand = ai.getCardsIn(ZoneType.Hand);
if (CardLists.filter(hand, Presets.LANDS).isEmpty() && CardLists.filter(ai.getCardsIn(ZoneType.Battlefield), Presets.LANDS).size() < 4) {
if (CardLists.filter(hand, Presets.LANDS).size() == 0 && CardLists.filter(ai.getCardsIn(ZoneType.Battlefield), Presets.LANDS).size() < 4) {
boolean canCastSomething = false;
for (Card cardInHand : hand) {
canCastSomething |= ComputerUtilMana.payManaCost(cardInHand.getFirstSpellAbility(), ai, true, 0, false);
@@ -1254,7 +1250,12 @@ public class ChangeZoneAi extends SpellAbilityAi {
c.setTapped(true);
}
if (sa.hasParam("GainControl")) {
c.setController(sa.getActivatingPlayer(), Singletons.getModel().getGame().getNextTimestamp());
if (sa.hasParam("NewController")) {
final Player p = AbilityUtils.getDefinedPlayers(sa.getSourceCard(), sa.getParam("DefinedPlayer"), sa).get(0);
c.setController(p, Singletons.getModel().getGame().getNextTimestamp());
} else {
c.setController(sa.getActivatingPlayer(), Singletons.getModel().getGame().getNextTimestamp());
}
}
if (sa.hasParam("AttachedTo")) {

14
src/main/java/forge/card/ability/effects/ChangeZoneEffect.java
View File

@@ -386,7 +386,12 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
tgtC.setTapped(true);
}
if (sa.hasParam("GainControl")) {
tgtC.setController(sa.getActivatingPlayer(), Singletons.getModel().getGame().getNextTimestamp());
if (sa.hasParam("NewController")) {
final Player p = AbilityUtils.getDefinedPlayers(sa.getSourceCard(), sa.getParam("NewController"), sa).get(0);
tgtC.setController(p, Singletons.getModel().getGame().getNextTimestamp());
} else {
tgtC.setController(sa.getActivatingPlayer(), Singletons.getModel().getGame().getNextTimestamp());
}
}
if (sa.hasParam("AttachedTo")) {
List<Card> list = AbilityUtils.getDefinedCards(hostCard,
@@ -670,7 +675,12 @@ public class ChangeZoneEffect extends SpellAbilityEffect {
c.setTapped(true);
}
if (sa.hasParam("GainControl")) {
c.setController(sa.getActivatingPlayer(), Singletons.getModel().getGame().getNextTimestamp());
if (sa.hasParam("NewController")) {
final Player p = AbilityUtils.getDefinedPlayers(sa.getSourceCard(), sa.getParam("NewController"), sa).get(0);
c.setController(p, Singletons.getModel().getGame().getNextTimestamp());
} else {
c.setController(sa.getActivatingPlayer(), Singletons.getModel().getGame().getNextTimestamp());
}
}
if (sa.hasParam("AttachedTo")) {