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

Lower xeno ratio #16572

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
2 changes: 2 additions & 0 deletions code/__DEFINES/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ GLOBAL_LIST_INIT(jobs_fallen_marine, typecacheof(list(/datum/job/fallen/marine),
#define LARVA_POINTS_SHIPSIDE 1
#define LARVA_POINTS_SHIPSIDE_STRONG 1.5
#define LARVA_POINTS_REGULAR 3.25
///How many marines per xeno at optimal ratio
#define XENO_MARINE_RATIO 3

#define SURVIVOR_POINTS_REGULAR 1

Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/mode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
#define INFESTATION_MARINE_CRASHING 1
#define INFESTATION_DROPSHIP_CAPTURED_XENOS 2

#define NUCLEAR_WAR_LARVA_POINTS_NEEDED 8
#define NUCLEAR_WAR_LARVA_POINTS_NEEDED 10
#define CRASH_LARVA_POINTS_NEEDED 10

#define FREE_XENO_AT_START 2
Expand Down
3 changes: 1 addition & 2 deletions code/controllers/subsystem/silo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ SUBSYSTEM_DEF(silo)
current_larva_spawn_rate *= SSticker.mode.silo_scaling
//We scale the rate based on the current ratio of humans to xenos
var/current_human_to_xeno_ratio = active_humans / active_xenos
var/optimal_human_to_xeno_ratio = xeno_job.job_points_needed / LARVA_POINTS_REGULAR
current_larva_spawn_rate *= clamp(current_human_to_xeno_ratio / optimal_human_to_xeno_ratio , 0.7, 1)
current_larva_spawn_rate *= clamp(current_human_to_xeno_ratio / XENO_MARINE_RATIO , 0.7, 1)

GLOB.round_statistics.larva_from_silo += current_larva_spawn_rate / xeno_job.job_points_needed

Expand Down
Loading