tgstation.dmb - 0 errors, 1 warning (8/3/25 1:02 pm)

sob sob sob sob sob

Author: Bruh-24

code/controllers/configuration/entries/game_options.dm

@@ -62,6 +62,13 @@
 	integer = FALSE
 	min_val = 0
 
+/// Determines the ideal player count for maximum progression per minute.
+// MASSMETA EDIT ADDITION BEGIN (re_traitorsecondary)
+/datum/config_entry/number/traitor_ideal_player_count
+	default = 20
+	min_val = 1
+// MASSMETA EDIT ADDITION END (re_traitorsecondary)
+
 /// Determines how fast traitors scale in general.
 /datum/config_entry/number/traitor_scaling_multiplier
 	default = 1

code/controllers/subsystem/traitor.dm

@@ -28,14 +28,14 @@ SUBSYSTEM_DEF(traitor)
 
 	/// The coefficient multiplied by the current_global_progression for new joining traitors to calculate their progression
 	var/newjoin_progression_coeff = 1
-	/// The current progression that all traitors should be at in the round, you can't have less than this
+	/// The current progression that all traitors should be at in the round
 	var/current_global_progression = 0
-	/// The current uplink handlers being managed
+	/// The amount of deviance from the current global progression before you start getting 2x the current scaling or no scaling at all
 
 	//MASSMETA ADDDITION START (re_traitorsecondary)
 
 	var/list/datum/uplink_handler/uplink_handlers = list()
-	/// The current scaling per minute of progression.
+	/// The current scaling per minute of progression. Has a maximum value of 1 MINUTES.
 	var/current_progression_scaling = 1 MINUTES
 	/// Used to handle the probability of getting an objective.
 	var/datum/traitor_category_handler/category_handler
@@ -72,13 +72,26 @@ SUBSYSTEM_DEF(traitor)
 /datum/controller/subsystem/traitor/fire(resumed)
 	var/previous_progression = current_global_progression
 	current_global_progression = (STATION_TIME_PASSED()) * CONFIG_GET(number/traitor_scaling_multiplier)
-	var/progression_increment = current_global_progression - previous_progression
 	var/progression_scaling_delta = (wait / (1 MINUTES)) * current_progression_scaling
+	var/player_count = length(GLOB.alive_player_list)
+	// Has a maximum of 1 minute, however the value can be lower if there are lower players than the ideal
+	// player count for a traitor to be threatening. Rounds to the nearest 10% of a minute to prevent weird
+	// values from appearing in the UI. Traitor scaling multiplier bypasses the limit and only multiplies the end value.
+	// from all of our calculations.
+	current_progression_scaling = max(min(
+		(player_count / CONFIG_GET(number/traitor_ideal_player_count)) * 1 MINUTES,
+		1 MINUTES
+	), 0.1 MINUTES) * CONFIG_GET(number/traitor_scaling_multiplier)
+
+	var/previous_global_progression = current_global_progression
+
+	current_global_progression += progression_scaling_delta
 	for(var/datum/uplink_handler/handler in uplink_handlers)
 		if(!handler.has_progression || QDELETED(handler))
 			uplink_handlers -= handler
-		if(handler.progression_points < current_global_progression)
-			// If we got unsynced somehow, just set them to the current global progression
+		var/deviance = (previous_global_progression - handler.progression_points) / progression_scaling_deviance
+		if(abs(deviance) < 0.01)
+			// If deviance is less than 1%, just set them to the current global progression
 			// Prevents problems with precision errors.
 			handler.progression_points = current_global_progression
 		else
@@ -87,9 +100,9 @@ SUBSYSTEM_DEF(traitor)
 			var/amount_to_give = progression_scaling_delta + (progression_scaling_delta * deviance)
 			amount_to_give = clamp(amount_to_give, 0, progression_scaling_delta * 2)
 			handler.progression_points += amount_to_give
-			handler.update_objectives()
 			handler.on_update()
-//MASSMETA EDIT START (re_traitorsecondary)
+
+//MASSMETA EDIT END (re_traitorsecondary)
 /datum/controller/subsystem/traitor/proc/register_uplink_handler(datum/uplink_handler/uplink_handler)
 	if(!uplink_handler.has_progression)
 		return

code/datums/components/uplink.dm

@@ -192,6 +192,9 @@
 	data["joined_population"] = length(GLOB.joined_player_list)
 	data["maximum_potential_objectives"] = uplink_handler.maximum_potential_objectives
 	data["progression_scaling_deviance"] = SStraitor.progression_scaling_deviance
+	data["current_expected_progression"] = SStraitor.current_global_progression
+	data["progression_scaling_deviance"] = SStraitor.progression_scaling_deviance
+	data["current_progression_scaling"] = SStraitor.current_progression_scaling
 
 	if(uplink_handler.primary_objectives)
 		var/list/primary_objectives = list()

tgui/packages/tgui/interfaces/Uplink/index.tsx

@@ -54,6 +54,8 @@ type UplinkData = {
   progression_points: number;
   joined_population?: number;
   lockable: BooleanLike;
+  current_expected_progression: number;
+  progression_scaling_deviance: number;
   current_progression_scaling: number;
   uplink_flag: number;
   assigned_role: string;
@@ -282,7 +284,17 @@ export class Uplink extends Component<any, UplinkState> {
         },
       });
     }
-
+    // Get the difference between the current progression and
+    // expected progression
+    let progressionPercentage =
+      current_expected_progression - progression_points;
+    // Clamp it down between 0 and 2
+    progressionPercentage = Math.min(
+      Math.max(progressionPercentage / progression_scaling_deviance, -1),
+      1,
+    );
+    // Round it and convert it into a percentage
+    progressionPercentage = Math.round(progressionPercentage * 1000) / 10;
     return (
       <Window width={700} height={600} theme="syndicate">
         <Window.Content>
@@ -312,6 +324,29 @@ export class Uplink extends Component<any, UplinkState> {
                                 </Box>
                                 &nbsp;every minute
                               </Box>
+                              {Math.abs(progressionPercentage) > 0 && (
+                                <Box mt={0.5}>
+                                  Because your threat level is
+                                  {progressionPercentage < 0
+                                    ? ' ahead '
+                                    : ' behind '}
+                                  of where it should be, you are getting
+                                  <Box
+                                    as="span"
+                                    color={
+                                      progressionPercentage < 0
+                                        ? 'red'
+                                        : 'green'
+                                    }
+                                    ml={1}
+                                    mr={1}
+                                  >
+                                    {progressionPercentage}%
+                                  </Box>
+                                  {progressionPercentage < 0 ? 'less' : 'more'}{' '}
+                                  threat every minute
+                                </Box>
+                              )}
                               {dangerLevelsTooltip}
                             </Box>
                           </Box>