Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebalances some dynamic values and ends the eternal greenshift. #254

Merged
merged 5 commits into from
Aug 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion code/game/gamemodes/dynamic/dynamic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,6 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
threat_level = round(GLOB.dynamic_forced_threat_level, 0.1)
else
generate_threat()
threat_level = clamp(threat_level,roundstart_pop_ready*1, roundstart_pop_ready*2) //Minimum threat is playercount and the max is playercount * 2, grabbed from OG Monke
generate_budgets()
set_cooldowns()
log_dynamic("Dynamic Mode initialized with a Threat Level of... [threat_level]! ([round_start_budget] round start budget)")
Expand Down
4 changes: 2 additions & 2 deletions code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@
required_candidates = 1
weight = 11
cost = 5
requirements = list(5,5,5,5,5,5,5,5,5,5)
requirements = list(30,20,10,5,5,5,5,5,5,5)
repeatable = TRUE

minimum_players = 8
minimum_players = 10

//////////////////////////////////////////////
// //
Expand Down
11 changes: 7 additions & 4 deletions code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,15 @@
ROLE_POSITRONIC_BRAIN,
)
required_candidates = 1
minimum_players = 8
weight = 25
cost = 5
requirements = list(8,10,10,10,10,10,10,10,10,10)
weight = 35
cost = 3
requirements = list(30,20,10,3,3,3,3,3,3,3)
required_enemies = list(2,2,1,0,0,0,0,0,0)
repeatable_weight_decrease = 5 //max 7 per round
repeatable = TRUE

minimum_players = 15

/datum/dynamic_ruleset/midround/from_living/autotraitor/trim_candidates()
..()
candidates = living_players
Expand Down
18 changes: 9 additions & 9 deletions code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
weight = 5
cost = 8 // Avoid raising traitor threat above this, as it is the default low cost ruleset.
scaling_cost = 9
minimum_players = 8
requirements = list(101,8,8,8,8,8,8,8,8,8)
minimum_players = 10
requirements = list(20,16,10,8,8,8,8,8,8,8)
antag_cap = list("denominator" = 38)

var/autotraitor_cooldown = (15 MINUTES)
Expand Down Expand Up @@ -64,7 +64,8 @@
required_candidates = 1
weight = 3
cost = 18
requirements = list(101,101,101,80,60,50,30,20,10,10)
minimum_players = 25
requirements = list(90,80,80,70,60,40,30,20,10,10)
antag_cap = 1
flags = HIGH_IMPACT_RULESET

Expand Down Expand Up @@ -192,7 +193,7 @@
cost = 16
scaling_cost = 10

minimum_players = 25
minimum_players = 20

requirements = list(70,70,60,50,40,20,20,10,10,10)
antag_cap = list("denominator" = 29)
Expand Down Expand Up @@ -244,13 +245,13 @@
JOB_CYBORG,
)
required_candidates = 1
weight = 3
weight = 4
cost = 10

minimum_players = 25
minimum_players = 20

scaling_cost = 9
requirements = list(101,101,60,30,30,25,20,15,10,10)
requirements = list(101,101,50,20,20,10,10,10,10,10)
antag_cap = list("denominator" = 24)


Expand Down Expand Up @@ -629,10 +630,9 @@
antag_datum = null
restricted_roles = list()
required_candidates = 0
maximum_players = 4
weight = 3
cost = 0
requirements = list(101,101,101,101,101,101,101,101,101,101) //
requirements = list(101,101,101,101,101,101,101,101,101,101)
flags = LONE_RULESET

/datum/dynamic_ruleset/roundstart/extended/pre_execute()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
antag_datum = /datum/antagonist/bloodsucker
protected_roles = list(
// Command
JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY,
JOB_CAPTAIN, JOB_HEAD_OF_PERSONNEL, JOB_HEAD_OF_SECURITY, JOB_RESEARCH_DIRECTOR, JOB_CHIEF_ENGINEER, JOB_CHIEF_MEDICAL_OFFICER,
// Security
JOB_WARDEN, JOB_SECURITY_OFFICER, JOB_DETECTIVE,
// Curator
Expand All @@ -20,9 +20,9 @@
required_candidates = 1
weight = 3
cost = 14
minimum_players = 13
minimum_players = 20
scaling_cost = 9
requirements = list(10,10,10,10,10,10,10,10,10,10)
requirements = list(101,101,60,30,30,25,20,20,14,14)
antag_cap = list("denominator" = 24)

/datum/dynamic_ruleset/roundstart/bloodsucker/pre_execute(population)
Expand Down Expand Up @@ -70,7 +70,7 @@
weight = 3
cost = 14
minimum_players = 20
requirements = list(40,30,20,10,10,10,10,10,10,10)
requirements = list(101,101,60,30,30,25,20,20,14,14)
repeatable = FALSE

/datum/dynamic_ruleset/midround/bloodsucker/trim_candidates()
Expand Down Expand Up @@ -118,7 +118,8 @@
required_candidates = 1
weight = 5
cost = 10
requirements = list(10,10,10,10,10,10,10,10,10,10)
minimum_players = 20
requirements = list(101,101,60,20,20,20,20,20,14,14)
repeatable = FALSE

/datum/dynamic_ruleset/latejoin/bloodsucker/execute()
Expand Down
Loading