External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-21 19:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Commander] Display Commander in client

Browse source
This commit is contained in:
Plopman 2013-07-17 20:35:52 +02:00
parent 930e70fbbb
commit e6847a472d
3 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/game/PlayerPanelExt.java
View file

@ -651,7 +651,7 @@ public class PlayerPanelExt extends javax.swing.JPanel {
} }
private void btnCommandZoneActionPerformed(java.awt.event.ActionEvent evt) { private void btnCommandZoneActionPerformed(java.awt.event.ActionEvent evt) {
DialogManager.getManager(gameId).showEmblemsDialog(CardsViewUtil.convertEmblems(player.getEmblemList()), bigCard, gameId); DialogManager.getManager(gameId).showEmblemsDialog(CardsViewUtil.convertCommandObject(player.getCommadObjectList()), bigCard, gameId);
} }
private void btnCheatActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCheatActionPerformed private void btnCheatActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCheatActionPerformed

16
Mage.Client/src/main/java/mage/client/util/CardsViewUtil.java
View file

@ -28,13 +28,12 @@
package mage.client.util; package mage.client.util;
import java.util.List;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.repository.CardInfo; import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository; import mage.cards.repository.CardRepository;
import mage.view.*; import mage.view.*;
import java.util.List;
/** /**
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
@ -55,12 +54,17 @@ public class CardsViewUtil {
return cards; return cards;
} }
public static CardsView convertEmblems(List<EmblemView> view) { public static CardsView convertCommandObject(List<CommandObjectView> view) {
CardsView cards = new CardsView(); CardsView cards = new CardsView();
for (EmblemView emblem : view) { for (CommandObjectView commandObject : view) {
CardView cardView = new CardView(emblem); if(commandObject instanceof EmblemView ){
cards.put(emblem.getId(), cardView); CardView cardView = new CardView((EmblemView)commandObject);
cards.put(commandObject.getId(), cardView);
}
else if(commandObject instanceof CommanderView ){
cards.put(commandObject.getId(),(CommanderView)commandObject);
}
} }
return cards; return cards;

18
Mage.Common/src/mage/view/PlayerView.java
View file

@ -39,6 +39,7 @@ import mage.players.Player;
import java.io.Serializable; import java.io.Serializable;
import java.util.*; import java.util.*;
import mage.game.command.Commander;
/** /**
* *
@ -61,7 +62,7 @@ public class PlayerView implements Serializable {
private Map<UUID, PermanentView> battlefield = new LinkedHashMap<UUID, PermanentView>(); private Map<UUID, PermanentView> battlefield = new LinkedHashMap<UUID, PermanentView>();
private CardView topCard; private CardView topCard;
private UserDataView userDataView; private UserDataView userDataView;
private List<EmblemView> emblemList = new ArrayList<EmblemView>(); private List<CommandObjectView> commandList = new ArrayList<CommandObjectView>();
private List<UUID> attachments = new ArrayList<UUID>(); private List<UUID> attachments = new ArrayList<UUID>();
private int statesSavedSize; private int statesSavedSize;
private int priorityTimeLeft; private int priorityTimeLeft;
@ -100,7 +101,16 @@ public class PlayerView implements Serializable {
if (emblem.getControllerId().equals(this.playerId)) { if (emblem.getControllerId().equals(this.playerId)) {
Card sourceCard = game.getCard(((CommandObject)emblem).getSourceId()); Card sourceCard = game.getCard(((CommandObject)emblem).getSourceId());
if (sourceCard != null) { if (sourceCard != null) {
emblemList.add(new EmblemView(emblem, sourceCard)); commandList.add(new EmblemView(emblem, sourceCard));
}
}
}
else if(commandObject instanceof Commander){
Commander commander = (Commander)commandObject;
if(commander.getControllerId().equals(this.playerId)){
Card sourceCard = game.getCard(commander.getSourceId());
if(sourceCard != null){
commandList.add(new CommanderView(commander, sourceCard));
} }
} }
} }
@ -180,8 +190,8 @@ public class PlayerView implements Serializable {
return this.userDataView; return this.userDataView;
} }
public List<EmblemView> getEmblemList() { public List<CommandObjectView> getCommadObjectList() {
return emblemList; return commandList;
} }
public List<UUID> getAttachments() { public List<UUID> getAttachments() {