From 2b7ad652c7fda8ac874812c964c99352b43ab09d Mon Sep 17 00:00:00 2001 From: myk Date: Thu, 21 Mar 2013 00:23:50 +0000 Subject: [PATCH] use new booster images from Xitax and align the filenames with what we're actually looking for --- res/lists/booster-images.txt | 31 +++++++++---------- .../forge/gui/MigrationSourceAnalyzer.java | 2 +- src/main/java/forge/view/FView.java | 2 +- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/res/lists/booster-images.txt b/res/lists/booster-images.txt index 662c0450247..a408c188996 100644 --- a/res/lists/booster-images.txt +++ b/res/lists/booster-images.txt @@ -1,16 +1,16 @@ +http://www.cardforge.org/fpics/products/boosters/10E.png http://www.cardforge.org/fpics/products/boosters/2ED.png http://www.cardforge.org/fpics/products/boosters/3ED.png http://www.cardforge.org/fpics/products/boosters/4ED.png http://www.cardforge.org/fpics/products/boosters/5DN.png http://www.cardforge.org/fpics/products/boosters/5ED.png http://www.cardforge.org/fpics/products/boosters/6ED.png -http://www.cardforge.org/fpics/products/boosters/7E.png +http://www.cardforge.org/fpics/products/boosters/7ED.png http://www.cardforge.org/fpics/products/boosters/8ED.png http://www.cardforge.org/fpics/products/boosters/9ED.png -http://www.cardforge.org/fpics/products/boosters/10E.png http://www.cardforge.org/fpics/products/boosters/ALA.png http://www.cardforge.org/fpics/products/boosters/ALL.png -http://www.cardforge.org/fpics/products/boosters/AP.png +http://www.cardforge.org/fpics/products/boosters/APC.png http://www.cardforge.org/fpics/products/boosters/ARB.png http://www.cardforge.org/fpics/products/boosters/ARN.png http://www.cardforge.org/fpics/products/boosters/ATQ.png @@ -22,18 +22,17 @@ http://www.cardforge.org/fpics/products/boosters/CHR.png http://www.cardforge.org/fpics/products/boosters/CSP.png http://www.cardforge.org/fpics/products/boosters/DIS.png http://www.cardforge.org/fpics/products/boosters/DKA.png -http://www.cardforge.org/fpics/products/boosters/DPA.png http://www.cardforge.org/fpics/products/boosters/DRK.png http://www.cardforge.org/fpics/products/boosters/DST.png http://www.cardforge.org/fpics/products/boosters/EVE.png -http://www.cardforge.org/fpics/products/boosters/EX.png +http://www.cardforge.org/fpics/products/boosters/EXO.png http://www.cardforge.org/fpics/products/boosters/FEM.png http://www.cardforge.org/fpics/products/boosters/FUT.png http://www.cardforge.org/fpics/products/boosters/GPT.png http://www.cardforge.org/fpics/products/boosters/GTC.png http://www.cardforge.org/fpics/products/boosters/HML.png http://www.cardforge.org/fpics/products/boosters/ICE.png -http://www.cardforge.org/fpics/products/boosters/IN.png +http://www.cardforge.org/fpics/products/boosters/INV.png http://www.cardforge.org/fpics/products/boosters/ISD.png http://www.cardforge.org/fpics/products/boosters/JUD.png http://www.cardforge.org/fpics/products/boosters/LEA.png @@ -46,19 +45,19 @@ http://www.cardforge.org/fpics/products/boosters/M11.png http://www.cardforge.org/fpics/products/boosters/M12.png http://www.cardforge.org/fpics/products/boosters/M13.png http://www.cardforge.org/fpics/products/boosters/MBS.png -http://www.cardforge.org/fpics/products/boosters/MI.png +http://www.cardforge.org/fpics/products/boosters/MIR.png http://www.cardforge.org/fpics/products/boosters/MMQ.png http://www.cardforge.org/fpics/products/boosters/MOR.png http://www.cardforge.org/fpics/products/boosters/MRD.png http://www.cardforge.org/fpics/products/boosters/NMS.png http://www.cardforge.org/fpics/products/boosters/NPH.png -http://www.cardforge.org/fpics/products/boosters/OD.png +http://www.cardforge.org/fpics/products/boosters/ODY.png http://www.cardforge.org/fpics/products/boosters/ONS.png http://www.cardforge.org/fpics/products/boosters/PCY.png http://www.cardforge.org/fpics/products/boosters/PLC.png +http://www.cardforge.org/fpics/products/boosters/PLS.png http://www.cardforge.org/fpics/products/boosters/PO2.png http://www.cardforge.org/fpics/products/boosters/POR.png -http://www.cardforge.org/fpics/products/boosters/PS.png http://www.cardforge.org/fpics/products/boosters/PTK.png http://www.cardforge.org/fpics/products/boosters/RAV.png http://www.cardforge.org/fpics/products/boosters/ROE.png @@ -68,14 +67,14 @@ http://www.cardforge.org/fpics/products/boosters/SCG.png http://www.cardforge.org/fpics/products/boosters/SHM.png http://www.cardforge.org/fpics/products/boosters/SOK.png http://www.cardforge.org/fpics/products/boosters/SOM.png -http://www.cardforge.org/fpics/products/boosters/ST.png -http://www.cardforge.org/fpics/products/boosters/TE.png +http://www.cardforge.org/fpics/products/boosters/STH.png +http://www.cardforge.org/fpics/products/boosters/TMP.png http://www.cardforge.org/fpics/products/boosters/TOR.png http://www.cardforge.org/fpics/products/boosters/TSP.png -http://www.cardforge.org/fpics/products/boosters/UD.png -http://www.cardforge.org/fpics/products/boosters/UL.png -http://www.cardforge.org/fpics/products/boosters/UZ.png -http://www.cardforge.org/fpics/products/boosters/VI.png -http://www.cardforge.org/fpics/products/boosters/WL.png +http://www.cardforge.org/fpics/products/boosters/UDS.png +http://www.cardforge.org/fpics/products/boosters/ULG.png +http://www.cardforge.org/fpics/products/boosters/USG.png +http://www.cardforge.org/fpics/products/boosters/VIS.png +http://www.cardforge.org/fpics/products/boosters/WTH.png http://www.cardforge.org/fpics/products/boosters/WWK.png http://www.cardforge.org/fpics/products/boosters/ZEN.png diff --git a/src/main/java/forge/gui/MigrationSourceAnalyzer.java b/src/main/java/forge/gui/MigrationSourceAnalyzer.java index 7d5443b9be2..cc7af390d4a 100644 --- a/src/main/java/forge/gui/MigrationSourceAnalyzer.java +++ b/src/main/java/forge/gui/MigrationSourceAnalyzer.java @@ -476,7 +476,7 @@ public class MigrationSourceAnalyzer { } private void _analyzeProductPicsDir(File root) { - // we don't care about the files in the root dir -- the new files are .png, not the current .jpg ones + // we don't care about the files in the root dir -- the new booster files are .png, not the current .jpg ones _analyzeDir(root, new _Analyzer() { @Override boolean onDir(File dir) { String dirName = dir.getName(); diff --git a/src/main/java/forge/view/FView.java b/src/main/java/forge/view/FView.java index a78b6988dc9..393c4530504 100644 --- a/src/main/java/forge/view/FView.java +++ b/src/main/java/forge/view/FView.java @@ -162,7 +162,7 @@ public enum FView { new DialogMigrateProfile("res", new Runnable() { @Override public void run() { // remove known cruft files, yes this is ugly, but it's also temporary - for (String cruftFile : Lists.newArrayList("decks/SkieraCube-cards_not_supported_yet.txt", "decks/cube/ArabianExtended.dck", "decks/cube/GtcGuildBoros.dck", "decks/cube/GtcGuildDimir.dck", "decks/cube/GtcGuildGruul.dck", "decks/cube/GtcGuildOrzhov.dck", "decks/cube/GtcGuildSimic.dck", "decks/cube/GtcPromoBoros.dck", "decks/cube/GtcPromoDimir.dck", "decks/cube/GtcPromoGruul.dck", "decks/cube/GtcPromoOrzhov.dck", "decks/cube/GtcPromoSimic.dck", "decks/cube/JuzamjediCube.dck", "decks/cube/RtRGuildAzorius.dck", "decks/cube/RtRGuildGolgari.dck", "decks/cube/RtRGuildIzzet.dck", "decks/cube/RtRGuildRakdos.dck", "decks/cube/RtRGuildSelesnya.dck", "decks/cube/RtRPromoAzorius.dck", "decks/cube/RtRPromoGolgari.dck", "decks/cube/RtRPromoIzzet.dck", "decks/cube/RtRPromoRakdos.dck", "decks/cube/RtRPromoSelesnya.dck", "decks/cube/SkieraCube.dck", "gauntlet/LOCKED_DotP Preconstructed.dat", "gauntlet/LOCKED_Swimming With Sharks.dat", "layouts/editor_default.xml", "layouts/home_default.xml", "layouts/match_default.xml", "pics/snow_covered_forest1.jpg", "pics/snow_covered_forest2.jpg", "pics/snow_covered_forest3.jpg", "pics/snow_covered_island1.jpg", "pics/snow_covered_island2.jpg", "pics/snow_covered_island3.jpg", "pics/snow_covered_mountain1.jpg", "pics/snow_covered_mountain2.jpg", "pics/snow_covered_mountain3.jpg", "pics/snow_covered_plains1.jpg", "pics/snow_covered_plains2.jpg", "pics/snow_covered_plains3.jpg", "pics/snow_covered_swamp1.jpg", "pics/snow_covered_swamp2.jpg", "pics/snow_covered_swamp3.jpg", "pics/VAN/Birds of Paradise Avatar.full.jpg", "pics/VAN/Erhnam Djinn Avatar.full.jpg", "pics/VAN/Goblin Warchief Avatar.full.jpg", "pics/VAN/Grinning Demon Avatar.full.jpg", "pics/VAN/Platinum Angel Avatar.full.jpg", "pics/VAN/Prodigal Sorcerer Avatar.full.jpg", "pics/VAN/Rith, the Awakener Avatar.full.jpg", "pics/VAN/Royal Assassin Avatar.full.jpg", "pics/VAN/Serra Angel Avatar.full.jpg", "pics/VAN/Tradewind Rider Avatar.full.jpg", "pics_product/10E.jpg", "pics_product/2ED.jpg", "pics_product/3ED.jpg", "pics_product/4ED.jpg", "pics_product/5DN.jpg", "pics_product/5ED.jpg", "pics_product/6ED.jpg", "pics_product/7ED.jpg", "pics_product/8ED.jpg", "pics_product/9ED.jpg", "pics_product/ALA.jpg", "pics_product/ALL.jpg", "pics_product/APC.jpg", "pics_product/ARB.jpg", "pics_product/ARN.jpg", "pics_product/ATQ.jpg", "pics_product/BOK.jpg", "pics_product/CFX.jpg", "pics_product/CHK.jpg", "pics_product/CHR.jpg", "pics_product/CSP.jpg", "pics_product/DIS.jpg", "pics_product/DKA.jpg", "pics_product/DRK.jpg", "pics_product/DST.jpg", "pics_product/EVE.jpg", "pics_product/EXO.jpg", "pics_product/FEM.jpg", "pics_product/FUT.jpg", "pics_product/GPT.jpg", "pics_product/HML.jpg", "pics_product/ICE.jpg", "pics_product/INV.jpg", "pics_product/ISD.jpg", "pics_product/JUD.jpg", "pics_product/LEA.jpg", "pics_product/LEB.jpg", "pics_product/LEG.jpg", "pics_product/LGN.jpg", "pics_product/LRW.jpg", "pics_product/M10.jpg", "pics_product/M11.jpg", "pics_product/M12.jpg", "pics_product/MBS.jpg", "pics_product/MIR.jpg", "pics_product/MMQ.jpg", "pics_product/MOR.jpg", "pics_product/MRD.jpg", "pics_product/NMS.jpg", "pics_product/NPH.jpg", "pics_product/ODY.jpg", "pics_product/ONS.jpg", "pics_product/PCY.jpg", "pics_product/PLC.jpg", "pics_product/PLS.jpg", "pics_product/PO2.jpg", "pics_product/POR.jpg", "pics_product/PTK.jpg", "pics_product/RAV.jpg", "pics_product/ROE.jpg", "pics_product/S99.jpg", "pics_product/SCG.jpg", "pics_product/SHM.jpg", "pics_product/SOK.jpg", "pics_product/SOM.jpg", "pics_product/STH.jpg", "pics_product/TMP.jpg", "pics_product/TOR.jpg", "pics_product/TSP.jpg", "pics_product/UDS.jpg", "pics_product/ULG.jpg", "pics_product/USG.jpg", "pics_product/VIS.jpg", "pics_product/WTH.jpg", "pics_product/WWK.jpg", "pics_product/ZEN.jpg", "preferences/.project", "preferences/editor.default.preferences", "preferences/main.properties", "quest/quest.preferences", "quest/quest.properties")) { + for (String cruftFile : Lists.newArrayList("decks/SkieraCube-cards_not_supported_yet.txt", "decks/cube/ArabianExtended.dck", "decks/cube/GtcGuildBoros.dck", "decks/cube/GtcGuildDimir.dck", "decks/cube/GtcGuildGruul.dck", "decks/cube/GtcGuildOrzhov.dck", "decks/cube/GtcGuildSimic.dck", "decks/cube/GtcPromoBoros.dck", "decks/cube/GtcPromoDimir.dck", "decks/cube/GtcPromoGruul.dck", "decks/cube/GtcPromoOrzhov.dck", "decks/cube/GtcPromoSimic.dck", "decks/cube/JuzamjediCube.dck", "decks/cube/RtRGuildAzorius.dck", "decks/cube/RtRGuildGolgari.dck", "decks/cube/RtRGuildIzzet.dck", "decks/cube/RtRGuildRakdos.dck", "decks/cube/RtRGuildSelesnya.dck", "decks/cube/RtRPromoAzorius.dck", "decks/cube/RtRPromoGolgari.dck", "decks/cube/RtRPromoIzzet.dck", "decks/cube/RtRPromoRakdos.dck", "decks/cube/RtRPromoSelesnya.dck", "decks/cube/SkieraCube.dck", "gauntlet/LOCKED_DotP Preconstructed.dat", "gauntlet/LOCKED_Swimming With Sharks.dat", "layouts/editor_default.xml", "layouts/home_default.xml", "layouts/match_default.xml", "pics/snow_covered_forest1.jpg", "pics/snow_covered_forest2.jpg", "pics/snow_covered_forest3.jpg", "pics/snow_covered_island1.jpg", "pics/snow_covered_island2.jpg", "pics/snow_covered_island3.jpg", "pics/snow_covered_mountain1.jpg", "pics/snow_covered_mountain2.jpg", "pics/snow_covered_mountain3.jpg", "pics/snow_covered_plains1.jpg", "pics/snow_covered_plains2.jpg", "pics/snow_covered_plains3.jpg", "pics/snow_covered_swamp1.jpg", "pics/snow_covered_swamp2.jpg", "pics/snow_covered_swamp3.jpg", "pics/VAN/Birds of Paradise Avatar.full.jpg", "pics/VAN/Erhnam Djinn Avatar.full.jpg", "pics/VAN/Goblin Warchief Avatar.full.jpg", "pics/VAN/Grinning Demon Avatar.full.jpg", "pics/VAN/Platinum Angel Avatar.full.jpg", "pics/VAN/Prodigal Sorcerer Avatar.full.jpg", "pics/VAN/Rith, the Awakener Avatar.full.jpg", "pics/VAN/Royal Assassin Avatar.full.jpg", "pics/VAN/Serra Angel Avatar.full.jpg", "pics/VAN/Tradewind Rider Avatar.full.jpg", "pics_product/10E.jpg", "pics_product/2ED.jpg", "pics_product/3ED.jpg", "pics_product/4ED.jpg", "pics_product/5DN.jpg", "pics_product/5ED.jpg", "pics_product/6ED.jpg", "pics_product/7ED.jpg", "pics_product/8ED.jpg", "pics_product/9ED.jpg", "pics_product/ALA.jpg", "pics_product/ALL.jpg", "pics_product/APC.jpg", "pics_product/ARB.jpg", "pics_product/ARN.jpg", "pics_product/ATQ.jpg", "pics_product/BOK.jpg", "pics_product/CFX.jpg", "pics_product/CHK.jpg", "pics_product/CHR.jpg", "pics_product/CSP.jpg", "pics_product/DIS.jpg", "pics_product/DKA.jpg", "pics_product/DRK.jpg", "pics_product/DST.jpg", "pics_product/EVE.jpg", "pics_product/EXO.jpg", "pics_product/FEM.jpg", "pics_product/FUT.jpg", "pics_product/GPT.jpg", "pics_product/HML.jpg", "pics_product/ICE.jpg", "pics_product/INV.jpg", "pics_product/ISD.jpg", "pics_product/JUD.jpg", "pics_product/LEA.jpg", "pics_product/LEB.jpg", "pics_product/LEG.jpg", "pics_product/LGN.jpg", "pics_product/LRW.jpg", "pics_product/M10.jpg", "pics_product/M11.jpg", "pics_product/M12.jpg", "pics_product/MBS.jpg", "pics_product/MIR.jpg", "pics_product/MMQ.jpg", "pics_product/MOR.jpg", "pics_product/MRD.jpg", "pics_product/NMS.jpg", "pics_product/NPH.jpg", "pics_product/ODY.jpg", "pics_product/ONS.jpg", "pics_product/PCY.jpg", "pics_product/PLC.jpg", "pics_product/PLS.jpg", "pics_product/PO2.jpg", "pics_product/POR.jpg", "pics_product/PTK.jpg", "pics_product/RAV.jpg", "pics_product/ROE.jpg", "pics_product/S99.jpg", "pics_product/SCG.jpg", "pics_product/SHM.jpg", "pics_product/SOK.jpg", "pics_product/SOM.jpg", "pics_product/STH.jpg", "pics_product/TMP.jpg", "pics_product/TOR.jpg", "pics_product/TSP.jpg", "pics_product/UDS.jpg", "pics_product/ULG.jpg", "pics_product/USG.jpg", "pics_product/VIS.jpg", "pics_product/WTH.jpg", "pics_product/WWK.jpg", "pics_product/ZEN.jpg", "pics_product/booster/7E.png", "pics_product/booster/AP.png", "pics_product/booster/DPA.png", "pics_product/booster/EX.png", "pics_product/booster/IN.png", "pics_product/booster/MI.png", "pics_product/booster/OD.png", "pics_product/booster/PS.png", "pics_product/booster/ST.png", "pics_product/booster/TE.png", "pics_product/booster/UD.png", "pics_product/booster/UL.png", "pics_product/booster/UZ.png", "pics_product/booster/VI.png", "pics_product/booster/WL.png", "preferences/.project", "preferences/editor.default.preferences", "preferences/main.properties", "quest/quest.preferences", "quest/quest.properties")) { new File("res", cruftFile).delete(); }