chipmult operator api stuff

Author: lord-ruby

items/exotic.lua

@@ -167,6 +167,13 @@ local universum = {
 	},
 	init = function(self)
 		--Universum Patches
+		SMODS.Scoring_Parameter:take_ownership("mult", {
+			level_up_hand = function(amount, hand)
+				if not next(find_joker('cry-Universum')) then
+					hand[self.key] = math.max(hand['s_'..self.key] + hand['l_'..self.key]*(hand.level - 1), 0)
+				end
+			end
+		})
 		local uht = update_hand_text
 		function update_hand_text(config, vals)
 			if next(find_joker("cry-Universum")) and (not Talisman or not Talisman.config_file.disable_anims) then

lib/overrides.lua

@@ -2115,8 +2115,9 @@ if SMODS and SMODS.Mods and (not SMODS.Mods.Talisman or not SMODS.Mods.Talisman.
 			if effect.card then
 				juice_card(effect.card)
 			end
-			hand_chips = mod_chips(hand_chips ^ amount)
-			update_hand_text({ delay = 0 }, { chips = hand_chips, mult = mult })
+			local chips = SMODS.Scoring_Parameters["chips"]
+			chips.current = mod_chips(chips.current ^ amount)
+			update_hand_text({delay = 0}, {chips = chips.current})
 			if not effect.remove_default_message then
 				if from_edition then
 					card_eval_status_text(
@@ -2125,31 +2126,20 @@ if SMODS and SMODS.Mods and (not SMODS.Mods.Talisman or not SMODS.Mods.Talisman.
 						nil,
 						percent,
 						nil,
-						{ message = "^" .. amount, colour = G.C.EDITION, edition = true, sound = "cry_chips" }
+						{ message = "^" .. amount, colour = G.C.EDITION, edition = true }
 					)
 				elseif key ~= "Echip_mod" then
-					if effect.echip_message or effect.message then
-						local msg = effect.echip_message or effect.message
-						if not msg.sound then
-							msg.sound = "cry_echips"
-						end
+					if effect.echip_message then
 						card_eval_status_text(
 							scored_card or effect.card or effect.focus,
-							"e_chips",
-							amount,
-							percent,
+							"extra",
 							nil,
-							msg
-						)
-					else
-						card_eval_status_text(
-							scored_card or effect.card or effect.focus,
-							"e_chips",
-							amount,
 							percent,
 							nil,
-							{ colour = G.C.DARK_EDITION }
+							effect.echip_message
 						)
+					else
+						card_eval_status_text(scored_card or effect.card or effect.focus, "e_chips", amount, percent)
 					end
 				end
 			end
@@ -2159,39 +2149,31 @@ if SMODS and SMODS.Mods and (not SMODS.Mods.Talisman or not SMODS.Mods.Talisman.
 			if effect.card then
 				juice_card(effect.card)
 			end
-			mult = mod_mult(mult ^ amount)
-			update_hand_text({ delay = 0 }, { chips = hand_chips, mult = mult })
+			local mult = SMODS.Scoring_Parameters["mult"]
+			mult.current = mod_mult(mult.current ^ amount)
+			update_hand_text({delay = 0}, {mult = mult.current})
 			if not effect.remove_default_message then
 				if from_edition then
-					card_eval_status_text(scored_card, "jokers", nil, percent, nil, {
-						message = "^" .. amount .. " " .. localize("k_mult"),
-						colour = G.C.EDITION,
-						edition = true,
-						sound = "cry_emult",
-					})
+					card_eval_status_text(
+						scored_card,
+						"jokers",
+						nil,
+						percent,
+						nil,
+						{ message = "^" .. amount .. " " .. localize("k_mult"), colour = G.C.EDITION, edition = true }
+					)
 				elseif key ~= "Emult_mod" then
-					if effect.emult_message or effect.message then
-						local msg = effect.echip_message or effect.message
-						if not msg.sound then
-							msg.sound = "cry_emult"
-						end
+					if effect.emult_message then
 						card_eval_status_text(
 							scored_card or effect.card or effect.focus,
-							"e_mult",
-							amount,
-							percent,
+							"extra",
 							nil,
-							msg
-						)
-					else
-						card_eval_status_text(
-							scored_card or effect.card or effect.focus,
-							"e_mult",
-							amount,
 							percent,
 							nil,
-							{ colour = G.C.DARK_EDITION }
+							effect.emult_message
 						)
+					else
+						card_eval_status_text(scored_card or effect.card or effect.focus, "e_mult", amount, percent)
 					end
 				end
 			end

lovely/universum.toml

@@ -3,42 +3,22 @@ version = "1.0.0"
 dump_lua = true
 priority = -1
 
-# Level up modifier
 [[patches]]
 [patches.pattern]
-target = "functions/common_events.lua"
-pattern = "amount = amount or 1"
-position = "after"
-payload = "if not next(find_joker('cry-Universum')) then"
-match_indent = true
-
-
-[[patches]]
-[patches.pattern]
-target = "functions/common_events.lua"
-pattern = "G.GAME.hands[hand].mult = math.max(G.GAME.hands[hand].s_mult + G.GAME.hands[hand].l_mult*(G.GAME.hands[hand].level - 1), 1)"
-position = "at"
-payload = "G.GAME.hands[hand].mult = math.max(G.GAME.hands[hand].mult + G.GAME.hands[hand].l_mult*amount, 1)"
-match_indent = true
-
-
-[[patches]]
-[patches.pattern]
-target = "functions/common_events.lua"
-pattern = "G.GAME.hands[hand].chips = math.max(G.GAME.hands[hand].s_chips + G.GAME.hands[hand].l_chips*(G.GAME.hands[hand].level - 1), 0)"
+target = '''=[SMODS _ "src/game_objects.lua"]'''
+pattern = "hand[self.key] = math.max(hand['s_'..self.key] + hand['l_'..self.key]*(hand.level - 1), 0)"
 position = "at"
 payload = '''
-G.GAME.hands[hand].chips = math.max(G.GAME.hands[hand].chips + G.GAME.hands[hand].l_chips*amount, 1)
+if not next(find_joker('cry-Universum')) then
+    hand[self.key] = math.max(hand['s_'..self.key] + hand['l_'..self.key]*(hand.level - 1), 0)
 else
     universum_mod = 1
     local effects = {}
     SMODS.calculate_context({cry_universum = true}, effects)
     for i = 1, #effects do
         universum_mod = universum_mod * (effects[i] and effects[i].jokers and effects[i].jokers.mod or 1)
     end
-    G.GAME.hands[hand].level = math.max(0, G.GAME.hands[hand].level + amount)
-    G.GAME.hands[hand].mult = G.GAME.hands[hand].mult * (universum_mod)^amount
-    G.GAME.hands[hand].chips = G.GAME.hands[hand].chips * (universum_mod)^amount
+    hand[self.key] = hand[self.key]* (universum_mod)^amount
 end
 '''
 match_indent = true