Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Now StackAbilityView has sourceCard. Added displaying source card for abilities. Fixed arrows offsets. Added "source" blue arrows (target arrows are red). Fixed NullPointerException happen for AbilityPicker. Fixed random order of spells in stack. Code clean up.

Browse source
This commit is contained in:
magenoxx 2010-11-27 15:29:48 +00:00
parent a910b59399
commit 03cb41f2aa
10 changed files with 110 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Mage.Client/src/main/java/mage/client/cards/Cards.java
View file

@ -36,20 +36,19 @@ package mage.client.cards;
import java.awt.Component;
import java.awt.Dimension;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import java.util.Map.Entry;
import mage.cards.CardDimensions;
import mage.cards.MageCard;
import mage.client.plugins.adapters.MageMouseAdapter;
import mage.client.plugins.adapters.MageMouseMotionAdapter;
import mage.client.plugins.impl.Plugins;
import mage.client.util.Config;
import mage.view.CardView;
import mage.view.CardsView;
import mage.view.StackAbilityView;
/**
*
@ -57,7 +56,7 @@ import mage.view.CardsView;
*/
public class Cards extends javax.swing.JPanel {
private Map<UUID, MageCard> cards = new HashMap<UUID, MageCard>();
private Map<UUID, MageCard> cards = new LinkedHashMap<UUID, MageCard>();
/** Creates new form Cards */
public Cards() {
@ -73,13 +72,7 @@ public class Cards extends javax.swing.JPanel {
public boolean loadCards(CardsView cardsView, BigCard bigCard, UUID gameId) {
boolean changed = false;
for (CardView card: cardsView.values()) {
if (!cards.containsKey(card.getId())) {
addCard(card, bigCard, gameId);
changed = true;
}
cards.get(card.getId()).update(card);
}
for (Iterator<Entry<UUID, MageCard>> i = cards.entrySet().iterator(); i.hasNext();) {
Entry<UUID, MageCard> entry = i.next();
if (!cardsView.containsKey(entry.getKey())) {
@ -89,6 +82,21 @@ public class Cards extends javax.swing.JPanel {
}
}
for (CardView card: cardsView.values()) {
if (card instanceof StackAbilityView) {
CardView tmp = ((StackAbilityView)card).getSourceCard();
tmp.overrideRules(card.getRules());
tmp.setIsAbility(true);
tmp.overrideTargets(card.getTargets());
card = tmp;
}
if (!cards.containsKey(card.getId())) {
addCard(card, bigCard, gameId);
changed = true;
}
cards.get(card.getId()).update(card);
}
cardArea.setPreferredSize(new Dimension(cards.size() * Config.dimensions.frameWidth, Config.dimensions.frameHeight));
cardArea.revalidate();
cardArea.repaint();