the beginning of greatness

Author: Matt Atlas

…/migrate-2023/V011__skills_education.sql …/migrate-2023/V019__skills_education.sqlSQL/migrate-2023/V011__skills_education.sql renamed to SQL/migrate-2023/V019__skills_education.sql SQL/migrate-2023/V011__skills_education.sql renamed to SQL/migrate-2023/V019__skills_education.sql

@@ -30,3 +30,12 @@
 #define SKILL_DIFFICULTY_MODIFIER_EASY				1
 #define SKILL_DIFFICULTY_MODIFIER_MEDIUM			2
 #define SKILL_DIFFICULTY_MODIFIER_HARD				4
+
+/// Critical success on a difficulty class. Obtained by rolling a nat 20 or +10 over the DC. Used for skills at the moment, will be used for more later.
+#define CRITICAL_SUCCESS 2
+/// Normal success on a difficulty class. Obtained by rolling equal or higher than the DC. Used for skills at the moment, will be used for more later.
+#define SUCCESS 1
+/// Normal failure on a difficulty class. Obtained by rolling less than the DC. Used for skills at the moment, will be used for more later.
+#define FAILURE 0
+/// Critical failure on a difficulty class. Obtained by rolling a nat 1 or -10 under the DC. Used for skills at the moment, will be used for more later.
+#define CRITICAL_FAILURE -1

code/__DEFINES/skills.dm

@@ -56,8 +56,37 @@
 /mob/proc/get_skill_multiplier(skill_type, skill_floor = SKILL_LEVEL_TRAINED, bonus = 0.2, malus = 0.2)
 	var/modifier = 1
 	var/skill_level = get_skill_level(skill_type)
-	if(skill_level >= SKILL_LEVEL_TRAINED)
-		modifier -= bonus * max(1, skill_level - skill_floor)
+	if(skill_level > skill_floor)
+		modifier -= bonus * max(0, skill_level - skill_floor)
 	else
 		modifier += malus * max(1, skill_floor - skill_level)
 	return modifier
+
+/**
+ * A do_after modified by skill proficiency.
+ *
+ * delay = The base delay in seconds the do_after should take if skill level is equal to `skill_floor`.
+ * target = The do_after target.
+ * skill_type = The skill used for this do_after. Can be a list or a path.
+ * skill_floor = The base skill level at which the delay is unaffected.
+ * bonus/malus = The bonus added or removed for each step of skill difference, see get_skill_multiplier.
+ * do_flags = The do_flags fed to the do_after.
+ */
+/mob/proc/do_after_skill(base_delay, atom/target, skill_type, skill_floor = SKILL_LEVEL_TRAINED, bonus = 0.2, malus = 0.2, do_flags)
+	var/skill_mult
+	if(islist(skill_type))
+		for(var/skill in skill_type)
+			skill_mult = min(skill_mult, get_skill_multiplier(skill, skill_floor, bonus, malus))
+	else
+		skill_mult = get_skill_multiplier(skill_type, skill_floor, bonus, malus)
+	return do_after(src, base_delay * skill_mult, target, do_flags)
+
+/**
+ * Throws a DC challenge against the difficulty class. For explanation on how criticals work, see code\__DEFINES\skills.dm.
+ * Remember that you should not check `if(!result)` for a failure. You should do `if(result >= FAILURE)` instead, so as to also check for a crit fail.
+ *
+ * difficulty_class = The DC to beat.
+ * skill_type = The skill used for this check. Can be a list or a path.
+ */
+/mob/proc/skill_challenge(difficulty_class, skill_type)
+	var/roll = rand(1, 20)

code/modules/mob/skills/skills.dm

@@ -98,9 +98,12 @@
 
 /obj/machinery/power/emitter/attack_hand(mob/user)
 	add_fingerprint(user)
-	if(user.get_skill_level(/singleton/skill/reactor_systems) <= SKILL_LEVEL_FAMILIAR)
-		to_chat(user, SPAN_WARNING("You have no idea where the switch even is on this thing..."))
-		return
+	var/max_engineering_skill = max(user.get_skill_level(/singleton/skill/reactor_systems), user.get_skill_level(/singleton/skill/electrical_engineering))
+	if(max_engineering_skill <= SKILL_LEVEL_TRAINED)
+		to_chat(user, SPAN_WARNING("You try to find the switch on \the [src]... How do you even turn this thing on?"))
+		if(!user.do_after_skill(3 SECONDS, src, list(/singleton/skill/reactor_systems, /singleton/skill/electrical_engineering)))
+			return
+		to_chat(user, SPAN_NOTICE("You finally find the switch!"))
 	activate(user)
 
 /obj/machinery/power/emitter/proc/activate(mob/user)