mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 04:38:00 +00:00
Removed duplicate renamed formats
Corrected extended additional cards list to separate with ; not , - I've realized all the other historic formats have this issue in their banned/restricted list and will need updating
This commit is contained in:
maustin
@@ -123,7 +123,7 @@ public class GameFormat implements Comparable<GameFormat> {
|
|||||||
}
|
}
|
||||||
p = Predicates.and(p, Predicates.or(crp));
|
p = Predicates.and(p, Predicates.or(crp));
|
||||||
}
|
}
|
||||||
if (!this.additionalCardNames_ro.isEmpty() && !printed) {
|
if (!this.additionalCardNames_ro.isEmpty()) {
|
||||||
p = Predicates.or(p, IPaperCard.Predicates.names(this.additionalCardNames_ro));
|
p = Predicates.or(p, IPaperCard.Predicates.names(this.additionalCardNames_ro));
|
||||||
}
|
}
|
||||||
return p;
|
return p;
|
||||||
|
|||||||
@@ -4,5 +4,5 @@ Order:571
|
|||||||
Subtype:Rotating
|
Subtype:Rotating
|
||||||
Type:Historic
|
Type:Historic
|
||||||
Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS
|
Sets:ICE, HML, ALL, MIR, VIS, 5ED, WTH, TMP, STH, EXO, USG, ULG, 6ED, UDS
|
||||||
Additional:Badlands, Bayou, Plateau, Savannah, Scrubland, Taiga, Tropical Island, Tundra, Underground Sea, Volcanic Island
|
Additional:Badlands; Bayou; Plateau; Savannah; Scrubland; Taiga; Tropical Island; Tundra; Underground Sea; Volcanic Island
|
||||||
Banned:Amulet of Quoz, Balance, Dream Halls, Earthcraft, Lotus Petal, Memory Jar, Mind Over Matter, Time Spiral, Timmerian Fiends, Tolarian Academy, Windfall, Yawgmoth's Bargain, Yawgmoth's Will, Zuran Orb
|
Banned:Amulet of Quoz, Balance, Dream Halls, Earthcraft, Lotus Petal, Memory Jar, Mind Over Matter, Time Spiral, Timmerian Fiends, Tolarian Academy, Windfall, Yawgmoth's Bargain, Yawgmoth's Will, Zuran Orb
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type I, Alliances
|
|
||||||
Type:Historic
|
|
||||||
Order:169
|
|
||||||
Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL
|
|
||||||
Restricted:Ancestral Recall, Balance, Berserk, Black Lotus, Braingeyser, Candelabra of Tawnos, Chromium, Copy Artifact, Demonic Tutor, Feldon's Cane, Fork, Ivory Tower, Library of Alexandria, Mirror Universe, Mishra's Workshop, Mox Pearl, Mox Emerald, Mox Ruby, Mox Sapphire, Mox Jet, Regrowth, Sol Ring, Timetwister, Time Walk, Underworld Dreams, Wheel of Fortune, Zuran Orb
|
|
||||||
Banned:Amulet of Quoz, Bronze Tablet, Channel, Chaos Orb, Contract from Below, Darkpact, Demonic Attorney, Divine Intervention, Falling Star, Jeweled Bird, Land Tax, Mind Twist, Rebirth, Shahrazad, Tempest Efreet
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type I, Apr 1996
|
|
||||||
Type:Historic
|
|
||||||
Order:166
|
|
||||||
Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML
|
|
||||||
Restricted:Ancestral Recall, Balance, Berserk, Black Lotus, Braingeyser, Candelabra of Tawnos, Chromium, Copy Artifact, Demonic Tutor, Feldon's Cane, Fork, Ivory Tower, Library of Alexandria, Mirror Universe, Mishra's Workshop, Mox Pearl, Mox Emerald, Mox Ruby, Mox Sapphire, Mox Jet, Regrowth, Sol Ring, Timetwister, Time Walk, Underworld Dreams, Wheel of Fortune, Zuran Orb
|
|
||||||
Banned:Amulet of Quoz, Bronze Tablet, Channel, Chaos Orb, Contract from Below, Darkpact, Demonic Attorney, Divine Intervention, Falling Star, Jeweled Bird, Mind Twist, Rebirth, Shahrazad, Tempest Efreet
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type I, Feb 1996
|
|
||||||
Type:Historic
|
|
||||||
Order:164
|
|
||||||
Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML
|
|
||||||
Restricted:Ali from Cairo, Ancestral Recall, Balance, Berserk, Black Lotus, Black Vise, Braingeyser, Candelabra of Tawnos, Chromium, Copy Artifact, Demonic Tutor, Feldon's Cane, Fork, Ivory Tower, Library of Alexandria, Mirror Universe, Mishra's Workshop, Mox Pearl, Mox Emerald, Mox Ruby, Mox Sapphire, Mox Jet, Regrowth, Sol Ring, Sword of Ages, Timetwister, Time Walk, Underworld Dreams, Wheel of Fortune, Zuran Orb
|
|
||||||
Banned:Amulet of Quoz, Bronze Tablet, Channel, Chaos Orb, Contract from Below, Darkpact, Demonic Attorney, Divine Intervention, Falling Star, Jeweled Bird, Mind Twist, Rebirth, Shahrazad, Time Vault, Tempest Efreet
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type I, Homelands
|
|
||||||
Type:Historic
|
|
||||||
Order:162
|
|
||||||
Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML
|
|
||||||
Restricted:Ali from Cairo, Ancestral Recall, Balance, Berserk, Black Lotus, Braingeyser, Candelabra of Tawnos, Chromium, Copy Artifact, Demonic Tutor, Feldon's Cane, Fork, Ivory Tower, Library of Alexandria, Mind Twist, Mirror Universe, Mishra's Workshop, Mox Pearl, Mox Emerald, Mox Ruby, Mox Sapphire, Mox Jet, Regrowth, Sol Ring, Sword of Ages, Timetwister, Time Walk, Underworld Dreams, Wheel of Fortune, Zuran Orb
|
|
||||||
Banned:Amulet of Quoz, Bronze Tablet, Channel, Chaos Orb, Contract from Below, Darkpact, Demonic Attorney, Divine Intervention, Falling Star, Jeweled Bird, Rebirth, Shahrazad, Time Vault, Tempest Efreet
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type I, Nov 1995
|
|
||||||
Type:Historic
|
|
||||||
Order:160
|
|
||||||
Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR
|
|
||||||
Restricted:Ali from Cairo, Ancestral Recall, Balance, Berserk, Black Lotus, Braingeyser, Candelabra of Tawnos, Chromium, Copy Artifact, Demonic Tutor, Feldon's Cane, Fork, Ivory Tower, Library of Alexandria, Mind Twist, Mirror Universe, Mishra's Workshop, Mox Pearl, Mox Emerald, Mox Ruby, Mox Sapphire, Mox Jet, Regrowth, Sol Ring, Sword of Ages, Timetwister, Time Walk, Underworld Dreams, Wheel of Fortune, Zuran Orb
|
|
||||||
Banned:Amulet of Quoz, Bronze Tablet, Channel, Chaos Orb, Contract from Below, Darkpact, Demonic Attorney, Divine Intervention, Falling Star, Jeweled Bird, Rebirth, Shahrazad, Time Vault, Tempest Efreet
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type I, October 1995
|
|
||||||
Type:Historic
|
|
||||||
Order:158
|
|
||||||
Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR
|
|
||||||
Restricted:Adun Oakenshield, Ali from Cairo, Ancestral Recall, Angus Mackenzie, Arcades Sabboth, Axelrod Gunnarson, Ayesha Tanaka, Balance, Barktooth Warbeard, Bartel Runeaxe, Berserk, Black Lotus, Boris Devilboon, Braingeyser, Candelabra of Tawnos, Channel, Chaos Orb, Chromium, Copy Artifact, Dakkon Blackblade, Demonic Tutor, Falling Star, Feldon's Cane, Fork, Gabriel Angelfire, Gosta Dirk, Gwendlyn Di Corci, Halfdane, Hammerheim, Hazezon Tamar, Hunding Gjornersen, Ivory Tower, Jacques le Vert, Jasmine Boreal, Jedit Ojanen, Jerrard of the Closed Fist, Johan, Karakas, Kasimir the Lone Wolf, Kei Takahashi, Lady Caleria, Lady Evangela, Lady Orca, Library of Alexandria, Livonya Silone, Lord Magnus, Marhault Elsdragon, Maze of Ith, Mind Twist, Mirror Universe, Mishra's Workshop, Mox Pearl, Mox Emerald, Mox Ruby, Mox Sapphire, Mox Jet, Nebuchadnezzar, Nicol Bolas, Palladia-Mors, Pavel Maliki, Pendelhaven, Princess Lucrezia, Ragnar, Ramirez DePietro, Ramses Overdark, Rasputin Dreamweaver, Regrowth, Riven Turnbull, Rohgahh of Kher Keep, Rubinia Soulsinger, Sir Shandlar of Eberyn, Sivitri Scarzam, Sol Ring, Sol'kanar the Swamp King, Stangg, Sunastian Falconer, Sword of Ages, Tetsuo Umezawa, The Lady of the Mountain, The Tabernacle at Pendrell Vale, Timetwister, Time Walk, Tobias Andrion, Tolaria, Tor Wauki, Torsten Von Ursus, Tuknir Deathlock, Underworld Dreams, Ur-Drago, Urborg, Vaevictis Asmadi, Wheel of Fortune, Xira Arien
|
|
||||||
Banned:Amulet of Quoz, Bronze Tablet, Contract from Below, Darkpact, Demonic Attorney, Divine Intervention, Jeweled Bird, Rebirth, Shahrazad, Time Vault, Tempest Efreet
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type I.5, Alliances
|
|
||||||
Type:Historic
|
|
||||||
Order:170
|
|
||||||
Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML, ALL
|
|
||||||
Banned:Amulet of Quoz, Ancestral Recall, Balance, Berserk, Black Lotus, Black Vise, Braingeyser, Bronze Tablet, Candelabra of Tawnos, Channel, Chaos Orb, Contract from Below, Copy Artifact, Darkpact, Demonic Attorney, Demonic Tutor, Divine Intervention, Falling Star, Feldon's Cane, Fork, Ivory Tower, Jeweled Bird, Library of Alexandria, Maze of Ith, Mind Twist, Mirror Universe, Mishra's Workshop, Mox Emerald, Mox Jet, Mox Pearl, Mox Ruby, Mox Sapphire, Rebirth, Recall, Regrowth, Shahrazad, Sol Ring, Tempest Efreet, Timetwister, Time Walk, Underworld Dreams, Wheel of Fortune, Zuran Orb
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type I.5, May 1996
|
|
||||||
Type:Historic
|
|
||||||
Order:168
|
|
||||||
Sets:LEA, LEB, 2ED, ARN, DRC94, ATQ, 3ED, LEG, DRK, ARENA, FEM, WW, SHC, FS, 4ED, ICE, CHR, HML
|
|
||||||
Banned:Amulet of Quoz, Ancestral Recall, Balance, Berserk, Black Lotus, Black Vise, Braingeyser, Bronze Tablet, Candelabra of Tawnos, Channel, Chaos Orb, Contract from Below, Copy Artifact, Darkpact, Demonic Attorney, Demonic Tutor, Divine Intervention, Falling Star, Feldon's Cane, Fork, Ivory Tower, Jeweled Bird, Library of Alexandria, Maze of Ith, Mind Twist, Mirror Universe, Mishra's Workshop, Mox Emerald, Mox Jet, Mox Pearl, Mox Ruby, Mox Sapphire, Rebirth, Recall, Regrowth, Shahrazad, Sol Ring, Tempest Efreet, Timetwister, Time Walk, Underworld Dreams, Wheel of Fortune, Zuran Orb
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type II, Alliances
|
|
||||||
Type:Historic
|
|
||||||
Order:171
|
|
||||||
Sets:FEM, 4ED, ICE, CHR, HML, ALL
|
|
||||||
Restricted:Balance, Black Vise, Ivory Tower, Zuran Orb
|
|
||||||
Banned:Amulet of Quoz, Bronze Tablet, Channel, Mind Twist, Rebirth, Tempest Efreet
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type II, Apr 1996
|
|
||||||
Type:Historic
|
|
||||||
Order:167
|
|
||||||
Sets:FEM, 4ED, ICE, CHR, HML
|
|
||||||
Restricted:Balance, Black Vise, Ivory Tower, Zuran Orb
|
|
||||||
Banned:Amulet of Quoz, Bronze Tablet, Channel, Mind Twist, Rebirth, Tempest Efreet
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type II, Feb 1996
|
|
||||||
Type:Historic
|
|
||||||
Order:165
|
|
||||||
Sets:FEM, 4ED, ICE, CHR, HML
|
|
||||||
Restricted:Balance, Black Vise, Feldon's Cane, Ivory Tower, Zuran Orb
|
|
||||||
Banned:Amulet of Quoz, Bronze Tablet, Channel, Mind Twist, Rebirth, Tempest Efreet
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type II, Homelands
|
|
||||||
Type:Historic
|
|
||||||
Order:163
|
|
||||||
Sets:FEM, 4ED, ICE, CHR, HML
|
|
||||||
Restricted:Balance, Feldon's Cane, Ivory Tower, Mind Twist, Zuran Orb
|
|
||||||
Banned:Amulet of Quoz, Bronze Tablet, Channel, Rebirth, Tempest Efreet
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type II, Nov 1995
|
|
||||||
Type:Historic
|
|
||||||
Order:161
|
|
||||||
Sets:FEM, 4ED, ICE, CHR
|
|
||||||
Restricted:Balance, Feldon's Cane, Ivory Tower, Mind Twist, Zuran Orb
|
|
||||||
Banned:Amulet of Quoz, Bronze Tablet, Channel, Rebirth, Tempest Efreet
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
[format]
|
|
||||||
Name:Type II, October 1995
|
|
||||||
Type:Historic
|
|
||||||
Order:159
|
|
||||||
Sets:FEM, 4ED, ICE, CHR
|
|
||||||
Restricted:Balance, Channel, Feldon's Cane, Ivory Tower, Mind Twist
|
|
||||||
Banned:Amulet of Quoz, Bronze Tablet, Rebirth, Tempest Efreet
|
|
||||||
Reference in New Issue
Block a user