skill issue

Author: SapphicOverload

code/datums/mind.dm

@@ -68,6 +68,9 @@
 		SKILL_FITNESS = 0,
 	)
 
+	/// One-time experience gains that have already been acquired
+	var/list/unique_exp = list()
+
 	/// Free skill points to allocate
 	var/skill_points = 0
 
@@ -804,12 +807,15 @@
 		return FALSE
 	return (mind.skills[skill] >= amount)
 
-/// Adds progress towards increasing skill level. Returns TRUE if it improved the skill.
-/mob/proc/add_exp(skill, amount)
+/// Adds progress towards increasing skill level. Returns TRUE if it added progress. Adding a source prevents gaining exp from that source again.
+/mob/proc/add_exp(skill, amount, source)
 	if(!mind)
 		return FALSE
-	if(mind.skill_points > 0)
+	if(!amount)
+		return FALSE
+	if(source && (source in mind.unique_exp))
 		return FALSE
+	mind.unique_exp.Add(source)
 	var/exp_required = EXPERIENCE_PER_LEVEL * (2**mind.skills[skill]) // exp required scales exponentially
 	if(mind.exp_progress[skill] + amount >= exp_required)
 		var/levels_gained = round(log(2, 1 + (mind.exp_progress[skill] + amount) / exp_required)) // in case you gained so much you go up more than one level
@@ -818,11 +824,17 @@
 			hud_used.skill_menu.allocated_points -= min(levels_gained, levels_allocated)
 			hud_used.skill_menu.allocated_skills[skill] -= min(levels_gained, levels_allocated)
 		mind.exp_progress[skill] += amount - exp_required * (2**(levels_gained - 1))
+		mind.skill_points = max(mind.skill_points - levels_gained, 0) // remove an equal amount of unallocated skill points to prevent exploits
 		adjust_skill(skill, levels_gained)
 		to_chat(src, span_boldnotice("Your [skill] skill is now level [get_skill(skill)]!"))
-		return TRUE
 	mind.exp_progress[skill] += amount
-	return FALSE
+	return TRUE
+
+/// Returns whether experience has been gained from a given source
+/mob/proc/has_exp(source)
+	if(!mind)
+		return FALSE
+	return (source in mind.unique_exp) ? TRUE : FALSE
 
 /// Adds skill points to be allocated at will.
 /mob/proc/add_skill_points(amount)

code/datums/wires/_wires.dm

@@ -184,13 +184,15 @@
 		return TRUE
 	return FALSE
 
-/datum/wires/proc/cut(wire)
+/datum/wires/proc/cut(wire, mob/user)
 	if(is_cut(wire))
 		cut_wires -= wire
 		on_cut(wire, mend = TRUE)
 	else
 		cut_wires += wire
 		on_cut(wire, mend = FALSE)
+	if(user)
+		user.add_exp(SKILL_TECHNICAL, 50, "[wire]_[type]")
 
 /datum/wires/proc/cut_color(color)
 	cut(get_wire(color))
@@ -202,10 +204,12 @@
 	for(var/wire in wires)
 		cut(wire)
 
-/datum/wires/proc/pulse(wire, user)
+/datum/wires/proc/pulse(wire, mob/user)
 	if(is_cut(wire))
 		return
 	on_pulse(wire, user)
+	if(user)
+		user.add_exp(SKILL_TECHNICAL, 50, "[wire]_[type]")
 
 /datum/wires/proc/pulse_color(color, mob/living/user)
 	pulse(get_wire(color), user)

code/game/objects/items/storage/bags.dm

@@ -284,7 +284,7 @@
 	if(usr.incapacitated())
 		return
 	for(var/obj/item/O in contents)
-		seedify(O, 1)
+		seedify(O, 1, null, usr)
 
 // -----------------------------
 //        Stack Snatcher

code/modules/hydroponics/gene_modder.dm

@@ -255,7 +255,9 @@
 /obj/machinery/plantgenes/Topic(href, list/href_list)
 	if(..())
 		return
-	usr.set_machine(src)
+
+	var/mob/user = usr
+	user.set_machine(src)
 
 	if(href_list["eject_seed"] && !operation)
 		if (seed)
@@ -338,6 +340,9 @@
 								gene.value = max(gene.value, min_wrate)
 							else if(istype(G, /datum/plant_gene/core/weed_chance))
 								gene.value = max(gene.value, min_wchance)
