optimisations

Author: danreeves

NumericUI/scripts/mods/NumericUI/HudElementDodgeCount.lua

@@ -20,32 +20,25 @@ local color_efficient = Color.terminal_text_header(255, true)
 local color_inefficient = Color.ui_hud_warp_charge_low(255, true)
 local color_limit = Color.ui_hud_warp_charge_high(255, true)
 
-local timer_x_offset = (-UIWorkspaceSettings.screen.size[1]
-+ scenegraph_definition.container.size[1])/2
+local timer_x_offset = (-UIWorkspaceSettings.screen.size[1] + scenegraph_definition.container.size[1]) / 2
 
+local timer_size = { 0, 0 }
+local timer_color = { 0, 0, 0, 0 }
 local timer_size_color = function(time_to_refresh, cooldown, current_dodges, force_show_max_width)
 	-- NB: time_to_refresh will increase towards zero
 	local t_max = cooldown
 	if (-time_to_refresh >= t_max or force_show_max_width) and mod:get("dodge_timer_hide_full") then
 		return
 	end
 	local natural_time = force_show_max_width and 0 or math.clamp((time_to_refresh + t_max) / t_max, 0, 1)
-	local timer_size = {
-		mod:get("dodge_timer_width") * (1 - natural_time),
-		mod:get("dodge_timer_height"),
-	}
-	local timer_color = {}
+
+	timer_size[1] = mod:get("dodge_timer_width") * (1 - natural_time)
+	timer_size[2] = mod:get("dodge_timer_height")
+
 	local color_start = Color[mod:get("color_start")](255, true)
 	local color_end = Color[mod:get("color_end")](255, true)
 	for i = 1, 4 do
-		table.insert(
-			timer_color,
-			math.lerp(
-				color_start[i],
-				color_end[i],
-				natural_time
-			)
-		)
+		timer_color[i] = math.lerp(color_start[i], color_end[i], natural_time)
 	end
 	-- Hide timer if dodges are full (useful when playing with the Agile blessing)
 	if current_dodges == 0 then
