move tools into tools directory and lists into lists directory

.gitattributes

@@ -10,9 +10,6 @@
 /LICENSE.txt svneol=native#text/plain
 /README.txt svneol=native#text/plain
 /pom.xml svneol=native#text/xml
-res/AllTokens.txt svneol=native#text/plain
-res/PerSetTracking.py svneol=native#text/x-python
-res/assignSetInfo.py -text
 res/blockdata/blocks.txt svneol=native#text/plain
 res/blockdata/boosters.txt -text
 res/blockdata/fantasyblocks.txt -text
@@ -20,7 +17,6 @@ res/blockdata/fatpacks.txt -text
 res/blockdata/formats.txt -text
 res/blockdata/setdata.txt svneol=native#text/plain
 res/blockdata/starters.txt -text
-res/cardTemplateScript.py -text svneol=unset#text/x-python
 res/cardsfolder/a/a_display_of_my_dark_power.txt -text
 res/cardsfolder/a/abandon_hope.txt -text
 res/cardsfolder/a/abandoned_outpost.txt svneol=native#text/plain
@@ -12439,17 +12435,22 @@ res/defaults/match.xml svneol=native#text/xml
 res/draft/cube_juzamjedi.draft -text
 res/draft/cube_skiera.draft -text
 res/draft/rankings.txt -text
-res/gamedata/NonStackingKWList.txt svneol=native#text/plain
-res/gamedata/TypeLists.txt svneol=native#text/plain
 res/howto.txt svneol=native#text/plain
 res/licenses/java-yield-license.txt svneol=native#text/plain
 res/licenses/log4j-license.txt svneol=native#text/plain
 res/licenses/multiline-label-license.txt svneol=native#text/plain
 res/licenses/xpp3-license.txt svneol=native#text/plain
 res/licenses/xstream-license.txt svneol=native#text/plain
-res/mtg-data.txt svneol=native#text/plain
+res/lists/NonStackingKWList.txt svneol=native#text/plain
-res/mtgdata-sets-to-forge.txt -text
+res/lists/TypeLists.txt svneol=native#text/plain
-res/oracleScript.py -text svneol=unset#text/x-python
+res/lists/booster-images.txt svneol=native#text/plain
+res/lists/fatpack-images.txt svneol=native#text/plain
+res/lists/precon-images.txt svneol=native#text/plain
+res/lists/quest-opponent-icons.txt svneol=native#text/plain
+res/lists/quest-pet-shop-icons.txt svneol=native#text/plain
+res/lists/quest-pet-token-images.txt svneol=native#text/plain
+res/lists/token-images.txt svneol=native#text/plain
+res/lists/tournamentpack-images.txt svneol=native#text/plain
 res/pics_product/booster/10E.png -text
 res/pics_product/booster/5DN.png -text
 res/pics_product/booster/7E.png -text
@@ -12762,7 +12763,6 @@ res/quest/bazaar/wolf_pet_l1.txt -text
 res/quest/bazaar/wolf_pet_l2.txt -text
 res/quest/bazaar/wolf_pet_l3.txt -text
 res/quest/bazaar/wolf_pet_l4.txt -text
-res/quest/booster-images.txt -text
 res/quest/booster-prices.txt -text
 res/quest/challenges/quest1.dck -text
 res/quest/challenges/quest10.dck -text
@@ -13308,9 +13308,6 @@ res/quest/precons/Wicked[!!-~]Big.dck -text
 res/quest/precons/Wild[!!-~]Rush.dck -text
 res/quest/precons/World[!!-~]Aflame.dck -text
 res/quest/precons/Zombies[!!-~]Unleashed.dck -text
-res/quest/quest-opponent-icons.txt -text
-res/quest/quest-pet-shop-icons.txt -text
-res/quest/quest-pet-token-images.txt -text
 res/quest/themes/-1[!!-~]-1[!!-~]Counters[!!-~]BG.thm -text
 res/quest/themes/Anti[!!-~]Black[!!-~]WB.thm -text
 res/quest/themes/Anti[!!-~]Black[!!-~]WG.thm -text
@@ -13665,7 +13662,6 @@ res/sound/token.wav -text
 res/sound/untap.wav -text
 res/sound/white_land.wav -text
 res/sound/win_duel.wav -text
