From e51d39dcc3f2c02a9f0f83742f1bc81b1236b5eb Mon Sep 17 00:00:00 2001 From: maustin Date: Tue, 10 Apr 2018 08:25:08 +0100 Subject: [PATCH] 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 --- forge-game/src/main/java/forge/game/GameFormat.java | 2 +- forge-gui/res/formats/Extended, Oct 1999.txt | 2 +- forge-gui/res/formats/Type I, Alliances.txt | 7 ------- forge-gui/res/formats/Type I, Apr 1996.txt | 7 ------- forge-gui/res/formats/Type I, Feb 1996.txt | 7 ------- forge-gui/res/formats/Type I, Homelands.txt | 7 ------- forge-gui/res/formats/Type I, Nov 1995.txt | 7 ------- forge-gui/res/formats/Type I, October 1995.txt | 7 ------- forge-gui/res/formats/Type I.5, Alliances.txt | 6 ------ forge-gui/res/formats/Type I.5, May 1996.txt | 6 ------ forge-gui/res/formats/Type II, Alliances.txt | 7 ------- forge-gui/res/formats/Type II, Apr 1996.txt | 7 ------- forge-gui/res/formats/Type II, Feb 1996.txt | 7 ------- forge-gui/res/formats/Type II, Homelands.txt | 7 ------- forge-gui/res/formats/Type II, Nov 1995.txt | 7 ------- forge-gui/res/formats/Type II, October 1995.txt | 7 ------- 16 files changed, 2 insertions(+), 98 deletions(-) delete mode 100644 forge-gui/res/formats/Type I, Alliances.txt delete mode 100644 forge-gui/res/formats/Type I, Apr 1996.txt delete mode 100644 forge-gui/res/formats/Type I, Feb 1996.txt delete mode 100644 forge-gui/res/formats/Type I, Homelands.txt delete mode 100644 forge-gui/res/formats/Type I, Nov 1995.txt delete mode 100644 forge-gui/res/formats/Type I, October 1995.txt delete mode 100644 forge-gui/res/formats/Type I.5, Alliances.txt delete mode 100644 forge-gui/res/formats/Type I.5, May 1996.txt delete mode 100644 forge-gui/res/formats/Type II, Alliances.txt delete mode 100644 forge-gui/res/formats/Type II, Apr 1996.txt delete mode 100644 forge-gui/res/formats/Type II, Feb 1996.txt delete mode 100644 forge-gui/res/formats/Type II, Homelands.txt delete mode 100644 forge-gui/res/formats/Type II, Nov 1995.txt delete mode 100644 forge-gui/res/formats/Type II, October 1995.txt diff --git a/forge-game/src/main/java/forge/game/GameFormat.java b/forge-game/src/main/java/forge/game/GameFormat.java index f6cfe79b3a1..37016ccd362 100644 --- a/forge-game/src/main/java/forge/game/GameFormat.java +++ b/forge-game/src/main/java/forge/game/GameFormat.java @@ -123,7 +123,7 @@ public class GameFormat implements Comparable { } 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)); } return p; diff --git a/forge-gui/res/formats/Extended, Oct 1999.txt b/forge-gui/res/formats/Extended, Oct 1999.txt index 7c578977c06..d36362bf36f 100644 --- a/forge-gui/res/formats/Extended, Oct 1999.txt +++ b/forge-gui/res/formats/Extended, Oct 1999.txt @@ -4,5 +4,5 @@ Order:571 Subtype:Rotating Type:Historic 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 \ No newline at end of file diff --git a/forge-gui/res/formats/Type I, Alliances.txt b/forge-gui/res/formats/Type I, Alliances.txt deleted file mode 100644 index fb5d4e37ad4..00000000000 --- a/forge-gui/res/formats/Type I, Alliances.txt +++ /dev/null @@ -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 diff --git a/forge-gui/res/formats/Type I, Apr 1996.txt b/forge-gui/res/formats/Type I, Apr 1996.txt deleted file mode 100644 index 7e6f62bd82f..00000000000 --- a/forge-gui/res/formats/Type I, Apr 1996.txt +++ /dev/null @@ -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 diff --git a/forge-gui/res/formats/Type I, Feb 1996.txt b/forge-gui/res/formats/Type I, Feb 1996.txt deleted file mode 100644 index d2e6fb5cd5c..00000000000 --- a/forge-gui/res/formats/Type I, Feb 1996.txt +++ /dev/null @@ -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 diff --git a/forge-gui/res/formats/Type I, Homelands.txt b/forge-gui/res/formats/Type I, Homelands.txt deleted file mode 100644 index 6df3bdfc30e..00000000000 --- a/forge-gui/res/formats/Type I, Homelands.txt +++ /dev/null @@ -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 diff --git a/forge-gui/res/formats/Type I, Nov 1995.txt b/forge-gui/res/formats/Type I, Nov 1995.txt deleted file mode 100644 index 5a64c35753e..00000000000 --- a/forge-gui/res/formats/Type I, Nov 1995.txt +++ /dev/null @@ -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 diff --git a/forge-gui/res/formats/Type I, October 1995.txt b/forge-gui/res/formats/Type I, October 1995.txt deleted file mode 100644 index 7196aecf0ef..00000000000 --- a/forge-gui/res/formats/Type I, October 1995.txt +++ /dev/null @@ -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 diff --git a/forge-gui/res/formats/Type I.5, Alliances.txt b/forge-gui/res/formats/Type I.5, Alliances.txt deleted file mode 100644 index e640e009307..00000000000 --- a/forge-gui/res/formats/Type I.5, Alliances.txt +++ /dev/null @@ -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 diff --git a/forge-gui/res/formats/Type I.5, May 1996.txt b/forge-gui/res/formats/Type I.5, May 1996.txt deleted file mode 100644 index 13735163be9..00000000000 --- a/forge-gui/res/formats/Type I.5, May 1996.txt +++ /dev/null @@ -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 diff --git a/forge-gui/res/formats/Type II, Alliances.txt b/forge-gui/res/formats/Type II, Alliances.txt deleted file mode 100644 index 19ca0b3d860..00000000000 --- a/forge-gui/res/formats/Type II, Alliances.txt +++ /dev/null @@ -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 diff --git a/forge-gui/res/formats/Type II, Apr 1996.txt b/forge-gui/res/formats/Type II, Apr 1996.txt deleted file mode 100644 index c474c40d4c9..00000000000 --- a/forge-gui/res/formats/Type II, Apr 1996.txt +++ /dev/null @@ -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 diff --git a/forge-gui/res/formats/Type II, Feb 1996.txt b/forge-gui/res/formats/Type II, Feb 1996.txt deleted file mode 100644 index 0fe738bd02d..00000000000 --- a/forge-gui/res/formats/Type II, Feb 1996.txt +++ /dev/null @@ -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 diff --git a/forge-gui/res/formats/Type II, Homelands.txt b/forge-gui/res/formats/Type II, Homelands.txt deleted file mode 100644 index a9658cc91d0..00000000000 --- a/forge-gui/res/formats/Type II, Homelands.txt +++ /dev/null @@ -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 diff --git a/forge-gui/res/formats/Type II, Nov 1995.txt b/forge-gui/res/formats/Type II, Nov 1995.txt deleted file mode 100644 index b3a4d0658ab..00000000000 --- a/forge-gui/res/formats/Type II, Nov 1995.txt +++ /dev/null @@ -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 diff --git a/forge-gui/res/formats/Type II, October 1995.txt b/forge-gui/res/formats/Type II, October 1995.txt deleted file mode 100644 index 4bfcaa4a4b6..00000000000 --- a/forge-gui/res/formats/Type II, October 1995.txt +++ /dev/null @@ -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