@@ -54,25 +47,6 @@ local timer_size_color = function(time_to_refresh, cooldown, current_dodges, for
 	return timer_size, timer_color
 end
 
-local timer_pass = 	{ {
-	style_id = "timer",
-	pass_type = "rect",
-	style = {
-		color = {255, 255, 100, 100},
-		vertical_alignment = "top",
-		horizontal_alignment = "center",
-		drop_shadow = true,
-		size = {100, 8},
-		offset = {
-			timer_x_offset,
-			mod:get("dodge_timer_y_offset"),
-		},
-	},
-	visibility_function = function(content, style)
-		return mod:get("dodge_timer")
-	end,
-} }
-
 local style = {
 	line_spacing = 1.2,
 	font_size = 25,
@@ -94,11 +68,26 @@ local widget_definitions = {
 		"container"
 	),
 
-	dodge_timer = UIWidget.create_definition(
-		timer_pass
-	,
-		"container"
-	),
+	dodge_timer = UIWidget.create_definition({
+		{
+			style_id = "timer",
+			pass_type = "rect",
+			style = {
+				color = { 255, 255, 100, 100 },
+				vertical_alignment = "top",
+				horizontal_alignment = "center",
+				drop_shadow = true,
+				size = { 100, 8 },
+				offset = {
+					timer_x_offset,
+					mod:get("dodge_timer_y_offset"),
+				},
+			},
+			visibility_function = function(_content, _style)
+				return mod:get("dodge_timer")
+			end,
+		},
+	}, "container"),
 
 	debug_dodge_count = UIWidget.create_definition({
 		{
@@ -164,12 +153,13 @@ local function _calculate_dodge_diminishing_return(
 	return consecutive_dodges, dr_start, dr_limit, diminishing_return
 end
 
+local ZERO_SIZE = { 0, 0 }
 HudElementDodgeCount.update = function(self, dt, t, ui_renderer, render_settings, input_service)
 	HudElementDodgeCount.super.update(self, dt, t, ui_renderer, render_settings, input_service)
 	-- Reset to empty in case we can't fill it in
 	self._widgets_by_name.dodge_count.content.text = ""
 	self._widgets_by_name.debug_dodge_count.content.text = ""
-	self._widgets_by_name.dodge_timer.style.timer.size = {0, 0}
+	self._widgets_by_name.dodge_timer.style.timer.size = ZERO_SIZE
 
 	if self._is_in_hub or not mod:get("dodge_count") then
 		return
@@ -200,23 +190,23 @@ HudElementDodgeCount.update = function(self, dt, t, ui_renderer, render_settings
 
 		local archetype = unit_data_extension:archetype()
 		local base_dodge_template = archetype.dodge
-		local weapon_consecutive_dodges_reset = weapon_dodge_template and weapon_dodge_template.consecutive_dodges_reset or 0
+		local weapon_consecutive_dodges_reset = weapon_dodge_template and weapon_dodge_template.consecutive_dodges_reset
+			or 0
 		local stat_buffs = buff_extension:stat_buffs()
 		local buff_modifier = stat_buffs.dodge_cooldown_reset_modifier
 		local buff_dodge_cooldown_reset_modifier = buff_modifier and 1 - (buff_modifier - 1) or 1
-		local relative_cooldown = (base_dodge_template.consecutive_dodges_reset + weapon_consecutive_dodges_reset) * buff_dodge_cooldown_reset_modifier
+		local relative_cooldown = (base_dodge_template.consecutive_dodges_reset + weapon_consecutive_dodges_reset)
+			* buff_dodge_cooldown_reset_modifier
 
-		local is_actually_dodging = (movement_state_component.method ~= "vaulting") and movement_state_component.is_dodging
+		local is_actually_dodging = (movement_state_component.method ~= "vaulting")
+			and movement_state_component.is_dodging
 		local relative_time = gameplay_t - dodge_state_component.consecutive_dodges_cooldown
-		local force_show_max_width = current_dodges ~= 0 and (is_actually_dodging or movement_state_component.method == "sliding")
-		local timer_size, timer_color = timer_size_color(
-			relative_time,
-			relative_cooldown,
-			current_dodges,
-			force_show_max_width
-		)
+		local force_show_max_width = current_dodges ~= 0
+			and (is_actually_dodging or movement_state_component.method == "sliding")
+		local timer_size, timer_color =
+			timer_size_color(relative_time, relative_cooldown, current_dodges, force_show_max_width)
 
-		self._widgets_by_name.dodge_timer.style.timer.size = timer_size or {0, 0}
+		self._widgets_by_name.dodge_timer.style.timer.size = timer_size or ZERO_SIZE
 		self._widgets_by_name.dodge_timer.style.timer.color = timer_color or Color.text_default(0, true)
 
 		if num_efficient_dodges == math.huge then
@@ -228,11 +218,8 @@ HudElementDodgeCount.update = function(self, dt, t, ui_renderer, render_settings
 				or (math.ceil(num_efficient_dodges) - current_dodges)
 
 			if mod:get("show_efficient_dodges") then
-				self._widgets_by_name.dodge_count.content.text = string.format(
-					"%d/%d",
-					display_dodges,
-					math.ceil(num_efficient_dodges)
-				)
+				self._widgets_by_name.dodge_count.content.text =
+					string.format("%d/%d", display_dodges, math.ceil(num_efficient_dodges))
 			else
 				self._widgets_by_name.dodge_count.content.text = tostring(math.ceil(display_dodges))
 			end
@@ -247,11 +234,8 @@ HudElementDodgeCount.update = function(self, dt, t, ui_renderer, render_settings
 		end
 
 		if mod:get("fade_out_max_dodges") and current_dodges == 0 then
-			local time_since_cooldown = math.clamp(
-				gameplay_t - dodge_state_component.consecutive_dodges_cooldown - 1,
-				0,
-				1
-			)
+			local time_since_cooldown =
+				math.clamp(gameplay_t - dodge_state_component.consecutive_dodges_cooldown - 1, 0, 1)
 			style.text.text_color[1] = math.lerp(255, 0, time_since_cooldown)
 		end