cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5048 from VOREStation/upstream-merge-6065

Browse Source 
[MIRROR] Allows restriction of z-levels from spawning xenoarch finds
This commit is contained in:
Novacat
2019-04-14 03:08:41 -04:00
committed by GitHub
parent 84398845db 85f1c6339c
commit 629748faec
6 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/__defines/map.dm
View File

@@ -6,6 +6,7 @@
#define MAP_LEVEL_SEALED 0x010 // Z-levels that don't allow random transit at edge #define MAP_LEVEL_SEALED 0x010 // Z-levels that don't allow random transit at edge
#define MAP_LEVEL_EMPTY 0x020 // Empty Z-levels that may be used for various things (currently used by bluespace jump) #define MAP_LEVEL_EMPTY 0x020 // Empty Z-levels that may be used for various things (currently used by bluespace jump)
#define MAP_LEVEL_CONSOLES 0x040 // Z-levels available to various consoles, such as the crew monitor (when that gets coded in). Defaults to station_levels if unset. #define MAP_LEVEL_CONSOLES 0x040 // Z-levels available to various consoles, such as the crew monitor (when that gets coded in). Defaults to station_levels if unset.
#define MAP_LEVEL_XENOARCH_EXEMPT 0x080 // Z-levels exempt from xenoarch digsite generation.
// Misc map defines. // Misc map defines.
#define SUBMAP_MAP_EDGE_PAD 15 // Automatically created submaps are forbidden from being this close to the main map's edge. #define SUBMAP_MAP_EDGE_PAD 15 // Automatically created submaps are forbidden from being this close to the main map's edge.

1
code/__defines/map_vr.dm
View File

@@ -1 +0,0 @@
#define MAP_LEVEL_XENOARCH_EXEMPT 0x080 // Z-levels exempt from xenoarch digsite generation.

2
code/controllers/subsystems/xenoarch.dm
View File

@@ -31,7 +31,7 @@ SUBSYSTEM_DEF(xenoarch)
/datum/controller/subsystem/xenoarch/proc/SetupXenoarch() /datum/controller/subsystem/xenoarch/proc/SetupXenoarch()
for(var/turf/simulated/mineral/M in turfs) for(var/turf/simulated/mineral/M in turfs)
if(!M.density || M.z in using_map.xenoarch_exempt_levels) //VOREStation Edit: exclude some Z-levels from xenoarch spawns if(!M.density || M.z in using_map.xenoarch_exempt_levels)
continue continue
if(isnull(M.geologic_data)) if(isnull(M.geologic_data))

3
maps/~map_system/maps.dm
View File

@@ -30,6 +30,7 @@ var/list/all_maps = list()
var/list/contact_levels = list() // Z-levels that can be contacted from the station, for eg announcements var/list/contact_levels = list() // Z-levels that can be contacted from the station, for eg announcements
var/list/player_levels = list() // Z-levels a character can typically reach var/list/player_levels = list() // Z-levels a character can typically reach
var/list/sealed_levels = list() // Z-levels that don't allow random transit at edge var/list/sealed_levels = list() // Z-levels that don't allow random transit at edge
var/list/xenoarch_exempt_levels = list() //Z-levels exempt from xenoarch finds and digsites spawning.
var/list/empty_levels = null // Empty Z-levels that may be used for various things (currently used by bluespace jump) var/list/empty_levels = null // Empty Z-levels that may be used for various things (currently used by bluespace jump)
var/list/map_levels // Z-levels available to various consoles, such as the crew monitor (when that gets coded in). Defaults to station_levels if unset. var/list/map_levels // Z-levels available to various consoles, such as the crew monitor (when that gets coded in). Defaults to station_levels if unset.
@@ -185,7 +186,7 @@ var/list/all_maps = list()
if(flags & MAP_LEVEL_CONTACT) map.contact_levels += z if(flags & MAP_LEVEL_CONTACT) map.contact_levels += z
if(flags & MAP_LEVEL_PLAYER) map.player_levels += z if(flags & MAP_LEVEL_PLAYER) map.player_levels += z
if(flags & MAP_LEVEL_SEALED) map.sealed_levels += z if(flags & MAP_LEVEL_SEALED) map.sealed_levels += z
if(flags & MAP_LEVEL_XENOARCH_EXEMPT) map.xenoarch_exempt_levels += z //VOREStation Edit : excluse some z-levels from xenoarch spawns if(flags & MAP_LEVEL_XENOARCH_EXEMPT) map.xenoarch_exempt_levels += z
if(flags & MAP_LEVEL_EMPTY) if(flags & MAP_LEVEL_EMPTY)
if(!map.empty_levels) map.empty_levels = list() if(!map.empty_levels) map.empty_levels = list()
map.empty_levels += z map.empty_levels += z

2
maps/~map_system/maps_vr.dm
View File

@@ -1,2 +0,0 @@
/datum/map
var/list/xenoarch_exempt_levels = list() //Z-levels exempt from xenoarch finds and digsites spawning.

2
vorestation.dme
View File

@@ -50,7 +50,6 @@
#include "code\__defines\lighting.dm" #include "code\__defines\lighting.dm"
#include "code\__defines\machinery.dm" #include "code\__defines\machinery.dm"
#include "code\__defines\map.dm" #include "code\__defines\map.dm"
#include "code\__defines\map_vr.dm"
#include "code\__defines\math.dm" #include "code\__defines\math.dm"
#include "code\__defines\math_physics.dm" #include "code\__defines\math_physics.dm"
#include "code\__defines\MC.dm" #include "code\__defines\MC.dm"
@@ -3112,5 +3111,4 @@
#include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm"
#include "maps\tether\tether.dm" #include "maps\tether\tether.dm"
#include "maps\~map_system\maps.dm" #include "maps\~map_system\maps.dm"
#include "maps\~map_system\maps_vr.dm"
// END_INCLUDE // END_INCLUDE