Better UI

Author: MathIsFun0

items/spooky.lua

@@ -117,10 +117,6 @@ local choco_dice = {
 	no_dbl = true,
 	loc_vars = function(self, info_queue, center)
 		if not center then --tooltip
-		elseif not center.added_to_deck then
-			for i = 1, 10 do
-				info_queue[#info_queue + 1] = { set = "Other", key = "ev_cry_choco" .. i }
-			end
 		else
 			SMODS.Events["ev_cry_choco" .. center.ability.extra.roll]:loc_vars(info_queue, center)
 		end

lib/event.lua

@@ -9,7 +9,7 @@ SMODS.Event = SMODS.GameObject:extend({
 		"key",
 	},
 	inject = function() end,
-	set = "Event",
+	set = "Other",
 	class_prefix = "ev",
 	-- This should be called to start an event.
 	start = function(self)

lib/ui.lua

@@ -222,3 +222,17 @@ SMODS.DrawStep({
 	conditions = { vortex = false, facing = "front" },
 })
 SMODS.draw_ignore_keys.floating_sprite2 = true
+
+
+-- Make hover UI collidable - so we can detect collision and display tooltips
+local m = Card.move
+function Card:move(dt)
+	m(self, dt)
+	if self.children.h_popup then
+		self.children.h_popup.states.collide.can = true
+		if not self.highlighted and not self.states.hover.is then
+			self.children.h_popup:remove()
+			self.children.h_popup = nil
+		end
+	end
+end

localization/en-us.lua

@@ -3924,8 +3924,9 @@ return {
 			ev_cry_choco0 = {
 				name = "",
 				text = {
-					"Details of an active",
-					"{C:cry_ascendant,E:1}event{} will appear here",
+					"Possible events:",
+					"{T:ev_cry_choco1}1{} {T:ev_cry_choco2}2{} {T:ev_cry_choco3}3{} {T:ev_cry_choco4}4{} {T:ev_cry_choco5}5{}",
+					"{T:ev_cry_choco6}6{} {T:ev_cry_choco7}7{} {T:ev_cry_choco8}8{} {T:ev_cry_choco9}9{} {T:ev_cry_choco10}10{}",
 				},
 			},
 			ev_cry_choco1 = {

lovely/lib_ui.toml

@@ -70,3 +70,21 @@ pattern = "if (self.edition and self.edition.negative) or (self.ability.name ==
 position = 'at'
 match_indent = true
 payload = "if (self.edition and (self.edition.negative or self.edition.cry_oversat)) or (self.ability.name == 'Antimatter' and (self.config.center.discovered or self.bypass_discovery_center)) then"
+
+# Make description UI always appear if card is highlighted
+[[patches]]
+[patches.pattern]
+target = "engine/node.lua"
+pattern = "if self.children.h_popup then"
+position = 'at'
+match_indent = true
+payload = "if self.children.h_popup and not self.highlighted then"
+
+# Let description tooltips work for any object
+[[patches]]
+[patches.pattern]
+target = "functions/misc_functions.lua"
+pattern = "detailed_tooltip = part.control.T and (G.P_CENTERS[part.control.T] or G.P_TAGS[part.control.T]) or nil,"
+position = 'at'
+match_indent = true
+payload = "detailed_tooltip = part.control.T and Cryptid.get_center(part.control.T) or nil,"