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

Support using FDeckViewer to show deck list for Gui player from match screens of mobile and desktop games

Browse Source
This commit is contained in:
drdev
2014-05-04 04:41:45 +00:00
parent 056c8d0438
commit cf85a22492
5 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-gui-mobile/src/forge/screens/match/FControl.java
View File

@@ -56,6 +56,7 @@ import forge.model.FModel;
import forge.player.LobbyPlayerHuman;
import forge.properties.ForgePreferences;
import forge.properties.ForgePreferences.FPref;
import forge.quest.QuestController;
import forge.screens.match.views.VAssignDamage;
import forge.screens.match.views.VCardDisplayArea.CardAreaPanel;
import forge.screens.match.views.VPhaseIndicator;
@@ -115,19 +116,19 @@ public class FControl {
game = match.createGame();
/*if (game.getRules().getGameType() == GameType.Quest) {
QuestController qc = Singletons.getModel().getQuest();
if (game.getRules().getGameType() == GameType.Quest) {
QuestController qc = FModel.getQuest();
// Reset new list when the Match round starts, not when each game starts
if (game.getMatch().getPlayedGames().isEmpty()) {
qc.getCards().resetNewList();
}
game.subscribeToEvents(qc); // this one listens to player's mulligans ATM
}*/
}
inputQueue = new InputQueue();
inputProxy = new InputProxy();
//game.subscribeToEvents(Singletons.getControl().getSoundSystem());
//game.subscribeToEvents(FControl.getSoundSystem());
LobbyPlayer humanLobbyPlayer = game.getRegisteredPlayers().get(0).getLobbyPlayer(); //FServer.instance.getLobby().getGuiPlayer();
// The UI controls should use these game data as models
@@ -798,5 +799,4 @@ public class FControl {
public final static LobbyPlayer getGuiPlayer() {
return guiPlayer;
}
}

7
forge-gui-mobile/src/forge/screens/match/views/VGameMenu.java
View File

@@ -2,8 +2,11 @@ package forge.screens.match.views;
import forge.Forge;
import forge.assets.FSkinImage;
import forge.deck.FDeckViewer;
import forge.game.player.RegisteredPlayer;
import forge.menu.FDropDownMenu;
import forge.menu.FMenuItem;
import forge.player.GamePlayerUtil;
import forge.screens.match.FControl;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
@@ -38,6 +41,10 @@ public class VGameMenu extends FDropDownMenu {
addItem(new FMenuItem("Deck List", FSkinImage.DECKLIST, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
RegisteredPlayer player = GamePlayerUtil.getGuiRegisteredPlayer(FControl.getGame());
if (player != null) {
FDeckViewer.show(player.getDeck());
}
}
}));
addItem(new FMenuItem("Settings", FSkinImage.SETTINGS, new FEventHandler() {

31
forge-gui-mobile/src/forge/toolbox/ListChooser.java
View File

@@ -23,12 +23,15 @@ import com.google.common.base.Function;
import forge.FThreads;
import forge.Forge.Graphics;
import forge.assets.FSkin;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
import forge.assets.FSkinColor.Colors;
import forge.card.CardRenderer;
import forge.game.card.Card;
import forge.game.player.Player;
import forge.item.PaperCard;
import forge.screens.match.views.VAvatar;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FList;
@@ -279,6 +282,31 @@ public class ListChooser<T> extends FContainer {
CardRenderer.drawCardListItem(g, font, foreColor, (Card)value, 0, x, y, w, h);
}
}
private class PlayerItemRenderer extends ItemRenderer {
@Override
public int getDefaultFontSize() {
return 18;
}
@Override
public float getItemHeight() {
return VAvatar.HEIGHT;
}
@Override
public boolean tap(T value, float x, float y, int count) {
return false;
}
@Override
public void drawValue(Graphics g, T value, FSkinFont font, FSkinColor foreColor, boolean pressed, float x, float y, float w, float h) {
Player player = (Player)value;
g.drawImage(FSkin.getAvatars().get(player.getLobbyPlayer().getAvatarIndex()), x - FList.PADDING, y - FList.PADDING, VAvatar.WIDTH, VAvatar.HEIGHT);
x += VAvatar.WIDTH;
w -= VAvatar.WIDTH;
g.drawText(player.getName() + " (" + player.getLife() + ")", font, foreColor, x, y, w, h, false, HAlignment.LEFT, true);
}
}
private class ChoiceList extends FList<T> {
private boolean allowMultipleSelections;
@@ -296,6 +324,9 @@ public class ListChooser<T> extends FContainer {
else if (item instanceof Card) {
renderer = new CardItemRenderer();
}
else if (item instanceof Player) {
renderer = new PlayerItemRenderer();
}
else {
renderer = new DefaultItemRenderer();
}