diff --git a/.gitattributes b/.gitattributes index bb15d02e68a..7d93bca772d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17221,7 +17221,7 @@ forge-gui/src/main/java/forge/planarconquest/ConquestPlane.java -text forge-gui/src/main/java/forge/planarconquest/ConquestPlaneData.java -text forge-gui/src/main/java/forge/planarconquest/ConquestPreferences.java -text forge-gui/src/main/java/forge/planarconquest/ConquestUtil.java -text -forge-gui/src/main/java/forge/planarconquest/IVConquestBase.java -text +forge-gui/src/main/java/forge/planarconquest/IVCommandCenter.java -text forge-gui/src/main/java/forge/player/GamePlayerUtil.java -text forge-gui/src/main/java/forge/player/HumanCostDecision.java -text forge-gui/src/main/java/forge/player/HumanPlay.java -text diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java index 5b71fcf9266..ac8a48f0464 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java @@ -29,7 +29,7 @@ import forge.planarconquest.ConquestPlane.Region; import forge.planarconquest.ConquestPlaneData; import forge.planarconquest.ConquestPlaneData.RegionData; import forge.planarconquest.ConquestPreferences.CQPref; -import forge.planarconquest.IVConquestBase; +import forge.planarconquest.IVCommandCenter; import forge.screens.FScreen; import forge.screens.match.TargetingOverlay; import forge.toolbox.FCardPanel; @@ -40,7 +40,7 @@ import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FLabel; import forge.util.Utils; -public class CommandCenterScreen extends FScreen implements IVConquestBase { +public class CommandCenterScreen extends FScreen implements IVCommandCenter { private static final Color BACK_COLOR = FSkinColor.fromRGB(1, 2, 2); private static final float BORDER_THICKNESS = Utils.scale(1); private static final FSkinFont REGION_NAME_FONT = FSkinFont.get(15); diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestCommander.java b/forge-gui/src/main/java/forge/planarconquest/ConquestCommander.java index fad9210d74d..17c8ee5dd34 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestCommander.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestCommander.java @@ -9,6 +9,7 @@ public class ConquestCommander { private final PaperCard card; private final Deck deck; + private int stars; //think 1-star/4-star general private Region deployedRegion; private ConquestAction currentDayAction; @@ -43,6 +44,10 @@ public class ConquestCommander { currentDayAction = currentDayAction0; } + public int getStars() { + return stars; + } + public String toString() { return card.getName(); } diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java index 34370bed24d..df1ac26581c 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java @@ -94,7 +94,7 @@ public final class ConquestData { return day; } - public void endDay(final IVConquestBase base) { + public void endDay(final IVCommandCenter base) { FThreads.invokeInBackgroundThread(new Runnable() { @Override public void run() { diff --git a/forge-gui/src/main/java/forge/planarconquest/IVConquestBase.java b/forge-gui/src/main/java/forge/planarconquest/IVCommandCenter.java similarity index 60% rename from forge-gui/src/main/java/forge/planarconquest/IVConquestBase.java rename to forge-gui/src/main/java/forge/planarconquest/IVCommandCenter.java index 88e90cc39ab..677a203fe60 100644 --- a/forge-gui/src/main/java/forge/planarconquest/IVConquestBase.java +++ b/forge-gui/src/main/java/forge/planarconquest/IVCommandCenter.java @@ -1,5 +1,5 @@ package forge.planarconquest; -public interface IVConquestBase { +public interface IVCommandCenter { void updateCurrentDay(); }