Removed Tempest Remastered from "full" first/last-printed search. Upd…

…ated tests. Fixed bug with direct print time tests.
jhallbachner · Aug 21, 2016 · 7db36e7 · 7db36e7
1 parent 5499454
commit 7db36e7
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/lib/card.rb b/lib/card.rb
@@ -78,7 +78,8 @@ def all_legalities(date=nil)
   def first_release_date(filter="all")
     case filter
       when "full"
-        @printings.select{|pr| !%w(promo masters).include?(pr.set_type)}.map(&:release_date).compact.min
+        @printings.select{|pr| !%w(promo masters).include?(pr.set_type) && pr.set_code != 'tpr'}.map(&:release_date)
+          .compact.min
       when "expert"
         @printings.select{|pr| %w(core expansion).include?(pr.set_type)}.map(&:release_date).compact.min
       else
@@ -89,7 +90,8 @@ def first_release_date(filter="all")
   def last_release_date(filter="all")
     case filter
       when "full"
-        @printings.select{|pr| !%w(promo masters).include?(pr.set_type)}.map(&:release_date).compact.max
+        @printings.select{|pr| !%w(promo masters).include?(pr.set_type) && pr.set_code != 'tpr'}.map(&:release_date)
+          .compact.max
       when "expert"
         @printings.select{|pr| %w(core expansion).include?(pr.set_type)}.map(&:release_date).compact.max
       else

diff --git a/lib/condition/condition_print.rb b/lib/condition/condition_print.rb
@@ -1,7 +1,7 @@
 # This condition checks printing, first/lastprinted check card.
 # Should they check same thing?
 class ConditionPrint < Condition
-  def initialize(op, date, type)
+  def initialize(op, date, type = '')
     @op = op
     # Just for ConditionPrint#==
     if date.is_a?(Date)
@@ -21,7 +21,7 @@ def search(db)
       ps = db.printings.select{|card| match_date?(get_date(card, max_date), query_date, precision)}.to_set
 
       # avoid getting an and un confused
-      ps.select!{|printing| printing.set_code == @date} unless @date.is_a?(Date) || @op != '='
+      ps.select!{|printing| printing.set_code == @date} if %w(an un).include?(@date)
       ps
     else
       db.printings.to_set

diff --git a/test/test_full.rb b/test/test_full.rb
@@ -89,7 +89,7 @@ def test_print
     assert_search_results "t:jace firstprint=2012", "Jace, Architect of Thought"
 
     # This is fairly silly, as it includes prerelease promos etc.
-    assert_search_results "e:ktk firstprint<ktk",
+    assert_search_results "e:ktk firstprint*<ktk",
       "Abzan Ascendancy", "Act of Treason", "Anafenza, the Foremost",
       "Ankle Shanker", "Arc Lightning", "Avalanche Tusker", "Bloodsoaked Champion",
       "Bloodstained Mire", "Butcher of the Horde", "Cancel", "Crackling Doom",
@@ -107,7 +107,7 @@ def test_print
       "Trumpet Blast", "Utter End", "Villainous Wealth", "Windstorm", "Windswept Heath",
       "Wooded Foothills", "Zurgo Helmsmasher"
 
-    assert_search_results "e:ktk lastprint>ktk",
+    assert_search_results "e:ktk lastprint*>ktk",
       "Act of Treason", "Ainok Tracker", "Altar of the Brood", "Arc Lightning", "Bloodfell Caves", "Bloodstained Mire", "Blossoming Sands", "Briber's Purse", "Debilitating Injury", "Disdainful Stroke", "Dismal Backwater", "Dragonscale Boon", "Dutiful Return", "Flooded Strand", "Forest", "Ghostfire Blade", "Grim Haruspex", "Hordeling Outburst", "Incremental Growth", "Island", "Jeering Instigator", "Jungle Hollow", "Mountain", "Mystic of the Hidden Way", "Naturalize", "Plains", "Polluted Delta", "Ride Down", "Rugged Highlands", "Ruthless Ripper", "Scoured Barrens", "Shatter", "Smite the Monstrous", "Sultai Charm", "Summit Prowler", "Suspension Field", "Swamp", "Swiftwater Cliffs", "Thornwood Falls", "Throttle", "Tormenting Voice", "Tranquil Cove", "Watcher of the Roost", "Weave Fate", "Wind-Scarred Crag", "Windstorm", "Windswept Heath", "Wooded Foothills"
   end
 
@@ -116,7 +116,7 @@ def test_firstprint
   end
 
   def test_lastprint
-    assert_search_results "t:planeswalker lastprint<=roe", "Chandra Ablaze", "Sarkhan the Mad"
+    assert_search_results "t:planeswalker lastprint*<=roe", "Chandra Ablaze", "Sarkhan the Mad"
     assert_search_results "t:planeswalker lastprint<=2011",
       "Ajani Goldmane", "Ajani Vengeant", "Chandra Ablaze", "Elspeth Tirel",
       "Garruk Relentless", "Garruk, the Veil-Cursed", "Gideon Jura", "Liliana of the Veil",

diff --git a/test/test_printed.rb b/test/test_printed.rb
@@ -35,6 +35,7 @@ def test_last_printed
       "Karn, Silver Golem",
       "Masticore",
       "Memory Jar",
+      "Mox Diamond",
       "Sundering Titan",
       "Zuran Orb"
     # excludes cards reprinted in vintage masters
@@ -48,6 +49,26 @@ def test_last_printed
 
     assert_count_results "lastprint!=un", 27
     assert_count_results "lastprint=un", 25
-    assert_count_results "lastprint=un", 5
+    assert_count_results "lastprint*=un", 5
+  end
+
+  def test_unique_scenarios
+    # all reserved list cards that have been reprinted in paper nonetheless
+    assert_search_results "(lastprint>ud is:reserved) OR (lastprint*>ud st:promo is:reserved)",
+      "Deranged Hermit",
+      "Intuition",
+      "Karn, Silver Golem",
+      "Lightning Dragon",
+      "Masticore",
+      "Memory Jar",
+      "Morphling",
+      "Mox Diamond",
+      "Phyrexian Dreadnought",
+      "Phyrexian Negator",
+      "Powder Keg",
+      "Survival of the Fittest",
+      "Thawing Glaciers",
+      "Wheel of Fortune",
+      "Yawgmoth's Will"
   end
 end