mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-18 03:38:01 +00:00
Planar conquest updates
This commit is contained in:
@@ -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;
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 322 KiB After Width: | Height: | Size: 172 KiB |
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user