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.

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

View file

@ -31,9 +31,11 @@ package mage.view;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import mage.MageObject;
import mage.Constants.PhaseStep;
import mage.Constants.TurnPhase;
import mage.MageObject;
import mage.cards.Card;
import mage.game.ExileZone;
import mage.game.Game;
import mage.game.GameState;
@ -68,10 +70,11 @@ public class GameView implements Serializable {
for (StackObject stackObject: state.getStack()) {
if (stackObject instanceof StackAbility) {
MageObject object = game.getObject(stackObject.getSourceId());
Card card = game.getCard(stackObject.getSourceId());
if (object != null)
stack.put(stackObject.getId(), new StackAbilityView((StackAbility)stackObject, object.getName()));
stack.put(stackObject.getId(), new StackAbilityView((StackAbility)stackObject, object.getName(), new CardView(card)));
else
stack.put(stackObject.getId(), new StackAbilityView((StackAbility)stackObject, ""));
stack.put(stackObject.getId(), new StackAbilityView((StackAbility)stackObject, "", new CardView(card)));
}
else {
stack.put(stackObject.getId(), new CardView((Spell)stackObject));