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

- Added Death or Glory.

Browse Source
This commit is contained in:
Sloth
2012-02-16 18:03:14 +00:00
parent f0504c8934
commit cc658ee7e5
7 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
View File

@@ -1029,7 +1029,7 @@ public final class AbilityFactoryChangeZone {
if (params.containsKey("AtRandom")) {
c = CardUtil.getRandom(fetchList.toArray());
} else if (defined) {
c = fetchList.get(i);
c = fetchList.get(0);
} else if (type.contains("Basic")) {
c = AbilityFactoryChangeZone.basicManaFixing(fetchList);
} else if (AbilityFactoryChangeZone.areAllBasics(type)) {
@@ -1060,9 +1060,7 @@ public final class AbilityFactoryChangeZone {
}
fetched.add(c);
if (!defined) {
fetchList.remove(c);
}
fetchList.remove(c);
}
if (origin.contains(Zone.Library) && !defined) {

16
src/main/java/forge/card/abilityfactory/AbilityFactoryClash.java
View File

@@ -620,7 +620,7 @@ public final class AbilityFactoryClash {
Constant.Zone zone = null;
boolean pile1WasChosen = true;
if (params.containsKey("Origin")) {
if (params.containsKey("Zone")) {
zone = Constant.Zone.smartValueOf(params.get("Zone"));
}
@@ -666,10 +666,11 @@ public final class AbilityFactoryClash {
final List<Card> l = GuiUtils.getChoicesOptional("Put into pile 1 (multi-select)", pool.toArray());
for (final Card c : l) {
pile1.add(c);
pool.remove(c);
}
for (final Card c : pool) {
pile2.add(c);
if (!pile1.contains(c)) {
pile2.add(c);
}
}
} else if (size > 0) {
//computer separates
@@ -736,8 +737,13 @@ public final class AbilityFactoryClash {
}
} else {
final int cmc1 = CardFactoryUtil.evaluatePermanentList(new CardList(pile1));
final int cmc2 = CardFactoryUtil.evaluatePermanentList(new CardList(pile2));
int cmc1 = CardFactoryUtil.evaluatePermanentList(new CardList(pile1));
int cmc2 = CardFactoryUtil.evaluatePermanentList(new CardList(pile2));
if (pool.getNotType("Creature").isEmpty()) {
cmc1 = CardFactoryUtil.evaluateCreatureList(new CardList(pile1));
cmc2 = CardFactoryUtil.evaluateCreatureList(new CardList(pile2));
System.out.println("value:" + cmc1 + " " + cmc2);
}
// for now, this assumes that the outcome will be bad
// TODO: This should really have a ChooseLogic param to