Merge branch 'newBranch' into 'master'

Fix Card Display on Network Client

Closes #159

See merge request core-developers/forge!2775

forge-game/src/main/java/forge/game/GameView.java

@@ -24,7 +24,6 @@ import java.util.List;
 public class GameView extends TrackableObject {
     private static final long serialVersionUID = 8522884512960961528L;
 
-    private CombatView combatView;
     private final transient Game game; //TODO: Remove this when possible before network support added
 
     public GameView(final Game game0) {
@@ -140,15 +139,18 @@ public class GameView extends TrackableObject {
     }
 
     public CombatView getCombat() {
-        return combatView;
+        return get(TrackableProperty.CombatView);
+    }
+    public void updateCombatView(CombatView combatView) {
+        set(TrackableProperty.CombatView, combatView);
     }
     void updateCombat(Combat combat) {
         if (combat == null) {
-            combatView = null;
+            set(TrackableProperty.CombatView, null);
             return;
         }
 
-        combatView = new CombatView(combat.getAttackingPlayer().getGame().getTracker());
+        final CombatView combatView = new CombatView(combat.getAttackingPlayer().getGame().getTracker());
         for (final AttackingBand b : combat.getAttackingBands()) {
             if (b == null) continue;
             final GameEntity defender = combat.getDefenderByAttacker(b);
@@ -160,6 +162,7 @@ public class GameView extends TrackableObject {
                     isBlocked ? CardView.getCollection(blockers) : null,
                     CardView.getCollection(blockers));
         }
+        updateCombatView(combatView);
     }
 
     public void serialize() {

forge-game/src/main/java/forge/game/event/GameEventCombatUpdate.java

@@ -0,0 +1,22 @@
+package forge.game.event;
+
+import forge.game.card.Card;
+
+import java.util.List;
+
+public class GameEventCombatUpdate extends GameEvent {
+
+    public final List<Card> attackers;
+    public final List<Card> blockers;
+
+    public GameEventCombatUpdate(List<Card> attackers, List<Card> blockers) {
+        this.attackers = attackers;
+        this.blockers = blockers;
+    }
+
+    @Override
+    public <T> T visit(IGameEventVisitor<T> visitor) {
+        return visitor.visit(this);
+    }
+
+}

forge-game/src/main/java/forge/game/event/IGameEventVisitor.java

@@ -21,6 +21,7 @@ public interface IGameEventVisitor<T> {
     T visit(GameEventCardCounters event);
     T visit(GameEventCombatChanged event);
     T visit(GameEventCombatEnded event);
+    T visit(GameEventCombatUpdate event);
     T visit(GameEventGameFinished event);
     T visit(GameEventGameOutcome event);
     T visit(GameEventFlipCoin event);
@@ -69,6 +70,7 @@ public interface IGameEventVisitor<T> {
         public T visit(GameEventCardPhased event) { return null; }
         public T visit(GameEventCombatChanged event) { return null; }
         public T visit(GameEventCombatEnded event) { return null; }
+        public T visit(GameEventCombatUpdate event) { return null; }
         public T visit(GameEventGameFinished event) { return null; }
         public T visit(GameEventGameOutcome event) { return null; }
         public T visit(GameEventFlipCoin event) { return null; }

forge-game/src/main/java/forge/trackable/TrackableProperty.java

@@ -179,6 +179,7 @@ public enum TrackableProperty {
     BandsWithBlockers(TrackableTypes.GenericMapType, FreezeMode.IgnoresFreeze),
     AttackersWithPlannedBlockers(TrackableTypes.GenericMapType, FreezeMode.IgnoresFreeze),
     BandsWithPlannedBlockers(TrackableTypes.GenericMapType, FreezeMode.IgnoresFreeze),
+    CombatView(TrackableTypes.CombatViewType, FreezeMode.IgnoresFreeze),
 
     //Game
     Players(TrackableTypes.PlayerViewCollectionType),
@@ -219,6 +220,10 @@ public enum TrackableProperty {
         return freezeMode;
     }
 
+    public TrackableType<?> getType() {
+        return type;
+    }
+
     @SuppressWarnings("unchecked")
     public <T> void updateObjLookup(Tracker tracker, T newObj) {
         ((TrackableType<T>)type).updateObjLookup(tracker, newObj);

forge-game/src/main/java/forge/trackable/TrackableTypes.java

@@ -17,6 +17,7 @@ import forge.game.GameEntityView;
 import forge.game.card.CardView;
 import forge.game.card.CardView.CardStateView;
 import forge.game.card.CounterType;
+import forge.game.combat.CombatView;
 import forge.game.keyword.KeywordCollection.KeywordCollectionView;
 import forge.game.player.PlayerView;
 import forge.game.spellability.StackItemView;
@@ -104,11 +105,17 @@ public class TrackableTypes {
                         T newObj = newCollection.get(i);
                         if (newObj != null) {
                             T existingObj = from.getTracker().getObj(itemType, newObj.getId());
-                            if (existingObj != null) { //if object exists already, update its changed properties
+                            if (existingObj != null) {  //fix cards with alternate state/ manifest/ morph/ adventure etc...
+                                if (prop.getType() == TrackableTypes.CardViewCollectionType ||
+                                        prop.getType() == TrackableTypes.StackItemViewListType) {
+                                    newCollection.remove(i);
+                                    newCollection.add(i, newObj);
+                                } else { //if object exists already, update its changed properties
                                     existingObj.copyChangedProps(newObj);
                                     newCollection.remove(i);
                                     newCollection.add(i, existingObj);
                                 }
+                            }
                             else { //if object is new, cache in object lookup
                                 from.getTracker().putObj(itemType, newObj.getId(), newObj);
                             }
@@ -626,4 +633,26 @@ public class TrackableTypes {
         public void serialize(TrackableSerializer ts, Map<Object, Object> value) {
         }
     };
+    public static final TrackableObjectType<CombatView> CombatViewType = new TrackableObjectType<CombatView>() {
+        @Override
+        protected CombatView getDefaultValue() {
+            return null;
+        }
+
+        @Override
+        protected CombatView deserialize(TrackableDeserializer td, CombatView oldValue) {
+            oldValue.deserialize(td); //TODO handle old value being null or changing to null
+            return oldValue;
+        }
+
+        @Override
+        protected void serialize(TrackableSerializer ts, CombatView value) {
+            if (value == null) {
+                ts.write(-1);
+            }
+            else {
+                value.serialize(ts);
+            }
+        }
+    };
 }

forge-gui-mobile/src/forge/Forge.java

@@ -274,8 +274,8 @@ public class Forge implements ApplicationListener {
             @Override
             public void run(Boolean result) {
                 if (result) {
-                    Dscreens.removeFirst();
+                    Dscreens.pollFirst();
-                    setCurrentScreen(Dscreens.getFirst());
+                    setCurrentScreen(Dscreens.peekFirst());
                 }
             }
         });

forge-gui-mobile/src/forge/screens/match/MatchController.java

@@ -119,9 +119,6 @@ public class MatchController extends AbstractGuiGame {
     public void refreshField() {
         if(!GuiBase.isNetworkplay())
             return;
-        if(getGameView().getPhase() == null)
-            return;
-        if (getGameView().getPhase().phaseforUpdateField())
         refreshCardDetails(null);
     }
 

forge-gui/src/main/java/forge/control/FControlGameEventHandler.java

@@ -361,6 +361,21 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
         return processCards(event.blockers, cardsUpdate);
     }
 
+    @Override
+    public Void visit(final GameEventCombatUpdate event) {
+        if (!GuiBase.isNetworkplay())
+            return null; //not needed if single player only...
+
+        final CardCollection cards = new CardCollection();
+        cards.addAll(event.attackers);
+        cards.addAll(event.blockers);
+
+        refreshFieldUpdate = true;
+
+        processCards(cards, cardsRefreshDetails);
+        return processCards(cards, cardsUpdate);
+    }
+
     @Override
     public Void visit(final GameEventCardChangeZone event) {
         if(GuiBase.getInterface().isLibgdxPort()) {
@@ -373,6 +388,7 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
 
     @Override
     public Void visit(final GameEventCardStatsChanged event) {
+        refreshFieldUpdate = true;
         processCards(event.cards, cardsRefreshDetails);
         return processCards(event.cards, cardsUpdate);
     }
@@ -397,6 +413,7 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
 
     @Override
     public Void visit(final GameEventTokenStateUpdate event) {
+        refreshFieldUpdate = true;
         processCards(event.cards, cardsRefreshDetails);
         return processCards(event.cards, cardsUpdate);
     }

forge-gui/src/main/java/forge/match/input/InputAttack.java

@@ -26,6 +26,7 @@ import forge.game.card.CardPredicates.Presets;
 import forge.game.combat.AttackingBand;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
+import forge.game.event.GameEventCombatUpdate;
 import forge.game.keyword.Keyword;
 import forge.game.player.Player;
 import forge.game.player.PlayerView;
@@ -335,6 +336,9 @@ public class InputAttack extends InputSyncronizedBase {
 
         updatePrompt();
 
+        if (combat != null)
+            getController().getGame().fireEvent(new GameEventCombatUpdate(combat.getAttackers(), combat.getAllBlockers()));
+
         getController().getGui().showCombat(); // redraw sword icons
     }
 }

forge-gui/src/main/java/forge/match/input/InputBlock.java

@@ -26,6 +26,7 @@ import forge.game.card.CardView;
 import forge.game.combat.Combat;
 import forge.game.combat.CombatUtil;
 import forge.game.event.GameEventCombatChanged;
+import forge.game.event.GameEventCombatUpdate;
 import forge.game.player.Player;
 import forge.game.zone.ZoneType;
 import forge.player.PlayerControllerHuman;
@@ -89,6 +90,9 @@ public class InputBlock extends InputSyncronizedBase {
             showMessage(message);
         }
 
+        if (combat != null)
+            getController().getGame().fireEvent(new GameEventCombatUpdate(combat.getAttackers(), combat.getAllBlockers()));
+
         getController().getGui().showCombat();
     }