Merge pull request #715 from real-niacat/main

fix pointer on tags (plus optimizations!)

Author: lord-ruby

Cryptid.lua

@@ -187,6 +187,7 @@ function SMODS.injectItems(...)
 			end
 		end
 	end
+	Cryptid.inject_pointer_aliases()
 end
 
 local old_repitions = SMODS.calculate_repetitions

items/pointer.lua

@@ -259,17 +259,28 @@ local pointer = {
 			end
 
 			for i, v in pairs(G.P_TAGS) do -- TAGS
-				if Cryptid.pointergetalias(i) and not Cryptid.pointergetblist(i) then
+				local blacklist = Cryptid.pointergetblist(i)
+				-- gonna be real w/ you idk why pointergetblist is a table now so im just gonna check if everything in it is falsey
+				local can_spawn = true
+				for _,val in pairs(blacklist) do
+					can_spawn = can_spawn and (not val)
+				end
+
+				if Cryptid.pointergetalias(i) and can_spawn then
+
 					if v.name and apply_lower(entered_card) == apply_lower(v.name) then
 						current_card = i
+						break --no clue why this wasn't done before, you can't create 2 tags with one pointer
 					end
 					if apply_lower(entered_card) == apply_lower(i) then
 						current_card = i
+						break
 					end
 					if
 						apply_lower(entered_card) == apply_lower(localize({ type = "name_text", set = v.set, key = i }))
 					then
 						current_card = i
+						break
 					end
 				end
 			end
@@ -2569,12 +2580,33 @@ return {
 	name = "Pointer://",
 	items = pointeritems,
 	init = function()
-		print("[CRYPTID] Inserting Pointer Aliases")
-		local alify = Cryptid.pointeraliasify
-		Cryptid.pointerblistifytype("rarity", "cry_exotic", nil)
-		for key, aliasesTable in pairs(aliases) do
-			for _, alias in pairs(aliasesTable) do
-				alify(key, alias, nil)
+		function Cryptid.inject_pointer_aliases()
+			--print("[CRYPTID] Inserting Pointer Aliases")
+			local alify = Cryptid.pointeraliasify
+			Cryptid.pointerblistifytype("rarity", "cry_exotic", nil)
+			for key, aliasesTable in pairs(aliases) do
+				for _, alias in pairs(aliasesTable) do
+					alify(key, alias, nil)
+				end
+				alify(key, key, nil)
+			end
+			for _, group in pairs(G.localization.descriptions) do
+				if
+					_ ~= "Back"
+					and _ ~= "Content Set"
+					and _ ~= "Edition"
+					and _ ~= "Enhanced"
+					and _ ~= "Stake"
+					and _ ~= "Other"
+				then
+					for key, card in pairs(group) do
+						if G.P_CENTERS[key] then
+							alify(key, card.name, nil)
+							if G.P_CENTERS[key].name then alify(key, G.P_CENTERS[key].name, nil) end
+							if G.P_CENTERS[key].original_key then alify(key, G.P_CENTERS[key].original_key, nil) end
+						end
+					end
+				end
 			end
 		end
 	end,

lib/overrides.lua

@@ -1363,6 +1363,24 @@ function init_localization()
 			end
 		end
 	end
+
+	for _, group in pairs(G.localization.descriptions) do
+		if
+			_ ~= "Back"
+			and _ ~= "Content Set"
+			and _ ~= "Edition"
+			and _ ~= "Enhanced"
+			and _ ~= "Stake"
+			and _ ~= "Other"
+		then
+			for key, card in pairs(group) do
+				if G.P_CENTERS[key] then
+					Cryptid.pointeraliasify(key, card.name, true)
+				end
+			end
+		end
+	end
+	Cryptid.inject_pointer_aliases()
 end
 
 --Fix a corrupted game state

lib/pointerlib.lua

@@ -25,18 +25,10 @@ function Cryptid.pointeraliasify(target, key, remove) -- Add a specific alias/ke
 		key = string.lower(key:gsub("%b{}", ""):gsub("%s+", ""))
 	end
 	if not remove then
-		if not Cryptid.pointeralias[target] then
-			Cryptid.pointeralias[target] = {}
-		end
-		Cryptid.pointeralias[target][#Cryptid.pointeralias[target] + 1] = key
+		Cryptid.pointeralias[key] = target
 		return true
 	else
-		for v = 1, #Cryptid.pointeralias[target] do
-			if Cryptid.pointeralias[target][v] == key then
-				table.remove(Cryptid.pointeralias, v)
-				return true
-			end
-		end
+		Cryptid.pointeralias[key] = nil
 	end
 	return false
 end
@@ -90,50 +82,16 @@ function Cryptid.pointergetalias(target) -- "Is this alias legit?"
 		end
 		return string.lower(strn)
 	end
-	for _, group in pairs(G.localization.descriptions) do
-		if
-			_ ~= "Back"
-			and _ ~= "Content Set"
-			and _ ~= "Edition"
-			and _ ~= "Enhanced"
-			and _ ~= "Stake"
-			and _ ~= "Other"
-		then
-			for key, card in pairs(group) do
-				if G.P_CENTERS[key] then
-					if apply_lower(card.name) == apply_lower(target) then
-						return key
-					end
-				end
-			end
-		end
-	end
-	for card, _ in pairs(Cryptid.pointeralias) do
-		if apply_lower(card) == apply_lower(target) then
-			return card
-		end
-		for _, alias in ipairs(Cryptid.pointeralias[card]) do
-			if apply_lower(alias) == apply_lower(target) then
-				return card
-			end
-		end
-	end
-	for keym, card in pairs(G.P_CENTERS) do
-		if apply_lower(card.name) == apply_lower(target) then
-			return keym
-		end
-		if apply_lower(card.original_key) == apply_lower(target) then
-			return keym
-		end
-		if apply_lower(keym) == apply_lower(target) then
-			return keym
-		end
-	end
+	if Cryptid.pointeralias[apply_lower(target)] then return Cryptid.pointeralias[apply_lower(target)] end
+	if G.P_CENTERS[apply_lower(target)] then return G.P_CENTERS[apply_lower(target)].key end
+	if Cryptid.pointeralias[target] then return Cryptid.pointeralias[target] end
+	if G.P_CENTERS[target] then return G.P_CENTERS[target].key end
 	return false
 end
 
 function Cryptid.pointergetblist(target) -- "Is this card pointer banned?"
-	target = Cryptid.pointergetalias(target)
+	target = Cryptid.pointergetalias(target) or target
+	target = G.P_CENTERS[target] or target
 	results = {}
 	results[1] = false
 	if not target then