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

Update getDefinedCards for how it get Valid* cards so the syntax is consistent with other Valid script. Also remove the hacky way to set Effect as mutable for Raging River and Plague of Vermin

Browse Source
This commit is contained in:
Hans Mackowiak
2021-07-18 09:06:47 +00:00
committed by Alumi
parent 52160c9e60
commit e753d45b42
28 changed files with 111 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,7 @@ public class Puzzle extends GameState implements InventoryItem, Comparable<Puzzl
goalCard.setOwner(human);
goalCard.setImageKey("t:puzzle");
goalCard.setName("Puzzle Goal");
goalCard.addType("Effect");
goalCard.setImmutable(true);
goalCard.setOracleText(getGoalDescription());
int turnCorr = 0;

14
forge-gui/src/main/java/forge/gui/card/CardDetailUtil.java
View File

@@ -221,7 +221,7 @@ public class CardDetailUtil {
String curColors = "";
// do not show current colors for temp effect cards, emblems and the like
if (state.getType().isEmblem() || state.getType().hasSubtype("Effect")) {
if (state.getCard().isImmutable()) {
return "";
}
@@ -275,16 +275,14 @@ public class CardDetailUtil {
// Token
if (card.isToken()) {
if(card.getCurrentState().getType().hasSubtype("Effect"))
area.append("Effect");
else if(card.getCurrentState().getType().isEmblem())
area.append("Emblem");
else
area.append("Token");
area.append("Token");
} else if (card.isTokenCard()) {
area.append("Token card");
} else if(card.isEmblem()) {
area.append("Emblem");
} else if(card.isImmutable()) {
area.append("Effect");
}
// card text
if (area.length() != 0) {
area.append("\n");