cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix overlay stacking on action HUD icons (#31101)

Browse Source
This commit is contained in:
warriorstar-orion
2025-12-09 16:26:24 +00:00
committed by GitHub
parent dacc72b732
commit d537d3320a
3 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/actions/action.dm
+13 -10
View File
@@ -30,8 +30,6 @@
var/show_to_observers = TRUE
/// Toggles whether this action is usable or not
var/action_disabled = FALSE
/// The appearance used as an overlay for when the action is unavailable
var/mutable_appearance/unavailable_effect
/// If False, the owner of this action does not get a hud and cannot activate it on their own
var/owner_has_control = TRUE
@@ -194,7 +192,7 @@
* force - whether an update is forced regardless of existing status
*/
/datum/action/proc/update_button_status(atom/movable/screen/movable/action_button/button, force = FALSE)
button.overlays -= unavailable_effect
button.cut_overlay(button.unavailable_image)
button.maptext = ""
if(IsAvailable(show_message = FALSE))
button.color = rgb(255, 255, 255, 255)
@@ -268,13 +266,18 @@
return
/datum/action/proc/apply_unavailable_effect(atom/movable/screen/movable/action_button/button)
if(isnull(unavailable_effect))
unavailable_effect = mutable_appearance('icons/mob/screen_white.dmi', icon_state = "template")
unavailable_effect.alpha = 200
unavailable_effect.appearance_flags = RESET_COLOR | RESET_ALPHA
unavailable_effect.color = "#000000"
unavailable_effect.plane = FLOAT_PLANE + 1
button.overlays |= unavailable_effect
if(isnull(button.unavailable_image))
var/mutable_appearance/ma = mutable_appearance(
icon = 'icons/mob/screen_white.dmi',
icon_state = "template",
plane = FLOAT_PLANE + 1,
alpha = 200,
appearance_flags = RESET_COLOR | RESET_ALPHA,
color = "#000000",
)
button.unavailable_image = new
button.unavailable_image.appearance = ma
button.add_overlay(button.unavailable_image)
/**
* Applies any overlays to our button
code/datums/actions/spell_action.dm
+20 -14
View File
@@ -48,21 +48,27 @@
return FALSE
/datum/action/spell_action/apply_unavailable_effect(atom/movable/screen/movable/action_button/button)
var/datum/spell/S = target
if(!istype(S))
return ..()
var/datum/spell/spell = target
if(!istype(spell))
return
unavailable_effect = mutable_appearance('icons/mob/screen_white.dmi', icon_state = "template")
unavailable_effect.appearance_flags = RESET_COLOR | RESET_ALPHA
unavailable_effect.color = "#000000"
unavailable_effect.plane = FLOAT_PLANE + 1
unavailable_effect.alpha = S.cooldown_handler.get_cooldown_alpha()
var/text = spell.cooldown_handler.cooldown_info()
// Make a holder for the charge text
button.cut_overlay(button.unavailable_image)
var/mutable_appearance/ma = mutable_appearance(
icon = 'icons/mob/screen_white.dmi',
icon_state = "template",
plane = FLOAT_PLANE + 1,
alpha = spell.cooldown_handler.get_cooldown_alpha(),
appearance_flags = RESET_COLOR | RESET_ALPHA,
color = "#000000"
)
button.unavailable_image = new
button.unavailable_image.appearance = ma
// Make a holder for the charge text, and yes this needs to be a separate overlay on our overlay
var/image/count_down_holder = mutable_appearance('icons/effects/effects.dmi', icon_state = "nothing", appearance_flags = RESET_COLOR | RESET_ALPHA)
var/text = S.cooldown_handler.cooldown_info()
count_down_holder.maptext_y = 4
count_down_holder.maptext_y = 4 // bump up off the bottom border
count_down_holder.maptext = "<div style=\"font-size:6pt;color:[recharge_text_color];font:'Small Fonts';text-align:center;\" valign=\"bottom\">[text]</div>"
unavailable_effect.add_overlay(count_down_holder)
button.overlays |= unavailable_effect
button.unavailable_image.overlays += count_down_holder
button.add_overlay(button.unavailable_image)