From 6fa23989cd7086d6a98bc14d7a0564603dcde869 Mon Sep 17 00:00:00 2001
From: Connor Mills <connor@virtualized.dev>
Date: Sun, 23 Mar 2025 18:59:54 -0700
Subject: [PATCH] Refactored clean_hand

---
 FNPreview/Card.lua  | 18 +++---------------
 FNPreview/Utils.lua | 10 ++++++++++
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/FNPreview/Card.lua b/FNPreview/Card.lua
index 33298f4..4b33d4e 100644
--- a/FNPreview/Card.lua
+++ b/FNPreview/Card.lua
@@ -4,22 +4,10 @@
 
 local orig_get_X_same = get_X_same
 function get_X_same(num, hand)
-	local clean_hand = {}
-	for _, v in pairs(hand) do
-		if v.get_id then
-			table.insert(clean_hand, v)
-		end
-	end
-	return orig_get_X_same(num, clean_hand)
+	return orig_get_X_same(num, clean_hand(hand))
 end
 
 local orig_get_highest = get_highest
 function get_highest(hand)
-    local clean_hand = {}
-    for _, v in pairs(hand) do
-        if v.get_nominal then
-            table.insert(clean_hand, v)
-        end
-    end
-    return orig_get_highest(clean_hand)
-end
+	return orig_get_highest(clean_hand(hand))
+end
\ No newline at end of file
diff --git a/FNPreview/Utils.lua b/FNPreview/Utils.lua
index 0fac3d2..1f7d030 100644
--- a/FNPreview/Utils.lua
+++ b/FNPreview/Utils.lua
@@ -39,3 +39,13 @@ end
 function DV.PRE.enabled()
    return G.SETTINGS.DV.preview_score or G.SETTINGS.DV.preview_dollars
 end
+
+function clean_hand(hand)
+   local clean_hand = {}
+	for _, v in pairs(hand) do
+		if v.get_id then -- Should work for all functions even if they don't use get_id because get_id is a meta function and the broken cards don't have meta values
+			table.insert(clean_hand, v)
+		end
+	end
+   return clean_hand
+end