Merge pull request demilich1#369 from jmui/master

Added Hall of Fame set. Removed some sets from Standard
jphavoc · Jul 24, 2017 · 8cbf123 · 8cbf123
2 parents 92454bc + 9f98b15
commit 8cbf123
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/...s/classic/neutral/minion_azure_drake.json → ...ards/hall_of_fame/minion_azure_drake.json b/...s/classic/neutral/minion_azure_drake.json → ...ards/hall_of_fame/minion_azure_drake.json
@@ -20,6 +20,6 @@
 		"SPELL_DAMAGE": 1
 	},
 	"collectible": true,
-	"set": "CLASSIC",
+	"set": "HALL_OF_FAME",
 	"fileFormatVersion": 1
 }
diff --git a/.../cards/reward/minion_captains_parrot.json → .../hall_of_fame/minion_captains_parrot.json b/.../cards/reward/minion_captains_parrot.json → .../hall_of_fame/minion_captains_parrot.json
@@ -22,6 +22,6 @@
 		"BATTLECRY": true
 	},
 	"collectible": true,
-	"set": "REWARD",
+	"set": "HALL_OF_FAME",
 	"fileFormatVersion": 1
 }
diff --git a/.../promo/minion_elite_tauren_chieftain.json → ...f_fame/minion_elite_tauren_chieftain.json b/.../promo/minion_elite_tauren_chieftain.json → ...f_fame/minion_elite_tauren_chieftain.json
@@ -22,6 +22,6 @@
 		"BATTLECRY": true
 	},
 	"collectible": true,
-	"set": "PROMO",
+	"set": "HALL_OF_FAME",
 	"fileFormatVersion": 1
 }
diff --git a/...ards/promo/minion_gelbin_mekkatorque.json → ...ll_of_fame/minion_gelbin_mekkatorque.json b/...ards/promo/minion_gelbin_mekkatorque.json → ...ll_of_fame/minion_gelbin_mekkatorque.json
@@ -22,6 +22,6 @@
 		"BATTLECRY": true
 	},
 	"collectible": true,
-	"set": "PROMO",
+	"set": "HALL_OF_FAME",
 	"fileFormatVersion": 1
 }
diff --git a/...ces/cards/reward/minion_old_murk-eye.json → ...rds/hall_of_fame/minion_old_murk-eye.json b/...ces/cards/reward/minion_old_murk-eye.json → ...rds/hall_of_fame/minion_old_murk-eye.json
@@ -29,6 +29,6 @@
 		"CHARGE": true
 	},
 	"collectible": true,
-	"set": "REWARD",
+	"set": "HALL_OF_FAME",
 	"fileFormatVersion": 1
 }
diff --git a/...neutral/minion_ragnaros_the_firelord.json → ...of_fame/minion_ragnaros_the_firelord.json b/...neutral/minion_ragnaros_the_firelord.json → ...of_fame/minion_ragnaros_the_firelord.json
@@ -23,6 +23,6 @@
 		"CANNOT_ATTACK": true
 	},
 	"collectible": true,
-	"set": "CLASSIC",
+	"set": "HALL_OF_FAME",
 	"fileFormatVersion": 1
 }
diff --git a/...c/neutral/minion_sylvanas_windrunner.json → ...l_of_fame/minion_sylvanas_windrunner.json b/...c/neutral/minion_sylvanas_windrunner.json → ...l_of_fame/minion_sylvanas_windrunner.json
@@ -16,6 +16,6 @@
 		"DEATHRATTLES": true
 	},
 	"collectible": true,
-	"set": "CLASSIC",
+	"set": "HALL_OF_FAME",
 	"fileFormatVersion": 1
 }
diff --git a/...es/cards/classic/rogue/spell_conceal.json → ...ces/cards/hall_of_fame/spell_conceal.json b/...es/cards/classic/rogue/spell_conceal.json → ...ces/cards/hall_of_fame/spell_conceal.json
@@ -22,6 +22,6 @@
 		}
 	},
 	"collectible": true,
-	"set": "CLASSIC",
+	"set": "HALL_OF_FAME",
 	"fileFormatVersion": 1
 }
diff --git a/...s/cards/classic/mage/spell_ice_lance.json → ...s/cards/hall_of_fame/spell_ice_lance.json b/...s/cards/classic/mage/spell_ice_lance.json → ...s/cards/hall_of_fame/spell_ice_lance.json
@@ -23,6 +23,6 @@
 		}
 	},
 	"collectible": true,
-	"set": "CLASSIC",
+	"set": "HALL_OF_FAME",
 	"fileFormatVersion": 1
 }
diff --git a/...sic/warlock/spell_power_overwhelming.json → ...all_of_fame/spell_power_overwhelming.json b/...sic/warlock/spell_power_overwhelming.json → ...all_of_fame/spell_power_overwhelming.json
@@ -30,6 +30,6 @@
 		]
 	},
 	"collectible": true,
-	"set": "CLASSIC",
+	"set": "HALL_OF_FAME",
 	"fileFormatVersion": 1
 }
diff --git 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
@@ -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"
 	]
-}
+}
diff --git 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
@@ -6,6 +6,7 @@ public enum CardSet {
 	CLASSIC,
 	REWARD,
 	PROMO,
+	HALL_OF_FAME,
 	NAXXRAMAS,
 	GOBLINS_VS_GNOMES,
 	BLACKROCK_MOUNTAIN,