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

merge latest trunk

Browse Source
This commit is contained in:
myk
2013-03-15 03:15:24 +00:00
parent 173b0c9490 1728cf4440
commit de4766f16d
6 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/forge/Card.java
View File

@@ -8869,6 +8869,10 @@ public class Card extends GameEntity implements Comparable<Card> {
if (this.hasProtectionFrom(sa.getSourceCard())) {
return false;
}
if (this.isPhasedOut()) {
return false;
}
if (this.getKeyword() != null) {
final Card source = sa.getSourceCard();

2
src/main/java/forge/card/ability/ai/AttachAi.java
View File

@@ -802,7 +802,7 @@ public class AttachAi extends SpellAbilityAi {
}
});
if (attachSource.isAura()) {
if (attachSource.isAura() && !attachSource.getName().equals("Daybreak Coronet")) {
// TODO For Auras like Rancor, that aren't as likely to lead to
// card disadvantage, this check should be skipped
prefList = CardLists.filter(prefList, Predicates.not(Presets.ENCHANTED));

9
src/main/java/forge/card/ability/effects/ManaEffect.java
View File

@@ -137,12 +137,15 @@ public class ManaEffect extends SpellAbilityEffect {
abMana.setExpressChoice(choice);
}
else {
if (sa.hasParam("AILogic")) {
final String logic = sa.getParam("AILogic");
if (abMana.getExpressChoice().isEmpty()) {
final String logic = sa.hasParam("AILogic") ? sa.getParam("AILogic") : null;
String chosen = Constant.Color.BLACK;
if (logic.equals("MostProminentInComputerHand")) {
if (logic == null || logic.equals("MostProminentInComputerHand")) {
chosen = ComputerUtilCard.getMostProminentColor(act.getCardsIn(ZoneType.Hand));
}
if (chosen.equals("")) {
chosen = Constant.Color.GREEN;
}
GuiChoose.one("Computer picked: ", new String[]{chosen});
abMana.setExpressChoice(MagicColor.toShortString(chosen));
}