From f909005bb11a5393b9dc0a165f9085eade8be12d Mon Sep 17 00:00:00 2001 From: spjspj Date: Mon, 8 May 2017 23:20:33 +1000 Subject: [PATCH 1/2] Token refactor --- .../src/main/resources/card-pictures-tok.txt | 29 ++++--------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index 350a160274..5785022fec 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -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| @@ -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| @@ -643,8 +641,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 +673,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 +680,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| @@ -914,22 +907,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 +960,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 +977,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| From 0942db541ffd05363d8c04705c9153146c238faf Mon Sep 17 00:00:00 2001 From: spjspj Date: Mon, 8 May 2017 23:26:33 +1000 Subject: [PATCH 2/2] Token refactor --- .../main/java/mage/client/preference/MagePreferences.java | 3 +++ Mage.Client/src/main/resources/card-pictures-tok.txt | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/preference/MagePreferences.java b/Mage.Client/src/main/java/mage/client/preference/MagePreferences.java index 1566c8c5bf..7b17194867 100644 --- a/Mage.Client/src/main/java/mage/client/preference/MagePreferences.java +++ b/Mage.Client/src/main/java/mage/client/preference/MagePreferences.java @@ -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) { } diff --git a/Mage.Client/src/main/resources/card-pictures-tok.txt b/Mage.Client/src/main/resources/card-pictures-tok.txt index 5785022fec..390c7e92c0 100644 --- a/Mage.Client/src/main/resources/card-pictures-tok.txt +++ b/Mage.Client/src/main/resources/card-pictures-tok.txt @@ -547,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| @@ -601,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| @@ -894,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|