Make Monster less scuffed internally

wtf was I on geez

Author: Jevonnissocoolman

items/joker_display.lua

@@ -1806,7 +1806,7 @@ if JokerDisplay then
 			{
 				border_nodes = {
 					{ text = "X" },
-					{ ref_table = "card.ability.extra", ref_value = "mult", retrigger_type = "exp" },
+					{ ref_table = "card.ability.extra", ref_value = "monster", retrigger_type = "exp" },
 				},
 			},
 		},

items/m.lua

@@ -1403,29 +1403,25 @@ local longboi = {
 	name = "cry-longboi",
 	key = "longboi",
 	pos = { x = 5, y = 4 },
-	config = { extra = { mult = nil, bonus = 0.75 } },
+	config = { extra = { monster = 1, bonus = 0.75 } },
 	rarity = 1,
 	cost = 5,
 	order = 261,
 	pools = { ["M"] = true },
-	no_dbl = true,
 	blueprint_compat = true,
 	eternal_compat = false,
 	loc_vars = function(self, info_queue, center)
 		return {
 			vars = {
-				math.max(0.75, math.floor(center.ability.extra.bonus)),
-				(center.ability.extra.mult ~= nil and center.ability.extra.mult or (G.GAME.monstermult or 1)),
+				math.max(0.75, center.ability.extra.bonus),
+				center.ability.extra.monster,
 			},
 		}
 	end,
 	atlas = "atlasthree",
 	calculate = function(self, card, context)
 		if context.end_of_round and not context.individual and not context.repetition then
-			if not G.GAME.monstermult then
-				G.GAME.monstermult = 1
-			end
-			G.GAME.monstermult = G.GAME.monstermult + math.max(0.75, math.floor(card.ability.extra.bonus))
+			G.GAME.monstermult = G.GAME.monstermult + math.max(0.75, card.ability.extra.bonus)
 			if not context.retrigger_joker then
 				return {
 					card_eval_status_text(context.blueprint_card or card, "extra", nil, nil, nil, {
@@ -1434,22 +1430,15 @@ local longboi = {
 					}),
 				}
 			end
-		elseif context.joker_main and ((card.ability.extra.mult or 1) > 1) then
+		elseif context.joker_main and card.ability.extra.monster > 1 then
 			return {
-				message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.extra.mult } }),
-				Xmult_mod = card.ability.extra.mult,
+				message = localize({ type = "variable", key = "a_xmult", vars = { card.ability.extra.monster } }),
+				Xmult_mod = card.ability.extra.monster,
 			}
 		end
 	end,
-	add_to_deck = function(self, card, from_debuff)
-		if (not from_debuff and card.ability.extra.mult == nil) or card.checkmonster then
-			--Stops Things like Gemini from updating mult when it isn't supposed to
-			if card.checkmonster then
-				card.checkmonster = nil
-			end
-
-			card.ability.extra.mult = G.GAME.monstermult or 1
-		end
+	set_ability = function(self, card, from_debuff)
+		card.ability.extra.monster = G.GAME and G.GAME.monstermult or 1
 	end,
 	cry_credits = {
 		idea = {

lib/overrides.lua

@@ -169,6 +169,7 @@ function Game:init_game_object()
 	-- Add initial dropshot and number blocks card
 	g.current_round.cry_nb_card = { rank = "Ace" }
 	g.current_round.cry_dropshot_card = { suit = "Spades" }
+	g.monstermult = 1
 	-- Create G.GAME.events when starting a run, so there's no errors
 	g.events = {}
 	return g

lovely/misc.toml

@@ -23,15 +23,14 @@ new_card.from_copy = true
 '''
 match_indent = true
 
-# Used to check for Monster from copy_card and update values
-# more or less the same patch above but this also applies if strip_edition is true
+# Update value of Monsters created via copy_card
 [[patches]]
 [patches.pattern]
 target = 'functions/common_events.lua'
 pattern = "if not strip_edition then"
 position = 'before'
 payload = '''
-new_card.checkmonster = true
+if new_card.ability.extra.monster then new_card.ability.extra.monster = G.GAME.monstermult end
 '''
 match_indent = true