cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 07:33:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes atoms not spawning, Corrects defineCircularRange() to produce proper spheres when given differing Z coords.

Browse Source
This commit is contained in:
Remie Richards
2015-05-01 04:27:14 +01:00
committed by Tigercat2000
parent baa758921b
commit 0bcdcd037b
4 changed files with 84 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/procedural mapping/mapGenerator.dm
+62 -8
View File
@@ -1,3 +1,22 @@
//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 2 //Don't let turfs of DIFFERENT types cluster
#define CLUSTER_CHECK_DIFFERENT_ATOMS 4 //Don't let atoms of DIFFERENT types cluster
#define CLUSTER_CHECK_SAME_TURFS 8 //Don't let turfs of the SAME type cluster
#define CLUSTER_CHECK_SAME_ATOMS 16 //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 32 //Don't let ANY turfs cluster same and different types
#define CLUSTER_CHECK_ALL_ATOMS 64 //Don't let ANY atoms cluster same and different types
//All
#define CLUSTER_CHECK_ALL 96 //Don't let anything cluster, like, at all
/datum/mapGenerator
@@ -32,15 +51,32 @@
var/centerX = abs(max(End.x-Start.x,1))
var/centerY = abs(max(End.y-Start.y,1))
var/centerZ = abs(max(End.z-Start.z,1))
var/radius = abs(max(centerX,centerY)) //take the biggest displacement as the radius
var/turf/center = locate(centerX, centerY, centerZ) //spherical maps! because Idk
var/lilZ = min(Start.z,End.z)
var/bigZ = max(Start.z,End.z)
var/centerZ = 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()
map |= circlerange(center,radius)
var/evenCheckZ = 0
if(max(bigZ,lilZ) % 2 == 0)
evenCheckZ = centerZ+1
for(var/i = lilZ, i <= bigZ, i++)
var/theRadius = radius
if(i != centerZ)
if(i != evenCheckZ)
theRadius = max(radius/max((2*abs(centerZ-i)),1),1)
map |= circlerange(locate(centerX,centerY,i),theRadius)
return map
@@ -73,7 +109,8 @@
if(!modules || !modules.len)
return
for(var/datum/mapGeneratorModule/mod in modules)
mod.generate()
spawn(0)
mod.generate()
//Requests the mapGeneratorModule(s) to (re)generate this one turf
@@ -84,7 +121,8 @@
if(!modules || !modules.len)
return
for(var/datum/mapGeneratorModule/mod in modules)
mod.place(T)
spawn(0)
mod.place(T)
//Replaces all paths in the module list with actual module datums
@@ -135,8 +173,24 @@
src << "End Coords: [endCoords[1]] - [endCoords[2]] - [endCoords[3]]"
return
src << "Defining Region"
N.defineRegion(Start, End)
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","Map Gen Settings") as null|anything in clusters
//null for default
if(moduleClusters)
if(!clusters[moduleClusters])
src << "Invalid Cluster Flags"
return
for(var/datum/mapGeneratorModule/M in N.modules)
M.clusterCheckFlags = clusters[moduleClusters]
//src << "Defining Region"
N.defineCircularRegion(Start,End)
//N.defineRegion(Start, End)
src << "Region Defined"
src << "Generating Region"
N.generate()
code/modules/procedural mapping/mapGeneratorModule.dm
+17 -21
View File
@@ -1,19 +1,3 @@
//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 2 //Don't let turfs of DIFFERENT types cluster
#define CLUSTER_CHECK_DIFFERENT_ATOMS 4 //Don't let atoms of DIFFERENT types cluster
#define CLUSTER_CHECK_SAME_TURFS 8 //Don't let turfs of the SAME type cluster
#define CLUSTER_CHECK_SAME_ATOMS 16 //Don't let atoms of the SAME type cluster
//Combined defines
#define CLUSTER_CHECK_ALL_TURFS 32 //Don't let ANY turfs cluster same and different types
#define CLUSTER_CHECK_ALL_ATOMS 64 //Don't let ANY atoms cluster same and different types
//All
#define CLUSTER_CHECK_ALL 96 //Don't let anything cluster, like, at all
/datum/mapGeneratorModule
var/datum/mapGenerator/mother = null
@@ -21,7 +5,8 @@
var/list/spawnableTurfs = list()
var/clusterMax = 5
var/clusterMin = 1
var/clusterCheckFlags = CLUSTER_CHECK_ALL
var/clusterCheckFlags = CLUSTER_CHECK_ALL_ATOMS
var/allowAtomsOnSpace = FALSE
//Syncs the module up with it's mother
@@ -56,6 +41,10 @@
//You're the same as me? I hate you I'm going home
if(clusterCheckFlags & CLUSTER_CHECK_SAME_TURFS)
clustering = rand(clusterMin,clusterMax)
for(var/turf/F in trange(clustering,T))
if(F.type == turfPath) //NOT istype(), exact typematching
continue
if(locate(turfPath) in trange(clustering, T))
continue
@@ -63,7 +52,7 @@
if(clusterCheckFlags & CLUSTER_CHECK_DIFFERENT_TURFS)
clustering = rand(clusterMin,clusterMax)
for(var/turf/F in trange(clustering,T))
if(istype(F, turfPath))
if(F.type != turfPath)
continue
//Success!
@@ -81,16 +70,21 @@
//You're the same as me? I hate you I'm going home
if(clusterCheckFlags & CLUSTER_CHECK_SAME_ATOMS)
clustering = rand(clusterMin, clusterMax)
if(locate(atomPath) in range(clustering,T))
continue
for(var/atom/movable/M in range(clustering,T))
if(M.type == atomPath)
continue
//You're DIFFERENT from me? I hate you I'm going home
if(clusterCheckFlags & CLUSTER_CHECK_DIFFERENT_ATOMS)
clustering = rand(clusterMin, clusterMax)
for(var/atom/movable/M in range(clustering,T))
if(istype(M, atomPath))
if(M.type != atomPath)
continue
//Success!
if(prob(spawnableAtoms[atomPath]))
new atomPath(T)
. = 1
@@ -105,6 +99,8 @@
if(A.density)
. = 0
break
if(!allowAtomsOnSpace && (istype(T,/turf/space)))
. = 0
///////////////////////////////////////////////////////////
code/modules/procedural mapping/mapGeneratorReadme.dm
+3
View File
@@ -125,6 +125,7 @@ Variable Breakdown (For Mappers):
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
@@ -133,6 +134,8 @@ Variable Breakdown (For Mappers):
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 32 //Don't let ANY turfs cluster same and different types
CLUSTER_CHECK_ALL_ATOMS 64 //Don't let ANY atoms cluster same and different types
code/modules/procedural mapping/mapGenerators/nature.dm
+2 -2
View File
@@ -2,9 +2,9 @@
//Exists primarily as a test type.
/datum/mapGenerator/nature
modules = list(/datum/mapGeneratorModule/pineTrees, \
modules = list(/datum/mapGeneratorModule/bottomLayer/grassTurfs, \
/datum/mapGeneratorModule/pineTrees, \
/datum/mapGeneratorModule/deadTrees, \
/datum/mapGeneratorModule/randBushes, \
/datum/mapGeneratorModule/randRocks, \
/datum/mapGeneratorModule/bottomLayer/grassTurfs, \
/datum/mapGeneratorModule/denseLayer/grassTufts)