era ordeal stuff

vlggms · May 7, 2024 · 380ee79 · 380ee79
1 parent fa68bc0
commit 380ee79
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/code/controllers/subsystem/lobotomy_corp.dm b/code/controllers/subsystem/lobotomy_corp.dm
@@ -94,6 +94,8 @@ SUBSYSTEM_DEF(lobotomy_corp)
 	var/max_core_options = 3
 	/// Points used for facility upgrades
 	var/lob_points = 2
+	/// Stats for Era/Do after an ordeal is done
+	var/ordeal_stats = 0
 
 	/// If TRUE - will not count deaths for auto restart
 	var/auto_restart_in_progress = FALSE

diff --git a/code/modules/jobs/job_types/suppression.dm b/code/modules/jobs/job_types/suppression.dm
@@ -21,7 +21,7 @@
 	job_abbreviation = "ERA"
 
 	roundstart_attributes = list(FORTITUDE_ATTRIBUTE, PRUDENCE_ATTRIBUTE, TEMPERANCE_ATTRIBUTE, JUSTICE_ATTRIBUTE)
-	var/normal_attribute_level = 20 // Scales with round time & facility upgrades
+	var/normal_attribute_level = 20 // Scales with round time, facility upgrades, and ordeals done
 
 /datum/job/suppression/after_spawn(mob/living/carbon/human/outfit_owner, mob/M, latejoin = FALSE)
 	ADD_TRAIT(outfit_owner, TRAIT_WORK_FORBIDDEN, JOB_TRAIT)
@@ -52,7 +52,7 @@
 			set_attribute *= 4
 
 
-	set_attribute += GetFacilityUpgradeValue(UPGRADE_AGENT_STATS)*2 	//Get double stats because this is all they get.
+	set_attribute += GetFacilityUpgradeValue(UPGRADE_AGENT_STATS) + SSlobotomy_corp.ordeal_stats //Used to have doubled respawn stats, but that might be a bit too broken with stats from ordeals.
 
 	for(var/A in roundstart_attributes)
 		roundstart_attributes[A] = round(set_attribute)

diff --git a/code/modules/ordeals/_ordeal.dm b/code/modules/ordeals/_ordeal.dm
@@ -55,6 +55,7 @@
 	priority_announce("The Ordeal has ended. Facility has been rewarded with [reward_percent*100]% PE.", name, sound=null)
 	SSlobotomy_corp.AdjustAvailableBoxes(total_reward)
 	SSlobotomy_corp.current_ordeals -= src
+	SSlobotomy_corp.ordeal_stats += 5
 	SSlobotomy_corp.AddLobPoints(level * 0.5, "Ordeal Reward")
 	if(end_sound)
 		for(var/mob/player in GLOB.player_list)

diff --git a/lobotomy-corp13.dme b/lobotomy-corp13.dme
@@ -3990,8 +3990,8 @@
 #include "ModularTegustation\fishing\code\rod_components\fishing_lines.dm"
 #include "ModularTegustation\living\living.dm"
 #include "ModularTegustation\living\carbon\life.dm"
-#include "ModularTegustation\ssd_indicator\code\mob.dm"
 #include "ModularTegustation\primitive_farming\farming_structures.dm"
+#include "ModularTegustation\ssd_indicator\code\mob.dm"
 #include "ModularTegustation\tegu_borg_code\cyborg_upgrades.dm"
 #include "ModularTegustation\tegu_borg_code\medborg_holobed.dm"
 #include "ModularTegustation\tegu_borg_code\tegu_airlock_electroadaptive.dm"