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

Make previous fix actually work

Browse Source 
Fix so cards cast by opponent aren't hidden while on stack
This commit is contained in:
drdev
2014-10-02 22:43:23 +00:00
parent a6b4e74263
commit 5d919d9e03
3 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
forge-gui/src/main/java/forge/control/FControlGameEventHandler.java
View File

@@ -52,7 +52,6 @@ import forge.match.MatchUtil;
import forge.match.input.ButtonUtil;
import forge.match.input.InputBase;
import forge.model.FModel;
import forge.player.GamePlayerUtil;
import forge.properties.ForgePreferences.FPref;
import forge.util.Lang;
import forge.util.gui.SGuiChoose;
@@ -97,14 +96,6 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
eventReceived = false;
IMatchController controller = MatchUtil.getController();
if (!cardsUpdate.isEmpty()) {
MatchUtil.updateCards(gameView.getCardViews(cardsUpdate, true));
cardsUpdate.clear();
}
if (!cardsRefreshDetails.isEmpty()) {
controller.refreshCardDetails(gameView.getCardViews(cardsRefreshDetails, true));
cardsRefreshDetails.clear();
}
if (!livesUpdate.isEmpty()) {
controller.updateLives(gameView.getPlayerViews(livesUpdate, true));
livesUpdate.clear();
@@ -113,16 +104,6 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
controller.updateManaPool(gameView.getPlayerViews(manaPoolUpdate, true));
manaPoolUpdate.clear();
}
if (!zonesUpdate.isEmpty()) {
List<PlayerView> players = gameView.getPlayers(true);
ArrayList<Pair<PlayerView, ZoneType>> zones = new ArrayList<Pair<PlayerView, ZoneType>>();
for (String z : zonesUpdate) {
int idx = z.indexOf(PLAYER_ZONE_DELIM);
zones.add(Pair.of(players.get(Integer.parseInt(z.substring(0, idx))), ZoneType.valueOf(z.substring(idx + 1))));
}
controller.updateZones(zones);
zonesUpdate.clear();
}
if (turnUpdate != null) {
controller.updateTurn(gameView.getPlayerView(turnUpdate, true));
turnUpdate = null;
@@ -144,6 +125,24 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
needPlayerControlUpdate = false;
controller.updatePlayerControl();
}
if (!zonesUpdate.isEmpty()) {
List<PlayerView> players = gameView.getPlayers(true);
ArrayList<Pair<PlayerView, ZoneType>> zones = new ArrayList<Pair<PlayerView, ZoneType>>();
for (String z : zonesUpdate) {
int idx = z.indexOf(PLAYER_ZONE_DELIM);
zones.add(Pair.of(players.get(Integer.parseInt(z.substring(0, idx))), ZoneType.valueOf(z.substring(idx + 1))));
}
controller.updateZones(zones);
zonesUpdate.clear();
}
if (!cardsUpdate.isEmpty()) {
MatchUtil.updateCards(gameView.getCardViews(cardsUpdate, true));
cardsUpdate.clear();
}
if (!cardsRefreshDetails.isEmpty()) {
controller.refreshCardDetails(gameView.getCardViews(cardsRefreshDetails, true));
cardsRefreshDetails.clear();
}
if (gameOver) {
gameOver = false;
gameView.getInputQueue().onGameOver(true); // this will unlock any game threads waiting for inputs to complete
@@ -303,7 +302,7 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
}
@Override
public Void visit(final GameEventBlockersDeclared event) { // This is to draw icons on blockers declared by AI
public Void visit(final GameEventBlockersDeclared event) {
for (MapOfLists<Card, Card> kv : event.blockers.values()) {
for (Collection<Card> blockers : kv.values()) {
cardsUpdate.addAll(blockers);
@@ -314,13 +313,6 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
@Override
public Void visit(GameEventAttackersDeclared event) {
// Skip redraw for GUI player?
if (event.player.getLobbyPlayer() == GamePlayerUtil.getGuiPlayer()) {
return null;
}
// Update all attackers.
// Although they might have been updated when they were tapped, there could be someone with vigilance, not redrawn yet.
cardsUpdate.addAll(event.attackersMap.values());
return null;
}

4
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1627,7 +1627,7 @@ public class PlayerControllerHuman extends PlayerController {
* @see forge.view.LocalGameView#getCardView(forge.game.card.Card)
*/
public CardView getCardView(Card c) {
return gameView.getCardView(c, false);
return gameView.getCardView(c, true);
}
/**
@@ -1636,7 +1636,7 @@ public class PlayerControllerHuman extends PlayerController {
* @see forge.view.LocalGameView#getCardViews(java.util.List)
*/
public final List<CardView> getCardViews(final Iterable<Card> cards) {
return gameView.getCardViews(cards, false);
return gameView.getCardViews(cards, true);
}
/**

2
forge-gui/src/main/java/forge/view/StackItemView.java
View File

@@ -30,7 +30,7 @@ public class StackItemView implements IIdentifiable {
key = si.getSpellAbility().toUnsuppressedString();
sourceTrigger = si.getSpellAbility().getSourceTrigger();
text = si.getStackDescription();
source = gameView.getCardView(si.getSourceCard(), false);
source = gameView.getCardView(si.getSourceCard(), true);
activatingPlayer = gameView.getPlayerView(si.getActivator(), false);
targetCards = gameView.getCardViews(si.getTargetChoices().getTargetCards(), false);
targetPlayers = gameView.getPlayerViews(si.getTargetChoices().getTargetPlayers(), false);