diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index b56cf5a5..4d7d3361 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -1,6 +1,6 @@ #define DYNAMIC_DEFAULT_CHAOS 1.0 //The default chaos value for low pop low vote rounds -#define DYNAMIC_VOTE_NORMALIZATION 5 //If there are fewer than this many votes, the average will be skewed towards the default -#define DYNAMIC_NONVOTER_FACTOR 0.75 // 1 means they count for a full vote +#define DYNAMIC_VOTE_NORMALIZATION 7 //If there are fewer than this many votes, the average will be skewed towards the default +#define DYNAMIC_NONVOTER_FACTOR 0.5 // 1 means they count for a full vote SUBSYSTEM_DEF(vote) name = "Vote" diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm index e6b99497..a5b9c9be 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm @@ -452,6 +452,7 @@ typepath = /datum/round_event/processor_overload cost = 4 weight = 2 + earliest_start = 30 MINUTES repeatable_weight_decrease = 3 enemy_roles = list("Chief Engineer","Station Engineer") required_enemies = list(2,2,2,2,1,1,1,1,1,1) @@ -552,7 +553,7 @@ earliest_start = 40 MINUTES //property_weights = list("teamwork" = 1,"chaos" = 1, "extended" = -1) occurances_max = 1 - chaos_min = 1.3 + chaos_min = 1.5 /datum/dynamic_ruleset/event/wormholes @@ -594,13 +595,14 @@ enemy_roles = list("Virologist","Chief Medical Officer","Captain","Chemist") required_enemies = list(2,1,1,1,1,1,1,0,0,0) required_candidates = 1 - weight = 4 - cost = -5 + weight = 2 + cost = 4 + earliest_start = 30 MINUTES requirements = list(101,101,20,20,15,10,10,10,10,5) // yes, it can even happen in "extended"! //property_weights = list("story_potential" = 1, "extended" = 1, "valid" = -2) high_population_requirement = 5 occurances_max = 1 - chaos_min = 1.5 + chaos_min = 1.75 /datum/dynamic_ruleset/event/revenant name = "Revenant"