-res/token-images.txt -text
 src/main/config/Forge.icns -text
 src/main/config/backgroundImage.jpg -text svneol=unset#image/jpeg
 src/main/config/create-dmg -text
@@ -14560,3 +14556,9 @@ src/test/java/forge/gui/ListChooserTest.java svneol=native#text/plain
 src/test/java/forge/gui/game/CardDetailPanelTest.java svneol=native#text/plain
 src/test/java/forge/item/DeckHintsTest.java -text
 src/test/java/forge/model/FModelTest.java -text
+tools/PerSetTracking.py svneol=native#text/x-python
+tools/assignSetInfo.py svneol=native#text/x-python
+tools/cardTemplateScript.py svneol=native#text/x-python
+tools/mtg-data.txt svneol=native#text/plain
+tools/mtgdata-sets-to-forge.txt svneol=native#text/plain
+tools/oracleScript.py svneol=native#text/x-python

.gitignore

@@ -8,16 +8,12 @@
 /pom.xml.releaseBackup
 /pom.xml.tag
 /release.properties
-res/*.log
-res/PerSetTrackingResults
-res/decks
-res/layouts
-res/pics*
 res/pics_product/*
 res/pics_product/booster/*
 res/pics_product/fatpacks/*
 res/pics_product/precons/*
 res/pics_product/tournamentpacks/*
-res/preferences
 res/quest/data
 /target
+tools/PerSetTrackingResults
+tools/oracleScript.log

res/AllTokens.txt

@@ -1,836 +0,0 @@
-Angel
-B
-Creature Angel
-3/3
-Flying
-
-Angel
-W
-Creature Angel
-4/4
-Flying
-
-Ape
-G
-Creature Ape
-2/2
-
-Ape
-G
-Creature Ape
-3/3
-
-Assembly-Worker
-C
-Artifact Creature Assembly-Worker
-2/2
-
-Avatar
-W
-Creature Avatar
-N/N
-This creature's power and toughness are each equal to your life total.
-
-Bat
-B
-Creature Bat
-1/1
-Flying
-
-Bat
-B
-Creature Bat
-1/2
-"1B, Sacrifice this creature: Return an exiled card named Sengir Nosferatu to the battlefield under its owner's control."
-
-Bear
-G
-Creature Bear
-2/2
-
-Beast
-G
-Creature Beast
-2/2
-
-Beast
-G
-Creature Beast
-3/3
-
-Beast
-G
-Creature Beast
-4/4
-
-Beast
-G
-Creature Beast
-5/5
-
-Beast
-R G W
-Creature Beast
-8/8
-
-Bird
-R
-Creature Bird
-4/4
-Flying
-
-Bird
-U
-Creature Bird
-1/1
-
-Bird
-W
-Creature Bird
-1/1
-Flying
-
-Bird
-W U
-Creature Bird
-1/1
-Flying
-
-Butterfly
-G
-Creature Insect
-1/1
-Flying
-
-Camarid
-U
-Creature Camarid
-1/1
-
-Caribou
-W
-Creature Caribou
-0/1
-
-Carnivore
-R
-Creature Beast
-3/1
-
-Cat
-B
-Creature Cat
-2/1
-
-Cat
-G
-Creature Cat
-1/1
-
-Cat Warrior
-G
-Creature Cat Warrior
-2/2
-Forestwalk
-
-Centaur
-G
-Creature Centaur
-3/3
-
-Centaur
-G
-Creature Centaur
-3/3
-Protection from black
-
-Citizen
-W
-Creature Citizen
-1/1
-
-Demon
-B
-Creature Demon
-X/X
-
-Deserter
-W
-Creature Deserter
-0/1
-
-Djinn
-C
-Artifact Creature Djinn
-5/5
-
-Dragon
-R
-Creature Dragon
-4/4
-Flying
-
-Dragon
-R
-Creature Dragon
-5/5
-Flying
-
-Dragon Spirit
-U
-Creature Dragon Spirit
-5/5
-Flying
-
-Drake
-U G
-Creature Drake
-2/2
-Flying
-
-Elemental
-B R
-Creature Elemental
-5/5
-
-Elemental
-G
-Creature Elemental
-4/4
-
-Elemental
-G
-Creature Elemental
-7/7
-Trample
-
-Elemental
-G
-Creature Elemental
-X/X
-
-Elemental
-R
-Creature Elemental
-1/1
-Haste
-
-Elemental
-R
-Creature Elemental
-3/1
-
-Elemental
-R
-Creature Elemental
-3/1
-Haste
-
-Elemental
-R
-Creature Elemental
-3/3
-
-Elemental
-U
-Creature Elemental
-2/2
-Flying
-
-Elemental
-U R
-Creature Elemental
-5/5
-Flying
-
-Elemental
-W
-Creature Elemental
-4/4
-Flying
-
-Elemental Cat
-R
-Creature Elemental Cat
-1/1
-
-Elemental Shaman
-R
-Creature Elemental Shaman
-3/1
-
-Elephant
-G
-Creature Elephant
-3/3
-
-Elephant
-G
-Creature Elephant
-N/N
-This creature's power and toughness are each equal to the number of creature cards in its controller's graveyard.
-
-Elf Warrior
-G
-Creature Elf Warrior
-1/1
-
-Elf Warrior
-G W
-Creature Elf Warrior
-1/1
-
-Faerie
-U
-Creature Faerie
-1/1
-Flying
-
-Faerie Rogue
-B
-Creature Faerie Rogue
-1/1
-Flying
-
-Faerie Rogue
-U B
-Creature Faerie Rogue
-1/1
-Flying
-
-Giant
-R
-Creature Giant
-4/4
-
-Giant Warrior
-R G
-Creature Giant Warrior
-4/4
-Haste
-
-Giant Warrior
-W
-Creature Giant Warrior
-5/5
-
-Gnome
-C
-Artifact Creature Gnome
-1/1
-
-Goat
-W
-Creature Goat
-0/1
-
-Goblin
-R
-Creature Goblin
-1/1
-
-Goblin
-R
-Creature Goblin
-1/1
-Haste
-
-Goblin
-R
-Creature Goblin
-2/1
-Haste
-
-Goblin Rogue
-B
-Creature Goblin Rogue
-1/1
-
-Goblin Scout
-R
-Creature Goblin Scout
-1/1
-Mountainwalk
-
-Goblin Soldier
-R W
-Creature Goblin Soldier
-1/1
-
-Goblin Warrior
-R G
-Creature Goblin Warrior
-1/1
-
-Graveborn
-Creature Graveborn
-B R
-3/1
-Haste
-
-Griffin
-W
-Creature Griffin
-2/2
-Flying
-
-Hippo
-G
-Creature Hippo
-1/1
-
-Homunculus
-U
-Artifact Creature
-0/1
-
-Hornet
-C
-Haste
-1/1
-Flying
-
-Horror
-B
-Creature Horror
-4/4
-
-Hound
-G
-Creature Hound
-1/1
-
-Illusion
-U
-Creature Illusion
-1/1
-Flying
-
-Insect
-B
-Creature Insect
-0/1
-
-Insect
-G
-Creature Insect
-1/1
-
-Insect
-G
-Creature Insect
-6/1
-Shroud
-
-Kaldra
-C
-Legendary Creature Avatar
-4/4
-
-Kavu
-B
-Creature Kavu
-3/3
-
-Kelp
-U
-Creature Plant Wall
-0/1
-Defender
-
-Kithkin Soldier
-W
-Creature Kithkin Soldier
-1/1
-
-Knight
-B
-Protection from white
-2/2
-Flanking
-
-Knight
-W
-Creature Knight
-1/1
-Banding
-
-Knight
-W
-Creature Knight
-2/2
-First Strike
-
-Knight
-W
-Creature Knight
-2/2
-
-Kobolds of Kher Keep
-R
-Creature Kobold
-0/1
-
-Marit Lage
-B
-Indestructible
-20/20
-Flying
-
-Merfolk Wizard
-U
-Creature Merfolk Wizard
-1/1
-
-Minion
-B
-Creature Minion
-1/1
-
-Minion
-B
-Creature Minion
-X/X
-
-Minor Demon
-B R
-Creature Demon
-1/1
-
-Myr
-C
-Artifact Creature Myr
-1/1
-
-Ooze
-G
-Creature Ooze
-X/X
-
-Orb
-U
-Creature Orb
-X/X
-Flying
-
-Pegasus
-W
-Creature Pegasus
-1/1
-Flying
-
-Pentavite
-C
-Artifact Creature Pentavite
-1/1
-
-Pest
-C
-Artifact Creature Pest
-0/1
-
-Pincher
-C
-Creature Pincher
-2/2
-
-Plant Wall
-G
-Creature Plant Wall
-0/1
-Defender
-
-Prism
-C
-Artifact Creature Prism
-0/1
-
-Rat
-B
-Creature Rat
-1/1
-
-Reflection
-W
-Creature Reflection
-2/2
-
-Reflection
-W
-Creature Reflection
-X/X
-
-Sand
-C
-Creature Sand
-1/1
-
-Sand Warrior
-R G W
-Creature Sand Warrior
-1/1
-"When a permanent name Hazezon Tamar isn't on the battlefield, exile this creature."
-
-Saproling
-G
-Creature Saproling
-1/1
-
-Saproling
-G
-Creature Saproling
-N/N
-This creature's power and toughness are each equal to the number of fade counters on Saproling Burst.
-
-Serf
-B
-Creature Serf
-0/1
-
-Shapeshifter
-C
-Creature Shapeshifter
-1/1
-Changeling
-
-Sheep
-G
-Creature Sheep
-0/1
-
-Skeleton
-B
-Creature Skeleton
-1/1
-B: Regenerate this creature.
-
-Sliver
-C
-Creature Sliver
-1/1
-
-Snake
-C
-Artifact Creature Snake
-1/1
-"Whenever this creature deals damage to a player, that player gets a poison counter."
-
-Snake
-G
-Creature Snake
-1/1
-
-Snake
-G U
-Creature Snake
-1/1
-
-Soldier
-W
-Creature Soldier
-1/1
-
-Spawn
-C
-Artifact Creature Spawn
-2/2
-
-Spider
-B
-Creature Spider
-2/4
-Reach
-
-Spider
-G
-Creature Spider
-1/2
-Reach
-
-Spike
-G
-Creature Spike
-1/1
-
-Spirit
-B
-Creature Spirit
-N/N
-
-Spirit
-C
-Creature Spirit
-1/1
-
-Spirit
-W
-Creature Spirit
-1/1
-Flying
-
-Spirit
-W
-Creature Spirit
-3/3
-Flying
-
-Spirit
-W B
-Creature Spirit
-1/1
-Flying
-
-Splinter
-G
-Cumulative upkeep - G
-1/1
-Flying
-
-Squirrel
-G
-Creature Squirrel
-1/1
-
-Stangg Twin
-R G
-Legendary Creature Human Warrior
-3/4
-
-Starfish
-U
-Creature Starfish
-0/1
-
-Survivor
-R
-Creature Survivor
-1/1
-
-Tetravite
-C
-This creature can't be enchanted.
-1/1
-Flying
-
-Thopter
-C
-Artifact Creature Thopter
-1/1
-Flying
-
-Thopter
-U
-Creature Thopter
-1/1
-Flying
-
-Thrull
-B
-Creature Thrull
-0/1
-
-Thrull
-B
-Creature Thrull
-1/1
-
-Tombspawn
-B
-Creature Zombie
-2/2
-Haste
-
-Treefolk Shaman
-G
-Creature Treefolk Shaman
-2/1
-
-Triskelavite
-C
-Artifact Creature
-1/1
-Flying
-
-Voja
-G W
-Legendary Creature Wolf
-2/2
-
-Wall
-C
-Artifact Creature Wall
-0/2
-Defender
-
-Wall
-U
-Creature Wall
-5/5
-Defender
-
-Warrior
-R
-Creature Warrior
-1/1
-
-Wasp
-C
-Artifact Creature Insect
-1/1
-Flying
-
-Weird
-U
-Flying
-3/3
-Defender
-
-Wirefly
-C
-Artifact Creature Insect
-2/2
-Flying
-
-Wolf
-G
-Creature Wolf
-1/1
-This creature gets +1/+1 for each card named Sound the Call in each graveyard.
-
-Wolf
-G
-Creature Wolf
-2/2
-
-Wolves of the Hunt
-G
-Creature Wolf
-1/1
-Bands with other Wolves
-
-Worm
-B G
-Creature Worm
-1/1
-
-Wurm
-B
-Creature Wurm
-6/6
-Trample
-
-Wurm
-G
-Creature Wurm
-6/6
-
-Wurm
-G
-Creature Wurm
-X/X
-
-Zombie
-B
-Creature Zombie
-2/2
-

src/main/java/forge/model/FModel.java

@@ -183,7 +183,7 @@ public enum FModel {
      */
     public void loadDynamicGamedata() {
         if (!Constant.CardTypes.LOADED[0]) {
-            final List<String> typeListFile = FileUtil.readFile("res/gamedata/TypeLists.txt");
+            final List<String> typeListFile = FileUtil.readFile(NewConstants.TYPE_LIST_FILE);
 
             List<String> tList = null;
 
@@ -253,7 +253,7 @@ public enum FModel {
         }
 
         if (!Constant.Keywords.LOADED[0]) {
-            final List<String> nskwListFile = FileUtil.readFile("res/gamedata/NonStackingKWList.txt");
+            final List<String> nskwListFile = FileUtil.readFile(NewConstants.KEYWORD_LIST_FILE);
 
             if (nskwListFile.size() > 1) {
                 for (String s : nskwListFile) {

src/main/java/forge/properties/NewConstants.java

@@ -25,17 +25,20 @@ public final class NewConstants {
     public static final String PROFILE_TEMPLATE_FILE = PROFILE_FILE + ".example";
 
     // data that is only in the program dir
-    private static final String _RES_ROOT       = "res/";
+    private static final String _RES_ROOT = "res/";
-    private static final String _QUEST_DIR      = _RES_ROOT + "quest/";
+    private static final String _LIST_DIR = _RES_ROOT + "lists/";
-    public static final String IMAGE_LIST_TOKENS_FILE                = _RES_ROOT + "token-images.txt";
+    public static final String KEYWORD_LIST_FILE                     = _LIST_DIR + "NonStackingKWList.txt";
-    public static final String IMAGE_LIST_QUEST_OPPONENT_ICONS_FILE  = _QUEST_DIR + "quest-opponent-icons.txt";
+    public static final String TYPE_LIST_FILE                        = _LIST_DIR + "TypeLists.txt";
-    public static final String IMAGE_LIST_QUEST_PET_SHOP_ICONS_FILE  = _QUEST_DIR + "quest-pet-shop-icons.txt";
+    public static final String IMAGE_LIST_TOKENS_FILE                = _LIST_DIR + "token-images.txt";
-    public static final String IMAGE_LIST_QUEST_TOKENS_FILE          = _QUEST_DIR + "quest-pet-token-images.txt";
+    public static final String IMAGE_LIST_QUEST_OPPONENT_ICONS_FILE  = _LIST_DIR + "quest-opponent-icons.txt";
-    public static final String IMAGE_LIST_QUEST_BOOSTERS_FILE        = _QUEST_DIR + "booster-images.txt";
+    public static final String IMAGE_LIST_QUEST_PET_SHOP_ICONS_FILE  = _LIST_DIR + "quest-pet-shop-icons.txt";
-    public static final String IMAGE_LIST_QUEST_FATPACKS_FILE        = _QUEST_DIR + "fatpack-images.txt";
+    public static final String IMAGE_LIST_QUEST_TOKENS_FILE          = _LIST_DIR + "quest-pet-token-images.txt";
-    public static final String IMAGE_LIST_QUEST_PRECONS_FILE         = _QUEST_DIR + "precon-images.txt";
+    public static final String IMAGE_LIST_QUEST_BOOSTERS_FILE        = _LIST_DIR + "booster-images.txt";
-    public static final String IMAGE_LIST_QUEST_TOURNAMENTPACKS_FILE = _QUEST_DIR + "tournamentpack-images.txt";
+    public static final String IMAGE_LIST_QUEST_FATPACKS_FILE        = _LIST_DIR + "fatpack-images.txt";
+    public static final String IMAGE_LIST_QUEST_PRECONS_FILE         = _LIST_DIR + "precon-images.txt";
+    public static final String IMAGE_LIST_QUEST_TOURNAMENTPACKS_FILE = _LIST_DIR + "tournamentpack-images.txt";
     
+    private static final String _QUEST_DIR      = _RES_ROOT + "quest/";
     public static final String TEXT_HOWTO_FILE     = _RES_ROOT + "howto.txt";
     public static final String DRAFT_RANKINGS_FILE = _RES_ROOT + "draft/rankings.txt";
     public static final String PRICES_BOOSTER_FILE = _QUEST_DIR + "booster-prices.txt";

tools/PerSetTracking.py

@@ -7,7 +7,7 @@ import os,sys,fnmatch,re
 
 def getSetByFormat(requestedFormat):
 	# Parse out Standard sets from the Format file
-	formatLocation = os.path.join(sys.path[0], 'blockdata', 'formats.txt')
+	formatLocation = os.path.join(sys.path[0], '..', 'res', 'blockdata', 'formats.txt')
 	with open(formatLocation) as formatFile:
 		formats = formatFile.readlines()
 
@@ -46,7 +46,6 @@ def printCardSet(implementedSet, missingSet, fileName, setCoverage=None, printIm
 			outfile.write("\nImplemented (%d):" % impCount)
 			for s in implemented:
 				outfile.write("\n%s" % s)
-			outfile.write("\n")
 
 		# By default Missing will print, but you can disable it
 		if printMissing:
@@ -56,6 +55,8 @@ def printCardSet(implementedSet, missingSet, fileName, setCoverage=None, printIm
 			for s in missing:
 				outfile.write("\n%s" % s)
 
+		outfile.write("\n")
+
 def printDistinctOracle(missingSet, fileName):
 	filePath = os.path.join(sys.path[0], "PerSetTrackingResults", fileName)
 	missing = list(missingSet)
@@ -65,6 +66,7 @@ def printDistinctOracle(missingSet, fileName):
 			if s:
 				oracle = mtgOracleCards.get(s, "")
 				outfile.write("%s\n%s" % (s, oracle))
+		outfile.write("\n")
 
 
 if __name__ == '__main__':
@@ -131,7 +133,8 @@ if __name__ == '__main__':
 
 	#Parse Forge
 	print("Parsing Forge")
-	for root, dirnames, filenames in os.walk("cardsfolder"):
+	cardsfolderLocation = os.path.join(sys.path[0], '..', 'res', 'cardsfolder')
+	for root, dirnames, filenames in os.walk(cardsfolderLocation):
 		for fileName in fnmatch.filter(filenames, '*.txt'):
 			with open(os.path.join(root, fileName))  as currentForgeCard :
 				# Check all names for this card
@@ -214,6 +217,7 @@ if __name__ == '__main__':
 		totalPercentage = totalImplemented / fullTotal
 		statsfile.write("\n")
 		statsfile.write("Total over all sets: " + str(totalImplemented) + " (" + str(totalMissing) + ") / " + str(fullTotal))
+		statsfile.write("\n")
 
 	printCardSet(allImplemented, allMissing, "DistinctStats.txt")
 	printCardSet(standardImplemented, standardMissing, "FormatStandard.txt", setCoverage=standardSets)

tools/assignSetInfo.py

@@ -110,7 +110,7 @@ if __name__ == '__main__':
 				setCodeToForge[code1] = code2
 
 
-	folder = "cardsfolder"
+	folder = os.path.join(sys.path[0], '..', 'res', 'cardsfolder')
 	for root, dirnames, filenames in os.walk(folder):
 		for fileName in fnmatch.filter(filenames, '*.txt'):
 			if fileName.startswith('.'):

tools/oracleScript.py

@@ -42,7 +42,7 @@ mtgData = parseFrom.read()
 parseFrom.close()
 print "Size of parse data: %s" % len(mtgData)
 
-folder = "cardsfolder"
+folder = os.path.join(sys.path[0], '..', 'res', 'cardsfolder')
 err = open('oracleScript.log', 'w')
 
 setStr = 'SetInfo:'