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.

Sign up for GitHub

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

Jump to bottom

Roundstart xenomorph count changes #6291

Merged
merged 4 commits into from
May 19, 2024
Merged

Roundstart xenomorph count changes #6291

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96cc048
a
Git-Nivrak May 16, 2024
d33950f
autocomplete moment
Git-Nivrak May 16, 2024
347598d
Update role_authority.dm
Git-Nivrak May 18, 2024
01a8969
Update role_authority.dm
Git-Nivrak May 18, 2024
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: 1 addition & 0 deletions code/__DEFINES/mode.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
#define ROUNDSTATUS_FOG_DOWN 1
#define ROUNDSTATUS_PODDOORS_OPEN 2

#define LATEJOIN_MARINES_PER_LATEJOIN_LARVA_EARLY 4
#define LATEJOIN_MARINES_PER_LATEJOIN_LARVA 2.5

//=================================================
Expand Down
1 change: 1 addition & 0 deletions code/game/gamemodes/cm_initialize.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ Additional game mode variables.
var/monkey_amount = 0 //How many monkeys do we spawn on this map ?
var/list/monkey_types = list() //What type of monkeys do we spawn
var/latejoin_tally = 0 //How many people latejoined Marines
var/latejoin_larva_drop_early = LATEJOIN_MARINES_PER_LATEJOIN_LARVA_EARLY
var/latejoin_larva_drop = LATEJOIN_MARINES_PER_LATEJOIN_LARVA //A larva will spawn in once the tally reaches this level. If set to 0, no latejoin larva drop
/// Amount of latejoin_tally already awarded as larvas
var/latejoin_larva_used = 0
Expand Down
4 changes: 2 additions & 2 deletions code/game/jobs/role_authority.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,8 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
var/list/roles_left = list()
var/assigned = 0
for(var/priority in HIGH_PRIORITY to LOW_PRIORITY)
// Assigning xenos first.
assigned += assign_initial_roles(priority, roles_for_mode & GLOB.ROLES_XENO, unassigned_players)
// Assigning xenos first, should not be counted
assign_initial_roles(priority, roles_for_mode & GLOB.ROLES_XENO, unassigned_players)
Git-Nivrak marked this conversation as resolved.
Show resolved Hide resolved
// Assigning special roles second. (survivor, predator)
assigned += assign_initial_roles(priority, roles_for_mode & (GLOB.ROLES_WHITELISTED|GLOB.ROLES_SPECIAL), unassigned_players)
// Assigning command third.
Expand Down
9 changes: 7 additions & 2 deletions code/modules/mob/new_player/new_player.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,13 @@
sq.max_engineers = engi_slot_formula(GLOB.clients.len)
sq.max_medics = medic_slot_formula(GLOB.clients.len)

if(SSticker.mode.latejoin_larva_drop && SSticker.mode.latejoin_tally - SSticker.mode.latejoin_larva_used >= SSticker.mode.latejoin_larva_drop)
SSticker.mode.latejoin_larva_used += SSticker.mode.latejoin_larva_drop
var/latejoin_larva_drop = SSticker.mode.latejoin_larva_drop

if (ROUND_TIME < XENO_ROUNDSTART_PROGRESS_TIME_2)
latejoin_larva_drop = SSticker.mode.latejoin_larva_drop_early

if(latejoin_larva_drop && SSticker.mode.latejoin_tally - SSticker.mode.latejoin_larva_used >= latejoin_larva_drop)
SSticker.mode.latejoin_larva_used += latejoin_larva_drop
var/datum/hive_status/hive
for(var/hivenumber in GLOB.hive_datum)
hive = GLOB.hive_datum[hivenumber]
Expand Down
Loading