Merge pull request #441 from SDM0/main

Author: MathIsFun0

items/achievement.lua

@@ -337,7 +337,7 @@ local home_realtor = {
 	atlas = "cry_achievements",
 	--reset_on_startup = true,
 	unlock_condition = function(self, args)
-		--todo: check for doe/antimatter sleeves
+		--TODO: check for antimatter sleeve in the check_unlock when it's added
 		if args.type == "home_realtor" then
 			return true
 		end

items/misc_joker.lua

@@ -144,9 +144,15 @@ local happyhouse = {
 			if
 				card.ability.extra.check == 114
 				and G.GAME.round_resets.ante < 8
-				and not (
-					G.GAME.selected_back.effect.center.key == "antimatter"
-					or G.GAME.selected_back.effect.center.key == "equilibrium"
+				and not (G.GAME.selected_back.effect.center.key == "antimatter" or G.GAME.selected_back.effect.center.key == "equilibrium")
+				and (
+					not CardSleeves
+					or (
+						CardSleeves
+						and G.GAME.selected_sleeve
+						--	and G.GAME.selected_sleeve ~= "sleeve_cry_antimatter_sleeve"	TODO: Add check if Antimatter sleeve gets added
+						and G.GAME.selected_sleeve ~= "sleeve_cry_equilibrium_sleeve"
+					)
 				)
 			then --Yes, the cut off point is boss blind Ante 7. I'm evil >:3.
 				check_for_unlock({ type = "home_realtor" })
@@ -1750,17 +1756,20 @@ local gardenfork = {
 		return { vars = { center.ability.extra.money } }
 	end,
 	calculate = function(self, card, context)
-		if context.cardarea == G.jokers and context.before then
+		if context.cardarea == G.jokers and context.before and context.full_hand then
+			local has_ace = false
+			local has_7 = false
 			for i = 1, #context.full_hand do
 				if context.full_hand[i]:get_id() == 14 then
-					for j = 1, #context.full_hand do
-						if context.full_hand[j]:get_id() == 7 then -- :( ekshpenshive
-							ease_dollars(card.ability.extra.money)
-							return { message = "$" .. card.ability.extra.money, colour = G.C.MONEY }
-						end
-					end
+					has_ace = true
+				elseif context.full_hand[i]:get_id() == 7 then
+					has_7 = true
 				end
 			end
+			if has_ace and has_7 then
+				ease_dollars(card.ability.extra.money)
+				return { message = "$" .. card.ability.extra.money, colour = G.C.MONEY }
+			end
 		end
 	end,
 	cry_credits = {

items/spectral.lua

@@ -713,16 +713,15 @@ local ritual = {
 	atlas = "atlasnotjokers",
 	pos = { x = 5, y = 1 },
 	can_use = function(self, card)
-		--TODO: CCD card compat
-		if #G.hand.highlighted > card.ability.max_highlighted then
-			return false
-		end
-		for _, v in ipairs(G.hand.highlighted) do
-			if v.edition then
-				return false
+		if card.area ~= G.hand then
+			return G.hand and (#G.hand.highlighted == 1) and G.hand.highlighted[1] and not G.hand.highlighted[1].edition
+		else
+			local idx = 1
+			if G.hand.highlighted[1] == card then
+				idx = 2
 			end
+			return (#G.hand.highlighted == 2) and not G.hand.highlighted[idx].edition
 		end
-		return true
 	end,
 	use = function(self, card, area, copier)
 		local used_consumable = copier or card