Merge pull request #730 from crazybot27/main

fix pizza slice and stop conduit bypassing no_dbl

Author: lord-ruby

items/misc_joker.lua

@@ -10354,7 +10354,12 @@ local pizza_slice = { -- +1 to all listed probabilities for the highest cat tag
 	calculate = function(self, card, context)
 		if context.joker_main then
 			return {
-				xmult = card.ability.xmult,
+				message = localize({
+					type = "variable",
+					key = "a_xmult",
+					vars = { number_format(card.ability.extra.xmult) },
+				}),
+				Xmult_mod = lenient_bignum(card.ability.extra.xmult),
 			}
 		end
 		if context.selling_card and context.card and context.card.config.center.key == "j_cry_pizza_slice" then

items/spectral.lua

@@ -869,19 +869,31 @@ local conduit = {
 	atlas = "atlasnotjokers",
 	can_use = function(self, card)
 		local combinedTable = {}
+		dbl = false
+		no_dbl = false
 
 		for _, value in ipairs(G.hand.highlighted) do
 			if value ~= card then
+				if Card.no(value, "dbl") then
+					no_dbl = true
+				elseif value.edition and value.edition.cry_double_sided then
+					dbl = true
+				end
 				table.insert(combinedTable, value)
 			end
 		end
 
 		for _, value in ipairs(G.jokers.highlighted) do
 			if value ~= card then
+				if Card.no(value, "dbl") then
+					no_dbl = true
+				elseif value.edition and value.edition.cry_double_sided then
+					dbl = true
+				end
 				table.insert(combinedTable, value)
 			end
 		end
-		return (#combinedTable == 2)
+		return (#combinedTable == 2 and not (dbl and no_dbl))
 	end,
 	use = function(self, card, area, copier)
 		local used_consumable = copier or card

localization/en-us.lua

@@ -2693,9 +2693,9 @@ return {
 			j_cry_pizza_slice = {
 				name = "Pizza Slice",
 				text = {
-					"This Joker gains {X:mult,C:white}X#1#{}",
-					"per {C:attention}Pizza Slice{} sold",
-					"{C:inactive}(Currently{} {X:mult,C:white}X#2#{}{C:inactive}){}",
+					"This Joker gains {X:mult,C:white}X#1#{} Mult",
+					"when a {C:attention}Pizza Slice{} is sold",
+					"{C:inactive}(Currently{} {X:mult,C:white}X#2#{}{C:inactive} Mult){}",
 				},
 			},
 			j_cry_spaceglobe = {