progress bar indicators

Author: SapphicOverload

code/__DEFINES/flags.dm

@@ -250,5 +250,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define IGNORE_INCAPACITATED (1<<3)
 /// Used to prevent important slowdowns from being abused by drugs like kronkaine
 #define IGNORE_SLOWDOWNS (1<<4)
+/// Used to keep the skill indicator icon without using the built-in delay modifier
+#define IGNORE_SKILL_DELAY (1<<5)
 
 #define IGNORE_ALL (IGNORE_USER_LOC_CHANGE|IGNORE_TARGET_LOC_CHANGE|IGNORE_HELD_ITEM|IGNORE_INCAPACITATED|IGNORE_SLOWDOWNS)

code/__HELPERS/mobs.dm

@@ -350,7 +350,7 @@ GLOBAL_LIST_EMPTY(species_list)
 
 	var/datum/progressbar/progbar
 	if(progress)
-		progbar = new(user, delay, target || user)
+		progbar = new(user, delay, target || user, skill_check)
 
 	SEND_SIGNAL(user, COMSIG_DO_AFTER_BEGAN)
 

code/datums/components/crafting/crafting.dm

@@ -172,7 +172,7 @@
 	if(ismob(a))
 		var/mob/mob = a
 		timer *= (10 - (mob.get_skill(SKILL_MECHANICAL) + HAS_TRAIT(mob, TRAIT_CRAFTY)*2)) / 10
-	if(!do_after(a, timer, a))
+	if(!do_after(a, timer, a, IGNORE_SKILL_DELAY, skill_check = SKILL_MECHANICAL))
 		return "."
 	contents = get_surroundings(a, R.blacklist) // Double checking since items could no longer be there after the do_after().
 	if(!check_contents(a, R, contents))

code/datums/progressbar.dm

@@ -1,9 +1,13 @@
 #define PROGRESSBAR_HEIGHT 6
 #define PROGRESSBAR_ANIMATION_TIME 5
+#define SKILL_ICON_OFFSET_X -18
+#define SKILL_ICON_OFFSET_Y -13
 
 /datum/progressbar
 	///The progress bar visual element.
 	var/image/bar
+	///The icon for the skill used.
+	var/image/skill_icon
 	///The target where this progress bar is applied and where it is shown.
 	var/atom/bar_loc
 	///The mob whose client sees the progress bar.
@@ -18,7 +22,7 @@
 	var/listindex = 0
 
 
-/datum/progressbar/New(mob/User, goal_number, atom/target)
+/datum/progressbar/New(mob/User, goal_number, atom/target, skill_check)
 	. = ..()
 	if (!istype(target))
 		stack_trace("Invalid target [target] passed in")
@@ -37,6 +41,10 @@
 	bar = image('icons/effects/progessbar.dmi', bar_loc, "prog_bar_0")
 	SET_PLANE_EXPLICIT(bar, ABOVE_HUD_PLANE, User) //yogs change, increased so it draws ontop of ventcrawling overlays
 	bar.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
+	if(skill_check)
+		skill_icon = image('icons/mob/skills.dmi', bar_loc, "[skill_check]_small", pixel_x = SKILL_ICON_OFFSET_X)
+		SET_PLANE_EXPLICIT(skill_icon, ABOVE_HUD_PLANE, User)
+		skill_icon.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
 	user = User
 
 	LAZYADDASSOCLIST(user.progressbars, bar_loc, src)
@@ -60,10 +68,12 @@
 				continue
 			progress_bar.listindex--
 
-			progress_bar.bar.pixel_y = 32 + (PROGRESSBAR_HEIGHT * (progress_bar.listindex - 1))
-			var/dist_to_travel = 32 + (PROGRESSBAR_HEIGHT * (progress_bar.listindex - 1)) - PROGRESSBAR_HEIGHT
+			var/dist_to_travel = 32 + (PROGRESSBAR_HEIGHT * progress_bar.listindex) - PROGRESSBAR_HEIGHT
 			animate(progress_bar.bar, pixel_y = dist_to_travel, time = PROGRESSBAR_ANIMATION_TIME, easing = SINE_EASING)
 
+			if(progress_bar.skill_icon)
+				animate(progress_bar.skill_icon, pixel_y = dist_to_travel + SKILL_ICON_OFFSET_Y, time = PROGRESSBAR_ANIMATION_TIME, easing = SINE_EASING)
+
 		LAZYREMOVEASSOC(user.progressbars, bar_loc, src)
 		user = null
 
@@ -74,6 +84,8 @@
 
 	if(bar)
 		QDEL_NULL(bar)
+	if(skill_icon)
+		QDEL_NULL(skill_icon)
 
 	return ..()
 
@@ -94,6 +106,7 @@
 	if(!user_client) //Disconnected, already gone.
 		return
 	user_client.images -= bar
+	user_client.images -= skill_icon
 	user_client = null
 
 
@@ -116,6 +129,11 @@
 	bar.pixel_y = 0
 	bar.alpha = 0
 	user_client.images += bar
+	if(skill_icon)
+		skill_icon.pixel_y = SKILL_ICON_OFFSET_Y
+		skill_icon.alpha = 0
+		user_client.images += skill_icon
+		animate(skill_icon, pixel_y = 32 + SKILL_ICON_OFFSET_Y + (PROGRESSBAR_HEIGHT * (listindex - 1)), alpha = 255, time = PROGRESSBAR_ANIMATION_TIME, easing = SINE_EASING)
 	animate(bar, pixel_y = 32 + (PROGRESSBAR_HEIGHT * (listindex - 1)), alpha = 255, time = PROGRESSBAR_ANIMATION_TIME, easing = SINE_EASING)
 
 
@@ -134,9 +152,13 @@
 		bar.icon_state = "[bar.icon_state]_fail"
 
 	animate(bar, alpha = 0, time = PROGRESSBAR_ANIMATION_TIME)
+	if(skill_icon)
+		animate(skill_icon, alpha = 0, time = PROGRESSBAR_ANIMATION_TIME)
 
 	QDEL_IN(src, PROGRESSBAR_ANIMATION_TIME)
 
 
+#undef SKILL_ICON_OFFSET_Y
+#undef SKILL_ICON_OFFSET_X
 #undef PROGRESSBAR_ANIMATION_TIME
 #undef PROGRESSBAR_HEIGHT

code/game/mecha/mecha.dm

@@ -1038,7 +1038,7 @@
 
 	visible_message("[user] starts to climb into [name].")
 
-	if(do_after(user, round(enter_delay * (check_eva(user)**2)), src, skill_check = null))
+	if(do_after(user, round(enter_delay * (check_eva(user)**2)), src, IGNORE_SKILL_DELAY, skill_check = SKILL_TECHNICAL))
 		if(atom_integrity <= 0)
 			to_chat(user, span_warning("You cannot get in the [name], it has been destroyed!"))
 		else if(occupant)
@@ -1157,7 +1157,7 @@
 /obj/mecha/container_resist(mob/living/user)
 	is_currently_ejecting = TRUE
 	to_chat(occupant, "<span class='notice'>You begin the ejection procedure. Equipment is disabled during this process. Hold still to finish ejecting.<span>")
-	if(do_after(occupant, round(exit_delay * (check_eva(user)**2)), src))
+	if(do_after(occupant, round(exit_delay * (check_eva(user)**2)), src, IGNORE_SKILL_DELAY, skill_check = SKILL_TECHNICAL))
 		to_chat(occupant, "<span class='notice'>You exit the mech.<span>")
 		go_out()
 	else