Merge pull request #416 from TheRealNova422-real/patch-9

Fixed Gold Edition

Author: MathIsFun0

items/misc.lua

@@ -1073,7 +1073,7 @@ local glass_edition = {
 		end
 
 		if
-			context.cardarea == G.jokers and context.post_trigger --animation-wise this looks weird sometimes
+			context.cardarea == G.jokers and context.post_trigger and context.other_card == card --animation-wise this looks weird sometimes
 		then
 			if
 				not card.ability.eternal
@@ -1173,7 +1173,7 @@ local gold_edition = {
 	weight = 7,
 	extra_cost = 4,
 	in_shop = true,
-	config = { dollars = 2 },
+	config = { dollars = 2, active = true },
 	loc_vars = function(self, info_queue)
 		return { vars = { self.config.dollars } }
 	end,
@@ -1187,8 +1187,20 @@ local gold_edition = {
 		card.edition.cry_gold_seed = pseudorandom("e_cry_gold") * 2 - 1
 	end,
 	calculate = function(self, card, context)
-		if context.post_trigger or (context.using_consumeable and context.consumeable == card) then
-			SMODS.calculate_effect({ dollars = self.config.dollars }, card, true)
+		if
+			(
+				context.post_trigger -- for when on jonklers
+				and context.other_card == card
+			) or (
+				context.main_scoring -- for when on playing cards
+				and context.cardarea == G.play
+			) or (
+				context.using_consumeable -- for when using a consumable
+				and context.consumeable == card
+			)
+		then
+			print(context)
+			return { p_dollars = self.config.dollars } -- updated value
 		end
 	end,
 }

items/misc_joker.lua

@@ -1942,18 +1942,8 @@ local hunger = {
 	loc_vars = function(self, info_queue, center)
 		return { vars = { center.ability.extra.money } }
 	end,
-	calculate = function(self, card, context) --This didn't work for Jevonn for some reason but it works for me :joker:
-		if context.using_consumeable then --shush
-			ease_dollars(card.ability.extra.money)
-			card_eval_status_text(
-				context.blueprint_card or card,
-				"extra",
-				nil,
-				nil,
-				nil,
-				{ message = "$" .. card.ability.extra.money, colour = G.C.MONEY }
-			)
-		end
+	calculate = function(self, card, context) -- haha one liner
+		return context.using_consumeable and {p_dollars = card.ability.extra.money}
 	end,
 	cry_credits = {
 		idea = {