mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-26 18:21:56 +00:00
Rename all non-snake_case types. (#27268)
* refactor: Rename all non-snake_case types (not procs or vars (yet)). * completely dynamic update script * might help to include the data * update aa's scuffed python * oh * set script PR number * run updatepaths again * Add other table updates with JSON columns * bump SQL version * just fucking end my life * move JSON data
This commit is contained in:
committed by
GitHub
parent
db4dda0fdf
commit
0ffa8303a7
@@ -1,4 +1,4 @@
|
||||
/datum/mapGenerator
|
||||
/datum/map_generator
|
||||
|
||||
//Map information
|
||||
var/list/map = list()
|
||||
@@ -6,13 +6,13 @@
|
||||
//mapGeneratorModule information
|
||||
var/list/modules = list()
|
||||
|
||||
/datum/mapGenerator/New()
|
||||
/datum/map_generator/New()
|
||||
..()
|
||||
initialiseModules()
|
||||
|
||||
//Defines the region the map represents, sets map
|
||||
//Returns the map
|
||||
/datum/mapGenerator/proc/defineRegion(turf/Start, turf/End, replace = 0)
|
||||
/datum/map_generator/proc/defineRegion(turf/Start, turf/End, replace = 0)
|
||||
if(!checkRegion(Start, End))
|
||||
return 0
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
//Defines the region the map represents, as a CIRCLE!, sets map
|
||||
//Returns the map
|
||||
/datum/mapGenerator/proc/defineCircularRegion(turf/Start, turf/End, replace = 0)
|
||||
/datum/map_generator/proc/defineCircularRegion(turf/Start, turf/End, replace = 0)
|
||||
if(!checkRegion(Start, End))
|
||||
return 0
|
||||
|
||||
@@ -60,13 +60,13 @@
|
||||
|
||||
|
||||
//Empties the map list, he's dead jim.
|
||||
/datum/mapGenerator/proc/undefineRegion()
|
||||
/datum/map_generator/proc/undefineRegion()
|
||||
map = list() //bai bai
|
||||
|
||||
|
||||
//Checks for and Rejects bad region coordinates
|
||||
//Returns 1/0
|
||||
/datum/mapGenerator/proc/checkRegion(turf/Start, turf/End)
|
||||
/datum/map_generator/proc/checkRegion(turf/Start, turf/End)
|
||||
. = 1
|
||||
|
||||
if(!Start || !End)
|
||||
@@ -81,29 +81,29 @@
|
||||
|
||||
|
||||
//Requests the mapGeneratorModule(s) to (re)generate
|
||||
/datum/mapGenerator/proc/generate()
|
||||
/datum/map_generator/proc/generate()
|
||||
syncModules()
|
||||
if(!modules || !length(modules))
|
||||
return
|
||||
for(var/datum/mapGeneratorModule/mod in modules)
|
||||
for(var/datum/map_generator_module/mod in modules)
|
||||
spawn(0)
|
||||
mod.generate()
|
||||
|
||||
|
||||
//Requests the mapGeneratorModule(s) to (re)generate this one turf
|
||||
/datum/mapGenerator/proc/generateOneTurf(turf/T)
|
||||
/datum/map_generator/proc/generateOneTurf(turf/T)
|
||||
if(!T)
|
||||
return
|
||||
syncModules()
|
||||
if(!modules || !length(modules))
|
||||
return
|
||||
for(var/datum/mapGeneratorModule/mod in modules)
|
||||
for(var/datum/map_generator_module/mod in modules)
|
||||
spawn(0)
|
||||
mod.place(T)
|
||||
|
||||
|
||||
//Replaces all paths in the module list with actual module datums
|
||||
/datum/mapGenerator/proc/initialiseModules()
|
||||
/datum/map_generator/proc/initialiseModules()
|
||||
for(var/path in modules)
|
||||
if(ispath(path))
|
||||
modules.Remove(path)
|
||||
@@ -112,8 +112,8 @@
|
||||
|
||||
|
||||
//Sync mapGeneratorModule(s) to mapGenerator
|
||||
/datum/mapGenerator/proc/syncModules()
|
||||
for(var/datum/mapGeneratorModule/mod in modules)
|
||||
/datum/map_generator/proc/syncModules()
|
||||
for(var/datum/map_generator_module/mod in modules)
|
||||
mod.sync(src)
|
||||
|
||||
|
||||
@@ -129,7 +129,7 @@
|
||||
if(!check_rights(R_MAINTAINER))
|
||||
return
|
||||
|
||||
var/datum/mapGenerator/nature/N = new()
|
||||
var/datum/map_generator/nature/N = new()
|
||||
var/startInput = clean_input("Start turf of Map, (X;Y;Z)", "Map Gen Settings", "1;1;1")
|
||||
var/endInput = clean_input("End turf of Map (X;Y;Z)", "Map Gen Settings", "[world.maxx];[world.maxy];[mob ? mob.z : 1]")
|
||||
//maxx maxy and current z so that if you fuck up, you only fuck up one entire z level instead of the entire universe
|
||||
@@ -170,7 +170,7 @@
|
||||
theCluster = MAP_GENERATOR_CLUSTER_CHECK_NONE
|
||||
|
||||
if(theCluster)
|
||||
for(var/datum/mapGeneratorModule/M in N.modules)
|
||||
for(var/datum/map_generator_module/M in N.modules)
|
||||
M.clusterCheckFlags = theCluster
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
/datum/mapGeneratorModule
|
||||
var/datum/mapGenerator/mother = null
|
||||
/datum/map_generator_module
|
||||
var/datum/map_generator/mother = null
|
||||
var/list/spawnableAtoms = list()
|
||||
var/list/spawnableTurfs = list()
|
||||
var/clusterMax = 5
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
|
||||
//Syncs the module up with it's mother
|
||||
/datum/mapGeneratorModule/proc/sync(datum/mapGenerator/mum)
|
||||
/datum/map_generator_module/proc/sync(datum/map_generator/mum)
|
||||
mother = null
|
||||
if(mum)
|
||||
mother = mum
|
||||
|
||||
|
||||
//Generates it's spawnable atoms and turfs
|
||||
/datum/mapGeneratorModule/proc/generate()
|
||||
/datum/map_generator_module/proc/generate()
|
||||
if(!mother)
|
||||
return
|
||||
var/list/map = mother.map
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
|
||||
//Place a spawnable atom or turf on this turf
|
||||
/datum/mapGeneratorModule/proc/place(turf/T)
|
||||
/datum/map_generator_module/proc/place(turf/T)
|
||||
if(!T)
|
||||
return 0
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
|
||||
|
||||
//Checks and Rejects dense turfs
|
||||
/datum/mapGeneratorModule/proc/checkPlaceAtom(turf/T)
|
||||
/datum/map_generator_module/proc/checkPlaceAtom(turf/T)
|
||||
. = 1
|
||||
if(!T)
|
||||
return 0
|
||||
@@ -127,19 +127,19 @@
|
||||
|
||||
//Settings appropriate for a turf that covers the entire map region, eg a fill colour on a bottom layer in a graphics program.
|
||||
//Should only have one of these in your mapGenerator unless you want to waste CPU
|
||||
/datum/mapGeneratorModule/bottomLayer
|
||||
/datum/map_generator_module/bottom_layer
|
||||
clusterCheckFlags = MAP_GENERATOR_CLUSTER_CHECK_NONE
|
||||
spawnableAtoms = list()//Recommended: No atoms.
|
||||
spawnableTurfs = list(/turf = 100)
|
||||
|
||||
//Settings appropriate for turfs/atoms that cover SOME of the map region, sometimes referred to as a splatter layer.
|
||||
/datum/mapGeneratorModule/splatterLayer
|
||||
/datum/map_generator_module/splatter_layer
|
||||
clusterCheckFlags = MAP_GENERATOR_CLUSTER_CHECK_ALL
|
||||
spawnableAtoms = list(/atom = 30)
|
||||
spawnableTurfs = list(/turf = 30)
|
||||
|
||||
//Settings appropriate for turfs/atoms that cover a lot of the map region, eg a dense forest.
|
||||
/datum/mapGeneratorModule/denseLayer
|
||||
/datum/map_generator_module/dense_layer
|
||||
clusterCheckFlags = MAP_GENERATOR_CLUSTER_CHECK_NONE
|
||||
spawnableAtoms = list(/atom = 75)
|
||||
spawnableTurfs = list(/turf = 75)
|
||||
|
||||
@@ -2,11 +2,11 @@
|
||||
|
||||
|
||||
// Helper to repressurize the area in case it was run in space
|
||||
/datum/mapGeneratorModule/bottomLayer/repressurize
|
||||
/datum/map_generator_module/bottom_layer/repressurize
|
||||
spawnableAtoms = list()
|
||||
spawnableTurfs = list()
|
||||
|
||||
/datum/mapGeneratorModule/bottomLayer/repressurize/generate()
|
||||
/datum/map_generator_module/bottom_layer/repressurize/generate()
|
||||
if(!mother)
|
||||
return
|
||||
var/list/map = mother.map
|
||||
@@ -22,10 +22,10 @@
|
||||
T.blind_set_air(air)
|
||||
|
||||
//Only places atoms/turfs on area borders
|
||||
/datum/mapGeneratorModule/border
|
||||
/datum/map_generator_module/border
|
||||
clusterCheckFlags = MAP_GENERATOR_CLUSTER_CHECK_NONE
|
||||
|
||||
/datum/mapGeneratorModule/border/generate()
|
||||
/datum/map_generator_module/border/generate()
|
||||
if(!mother)
|
||||
return
|
||||
var/list/map = mother.map
|
||||
@@ -33,7 +33,7 @@
|
||||
if(is_border(T))
|
||||
place(T)
|
||||
|
||||
/datum/mapGeneratorModule/border/proc/is_border(turf/T)
|
||||
/datum/map_generator_module/border/proc/is_border(turf/T)
|
||||
for(var/direction in list(SOUTH,EAST,WEST,NORTH))
|
||||
if(get_step(T,direction) in mother.map)
|
||||
continue
|
||||
|
||||
@@ -3,18 +3,18 @@
|
||||
|
||||
|
||||
//Pine Trees
|
||||
/datum/mapGeneratorModule/pineTrees
|
||||
/datum/map_generator_module/pine_trees
|
||||
spawnableAtoms = list(/obj/structure/flora/tree/pine = 30)
|
||||
|
||||
//Dead Trees
|
||||
/datum/mapGeneratorModule/deadTrees
|
||||
/datum/map_generator_module/dead_trees
|
||||
spawnableAtoms = list(/obj/structure/flora/tree/dead = 10)
|
||||
|
||||
//Random assortment of bushes
|
||||
/datum/mapGeneratorModule/randBushes
|
||||
/datum/map_generator_module/rand_bushes
|
||||
spawnableAtoms = list()
|
||||
|
||||
/datum/mapGeneratorModule/randBushes/New()
|
||||
/datum/map_generator_module/rand_bushes/New()
|
||||
..()
|
||||
spawnableAtoms = typesof(/obj/structure/flora/ausbushes)
|
||||
for(var/i in spawnableAtoms)
|
||||
@@ -22,16 +22,16 @@
|
||||
|
||||
|
||||
//Random assortment of rocks and rockpiles
|
||||
/datum/mapGeneratorModule/randRocks
|
||||
/datum/map_generator_module/rand_rocks
|
||||
spawnableAtoms = list(/obj/structure/flora/rock = 40, /obj/structure/flora/rock/pile = 20)
|
||||
|
||||
|
||||
//Grass turfs
|
||||
/datum/mapGeneratorModule/bottomLayer/grassTurfs
|
||||
/datum/map_generator_module/bottom_layer/grass_turfs
|
||||
spawnableTurfs = list(/turf/simulated/floor/grass = 100)
|
||||
|
||||
|
||||
//Grass tufts with a high spawn chance
|
||||
/datum/mapGeneratorModule/denseLayer/grassTufts
|
||||
/datum/map_generator_module/dense_layer/grass_tufts
|
||||
spawnableTurfs = list()
|
||||
spawnableAtoms = list(/obj/structure/flora/ausbushes/grassybush = 75)
|
||||
|
||||
@@ -38,7 +38,7 @@ mapGenerator:
|
||||
|
||||
initialiseModules()
|
||||
Example: initialiseModules()
|
||||
Desc: Replaces all typepaths in the modules list with actual /datum/mapGenerator/Module types
|
||||
Desc: Replaces all typepaths in the modules list with actual /datum/map_generator/Module types
|
||||
Existing Calls: mapGenerator/New()
|
||||
|
||||
syncModules()
|
||||
@@ -51,7 +51,7 @@ 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/mapGenerator/mum)
|
||||
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()
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
//Asteroid turfs
|
||||
/datum/mapGeneratorModule/bottomLayer/asteroidTurfs
|
||||
/datum/map_generator_module/bottom_layer/asteroid_turfs
|
||||
spawnableTurfs = list(/turf/simulated/floor/plating/asteroid/airless = 100)
|
||||
|
||||
/datum/mapGeneratorModule/bottomLayer/asteroidWalls
|
||||
/datum/map_generator_module/bottom_layer/asteroid_walls
|
||||
spawnableTurfs = list(/turf/simulated/mineral = 100)
|
||||
|
||||
//Border walls
|
||||
/datum/mapGeneratorModule/border/asteroidWalls
|
||||
/datum/map_generator_module/border/asteroid_walls
|
||||
spawnableAtoms = list()
|
||||
spawnableTurfs = list(/turf/simulated/mineral = 100)
|
||||
|
||||
//Random walls
|
||||
/datum/mapGeneratorModule/splatterLayer/asteroidWalls
|
||||
/datum/map_generator_module/splatter_layer/asteroid_walls
|
||||
clusterCheckFlags = MAP_GENERATOR_CLUSTER_CHECK_NONE
|
||||
spawnableAtoms = list()
|
||||
spawnableTurfs = list(/turf/simulated/mineral = 30)
|
||||
|
||||
//Monsters
|
||||
/datum/mapGeneratorModule/splatterLayer/asteroidMonsters
|
||||
/datum/map_generator_module/splatter_layer/asteroid_monsters
|
||||
spawnableTurfs = list()
|
||||
spawnableAtoms = list(/mob/living/simple_animal/hostile/asteroid/basilisk = 10, \
|
||||
/mob/living/simple_animal/hostile/asteroid/hivelord = 10, \
|
||||
@@ -26,20 +26,20 @@
|
||||
|
||||
// GENERATORS
|
||||
|
||||
/datum/mapGenerator/asteroid/hollow
|
||||
modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \
|
||||
/datum/mapGeneratorModule/border/asteroidWalls)
|
||||
/datum/map_generator/asteroid/hollow
|
||||
modules = list(/datum/map_generator_module/bottom_layer/asteroid_turfs, \
|
||||
/datum/map_generator_module/border/asteroid_walls)
|
||||
|
||||
/datum/mapGenerator/asteroid/hollow/random
|
||||
modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \
|
||||
/datum/mapGeneratorModule/border/asteroidWalls, \
|
||||
/datum/mapGeneratorModule/splatterLayer/asteroidWalls)
|
||||
/datum/map_generator/asteroid/hollow/random
|
||||
modules = list(/datum/map_generator_module/bottom_layer/asteroid_turfs, \
|
||||
/datum/map_generator_module/border/asteroid_walls, \
|
||||
/datum/map_generator_module/splatter_layer/asteroid_walls)
|
||||
|
||||
/datum/mapGenerator/asteroid/hollow/random/monsters
|
||||
modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidTurfs, \
|
||||
/datum/mapGeneratorModule/border/asteroidWalls, \
|
||||
/datum/mapGeneratorModule/splatterLayer/asteroidWalls, \
|
||||
/datum/mapGeneratorModule/splatterLayer/asteroidMonsters)
|
||||
/datum/map_generator/asteroid/hollow/random/monsters
|
||||
modules = list(/datum/map_generator_module/bottom_layer/asteroid_turfs, \
|
||||
/datum/map_generator_module/border/asteroid_walls, \
|
||||
/datum/map_generator_module/splatter_layer/asteroid_walls, \
|
||||
/datum/map_generator_module/splatter_layer/asteroid_monsters)
|
||||
|
||||
/datum/mapGenerator/asteroid/filled
|
||||
modules = list(/datum/mapGeneratorModule/bottomLayer/asteroidWalls)
|
||||
/datum/map_generator/asteroid/filled
|
||||
modules = list(/datum/map_generator_module/bottom_layer/asteroid_walls)
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
|
||||
//Exists primarily as a test type.
|
||||
|
||||
/datum/mapGenerator/nature
|
||||
modules = list(/datum/mapGeneratorModule/bottomLayer/grassTurfs, \
|
||||
/datum/mapGeneratorModule/pineTrees, \
|
||||
/datum/mapGeneratorModule/deadTrees, \
|
||||
/datum/mapGeneratorModule/randBushes, \
|
||||
/datum/mapGeneratorModule/randRocks, \
|
||||
/datum/mapGeneratorModule/denseLayer/grassTufts)
|
||||
/datum/map_generator/nature
|
||||
modules = list(/datum/map_generator_module/bottom_layer/grass_turfs, \
|
||||
/datum/map_generator_module/pine_trees, \
|
||||
/datum/map_generator_module/dead_trees, \
|
||||
/datum/map_generator_module/rand_bushes, \
|
||||
/datum/map_generator_module/rand_rocks, \
|
||||
/datum/map_generator_module/dense_layer/grass_tufts)
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
// Modules
|
||||
|
||||
/datum/mapGeneratorModule/bottomLayer/syndieFloor
|
||||
/datum/map_generator_module/bottom_layer/syndie_floor
|
||||
spawnableTurfs = list(/turf/simulated/floor/mineral/plastitanium/red = 100)
|
||||
|
||||
/datum/mapGeneratorModule/border/syndieWalls
|
||||
/datum/map_generator_module/border/syndie_walls
|
||||
spawnableAtoms = list()
|
||||
spawnableTurfs = list(/turf/simulated/wall/r_wall = 100)
|
||||
|
||||
|
||||
/datum/mapGeneratorModule/syndieFurniture
|
||||
/datum/map_generator_module/syndie_furniture
|
||||
clusterCheckFlags = MAP_GENERATOR_CLUSTER_CHECK_SAME_ATOMS
|
||||
spawnableTurfs = list()
|
||||
spawnableAtoms = list(/obj/structure/table = 20,/obj/structure/chair = 15,/obj/structure/chair/stool = 10, \
|
||||
/obj/structure/computerframe = 15, /obj/item/storage/toolbox/syndicate = 15 ,\
|
||||
/obj/structure/closet/syndicate = 25)
|
||||
|
||||
/datum/mapGeneratorModule/splatterLayer/syndieMobs
|
||||
/datum/map_generator_module/splatter_layer/syndie_mobs
|
||||
clusterCheckFlags = MAP_GENERATOR_CLUSTER_CHECK_SAME_ATOMS
|
||||
spawnableAtoms = list(/mob/living/simple_animal/hostile/syndicate = 30, \
|
||||
/mob/living/simple_animal/hostile/syndicate/melee = 20, \
|
||||
@@ -26,26 +26,26 @@
|
||||
// Generators
|
||||
|
||||
/// walls and floor only
|
||||
/datum/mapGenerator/syndicate/empty
|
||||
modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
|
||||
/datum/mapGeneratorModule/border/syndieWalls,\
|
||||
/datum/mapGeneratorModule/bottomLayer/repressurize)
|
||||
/datum/map_generator/syndicate/empty
|
||||
modules = list(/datum/map_generator_module/bottom_layer/syndie_floor, \
|
||||
/datum/map_generator_module/border/syndie_walls,\
|
||||
/datum/map_generator_module/bottom_layer/repressurize)
|
||||
|
||||
/datum/mapGenerator/syndicate/mobsonly
|
||||
modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
|
||||
/datum/mapGeneratorModule/border/syndieWalls,\
|
||||
/datum/mapGeneratorModule/splatterLayer/syndieMobs, \
|
||||
/datum/mapGeneratorModule/bottomLayer/repressurize)
|
||||
/datum/map_generator/syndicate/mobsonly
|
||||
modules = list(/datum/map_generator_module/bottom_layer/syndie_floor, \
|
||||
/datum/map_generator_module/border/syndie_walls,\
|
||||
/datum/map_generator_module/splatter_layer/syndie_mobs, \
|
||||
/datum/map_generator_module/bottom_layer/repressurize)
|
||||
|
||||
/datum/mapGenerator/syndicate/furniture
|
||||
modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
|
||||
/datum/mapGeneratorModule/border/syndieWalls,\
|
||||
/datum/mapGeneratorModule/syndieFurniture, \
|
||||
/datum/mapGeneratorModule/bottomLayer/repressurize)
|
||||
/datum/map_generator/syndicate/furniture
|
||||
modules = list(/datum/map_generator_module/bottom_layer/syndie_floor, \
|
||||
/datum/map_generator_module/border/syndie_walls,\
|
||||
/datum/map_generator_module/syndie_furniture, \
|
||||
/datum/map_generator_module/bottom_layer/repressurize)
|
||||
|
||||
/datum/mapGenerator/syndicate/full
|
||||
modules = list(/datum/mapGeneratorModule/bottomLayer/syndieFloor, \
|
||||
/datum/mapGeneratorModule/border/syndieWalls,\
|
||||
/datum/mapGeneratorModule/syndieFurniture, \
|
||||
/datum/mapGeneratorModule/splatterLayer/syndieMobs, \
|
||||
/datum/mapGeneratorModule/bottomLayer/repressurize)
|
||||
/datum/map_generator/syndicate/full
|
||||
modules = list(/datum/map_generator_module/bottom_layer/syndie_floor, \
|
||||
/datum/map_generator_module/border/syndie_walls,\
|
||||
/datum/map_generator_module/syndie_furniture, \
|
||||
/datum/map_generator_module/splatter_layer/syndie_mobs, \
|
||||
/datum/map_generator_module/bottom_layer/repressurize)
|
||||
|
||||
Reference in New Issue
Block a user