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

- Restored the "Use Random Card Art" functionality. Implementation may be suboptimal with the latest changes in mind, feel free to reimplement in a better way if you know how (do NOT randomly remove though!).

Browse Source
This commit is contained in:
Agetian
2014-01-05 06:03:30 +00:00
parent d9e5d93265
commit 39061439dc
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
forge-gui/src/main/java/forge/game/Match.java
View File

@@ -99,12 +99,13 @@ public class Match {
*/ */
public void startGame(final Game game, final CountDownLatch latch) { public void startGame(final Game game, final CountDownLatch latch) {
final boolean canRandomFoil = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_RANDOM_FOIL) && gameType == GameType.Constructed; final boolean canRandomFoil = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_RANDOM_FOIL) && gameType == GameType.Constructed;
final boolean useRandomArt = Singletons.getModel().getPreferences().getPrefBoolean(FPref.UI_RANDOM_CARD_ART);
// This code could be run run from EDT. // This code could be run run from EDT.
game.getAction().invoke(new Runnable() { game.getAction().invoke(new Runnable() {
@Override @Override
public void run() { public void run() {
prepareAllZones(game, canRandomFoil); prepareAllZones(game, canRandomFoil, useRandomArt);
if (useAnte) { // Deciding which cards go to ante if (useAnte) { // Deciding which cards go to ante
Multimap<Player, Card> list = game.chooseCardsForAnte(); Multimap<Player, Card> list = game.chooseCardsForAnte();
@@ -236,24 +237,37 @@ public class Match {
return myRemovedAnteCards; return myRemovedAnteCards;
} }
private static void preparePlayerLibrary(Player player, final ZoneType zoneType, CardPool section, boolean canRandomFoil, Random generator) { private static void preparePlayerLibrary(Player player, final ZoneType zoneType, CardPool section, boolean canRandomFoil, boolean useRandomArt, Random generator) {
PlayerZone library = player.getZone(zoneType); PlayerZone library = player.getZone(zoneType);
List<Card> newLibrary = new ArrayList<Card>(); List<Card> newLibrary = new ArrayList<Card>();
for (final Entry<PaperCard, Integer> stackOfCards : section) { for (final Entry<PaperCard, Integer> stackOfCards : section) {
final PaperCard cp = stackOfCards.getKey(); final PaperCard cp = stackOfCards.getKey();
for (int i = 0; i < stackOfCards.getValue(); i++) { for (int i = 0; i < stackOfCards.getValue(); i++) {
final Card card = Card.fromPaperCard(cp, player);
// apply random pictures for cards
// TODO: potentially suboptimal implementation. Do NOT randomly remove this code! If you know how to implement
// it better, feel free to do so. Until then, unfortunately, this is the best implementation thus far.
PaperCard cpi = null;
if (useRandomArt) {
cpi = Singletons.getMagicDb().getCommonCards().getCard(cp.getName(), cp.getEdition(), -1);
if ( cp.isFoil() )
cpi = Singletons.getMagicDb().getCommonCards().getFoiled(cpi);
}
final Card card = cpi == null ? Card.fromPaperCard(cp, player) : Card.fromPaperCard(cpi, player);
// Assign card-specific foiling or random foiling on approximately 1:20 cards if enabled // Assign card-specific foiling or random foiling on approximately 1:20 cards if enabled
if (cp.isFoil() || (canRandomFoil && MyRandom.percentTrue(5))) { if (cp.isFoil() || (canRandomFoil && MyRandom.percentTrue(5))) {
card.setRandomFoil(); card.setRandomFoil();
} }
newLibrary.add(card); newLibrary.add(card);
} }
} }
library.setCards(newLibrary); library.setCards(newLibrary);
} }
private void prepareAllZones(final Game game, final boolean canRandomFoil) { private void prepareAllZones(final Game game, final boolean canRandomFoil, final boolean useRandomArt) {
// need this code here, otherwise observables fail // need this code here, otherwise observables fail
Trigger.resetIDs(); Trigger.resetIDs();
game.getTriggerHandler().clearDelayedTrigger(); game.getTriggerHandler().clearDelayedTrigger();
@@ -304,9 +318,9 @@ public class Match {
Random generator = MyRandom.getRandom(); Random generator = MyRandom.getRandom();
preparePlayerLibrary(player, ZoneType.Library, myDeck.getMain(), canRandomFoil, generator); preparePlayerLibrary(player, ZoneType.Library, myDeck.getMain(), canRandomFoil, useRandomArt, generator);
if (myDeck.has(DeckSection.Sideboard)) { if (myDeck.has(DeckSection.Sideboard)) {
preparePlayerLibrary(player, ZoneType.Sideboard, myDeck.get(DeckSection.Sideboard), canRandomFoil, generator); preparePlayerLibrary(player, ZoneType.Sideboard, myDeck.get(DeckSection.Sideboard), canRandomFoil, useRandomArt, generator);
} }
player.shuffle(null); player.shuffle(null);

4
forge-gui/src/main/java/forge/game/card/Card.java
View File

@@ -7871,6 +7871,10 @@ public class Card extends GameEntity implements Comparable<Card> {
} }
} }
public final void setRandomArt() {
}
/** /**
* *
* TODO Write javadoc for this method. * TODO Write javadoc for this method.