+						if(G.extract_value && user.add_exp(SKILL_SCIENCE, G.extract_value, G.type))
+							user.playsound_local(get_turf(src), 'sound/machines/ping.ogg', 25, TRUE)
+							balloon_alert(user, "new trait catalogued: [lowertext(G.name)]")
 						disk.update_appearance()
 						qdel(seed)
 						seed = null

code/modules/hydroponics/plant_genes.dm

@@ -1,5 +1,7 @@
 /datum/plant_gene
 	var/name
+	/// Skill gain from extracting this gene. Can only be gained once.
+	var/extract_value = 0
 
 /datum/plant_gene/proc/get_name() // Used for manipulator display and gene disk name.
 	return name
@@ -138,6 +140,7 @@
 	var/rate = 0.05
 	var/examine_line = ""
 	var/trait_id // must be set and equal for any two traits of the same type
+	extract_value = 150
 
 /datum/plant_gene/trait/Copy()
 	var/datum/plant_gene/trait/G = ..()
@@ -433,6 +436,7 @@
 
 /datum/plant_gene/trait/fire_resistance // Lavaland
 	name = "Fire Resistance"
+	extract_value = 500
 
 /datum/plant_gene/trait/fire_resistance/apply_vars(obj/item/seeds/S)
 	if(!(S.resistance_flags & FIRE_PROOF))
@@ -454,3 +458,4 @@
 
 /datum/plant_gene/trait/plant_type/alien_properties
 	name ="?????"
+	extract_value = 500

code/modules/hydroponics/seed_extractor.dm

@@ -22,7 +22,7 @@
 		else
 			t_max = rand(1,4)
 
-	var/seedloc = O.loc
+	var/atom/seedloc = O.loc
 	if(extractor)
 		seedloc = extractor.loc
 
@@ -37,7 +37,6 @@
 				t_prod.forceMove(seedloc)
 				t_amount++
 			qdel(O)
-			return seeds
 
 	else if(istype(O, /obj/item/grown))
 		var/obj/item/grown/F = O
@@ -46,13 +45,18 @@
 				return
 			while(t_amount < t_max)
 				var/obj/item/seeds/t_prod = F.seed.Copy()
+				seeds.Add(t_prod)
 				t_prod.forceMove(seedloc)
 				t_amount++
 			qdel(O)
-		return 1
 
-	return 0
+	if(user && seeds.len)
+		var/obj/item/seeds/seed = seeds[1] // all seeds are duplicates, pick the first one in the list
+		if(user.add_exp(SKILL_SCIENCE, seed.rarity * 10, seed.type))
+			user.playsound_local(get_turf(seedloc), 'sound/machines/ping.ogg', 25, TRUE)
+			seedloc.balloon_alert(user, "rare plant catalogued: [initial(seed.product.name)]")
 
+	return (seeds.len ? seeds : FALSE)
 
 /obj/machinery/seed_extractor
 	name = "seed extractor"

code/modules/hydroponics/seeds.dm

@@ -9,7 +9,7 @@
 	resistance_flags = FLAMMABLE
 	var/plantname = "Plants"		// Name of plant when planted.
 	var/plantdesc					// Description of plant when planted
-	var/product						// A type path. The thing that is created when the plant is harvested.
+	var/atom/product				// A type path. The thing that is created when the plant is harvested.
 	var/species = ""				// Used to update icons. Should match the name in the sprites unless all icon_* are overridden.
 
 	var/growing_icon = 'icons/obj/hydroponics/growing.dmi' //the file that stores the sprites of the growing plant from this seed.

code/modules/research/machinery/plortmachine.dm

@@ -40,14 +40,16 @@
 		return
 
 	if(istype(W, /obj/item/slime_extract))
-		refine_plort(W)
-		qdel(W)
+		refine_plort(W, user)
 		return
-	
-/obj/machinery/plortrefinery/proc/refine_plort(obj/item/slime_extract/W)
-	point_gain = W.plort_value * research_point_multiplier
-	linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, point_gain)
 
+/obj/machinery/plortrefinery/proc/refine_plort(obj/item/slime_extract/extract, mob/user)
+	point_gain = extract.plort_value * research_point_multiplier
+	linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, point_gain)
+	if(user.add_exp(SKILL_SCIENCE, extract.plort_value * 5, extract.type))
+		user.playsound_local(get_turf(src), 'sound/machines/ping.ogg', 25, TRUE)
+		balloon_alert(user, "new sample processed: [extract.effectmod]")
+	qdel(extract)
 
 /obj/machinery/plortrefinery/Initialize(mapload)
 	. = ..()