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

July 2024 cleanup: code (#5536)

Browse Source 
* Update ChooseGenericEffectAi.java

* Update CardTranslation.java

* Update AltWinAchievements.java

* Update altwin-achievements.txt

* Update EffectEffect.java
This commit is contained in:
Renato Filipe Vidal Santos
2024-07-07 11:37:01 +01:00
committed by GitHub
parent 897741ba0a
commit bb9c6dfd76
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
View File

@@ -206,7 +206,7 @@ public class ChooseGenericEffectAi extends SpellAbilityAi {
} }
// milling against Tamiyo is pointless // milling against Tamiyo is pointless
if (owner.isCardInCommand("Emblem - Tamiyo, the Moon Sage")) { if (owner.isCardInCommand("Emblem — Tamiyo, the Moon Sage")) {
return allow; return allow;
} }

6
forge-core/src/main/java/forge/util/CardTranslation.java
View File

@@ -59,7 +59,7 @@ public class CardTranslation {
try { try {
if (name.endsWith(" Token")) { if (name.endsWith(" Token")) {
return translateTokenName(name); return translateTokenName(name);
} else if (name.startsWith("Emblem - ") || name.contains("'s Effect") || name.contains("'s Boon")) { } else if (name.startsWith("Emblem — ") || name.contains("'s Effect") || name.contains("'s Boon")) {
return translateEffectNames(name); return translateEffectNames(name);
} else if (knownEffectNames.contains(name)) { } else if (knownEffectNames.contains(name)) {
return translateKnownEffectNames(name); return translateKnownEffectNames(name);
@@ -173,8 +173,8 @@ public class CardTranslation {
} }
translatedEffectNames.put(name, fname); translatedEffectNames.put(name, fname);
return fname; return fname;
} else if (finalname.startsWith("Emblem - ")) { } else if (finalname.startsWith("Emblem — ")) {
String []s = finalname.split(" - "); String []s = finalname.split(" — ");
try { try {
fname = translatednames.get(s[1].endsWith(" ") ? s[1].substring(0, s[1].lastIndexOf(" ")) : s[1]); fname = translatednames.get(s[1].endsWith(" ") ? s[1].substring(0, s[1].lastIndexOf(" ")) : s[1]);
if (fname == null || fname.isEmpty()) if (fname == null || fname.isEmpty())

2
forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
View File

@@ -149,7 +149,7 @@ public class EffectEffect extends SpellAbilityEffect {
image = ImageKeys.getTokenKey( image = ImageKeys.getTokenKey(
TextUtil.fastReplace( TextUtil.fastReplace(
TextUtil.fastReplace( TextUtil.fastReplace(
TextUtil.fastReplace(name.toLowerCase(), " - ", "_"), TextUtil.fastReplace(name.toLowerCase(), " — ", "_"),
",", ""), ",", ""),
" ", "_").toLowerCase()); " ", "_").toLowerCase());
} else { // use host image } else { // use host image

2
forge-gui/res/lists/altwin-achievements.txt
View File

@@ -46,4 +46,4 @@ Triskaidekaphile|The Luckiest Number|13, 169, 2197, 28561...
Triskaidekaphobia|The Fear of 13|It's just a silly ancient superstition... right? Triskaidekaphobia|The Fear of 13|It's just a silly ancient superstition... right?
Vessel of the All-Consuming|Consumed by Hidetsugu|Fade into nothingness. Vessel of the All-Consuming|Consumed by Hidetsugu|Fade into nothingness.
Vorpal Sword|Snicker-Snack!|He left it dead, and with its head / He went galumphing back. Vorpal Sword|Snicker-Snack!|He left it dead, and with its head / He went galumphing back.
Emblem - Vraska, Golgari Queen|The Flurry of Assassins|How good is your dodging? Emblem — Vraska, Golgari Queen|The Flurry of Assassins|How good is your dodging?

2
forge-gui/src/main/java/forge/localinstance/achievements/AltWinAchievements.java
View File

@@ -43,7 +43,7 @@ public class AltWinAchievements extends AchievementCollection {
Achievement achievement = achievements.get(altWinCondition); Achievement achievement = achievements.get(altWinCondition);
if (achievement == null) { if (achievement == null) {
achievement = achievements.get("Emblem - " + altWinCondition); // indirectly winning through an emblem achievement = achievements.get("Emblem — " + altWinCondition); // indirectly winning through an emblem
} }
if (achievement != null) { if (achievement != null) {
achievement.update(player); achievement.update(player);