external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

include setcode and artid for gamestate

Browse Source
This commit is contained in:
Anthony Calosa
2023-05-31 11:55:59 +08:00
parent 15116add08
commit b45d543e1a
4 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
forge-ai/src/main/java/forge/ai/GameState.java
View File

@@ -107,7 +107,7 @@ public abstract class GameState {
public GameState() { public GameState() {
} }
public abstract IPaperCard getPaperCard(String cardName); public abstract IPaperCard getPaperCard(String cardName, String setCode, int artID);
@Override @Override
public String toString() { public String toString() {
@@ -258,9 +258,12 @@ public abstract class GameState {
if (c.hasMergedCard()) { if (c.hasMergedCard()) {
// we have to go by the current top card name here // we have to go by the current top card name here
newText.append(c.getTopMergedCard().getPaperCard().getName()); newText.append(c.getTopMergedCard().getPaperCard().getName()).append("|Set:")
.append(c.getTopMergedCard().getPaperCard().getEdition()).append("|Art:")
.append(c.getTopMergedCard().getPaperCard().getArtIndex());
} else { } else {
newText.append(c.getPaperCard().getName()); newText.append(c.getPaperCard().getName()).append("|Set:").append(c.getPaperCard().getEdition())
.append("|Art:").append(c.getPaperCard().getArtIndex());
} }
} }
if (c.isCommander()) { if (c.isCommander()) {
@@ -735,9 +738,11 @@ public abstract class GameState {
String id = rememberedEnts.getValue(); String id = rememberedEnts.getValue();
Card exiledWith = idToCard.get(Integer.parseInt(id)); Card exiledWith = idToCard.get(Integer.parseInt(id));
exiledWith.addExiledCard(c); if (exiledWith != null) {
c.setExiledWith(exiledWith); exiledWith.addExiledCard(c);
c.setExiledBy(exiledWith.getController()); c.setExiledWith(exiledWith);
c.setExiledBy(exiledWith.getController());
}
} }
} }
@@ -1196,6 +1201,18 @@ public abstract class GameState {
} }
} }
int artID = -1;
for (final String info : cardinfo) {
if (info.startsWith("Art:")) {
try {
artID = Integer.parseInt(info.substring(info.indexOf(':') + 1));
} catch (Exception e) {
break;
}
break;
}
}
Card c; Card c;
boolean hasSetCurSet = false; boolean hasSetCurSet = false;
if (cardinfo[0].startsWith("t:")) { if (cardinfo[0].startsWith("t:")) {
@@ -1212,7 +1229,7 @@ public abstract class GameState {
} }
c = Card.fromPaperCard(token, player, player.getGame()); c = Card.fromPaperCard(token, player, player.getGame());
} else { } else {
PaperCard pc = StaticData.instance().getCommonCards().getCard(cardinfo[0], setCode); PaperCard pc = StaticData.instance().getCommonCards().getCard(cardinfo[0], setCode, artID);
if (pc == null) { if (pc == null) {
System.err.println("ERROR: Tried to create a non-existent card named " + cardinfo[0] + " (set: " + (setCode == null ? "any" : setCode) + ") when loading game state!"); System.err.println("ERROR: Tried to create a non-existent card named " + cardinfo[0] + " (set: " + (setCode == null ? "any" : setCode) + ") when loading game state!");
continue; continue;

6
forge-gui-mobile/src/forge/screens/match/MatchController.java
View File

@@ -262,9 +262,9 @@ public class MatchController extends AbstractGuiGame {
if (ph != null && saveState && ph.isMain()) { if (ph != null && saveState && ph.isMain()) {
phaseGameState = new GameState() { phaseGameState = new GameState() {
@Override //todo get specific card edition for this function? @Override
public IPaperCard getPaperCard(final String cardName) { public IPaperCard getPaperCard(final String cardName, final String setCode, final int artID) {
return FModel.getMagicDb().getCommonCards().getCard(cardName); return FModel.getMagicDb().getCommonCards().getCard(cardName, setCode, artID);
} }
}; };
try { try {

4
forge-gui/src/main/java/forge/gamemodes/puzzle/Puzzle.java
View File

@@ -98,8 +98,8 @@ public class Puzzle extends GameState implements InventoryItem, Comparable<Puzzl
this.parse(stateLines); this.parse(stateLines);
} }
public IPaperCard getPaperCard(final String cardName) { public IPaperCard getPaperCard(final String cardName, final String setCode, final int artID) {
return FModel.getMagicDb().getCommonCards().getCard(cardName); return FModel.getMagicDb().getCommonCards().getCard(cardName, setCode, artID);
} }
public void setupMaxPlayerHandSize(Game game, int maxHandSize) { public void setupMaxPlayerHandSize(Game game, int maxHandSize) {

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

@@ -2451,8 +2451,8 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
private GameState createGameStateObject() { private GameState createGameStateObject() {
return new GameState() { return new GameState() {
@Override @Override
public IPaperCard getPaperCard(final String cardName) { public IPaperCard getPaperCard(final String cardName, final String setCode, final int artID) {
return FModel.getMagicDb().getCommonCards().getCard(cardName); return FModel.getMagicDb().getCommonCards().getCard(cardName, setCode, artID);
} }
}; };
} }