From 6aa416c8668d99f8846f535dad18e5b75febba2c Mon Sep 17 00:00:00 2001 From: Fira Date: Sat, 2 Dec 2023 12:53:19 +0000 Subject: [PATCH] Jsut keep testing like this --- code/__DEFINES/mode.dm | 6 ++---- code/game/gamemodes/cm_initialize.dm | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm index a9f4ab7fac89..3e3427689bab 100644 --- a/code/__DEFINES/mode.dm +++ b/code/__DEFINES/mode.dm @@ -91,10 +91,8 @@ //================================================= -/// Number of ROUNDSTART weighter marine player for 1 gear_scale. gear_scale is clamped to 1 minimum -#define MARINE_GEAR_SCALING_NORMAL 30 -/// Number of LATEJOIN weighted marine players for 1 gear_scale -#define MARINE_GEAR_SCALING_LATEJOIN 60 +/// Number of weighted marine players for 1 gear_scale. gear_scale is clamped to 1 minimum +#define MARINE_GEAR_SCALING_NORMAL 60 #define RESOURCE_NODE_SCALE 95 //How many players minimum per extra set of resource nodes #define RESOURCE_NODE_QUANTITY_PER_POP 11 //How many resources total per pop diff --git a/code/game/gamemodes/cm_initialize.dm b/code/game/gamemodes/cm_initialize.dm index c0cd54493d98..55452972cc3f 100644 --- a/code/game/gamemodes/cm_initialize.dm +++ b/code/game/gamemodes/cm_initialize.dm @@ -950,7 +950,7 @@ Additional game mode variables. ///Updates the [/datum/game_mode/var/gear_scale] multiplier based on joining and cryoing marines /datum/game_mode/proc/update_gear_scale(delta) // Magic inverse function that guarantees marines still get good supplies for latejoins within first ~30 minutes but stalls starting 2 hours or so - gear_scale += delta * (0.25 + 0.75 / (1 + ROUND_TIME / 20000)) / MARINE_GEAR_SCALING_LATEJOIN + gear_scale += delta * (0.25 + 0.75 / (1 + ROUND_TIME / 20000)) / MARINE_GEAR_SCALING_NORMAL var/gear_delta = gear_scale - gear_scale_max if(gear_delta > 0) gear_scale_max = gear_scale