# MAINTAINER - USE THE BUTTON THAT SAYS "MERGE MASTER" THEN SET THE PR TO AUTO-MERGE! IT'S MUCH EASIER FOR ME TO FIX THINGS BEFORE THEY SKEW RATHER THAN AFTER THE FACT. ## About The Pull Request Hey there, This took a while to do, but here's the gist: Python file now regexes every file in `/code` except for those that have some valid reason to be tacking on more global defines. Some of those reasons are simply just that I don't have the time right now (doing what you see in this PR took a few hours) to refactor and parse what should belong and what should be thrown out. For the time being though, this PR will at least _halt_ people making the mistake of not `#undef`ing any files they `#define` "locally", or within the scope of a file. Most people forget to do this and this leads to a lot of mess later on due to how many variables can be unmanaged on the global level. I've made this mistake, you've made this mistake, it's a common thing. Let's automatically check for it so it can be fixed no-stress. Scenarios this PR corrects: * Forgetting to undef a define but undeffing others. * Not undeffing any defines in your file. * Earmarking a define as a "file local" define, but not defining it. * Having a define be a "file local" define, but having it be used elsewhere. * Having a "local" define not even be in the file that it only shows up in. * Having a completely unused define* (* I kept some of these because they seemed important... Others were junked.) ## Why It's Good For The Game If you wanna use it across multiple files, no reason to not make it a global define (maybe there's a few reasons but let's assume that this is the 95% case). Let me know if you don't like how I re-arranged some of the defines and how you'd rather see it be implemented, and I'd be happy to do that. This was mostly just "eh does it need it or not" sorta stuff. I used a pretty cool way to detect if we should use the standardized GitHub "error" output, you can see the results of that here https://github.com/san7890/bruhstation/actions/runs/4549766579/jobs/8022186846#step:7:792 ## Changelog Nothing that really concerns players. (I fixed up all this stuff using vscode, no regexes beyond what you see in the python script. sorry downstreams)
Procedural Mapping
With Regards To RemieRichards
Coder Informative Readme
mapGenerator:
Desc: a mapGenerator is a master datum that collects and syncs all mapGeneratorModules in its modules list.
defineRegion(var/turf/Start, turf/End, replace = 0)
Example: defineRegion(locate(1,1,1),locate(5,5,5),0)
Desc: Sets the bounds of the mapGenerator's "map".
defineCircularRegion(var/turf/Start, turf/End, replace = 0)
Example: defineCircularRegion(locate(1,1,1),locate(5,5,5),0)
Desc: Sets the mapGenerator's "map" as a circle, with center in the middle of Start and End's X,Y,Z coordinates.
undefineRegion()
Example: undefineRegion()
Desc: Empties the map generator list.
checkRegion(var/turf/Start, turf/End)
Example: checkRegion(locate(1,1,1), locate(5,5,5))
Desc: Checks if a rectangle between Start's coords and End's coords is valid.
Existing Calls: mapGenerator/defineRegion(), mapGenerator/defineCircularRegion()
generate()
Example: generate()
Desc: Orders all mapGeneratorModules in the modules list to generate().
generateOneTurf(var/turf/T)
Example: generateOneTurf(locate(1,1,1))
Desc: Orders all mapGeneratorModules in the modules list to place(T) on this turf.
initialiseModules()
Example: initialiseModules()
Desc: Replaces all typepaths in the modules list with actual /datum/map_generator/Module types.
Existing Calls: mapGenerator/New()
syncModules()
Example: syncModules()
Desc: Sets the Mother variable on all mapGeneratorModules in the modules list to this mapGenerator.
Existing Calls: initialiseModules(),generate(),generateOneTurf()
mapGeneratorModule
Desc: a mapGeneratorModule has spawnableAtoms and spawnableTurfs lists which it will generate on turfs in it's mother's map based on cluster variables.
sync(var/datum/map_generator/mum)
Example: sync(a_mapGenerator_as_a_variable)
Desc: Sets the Mother variable to the mum argument.
Existing Calls: mapGenerator/syncModules()
generate()
Example: generate()
Desc: Calls place(T) on all turfs in it's mother's map
Existing Calls: mapGenerator/generate()
place(var/turf/T)
Example: place(locate(1,1,1))
Desc: Run this mapGeneratorModule's effects on this turf (Spawning atoms, Changing turfs).
Existing Calls: mapGenerator/generate(), mapGenerator/generateOneTurf()
checkPlaceAtom(var/turf/T)
Example: checkPlace(locate(1,1,1))
Desc: Checks if the turf is valid for placing atoms.
Existing Calls: place()
Mapper Friendly Readme
Simple Workflow:
- Define a/some mapGeneratorModule(s) to your liking, choosing atoms and turfs to spawn
- I chose to split Turfs and Atoms off into separate modules, but this is NOT required.
- A mapGeneratorModule may have turfs AND atoms, so long as each is in it's appropriate list
- Define a mapGenerator type who's modules list contains the typepath(s) of all the module(s) you wish to use
- The order of the typepaths in the modules list is the order they will happen in, this is important for clusterCheckFlags.
- Take notes of the Bottom Left and Top Right turfs of your rectangular "map"'s coordinates
- X, Y, AND Z. Yes, you can create 3D "maps" by having differing Z coordinates
-
Create the mapGenerator type you created
-
Call
yourMapGeneratorType.defineRegion(locate(X,Y,Z), locate(X,Y,Z))
- The above X/Y/Zs are the coordinates of the start and end turfs, the locate() simply finds the turf for the code
- Call
yourMapGeneratorType.generate(), this will cause all the modules in the generator to build within the map bounds
Option Suggestions:
- Have separate modules for Turfs and Atoms, this is not enforced, but it is how I have structured my nature example.
- If your map doesn't look quite to your liking, simply jiggle with the variables on your modules and the type probabilities.
- You can mix and map premade areas with the procedural generation, for example mapping an entire flat land but having code generate just the grass tufts.
Using the Modules list
Simply think of it like each module is a layer in a graphics editing program!
To help you do this templates such as /mapGeneratorModule/bottomLayer have been provided with appropriate default settings.
These are located near the bottom of mapGeneratorModule.dm. You would order your list left to right, top to bottom. For example: modules = list(bottomLayer,nextLayer,nextNextLayer), etc.
Variable Breakdown (For Mappers):
mapGenerator
- map - INTERNAL, do not touch
- modules - A list of typepaths of mapGeneratorModules
mapGeneratorModule
-
mother - INTERNAL, do not touch
-
spawnableAtoms - A list of typepaths and their probability to spawn, eg:
spawnableAtoms = list(/obj/structure/flora/tree/pine = 30) -
spawnableTurfs - A list of typepaths and their probability to spawn, eg:
spawnableTurfs = list(/turf/unsimulated/floor/grass = 100) -
clusterMax - The max range to check for something being "too close" for this atom/turf to spawn, the true value is random between clusterMin and clusterMax
-
clusterMin - The min range to check for something being "too close" for this atom/turf to spawn, the true value is random between clusterMin and clusterMax
-
clusterCheckFlags - A Bitfield that controls how the cluster checks work, All based on clusterMin and clusterMax guides
-
allowAtomsOnSpace - A Boolean for if we allow atoms to spawn on space tiles
clusterCheckFlags flags:
CLUSTER_CHECK_NONE 0 //No checks are done, cluster as much as possible
CLUSTER_CHECK_DIFFERENT_TURFS 2 //Don't let turfs of DIFFERENT types cluster
CLUSTER_CHECK_DIFFERENT_ATOMS 4 //Don't let atoms of DIFFERENT types cluster
CLUSTER_CHECK_SAME_TURFS 8 //Don't let turfs of the SAME type cluster
CLUSTER_CHECK_SAME_ATOMS 16 //Don't let atoms of the SAME type cluster
CLUSTER_CHECK_SAMES 24 //Don't let any of the same type cluster
CLUSTER_CHECK_DIFFERENTS 6 //Don't let any different types cluster
CLUSTER_CHECK_ALL_TURFS 10 //Don't let ANY turfs cluster same and different types
CLUSTER_CHECK_ALL_ATOMS 20 //Don't let ANY atoms cluster same and different types
CLUSTER_CHECK_ALL 30 //Don't let anything cluster, like, at all