diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java index 8a9761d004e..aaf64357655 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMapScreen.java @@ -96,6 +96,9 @@ public class ConquestMapScreen extends FScreen { } int startIndex = regionIndex * rows * cols; int position = startIndex + row * cols + col; + if (position > model.getProgress()) { + return false; + } model.setPlaneswalkerPosition(position); return true; } @@ -185,7 +188,7 @@ public class ConquestMapScreen extends FScreen { else { //draw planeswalker token above stop int planeswalkerPosition = model.getPlaneswalkerPosition() - startIndex; - if (planeswalkerPosition < opponents.size()) { + if (planeswalkerPosition >= 0 && planeswalkerPosition < opponents.size()) { GridPosition pos = new GridPosition(startIndex, planeswalkerPosition); x0 = x + colWidth * pos.col + iconOffsetX; y0 = y + rowHeight * pos.row + iconOffsetY; diff --git a/forge-gui/res/skins/default/sprite_planar_conquest.png b/forge-gui/res/skins/default/sprite_planar_conquest.png index 6dff374eab5..9d0b911fe60 100644 Binary files a/forge-gui/res/skins/default/sprite_planar_conquest.png and b/forge-gui/res/skins/default/sprite_planar_conquest.png differ diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java index ed38e9614aa..f2da93c3803 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestData.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestData.java @@ -50,7 +50,7 @@ public final class ConquestData { private int wins, losses; private int winStreakBest = 0; private int winStreakCurrent = 0; - private int progress = 0; + private int progress = 100; private int planewalkerPosition = 0; private int difficulty; private ConquestPlane startingPlane, currentPlane;