cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 23:51:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Blobs now only spawn with 2 engineers and 10 players online. (#16197)

Browse Source 
Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2023-05-18 22:08:16 +00:00
committed by GitHub
co-authored by Matt Atlas
parent 8630cb886f
commit be5385a365
3 changed files with 62 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/event.dm
+20 -4
View File
@@ -8,10 +8,12 @@
var/one_shot = 0 // If true, then the event will not be re-added to the list of available events
var/add_to_queue= 1 // If true, add back to the queue of events upon finishing.
var/list/role_weights = list()
var/list/minimum_job_requirement = list() //Minimum amount of jobs required for the event to fire.
var/pop_requirement = 0 //Minimum amount of player_list mobs for this to fire.
var/list/excluded_gamemodes // A lazylist of gamemodes during which this event won't fire.
var/datum/event/event_type
/datum/event_meta/New(var/event_severity, var/event_name, var/datum/event/type, var/event_weight, var/list/job_weights, var/is_one_shot = 0, var/min_event_weight = 0, var/max_event_weight = 0, var/list/excluded_roundtypes, var/add_to_queue = TRUE)
/datum/event_meta/New(var/event_severity, var/event_name, var/datum/event/type, var/event_weight, var/list/job_weights, var/is_one_shot = 0, var/min_event_weight = 0, var/max_event_weight = 0, var/list/excluded_roundtypes, var/add_to_queue = TRUE, var/list/minimum_job_requirement_list, var/pop_needed = 0)
name = event_name
severity = event_severity
event_type = type
@@ -20,8 +22,11 @@
min_weight = min_event_weight
max_weight = max_event_weight
src.add_to_queue = add_to_queue
pop_requirement = pop_needed
if(job_weights)
role_weights = job_weights
if(minimum_job_requirement_list)
minimum_job_requirement = minimum_job_requirement_list
if(excluded_roundtypes)
excluded_gamemodes = excluded_roundtypes
@@ -29,15 +34,26 @@
if(!enabled)
return 0
if(length(player_list) <= pop_requirement)
return 0
if(LAZYISIN(excluded_gamemodes, SSticker.mode.name))
// There's no way it'll be run this round anyways.
enabled = FALSE
return 0
var/job_weight = 0
for(var/role in role_weights)
if(role in active_with_role)
job_weight += active_with_role[role] * role_weights[role]
var/minimum_met = TRUE
if(minimum_job_requirement)
for(var/role in minimum_job_requirement)
if(active_with_role[role] >= minimum_job_requirement[role])
minimum_met = TRUE
else
minimum_met = FALSE
if(minimum_met)
for(var/role in role_weights)
if(role in active_with_role)
job_weight += active_with_role[role] * role_weights[role]
var/total_weight = weight + job_weight
code/modules/events/event_container.dm
+1 -1
View File
@@ -233,7 +233,7 @@ var/global/list/severity_to_string = list(EVENT_LEVEL_MUNDANE = "Mundane", EVENT
severity = EVENT_LEVEL_MAJOR
available_events = list(
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Nothing", /datum/event/nothing, 135),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Blob", /datum/event/blob, 0, list(ASSIGNMENT_ENGINEER = 10), TRUE),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Blob", /datum/event/blob, 0, list(ASSIGNMENT_ENGINEER = 10), TRUE, minimum_job_requirement_list = list("Engineer" = 2), pop_needed = 10),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Space Vines", /datum/event/spacevine, 0, list(ASSIGNMENT_ANY = 1, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_GARDENER = 20), TRUE),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Spider Infestation", /datum/event/spider_infestation, 25, list(ASSIGNMENT_SECURITY = 10, ASSIGNMENT_MEDICAL = 5), TRUE),
new /datum/event_meta(EVENT_LEVEL_MAJOR, "Major Vermin Infestation", /datum/event/infestation/major, 15, list(ASSIGNMENT_SECURITY = 15, ASSIGNMENT_MEDICAL = 5)),