github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3333 from spjspj/master

Browse source 
Token Refactor
This commit is contained in:
spjspj 2017-05-09 00:19:34 +10:00 committed by GitHub
commit 64e7b7d1ef
2 changed files with 11 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Mage.Client/src/main/java/mage/client/preference/MagePreferences.java
View file

@ -70,6 +70,9 @@ public final class MagePreferences {
if (key.matches(".*userName$")) {
userIds.append(',').append(prefs().get(key, null));
}
if (key.matches(".*DeckPath.*")) {
userIds.append(',').append(prefs().get(key, null));
}
}
} catch (BackingStoreException ex) {
}

34
Mage.Client/src/main/resources/card-pictures-tok.txt
View file

@ -242,7 +242,7 @@
|Generate|TOK:C13|Thopter|||ThopterToken|
|Generate|TOK:C13|Thrull|||ThrullToken|
|Generate|TOK:C13|Zombie|||ZombieToken|
|Generate|TOK:C13|faerie|||CloudSpriteToken|
|Generate|TOK:C13|Faerie|||CloudSpriteToken|
|Generate|TOK:C14|Angel|||AngelToken|
|Generate|TOK:C14|Ape|||PongifyApeToken|
|Generate|TOK:C14|Beast|1||BeastToken|
@ -272,7 +272,6 @@
|Generate|TOK:C14|Spirit|||SpiritWhiteToken|
|Generate|TOK:C14|Stoneforged Blade||
|Generate|TOK:C14|Treefolk|||SylvanOfferingTreefolkToken|
|Generate|TOK:C14|Tuktuk the Returned||
|Generate|TOK:C14|Whale|||ReefWormWhaleToken|
|Generate|TOK:C14|Wolf|||WolfToken|
|Generate|TOK:C14|Wurm|1||Wurm1Token|
@ -304,7 +303,7 @@
|Generate|TOK:C15|Spirit|2||TeysaEnvoyOfGhostsToken|
|Generate|TOK:C15|Wolf|||WolfToken|
|Generate|TOK:C15|Zombie|||ZombieToken|
|Generate|TOK:C15|artifact|||LandMineToken|
|Generate|TOK:C15|Land Mine|||LandMineToken|
|Generate|TOK:C16|Beast||
|Generate|TOK:C16|Bird|1|
|Generate|TOK:C16|Bird|2|
@ -548,7 +547,7 @@
|Generate|TOK:FUT|Wurm|||WurmCallingWurmToken|
|Generate|TOK:FUT|Zombie Goblin|||FesteringGoblinToken|
|Generate|TOK:FUT|Zombie|||ZombieToken|
|Generate|TOK:FUT|faerie|||CloudSpriteToken|
|Generate|TOK:FUT|Faerie|||CloudSpriteToken|
|Generate|TOK:GPT|Bat|||BatToken|
|Generate|TOK:GPT|Pegasus|||PegasusToken|
|Generate|TOK:GPT|Sand|||DuneBroodNephilimToken|
@ -561,7 +560,6 @@
|Generate|TOK:GTC|Frog Lizard|||RapidHybridizationToken|
|Generate|TOK:GTC|Horror|||NightwingHorrorToken|
|Generate|TOK:GTC|Knight|||KnightWatch|
|Generate|TOK:GTC|Ooze||
|Generate|TOK:GTC|Ooze|||MysticGenesisOozeToken|
|Generate|TOK:GTC|Rat|||RatToken|
|Generate|TOK:GTC|Soldier|1||SoldierToken|
@ -603,7 +601,6 @@
|Generate|TOK:JOU|Sphinx|||HourOfNeedSphinxToken|
|Generate|TOK:JOU|Spider|||RenownedWeaverSpiderToken|
|Generate|TOK:JOU|Zombie||RitualOfTheReturnedZombieToken|
|Generate|TOK:JOU|artifact|||LandMineToken|
|Generate|TOK:JUD|Bear|||BearToken|
|Generate|TOK:JUD|Bird|||BirdToken|
|Generate|TOK:JUD|Elemental Cat|||ElementalCatToken|
@ -643,8 +640,6 @@
|Generate|TOK:LRW|Avatar|||AvatarToken|
|Generate|TOK:LRW|Beast|||BeastToken|
|Generate|TOK:LRW|Elemental Shaman|||ElementalShamanToken|
|Generate|TOK:LRW|Elemental|1|
|Generate|TOK:LRW|Elemental|2|
|Generate|TOK:LRW|Elemental|||WalkerOfTheGroveToken|
|Generate|TOK:LRW|Elemental|||WhiteElementalToken|
|Generate|TOK:LRW|Elf Warrior|||ElfToken|
@ -677,8 +672,6 @@
|Generate|TOK:M13|Cat|||CatToken|
|Generate|TOK:M13|Drake|||DrakeToken|
|Generate|TOK:M13|Goat|||GoatToken|
|Generate|TOK:M13|Goblin|1|
|Generate|TOK:M13|Goblin|2|
|Generate|TOK:M13|Goblin|||GoblinToken|
|Generate|TOK:M13|Hellion|1||HellionHasteToken|
|Generate|TOK:M13|Hellion|2||HellionToken|
@ -686,7 +679,6 @@
|Generate|TOK:M13|Soldier|||SoldierToken|
|Generate|TOK:M13|Wurm|||WurmToken|
|Generate|TOK:M13|Zombie|||ZombieToken|
|Generate|TOK:M13|artifact|||LandMineToken|
|Generate|TOK:M14|Angel|||AngelToken|
|Generate|TOK:M14|Beast|||BeastToken|
|Generate|TOK:M14|Cat|||CatToken|
@ -901,7 +893,7 @@
|Generate|TOK:RAV|Saproling|||SaprolingToken|
|Generate|TOK:RAV|Spirit|||SpiritWhiteToken|
|Generate|TOK:RAV|Wolf|||VojaToken|
|Generate|TOK:RAV|faerie|||FaerieToken|
|Generate|TOK:RAV|Faerie|||FaerieToken|
|Generate|TOK:ROE|Dragon|||DragonToken2|
|Generate|TOK:ROE|Eldrazi Spawn|1||EldraziSpawnToken|
|Generate|TOK:ROE|Eldrazi Spawn|2||EldraziSpawnToken|
@ -914,22 +906,16 @@
|Generate|TOK:ROE|Ooze|||MysticGenesisOozeToken|
|Generate|TOK:RTR|Assassin|||AssassinToken|
|Generate|TOK:RTR|Bird|||BirdToken|
|Generate|TOK:RTR|Centaur|1|
|Generate|TOK:RTR|Centaur|2|
|Generate|TOK:RTR|Centaur|||CentaurToken|
|Generate|TOK:RTR|Dragon|||UtvaraHellkiteDragonToken|
|Generate|TOK:RTR|Elemental||
|Generate|TOK:RTR|Goblin|||GoblinToken|
|Generate|TOK:RTR|Knight|1|
|Generate|TOK:RTR|Knight|2|
|Generate|TOK:RTR|Knight|||KnightToken|
|Generate|TOK:RTR|Ooze||
|Generate|TOK:RTR|Ooze|||MysticGenesisOozeToken|
|Generate|TOK:RTR|Rhino|||RhinoToken|
|Generate|TOK:RTR|Saproling|||SaprolingToken|
|Generate|TOK:RTR|Soldier|||SoldierToken|
|Generate|TOK:RTR|Wurm|||WurmToken2|
|Generate|TOK:RTR|Wurm|||WurmToken3|
|Generate|TOK:SCG|Angel|||AngelToken|
|Generate|TOK:SCG|Beast|||BeastToken2|
|Generate|TOK:SCG|Dragon|||DragonToken2|
@ -973,8 +959,8 @@
|Generate|TOK:SOM|Cat|||CatToken|
|Generate|TOK:SOM|Goblin|||GoblinToken|
|Generate|TOK:SOM|Golem|||GolemToken|
|Generate|TOK:SOM|Insect|||InsectInfectToken|
|Generate|TOK:SOM|Insect|||InsectToken|
|Generate|TOK:SOM|Insect|1||InsectToken|
|Generate|TOK:SOM|Insect|2||InsectInfectToken|
|Generate|TOK:SOM|Myr|||MyrToken|
|Generate|TOK:SOM|Soldier|||SoldierToken|
|Generate|TOK:SOM|Wolf|||WolfToken|
@ -990,16 +976,12 @@
|Generate|TOK:THS|Boar|||CurseOfTheSwineBoarToken|
|Generate|TOK:THS|Cleric|||HeliodGodOfTheSunToken|
|Generate|TOK:THS|Elemental|||MasterOfWavesElementalToken|
|Generate|TOK:THS|Golem|1|
|Generate|TOK:THS|Golem|2|
|Generate|TOK:THS|Golem|||HammerOfPurphorosGolemToken|
|Generate|TOK:THS|Harpy|||AbhorrentOverlordHarpyToken|
|Generate|TOK:THS|Satyr|||XenagosSatyrToken|
|Generate|TOK:THS|Soldier|1|
|Generate|TOK:THS|Soldier|2|
|Generate|TOK:THS|Soldier|3|
|Generate|TOK:THS|Soldier|||AkroanSoldierToken|
|Generate|TOK:THS|Soldier|||SoldierToken|
|Generate|TOK:THS|Soldier|1||SoldierToken|
|Generate|TOK:THS|Soldier|2||SoldierToken|
|Generate|TOK:TMP|Beast|||CarnivoreToken|
|Generate|TOK:TMP|Hound|||HoundToken|
|Generate|TOK:TMP|Pegasus|||PegasusToken|