Guaranteed spawn flag respects current sector && sectors blacklist (#17733)

* 0

* sectors_blacklist

* Update code/datums/ruins.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update code/modules/maps/ruins.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update maps/_common/mapsystem/map.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* Update maps/_common/mapsystem/map.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

---------

Co-authored-by: DreamySkrell <>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
This commit is contained in:
DreamySkrell
2023-11-13 14:10:41 +01:00
committed by GitHub
parent efb0ea1bfa
commit 9a51dfabbf
11 changed files with 105 additions and 36 deletions
+2 -2
View File
@@ -17,12 +17,12 @@ var/list/banned_ruin_ids = list()
var/remaining = budget
for(var/datum/map_template/ruin/ruin in potentialRuins)
if(ruin.template_flags & TEMPLATE_FLAG_SPAWN_GUARANTEED)
if(HAS_FLAG(ruin.template_flags, TEMPLATE_FLAG_SPAWN_GUARANTEED) && (ruin.spawns_in_current_sector()))
force_spawn |= ruin
continue
if(ruin.id in banned_ruin_ids)
continue
if(!(SSatlas.current_sector.name in ruin.sectors) && !ignore_sector)
if(!(ruin.spawns_in_current_sector()) && !ignore_sector)
continue
available[ruin] = ruin.spawn_weight