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

Update in-game text and also English and Japanese localization

Browse Source
This commit is contained in:
Lyu Zong-Hong
2021-04-23 11:00:34 +09:00
parent d82c8d466a
commit 2d7e88a8c2
9 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java
View File

@@ -210,7 +210,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
soFar += card.getCMC();
}
if (soFar > maxTotalCMC) {
showMessage(sa.getHostCard() + " - Cannot target this card (CMC limit exceeded)");
showMessage(sa.getHostCard() + " - Cannot target this card (mana value limit exceeded)");
return false;
}
}
@@ -260,7 +260,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
}
}
// If all cards must have different CMC
// If all cards must have different mana values
if (tgt.isDifferentCMC()) {
final List<Integer> targetedCMCs = new ArrayList<>();
for (final GameObject o : targetDepth.keySet()) {
@@ -270,7 +270,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
}
}
if (targetedCMCs.contains(card.getCMC())) {
showMessage(sa.getHostCard() + " - Cannot target this card (must have different CMC)");
showMessage(sa.getHostCard() + " - Cannot target this card (must have different mana values)");
return false;
}
}

8
forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestUtil.java
View File

@@ -280,10 +280,10 @@ public class ConquestUtil {
RARE (FSkinProp.IMG_PW_BADGE_RARE, new RarityFilter(EnumSet.of(CardRarity.Rare, CardRarity.Special, CardRarity.MythicRare)), "Rare"),
MYTHIC (FSkinProp.IMG_PW_BADGE_MYTHIC, new RarityFilter(EnumSet.of(CardRarity.MythicRare)), "Mythic Rare (100%)"),
CMC_LOW (FSkinProp.IMG_CMC_LOW, new CMCFilter(0, 3), "CMC 0-3"),
CMC_LOW_MID (FSkinProp.IMG_CMC_LOW_MID, new CMCFilter(2, 5), "CMC 2-5"),
CMC_MID_HIGH (FSkinProp.IMG_CMC_MID_HIGH, new CMCFilter(4, 7), "CMC 4-7"),
CMC_HIGH (FSkinProp.IMG_CMC_HIGH, new CMCFilter(6, -1), "CMC 6+");
CMC_LOW (FSkinProp.IMG_CMC_LOW, new CMCFilter(0, 3), "Mana Value 0-3"),
CMC_LOW_MID (FSkinProp.IMG_CMC_LOW_MID, new CMCFilter(2, 5), "Mana Value 2-5"),
CMC_MID_HIGH (FSkinProp.IMG_CMC_MID_HIGH, new CMCFilter(4, 7), "Mana Value 4-7"),
CMC_HIGH (FSkinProp.IMG_CMC_HIGH, new CMCFilter(6, -1), "Mana Value 6+");
private final FSkinProp skinProp;
private final Predicate<PaperCard> predicate;