diff --git a/cards/src/main/resources/cards/classic/neutral/minion_azure_drake.json b/cards/src/main/resources/cards/hall_of_fame/minion_azure_drake.json similarity index 94% rename from cards/src/main/resources/cards/classic/neutral/minion_azure_drake.json rename to cards/src/main/resources/cards/hall_of_fame/minion_azure_drake.json index 2987d7361..858476eca 100644 --- a/cards/src/main/resources/cards/classic/neutral/minion_azure_drake.json +++ b/cards/src/main/resources/cards/hall_of_fame/minion_azure_drake.json @@ -20,6 +20,6 @@ "SPELL_DAMAGE": 1 }, "collectible": true, - "set": "CLASSIC", + "set": "HALL_OF_FAME", "fileFormatVersion": 1 } \ No newline at end of file diff --git a/cards/src/main/resources/cards/reward/minion_captains_parrot.json b/cards/src/main/resources/cards/hall_of_fame/minion_captains_parrot.json similarity index 95% rename from cards/src/main/resources/cards/reward/minion_captains_parrot.json rename to cards/src/main/resources/cards/hall_of_fame/minion_captains_parrot.json index 1e7898694..6886e9c40 100644 --- a/cards/src/main/resources/cards/reward/minion_captains_parrot.json +++ b/cards/src/main/resources/cards/hall_of_fame/minion_captains_parrot.json @@ -22,6 +22,6 @@ "BATTLECRY": true }, "collectible": true, - "set": "REWARD", + "set": "HALL_OF_FAME", "fileFormatVersion": 1 } \ No newline at end of file diff --git a/cards/src/main/resources/cards/promo/minion_elite_tauren_chieftain.json b/cards/src/main/resources/cards/hall_of_fame/minion_elite_tauren_chieftain.json similarity index 95% rename from cards/src/main/resources/cards/promo/minion_elite_tauren_chieftain.json rename to cards/src/main/resources/cards/hall_of_fame/minion_elite_tauren_chieftain.json index 25dafbc77..8a5fa077a 100644 --- a/cards/src/main/resources/cards/promo/minion_elite_tauren_chieftain.json +++ b/cards/src/main/resources/cards/hall_of_fame/minion_elite_tauren_chieftain.json @@ -22,6 +22,6 @@ "BATTLECRY": true }, "collectible": true, - "set": "PROMO", + "set": "HALL_OF_FAME", "fileFormatVersion": 1 } \ No newline at end of file diff --git a/cards/src/main/resources/cards/promo/minion_gelbin_mekkatorque.json b/cards/src/main/resources/cards/hall_of_fame/minion_gelbin_mekkatorque.json similarity index 95% rename from cards/src/main/resources/cards/promo/minion_gelbin_mekkatorque.json rename to cards/src/main/resources/cards/hall_of_fame/minion_gelbin_mekkatorque.json index 1501e686b..0d9b22eff 100644 --- a/cards/src/main/resources/cards/promo/minion_gelbin_mekkatorque.json +++ b/cards/src/main/resources/cards/hall_of_fame/minion_gelbin_mekkatorque.json @@ -22,6 +22,6 @@ "BATTLECRY": true }, "collectible": true, - "set": "PROMO", + "set": "HALL_OF_FAME", "fileFormatVersion": 1 } \ No newline at end of file diff --git a/cards/src/main/resources/cards/reward/minion_old_murk-eye.json b/cards/src/main/resources/cards/hall_of_fame/minion_old_murk-eye.json similarity index 96% rename from cards/src/main/resources/cards/reward/minion_old_murk-eye.json rename to cards/src/main/resources/cards/hall_of_fame/minion_old_murk-eye.json index c70c5a9a3..76ef50681 100644 --- a/cards/src/main/resources/cards/reward/minion_old_murk-eye.json +++ b/cards/src/main/resources/cards/hall_of_fame/minion_old_murk-eye.json @@ -29,6 +29,6 @@ "CHARGE": true }, "collectible": true, - "set": "REWARD", + "set": "HALL_OF_FAME", "fileFormatVersion": 1 } \ No newline at end of file diff --git a/cards/src/main/resources/cards/classic/neutral/minion_ragnaros_the_firelord.json b/cards/src/main/resources/cards/hall_of_fame/minion_ragnaros_the_firelord.json similarity index 95% rename from cards/src/main/resources/cards/classic/neutral/minion_ragnaros_the_firelord.json rename to cards/src/main/resources/cards/hall_of_fame/minion_ragnaros_the_firelord.json index 0b7b7b4bb..738ede5d7 100644 --- a/cards/src/main/resources/cards/classic/neutral/minion_ragnaros_the_firelord.json +++ b/cards/src/main/resources/cards/hall_of_fame/minion_ragnaros_the_firelord.json @@ -23,6 +23,6 @@ "CANNOT_ATTACK": true }, "collectible": true, - "set": "CLASSIC", + "set": "HALL_OF_FAME", "fileFormatVersion": 1 } \ No newline at end of file diff --git a/cards/src/main/resources/cards/classic/neutral/minion_sylvanas_windrunner.json b/cards/src/main/resources/cards/hall_of_fame/minion_sylvanas_windrunner.json similarity index 94% rename from cards/src/main/resources/cards/classic/neutral/minion_sylvanas_windrunner.json rename to cards/src/main/resources/cards/hall_of_fame/minion_sylvanas_windrunner.json index 168285116..699356b01 100644 --- a/cards/src/main/resources/cards/classic/neutral/minion_sylvanas_windrunner.json +++ b/cards/src/main/resources/cards/hall_of_fame/minion_sylvanas_windrunner.json @@ -16,6 +16,6 @@ "DEATHRATTLES": true }, "collectible": true, - "set": "CLASSIC", + "set": "HALL_OF_FAME", "fileFormatVersion": 1 } \ No newline at end of file diff --git a/cards/src/main/resources/cards/classic/rogue/spell_conceal.json b/cards/src/main/resources/cards/hall_of_fame/spell_conceal.json similarity index 95% rename from cards/src/main/resources/cards/classic/rogue/spell_conceal.json rename to cards/src/main/resources/cards/hall_of_fame/spell_conceal.json index 79dcb42bf..bb2673786 100644 --- a/cards/src/main/resources/cards/classic/rogue/spell_conceal.json +++ b/cards/src/main/resources/cards/hall_of_fame/spell_conceal.json @@ -22,6 +22,6 @@ } }, "collectible": true, - "set": "CLASSIC", + "set": "HALL_OF_FAME", "fileFormatVersion": 1 } \ No newline at end of file diff --git a/cards/src/main/resources/cards/classic/mage/spell_ice_lance.json b/cards/src/main/resources/cards/hall_of_fame/spell_ice_lance.json similarity index 95% rename from cards/src/main/resources/cards/classic/mage/spell_ice_lance.json rename to cards/src/main/resources/cards/hall_of_fame/spell_ice_lance.json index a2bfe0040..e6c446eb3 100644 --- a/cards/src/main/resources/cards/classic/mage/spell_ice_lance.json +++ b/cards/src/main/resources/cards/hall_of_fame/spell_ice_lance.json @@ -23,6 +23,6 @@ } }, "collectible": true, - "set": "CLASSIC", + "set": "HALL_OF_FAME", "fileFormatVersion": 1 } \ No newline at end of file diff --git a/cards/src/main/resources/cards/classic/warlock/spell_power_overwhelming.json b/cards/src/main/resources/cards/hall_of_fame/spell_power_overwhelming.json similarity index 96% rename from cards/src/main/resources/cards/classic/warlock/spell_power_overwhelming.json rename to cards/src/main/resources/cards/hall_of_fame/spell_power_overwhelming.json index 9c35a9d88..e1b26cff5 100644 --- a/cards/src/main/resources/cards/classic/warlock/spell_power_overwhelming.json +++ b/cards/src/main/resources/cards/hall_of_fame/spell_power_overwhelming.json @@ -30,6 +30,6 @@ ] }, "collectible": true, - "set": "CLASSIC", + "set": "HALL_OF_FAME", "fileFormatVersion": 1 } \ No newline at end of file diff --git a/cards/src/main/resources/formats/all.json b/cards/src/main/resources/formats/all.json index af3fd5538..ce2604dd0 100644 --- a/cards/src/main/resources/formats/all.json +++ b/cards/src/main/resources/formats/all.json @@ -5,6 +5,7 @@ "CLASSIC", "REWARD", "PROMO", + "HALL_OF_FAME", "NAXXRAMAS", "GOBLINS_VS_GNOMES", "BLACKROCK_MOUNTAIN", diff --git a/cards/src/main/resources/formats/standard.json b/cards/src/main/resources/formats/standard.json index a00cd7e30..920e2e5bd 100644 --- a/cards/src/main/resources/formats/standard.json +++ b/cards/src/main/resources/formats/standard.json @@ -3,11 +3,8 @@ "sets": [ "BASIC", "CLASSIC", - "BLACKROCK_MOUNTAIN", - "THE_GRAND_TOURNAMENT", - "LEAGUE_OF_EXPLORERS", "THE_OLD_GODS", "ONE_NIGHT_IN_KARAZHAN", "MEAN_STREETS_OF_GADGETZAN" ] -} \ No newline at end of file +} diff --git a/cards/src/main/resources/formats/wild.json b/cards/src/main/resources/formats/wild.json index 4779f7156..3a0a92a66 100644 --- a/cards/src/main/resources/formats/wild.json +++ b/cards/src/main/resources/formats/wild.json @@ -5,6 +5,7 @@ "CLASSIC", "REWARD", "PROMO", + "HALL_OF_FAME", "NAXXRAMAS", "GOBLINS_VS_GNOMES", "BLACKROCK_MOUNTAIN", diff --git a/game/src/main/java/net/demilich/metastone/game/cards/CardSet.java b/game/src/main/java/net/demilich/metastone/game/cards/CardSet.java index 7c52f71cc..d5383f5f3 100644 --- a/game/src/main/java/net/demilich/metastone/game/cards/CardSet.java +++ b/game/src/main/java/net/demilich/metastone/game/cards/CardSet.java @@ -6,6 +6,7 @@ public enum CardSet { CLASSIC, REWARD, PROMO, + HALL_OF_FAME, NAXXRAMAS, GOBLINS_VS_GNOMES, BLACKROCK_MOUNTAIN,