Hide palette selector for deckskins/collabs that have only a single palette (#1163)

Author: VivianGiacobbi

lovely/deck_skins.toml

@@ -6,97 +6,6 @@ priority = -10
 #========================================================#
 # Choose any rank for custom deck and use provided atlas #
 #========================================================#
-[[patches]]
-[patches.pattern]
-target = "functions/UI_definitions.lua"
-pattern = "{n=G.UIT.O, config={object = face_cards}}"
-position = "at"
-payload = "{n=G.UIT.O, config={object = G.cdds_cards}}"
-match_indent = true
-overwrite = false
-
-[[patches]]
-[patches.pattern]
-target = "functions/UI_definitions.lua"
-pattern = "table.insert(t, create_toggle({label = localize('b_high_contrast_cards'), ref_table = G.SETTINGS, ref_value = 'colourblind_option', callback = G.FUNCS.refresh_contrast_mode}))"
-position = "at"
-payload = '''
-local deckskin_key = G.COLLABS.options[_suit][current_option]
-
-local palette_loc_options = SMODS.DeckSkin.get_palette_loc_options(deckskin_key, _suit)
-
-local selected_palette = 1
-for i, v in ipairs(G.COLLABS.colour_palettes[deckskin_key]) do
-    if G.SETTINGS.colour_palettes[_suit] == v then
-        selected_palette = i
-    end
-end
-
-table.insert(t,
-    {n=G.UIT.R, config={align = "cm", id = 'palette_selector'}, nodes={
-      create_option_cycle({options = palette_loc_options, w = 5.5, cycle_shoulders = false, curr_suit = _suit, curr_skin = deckskin_key, opt_callback = 'change_colour_palette', current_option = selected_palette, colour = G.C.ORANGE, focus_args = {snap_to = true, nav = 'wide'}}),
-    }}
-  )
-'''
-match_indent = true
-overwrite = false
-
-#=======================#
-# Extend custom deck ui #
-#=======================#
-[[patches]]
-[patches.regex]
-target = "functions/UI_definitions.lua"
-pattern = '''local face_cards = CardArea\(([\s\S]*?)\)'''
-position = "at"
-payload = '''
-local rankCount = 0
-local lookup = {}
-for i, s in ipairs(SMODS.Suit:obj_list(true)) do
-    local options = G.COLLABS.options[s.key]
-    for i = 1, #options do
-        local skin = SMODS.DeckSkins[options[i]]
-        if skin.palettes and not (skin.display_ranks or skin.ranks) then
-            for _, p in ipairs(skin.palettes) do
-                local p_ranks = p.display_ranks or p.ranks
-                for j = 1, #p_ranks do
-                    if not lookup[p_ranks[j]] then
-                        lookup[p_ranks[j]] = true
-                        rankCount = rankCount + 1
-                    end
-                end
-            end
-        elseif not skin.palettes and (skin.display_ranks or skin.ranks) then
-            local ranks = skin.display_ranks or skin.ranks
-            for j = 1, #ranks do
-                if not lookup[skin.ranks[j]] then
-                    lookup[skin.ranks[j]] = true
-                    rankCount = rankCount + 1
-                end
-            end
-        end
-
-    end
-end
-
-G.cdds_cards = CardArea(
-    0,0,
-    math.min(math.max(rankCount*G.CARD_W*0.6, 4*G.CARD_W), 10*G.CARD_W),
-    1.4*G.CARD_H,
-    {card_limit = rankCount, type = 'title', highlight_limit = 0})
-
-G.cdds_cards.rankCount = rankCount
-
-'''
-
-[[patches]]
-[patches.regex]
-target = "functions/UI_definitions.lua"
-pattern = '''for i = 1, 3 do([\s\S]*?)end'''
-position = "at"
-payload = '''
-G.FUNCS.update_collab_cards(current_option, _suit, true)
-'''
 
 [[patches]]
 [patches.regex]
@@ -183,4 +92,19 @@ target = "functions/UI_definitions.lua"
 pattern = '''label = "Collabs",'''
 position = "after"
 payload = '''chosen = SMODS.init_collab_credits,'''
-match_indent = true
+match_indent = true
+
+# Add note for overriden function
+[[patches]]
+[patches.pattern]
+target = 'functions/UI_definitions.lua'
+match_indent = true
+position = 'before'
+pattern = '''
+function G.UIDEF.custom_deck_tab(_suit)
+'''
+payload = '''
+-- WARNING
+-- This function is overriden by SMODS and can be found in src/ui.lua
+-- WARNING
+'''

src/overrides.lua

@@ -575,11 +575,11 @@ end
 
 
 function G.UIDEF.stake_option(_type)
-	
+
 	local middle = {n=G.UIT.R, config={align = "cm", minh = 1.7, minw = 7.3}, nodes={
 		{n=G.UIT.O, config={id = nil, func = 'RUN_SETUP_check_stake2', object = Moveable()}},
 	}}
-	
+
 	local stake_options = {}
 	local curr_options = {}
 	local deck_usage = G.PROFILES[G.SETTINGS.profile].deck_usage[G.GAME.viewed_back.effect.center.key]
@@ -590,7 +590,7 @@ function G.UIDEF.stake_option(_type)
 			curr_options[i] = #stake_options
 		end
 	end
-	
+
 	return {n=G.UIT.ROOT, config={align = "tm", colour = G.C.CLEAR, minh = 2.03, minw = 8.3}, nodes={
 		_type == 'Continue' and middle
 		or create_option_cycle({options = stake_options, opt_callback = 'change_stake', current_option = curr_options[G.viewed_stake] or 1,
@@ -865,7 +865,7 @@ function tally_sprite(pos, value, tooltip, suit)
 		local atlas_key_2 = ("ui_" .. (G.SETTINGS.colourblind_option and "2" or "1"))
 		local atlas = SMODS.get_atlas(atlas_key_1) or SMODS.get_atlas(atlas_key_2)
 		t_s = SMODS.create_sprite(0, 0, 0.3, 0.3, atlas, SMODS.Suits[suit].ui_pos)
-	else 
+	else
 		local atlas_key_1 = suit and SMODS.Suits[suit][G.SETTINGS.colourblind_option and "hc_ui_atlas" or "lc_ui_atlas"]
 		local atlas_key_2 = ("ui_"..(G.SETTINGS.colourblind_option and "2" or "1"))
 		local atlas = SMODS.get_atlas(atlas_key_1) or SMODS.get_atlas(atlas_key_2)
@@ -1219,7 +1219,7 @@ G.FUNCS.your_suits_page = function(args)
 	G.VIEWING_DECK = true
 	table.sort(G.playing_cards, function(a, b) return a:get_nominal('suit') > b:get_nominal('suit') end)
 	local SUITS = {}
-	local suit_map = {} 
+	local suit_map = {}
 	for i = #SMODS.Suit.obj_buffer, 1, -1 do
 		SUITS[SMODS.Suit.obj_buffer[i]] = {}
 		suit_map[#suit_map + 1] = SMODS.Suit.obj_buffer[i]
@@ -1640,7 +1640,7 @@ function create_UIBox_current_hands(simple, in_collection)
 						no_pips = true,
 						in_collection = in_collection
 					}) }
-			} or nil } 
+			} or nil }
 	}
 
 	local t = {
@@ -1944,9 +1944,9 @@ function create_UIBox_notify_alert(_achievement, _type)
   t_s.states.drag.can = false
   t_s.states.hover.can = false
   t_s.states.collide.can = false
- 
+
   local subtext = _type == 'achievement' and localize(G.F_TROPHIES and 'k_trophy' or 'k_achievement') or
-    _type == 'Joker' and localize('k_joker') or 
+    _type == 'Joker' and localize('k_joker') or
     _type == 'Voucher' and localize('k_voucher') or
 	_type == 'Back' and localize('k_deck') or
 	_c.set and localize('k_' .. _c.set:lower()) or
@@ -2031,7 +2031,7 @@ end
 -- silent = boolean value
 function Card:set_edition(edition, immediate, silent, delay)
 	SMODS.enh_cache:write(self, nil)
-	
+
 	if self.edition then
 		self.ability.card_limit = self.ability.card_limit - (self.edition.card_limit or 0)
 		self.ability.extra_slots_used = self.ability.extra_slots_used - (self.edition.extra_slots_used or 0)
@@ -2442,16 +2442,21 @@ G.FUNCS.change_collab = function(args)
 	end
 	G.FUNCS.update_suit_colours(args.cycle_config.curr_suit, deckskin_key, selected_palette)
 	G.FUNCS.update_collab_cards(args.to_key, args.cycle_config.curr_suit)
-	if swap_node then
-		for i=1, #swap_node.children do
-			swap_node.children[i]:remove()
-			swap_node.children[i] = nil
-		end
-		local new_palette_selector = {n=G.UIT.R, config={align = "cm", id = 'palette_selector'}, nodes={
-			create_option_cycle({options = palette_loc_options, w = 5.5, cycle_shoulders = false, curr_suit = args.cycle_config.curr_suit, curr_skin = deckskin_key, opt_callback = 'change_colour_palette', current_option = selected_palette, colour = G.C.ORANGE, focus_args = {snap_to = true, nav = 'wide'}}),
+
+	local swap_node = G.OVERLAY_MENU:get_UIE_by_ID('palette_selector')
+	for i=1, #swap_node.children do
+		swap_node.children[i]:remove()
+		swap_node.children[i] = nil
+	end
+    if #palette_loc_options > 1 then
+		local opt_cycle = create_option_cycle({options = palette_loc_options, w = 4.5, h = 0.5, text_scale = 0.3, cycle_shoulders = false, curr_suit = args.cycle_config.curr_suit, curr_skin = deckskin_key, opt_callback = 'change_colour_palette', current_option = selected_palette, colour = G.C.ORANGE, focus_args = {snap_to = true, nav = 'wide'}})
+		opt_cycle.nodes[1].config.padding = 0.085
+		local new_palette_selector = {n=G.UIT.R, config={align = "cm", id = 'palette_selector', minh = 0.85}, nodes={
+			opt_cycle
 		}}
 		swap_node.UIBox:add_child(new_palette_selector, swap_node)
-	end
+    end
+
 	for k, v in pairs(G.I.CARD) do
 		if v.config and v.config.card and v.children.front and v.ability.effect ~= 'Stone Card' then
 			v:set_sprites(nil, v.config.card)
@@ -2496,7 +2501,7 @@ end
 local debuff_card = Blind.debuff_card
 function Blind:debuff_card(card, from_blind)
 	local flags = SMODS.calculate_context({ debuff_card = card, ignore_debuff = true })
-	if flags.prevent_debuff then 
+	if flags.prevent_debuff then
 		if card.debuff then card:set_debuff(false) end
 		return
 	elseif flags.debuff then
@@ -2571,7 +2576,7 @@ function Card:set_base(card, initial, manual_sprites)
                 SMODS.merge_defaults(contexts, {change_rank = true, other_card = self, new_rank = new_rank, old_rank = self.base.id, rank_increase = ((self.base.id < new_rank) and true) or false})
             end
         end
-        if card and card.suit and self.base.suit ~= card.suit then 
+        if card and card.suit and self.base.suit ~= card.suit then
             SMODS.merge_defaults(contexts, {change_suit = true, other_card = self, new_suit = card.suit, old_suit = self.base.suit})
         end
         if next(contexts) then