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

Merge pull request #2682 from kevlahnota/newmaster2

Browse Source 
update Achievement Trophies
This commit is contained in:
Anthony Calosa
2023-03-15 03:45:12 +08:00
committed by GitHub
parent 50e46a176b eb4ac33b36
commit e8ea282e2a
9 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/gamemodes/planarconquest/ConquestData.java
View File

@@ -154,7 +154,7 @@ public final class ConquestData {
}
public void setPlaneswalker(PaperCard planeswalker0) {
planeswalker = planeswalker0;
planeswalkerToken = PlaneswalkerAchievements.getTrophyImage(planeswalker.getName());
planeswalkerToken = PlaneswalkerAchievements.getTrophyImage(planeswalker.getName(), planeswalker);
}
public ISkinImage getPlaneswalkerToken() {

2
forge-gui/src/main/java/forge/gui/interfaces/IGuiBase.java
View File

@@ -32,7 +32,7 @@ public interface IGuiBase {
ISkinImage getUnskinnedIcon(String path);
ISkinImage getCardArt(PaperCard card);
ISkinImage getCardArt(PaperCard card, boolean backFace);
ISkinImage createLayeredImage(FSkinProp background, String overlayFilename, float opacity);
ISkinImage createLayeredImage(PaperCard card, FSkinProp background, String overlayFilename, float opacity);
void showBugReportDialog(String title, String text, boolean showExitAppBtn);
void showImageDialog(ISkinImage image, String message, String title);
int showOptionDialog(String message, String title, FSkinProp icon, List<String> options, int defaultOption);

3
forge-gui/src/main/java/forge/localinstance/achievements/Achievement.java
View File

@@ -4,6 +4,7 @@ import forge.game.Game;
import forge.game.player.Player;
import forge.gui.GuiBase;
import forge.item.IPaperCard;
import forge.item.PaperCard;
import forge.localinstance.properties.ForgeConstants;
import forge.localinstance.skin.FSkinProp;
import forge.localinstance.skin.ISkinImage;
@@ -154,7 +155,7 @@ public abstract class Achievement {
background = FSkinProp.IMG_COMMON_TROPHY;
}
}
image = GuiBase.getInterface().createLayeredImage(background, ForgeConstants.CACHE_ACHIEVEMENTS_DIR + "/" + key + ".png", opacity);
image = GuiBase.getInterface().createLayeredImage((PaperCard) getPaperCard(), background, ForgeConstants.CACHE_ACHIEVEMENTS_DIR + "/" + key + ".png", opacity);
}
public int update(final Player player) {

5
forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java
View File

@@ -4,6 +4,7 @@ import forge.game.Game;
import forge.game.player.Player;
import forge.gui.GuiBase;
import forge.item.IPaperCard;
import forge.item.PaperCard;
import forge.localinstance.properties.ForgeConstants;
import forge.localinstance.skin.FSkinProp;
import forge.localinstance.skin.ISkinImage;
@@ -14,8 +15,8 @@ import forge.util.Localizer;
public class PlaneswalkerAchievements extends AchievementCollection {
public static final PlaneswalkerAchievements instance = new PlaneswalkerAchievements();
public static ISkinImage getTrophyImage(String planeswalkerName) {
return GuiBase.getInterface().createLayeredImage(FSkinProp.IMG_SPECIAL_TROPHY, ForgeConstants.CACHE_ACHIEVEMENTS_DIR + "/" + planeswalkerName + ".png", 1);
public static ISkinImage getTrophyImage(String planeswalkerName, PaperCard paperCard) {
return GuiBase.getInterface().createLayeredImage(paperCard, FSkinProp.IMG_SPECIAL_TROPHY, ForgeConstants.CACHE_ACHIEVEMENTS_DIR + "/" + planeswalkerName + ".png", 1);
}
private PlaneswalkerAchievements() {