mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 20:58:03 +00:00
Create layout for Achievements screen
Improve trophy appearance
This commit is contained in:
@@ -3,6 +3,7 @@ package forge.achievement;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.net.MalformedURLException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
@@ -18,15 +19,16 @@ import forge.properties.ForgeConstants;
|
||||
import forge.util.FileUtil;
|
||||
import forge.util.XmlUtil;
|
||||
|
||||
public abstract class AchievementCollection {
|
||||
public abstract class AchievementCollection implements Iterable<Achievement> {
|
||||
private final Map<String, Achievement> achievements = new HashMap<String, Achievement>();
|
||||
private final String filename;
|
||||
private final String name, filename;
|
||||
|
||||
static {
|
||||
FileUtil.ensureDirectoryExists(ForgeConstants.ACHIEVEMENTS_DIR);
|
||||
}
|
||||
|
||||
protected AchievementCollection(String filename0) {
|
||||
protected AchievementCollection(String name0, String filename0) {
|
||||
name = name0;
|
||||
filename = filename0;
|
||||
buildAchievementList();
|
||||
load();
|
||||
@@ -91,4 +93,21 @@ public abstract class AchievementCollection {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
public int getCount() {
|
||||
return achievements.size();
|
||||
}
|
||||
|
||||
/* (non-Javadoc)
|
||||
* @see java.lang.Iterable#iterator()
|
||||
*/
|
||||
@Override
|
||||
public Iterator<Achievement> iterator() {
|
||||
return achievements.values().iterator();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import forge.properties.ForgeConstants;
|
||||
|
||||
public class ConstructedAchievements extends AchievementCollection {
|
||||
public ConstructedAchievements() {
|
||||
super(ForgeConstants.ACHIEVEMENTS_DIR + "constructed.xml");
|
||||
super("Constructed", ForgeConstants.ACHIEVEMENTS_DIR + "constructed.xml");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -4,7 +4,7 @@ import forge.properties.ForgeConstants;
|
||||
|
||||
public class DraftAchievements extends AchievementCollection {
|
||||
public DraftAchievements() {
|
||||
super(ForgeConstants.ACHIEVEMENTS_DIR + "draft.xml");
|
||||
super("Booster Draft", ForgeConstants.ACHIEVEMENTS_DIR + "draft.xml");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -4,7 +4,7 @@ import forge.properties.ForgeConstants;
|
||||
|
||||
public class QuestAchievements extends AchievementCollection {
|
||||
public QuestAchievements() {
|
||||
super(ForgeConstants.ACHIEVEMENTS_DIR + "quest.xml");
|
||||
super("Quest Mode", ForgeConstants.ACHIEVEMENTS_DIR + "quest.xml");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -4,7 +4,7 @@ import forge.properties.ForgeConstants;
|
||||
|
||||
public class SealedAchievements extends AchievementCollection {
|
||||
public SealedAchievements() {
|
||||
super(ForgeConstants.ACHIEVEMENTS_DIR + "sealed.xml");
|
||||
super("Sealed Deck", ForgeConstants.ACHIEVEMENTS_DIR + "sealed.xml");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -22,12 +22,13 @@ package forge.assets;
|
||||
* hashtable, access using .get(settingName) method.
|
||||
*
|
||||
*/
|
||||
|
||||
public enum FSkinProp {
|
||||
//backgrounds
|
||||
BG_SPLASH (null, PropType.BACKGROUND),
|
||||
BG_TEXTURE (null, PropType.BACKGROUND),
|
||||
BG_MATCH (null, PropType.BACKGROUND),
|
||||
BG_TROPHY_CASE_TOP (null, PropType.BACKGROUND),
|
||||
BG_TROPHY_CASE_SHELF (null, PropType.BACKGROUND),
|
||||
|
||||
//colors
|
||||
CLR_THEME (new int[] {70, 10}, PropType.COLOR),
|
||||
|
||||
@@ -72,15 +72,17 @@ public final class ForgeConstants {
|
||||
public static final String SKINS_DIR = RES_DIR + "skins/";
|
||||
public static final String DEFAULT_SKINS_DIR = SKINS_DIR + "default/";
|
||||
//don't associate these skin files with a directory since skin directory will be determined later
|
||||
public static final String SPRITE_ICONS_FILE = "sprite_icons.png";
|
||||
public static final String SPRITE_FOILS_FILE = "sprite_foils.png";
|
||||
public static final String SPRITE_OLD_FOILS_FILE = "sprite_old_foils.png";
|
||||
public static final String SPRITE_AVATARS_FILE = "sprite_avatars.png";
|
||||
public static final String FONT_FILE = "font1.ttf";
|
||||
public static final String SPLASH_BG_FILE = "bg_splash.png";
|
||||
public static final String MATCH_BG_FILE = "bg_match.jpg";
|
||||
public static final String TEXTURE_BG_FILE = "bg_texture.jpg";
|
||||
public static final String DRAFT_DECK_IMG_FILE = "bg_draft_deck.png";
|
||||
public static final String SPRITE_ICONS_FILE = "sprite_icons.png";
|
||||
public static final String SPRITE_FOILS_FILE = "sprite_foils.png";
|
||||
public static final String SPRITE_OLD_FOILS_FILE = "sprite_old_foils.png";
|
||||
public static final String SPRITE_AVATARS_FILE = "sprite_avatars.png";
|
||||
public static final String FONT_FILE = "font1.ttf";
|
||||
public static final String SPLASH_BG_FILE = "bg_splash.png";
|
||||
public static final String MATCH_BG_FILE = "bg_match.jpg";
|
||||
public static final String TEXTURE_BG_FILE = "bg_texture.jpg";
|
||||
public static final String DRAFT_DECK_IMG_FILE = "bg_draft_deck.png";
|
||||
public static final String TROPHY_CASE_TOP_FILE = "bg_trophy_case_top.png";
|
||||
public static final String TROPHY_CASE_SHELF_FILE = "bg_trophy_case_shelf.png";
|
||||
|
||||
// data tree roots
|
||||
public static final String USER_DIR;
|
||||
|
||||
Reference in New Issue
Block a user