mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-28 10:31:59 +00:00
Makes the code compatible with 515.1594+
Few simple changes and one very painful one.
Let's start with the easy:
* puts call behind `LIBCALL` define, so call_ext is properly used in 515
* Adds `NAMEOF_STATIC(_,X)` macro for nameof in static definitions since
src is now invalid there.
* Fixes tgui and devserver. From 515 onward the tmp3333{procid} cache
directory is not appened to base path in browser controls so we don't
check for it in base js and put the dev server dummy window file in
actual directory not the byond root.
* Renames the few things that had /final/ in typepath to ultimate since
final is a new keyword
And the very painful change:
`.proc/whatever` format is no longer valid, so we're replacing it with
new nameof() function. All this wrapped in three new macros.
`PROC_REF(X)`,`TYPE_PROC_REF(TYPE,X)`,`GLOBAL_PROC_REF(X)`. Global is
not actually necessary but if we get nameof that does not allow globals
it would be nice validation.
This is pretty unwieldy but there's no real alternative.
If you notice anything weird in the commits let me know because majority
was done with regex replace.
@tgstation/commit-access Since the .proc/stuff is pretty big change.
Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
207 lines
6.2 KiB
Plaintext
207 lines
6.2 KiB
Plaintext
//clusterCheckFlags defines
|
|
//All based on clusterMin and clusterMax as guides
|
|
|
|
//Individual defines
|
|
#define CLUSTER_CHECK_NONE 0 //No checks are done, cluster as much as possible
|
|
#define CLUSTER_CHECK_DIFFERENT_TURFS (1<<1) //Don't let turfs of DIFFERENT types cluster
|
|
#define CLUSTER_CHECK_DIFFERENT_ATOMS (1<<2) //Don't let atoms of DIFFERENT types cluster
|
|
#define CLUSTER_CHECK_SAME_TURFS (1<<3) //Don't let turfs of the SAME type cluster
|
|
#define CLUSTER_CHECK_SAME_ATOMS (1<<4) //Don't let atoms of the SAME type cluster
|
|
|
|
//Combined defines
|
|
#define CLUSTER_CHECK_SAMES 24 //Don't let any of the same type cluster
|
|
#define CLUSTER_CHECK_DIFFERENTS 6 //Don't let any of different types cluster
|
|
#define CLUSTER_CHECK_ALL_TURFS 10 //Don't let ANY turfs cluster same and different types
|
|
#define CLUSTER_CHECK_ALL_ATOMS 20 //Don't let ANY atoms cluster same and different types
|
|
|
|
//All
|
|
#define CLUSTER_CHECK_ALL 30 //Don't let anything cluster, like, at all
|
|
|
|
/datum/map_generator
|
|
|
|
//Map information
|
|
var/list/map = list()
|
|
|
|
//mapGeneratorModule information
|
|
var/list/modules = list()
|
|
|
|
var/buildmode_name = "Undocumented"
|
|
|
|
/datum/map_generator/New()
|
|
..()
|
|
if(buildmode_name == "Undocumented")
|
|
buildmode_name = copytext_char("[type]", 20) // / d a t u m / m a p g e n e r a t o r / = 20 characters.
|
|
initialiseModules()
|
|
|
|
//Defines the region the map represents, sets map
|
|
//Returns the map
|
|
/datum/map_generator/proc/defineRegion(turf/Start, turf/End, replace = 0)
|
|
if(!checkRegion(Start, End))
|
|
return 0
|
|
|
|
if(replace)
|
|
undefineRegion()
|
|
map |= block(Start,End)
|
|
return map
|
|
|
|
|
|
//Defines the region the map represents, as a CIRCLE!, sets map
|
|
//Returns the map
|
|
/datum/map_generator/proc/defineCircularRegion(turf/Start, turf/End, replace = 0)
|
|
if(!checkRegion(Start, End))
|
|
return 0
|
|
|
|
var/centerX = max(abs((End.x+Start.x)/2),1)
|
|
var/centerY = max(abs((End.y+Start.y)/2),1)
|
|
|
|
var/lilZ = min(Start.z,End.z)
|
|
var/bigZ = max(Start.z,End.z)
|
|
|
|
var/sphereMagic = max(abs(bigZ-(lilZ/2)),1) //Spherical maps! woo!
|
|
|
|
var/radius = abs(max(centerX,centerY)) //take the biggest displacement as the radius
|
|
|
|
if(replace)
|
|
undefineRegion()
|
|
|
|
//Even sphere correction engage
|
|
var/offByOneOffset = 1
|
|
if(bigZ % 2 == 0)
|
|
offByOneOffset = 0
|
|
|
|
for(var/i in lilZ to bigZ+offByOneOffset)
|
|
var/theRadius = radius
|
|
if(i != sphereMagic)
|
|
theRadius = max(radius/max((2*abs(sphereMagic-i)),1),1)
|
|
|
|
|
|
map |= circle_range(locate(centerX,centerY,i),theRadius)
|
|
|
|
|
|
return map
|
|
|
|
|
|
//Empties the map list, he's dead jim.
|
|
/datum/map_generator/proc/undefineRegion()
|
|
map = list() //bai bai
|
|
|
|
|
|
//Checks for and Rejects bad region coordinates
|
|
//Returns 1/0
|
|
/datum/map_generator/proc/checkRegion(turf/Start, turf/End)
|
|
if(!Start || !End)
|
|
return FALSE //Just bail
|
|
|
|
if(Start.x > world.maxx || End.x > world.maxx)
|
|
return FALSE
|
|
if(Start.y > world.maxy || End.y > world.maxy)
|
|
return FALSE
|
|
if(Start.z > world.maxz || End.z > world.maxz)
|
|
return FALSE
|
|
return TRUE
|
|
|
|
|
|
//Requests the mapGeneratorModule(s) to (re)generate
|
|
/datum/map_generator/proc/generate()
|
|
syncModules()
|
|
if(!modules || !modules.len)
|
|
return
|
|
for(var/datum/map_generator_module/mod in modules)
|
|
INVOKE_ASYNC(mod, TYPE_PROC_REF(/datum/map_generator_module, generate))
|
|
|
|
|
|
//Requests the mapGeneratorModule(s) to (re)generate this one turf
|
|
/datum/map_generator/proc/generateOneTurf(turf/T)
|
|
if(!T)
|
|
return
|
|
syncModules()
|
|
if(!modules || !modules.len)
|
|
return
|
|
for(var/datum/map_generator_module/mod in modules)
|
|
INVOKE_ASYNC(mod, TYPE_PROC_REF(/datum/map_generator_module, place), T)
|
|
|
|
|
|
//Replaces all paths in the module list with actual module datums
|
|
/datum/map_generator/proc/initialiseModules()
|
|
for(var/path in modules)
|
|
if(ispath(path))
|
|
modules.Remove(path)
|
|
modules |= new path
|
|
syncModules()
|
|
|
|
|
|
//Sync mapGeneratorModule(s) to mapGenerator
|
|
/datum/map_generator/proc/syncModules()
|
|
for(var/datum/map_generator_module/mod in modules)
|
|
mod.sync(src)
|
|
|
|
|
|
|
|
///////////////////////////
|
|
// HERE BE DEBUG DRAGONS //
|
|
///////////////////////////
|
|
|
|
/client/proc/debugNatureMapGenerator()
|
|
set name = "Test Nature Map Generator"
|
|
set category = "Debug"
|
|
|
|
var/datum/map_generator/nature/N = new()
|
|
var/startInput = input(usr,"Start turf of Map, (X;Y;Z)", "Map Gen Settings", "1;1;1") as text|null
|
|
|
|
if (isnull(startInput))
|
|
return
|
|
|
|
var/endInput = input(usr,"End turf of Map (X;Y;Z)", "Map Gen Settings", "[world.maxx];[world.maxy];[mob ? mob.z : 1]") as text|null
|
|
|
|
if (isnull(endInput))
|
|
return
|
|
|
|
//maxx maxy and current z so that if you fuck up, you only fuck up one entire z level instead of the entire universe
|
|
if(!startInput || !endInput)
|
|
to_chat(src, "Missing Input")
|
|
return
|
|
|
|
var/list/startCoords = splittext(startInput, ";")
|
|
var/list/endCoords = splittext(endInput, ";")
|
|
if(!startCoords || !endCoords)
|
|
to_chat(src, "Invalid Coords")
|
|
to_chat(src, "Start Input: [startInput]")
|
|
to_chat(src, "End Input: [endInput]")
|
|
return
|
|
|
|
var/turf/Start = locate(text2num(startCoords[1]),text2num(startCoords[2]),text2num(startCoords[3]))
|
|
var/turf/End = locate(text2num(endCoords[1]),text2num(endCoords[2]),text2num(endCoords[3]))
|
|
if(!Start || !End)
|
|
to_chat(src, "Invalid Turfs")
|
|
to_chat(src, "Start Coords: [startCoords[1]] - [startCoords[2]] - [startCoords[3]]")
|
|
to_chat(src, "End Coords: [endCoords[1]] - [endCoords[2]] - [endCoords[3]]")
|
|
return
|
|
|
|
var/list/clusters = list("None"=CLUSTER_CHECK_NONE,"All"=CLUSTER_CHECK_ALL,"Sames"=CLUSTER_CHECK_SAMES,"Differents"=CLUSTER_CHECK_DIFFERENTS, \
|
|
"Same turfs"=CLUSTER_CHECK_SAME_TURFS, "Same atoms"=CLUSTER_CHECK_SAME_ATOMS, "Different turfs"=CLUSTER_CHECK_DIFFERENT_TURFS, \
|
|
"Different atoms"=CLUSTER_CHECK_DIFFERENT_ATOMS, "All turfs"=CLUSTER_CHECK_ALL_TURFS,"All atoms"=CLUSTER_CHECK_ALL_ATOMS)
|
|
|
|
var/moduleClusters = input("Cluster Flags (Cancel to leave unchanged from defaults)","Map Gen Settings") as null|anything in clusters
|
|
//null for default
|
|
|
|
var/theCluster = 0
|
|
if(moduleClusters != "None")
|
|
if(!clusters[moduleClusters])
|
|
to_chat(src, "Invalid Cluster Flags")
|
|
return
|
|
theCluster = clusters[moduleClusters]
|
|
else
|
|
theCluster = CLUSTER_CHECK_NONE
|
|
|
|
if(theCluster)
|
|
for(var/datum/map_generator_module/M in N.modules)
|
|
M.clusterCheckFlags = theCluster
|
|
|
|
|
|
to_chat(src, "Defining Region")
|
|
N.defineRegion(Start, End)
|
|
to_chat(src, "Region Defined")
|
|
to_chat(src, "Generating Region")
|
|
N.generate()
|
|
to_chat(src, "Generated Region")
|