mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
[MIRROR] Backports Bay/Neb random map optimizations.
This commit is contained in:
Chompstation Bot
@@ -10,6 +10,7 @@
|
||||
var/cell_base // Set in New()
|
||||
var/initial_cell_range // Set in New()
|
||||
var/smoothing_iterations = 0
|
||||
var/smooth_single_tiles // Single turfs of different value are not allowed
|
||||
|
||||
/datum/random_map/noise/New()
|
||||
initial_cell_range = cell_range/5
|
||||
@@ -35,13 +36,13 @@
|
||||
// Instantiate the grid.
|
||||
for(var/x = 1, x <= limit_x, x++)
|
||||
for(var/y = 1, y <= limit_y, y++)
|
||||
map[get_map_cell(x,y)] = 0
|
||||
map[TRANSLATE_COORD(x,y)] = 0
|
||||
|
||||
// Now dump in the actual random data.
|
||||
map[get_map_cell(1,1)] = cell_base+rand(initial_cell_range)
|
||||
map[get_map_cell(1,limit_y)] = cell_base+rand(initial_cell_range)
|
||||
map[get_map_cell(limit_x,limit_y)] = cell_base+rand(initial_cell_range)
|
||||
map[get_map_cell(limit_x,1)] = cell_base+rand(initial_cell_range)
|
||||
map[TRANSLATE_COORD(1,1)] = cell_base+rand(initial_cell_range)
|
||||
map[TRANSLATE_COORD(1,limit_y)] = cell_base+rand(initial_cell_range)
|
||||
map[TRANSLATE_COORD(limit_x,limit_y)] = cell_base+rand(initial_cell_range)
|
||||
map[TRANSLATE_COORD(limit_x,1)] = cell_base+rand(initial_cell_range)
|
||||
|
||||
/datum/random_map/noise/generate_map()
|
||||
// Begin recursion.
|
||||
@@ -69,33 +70,33 @@
|
||||
(x,y)----------(x+hsize,y)----------(x+isize,y)
|
||||
*/
|
||||
// Central edge values become average of corners.
|
||||
map[get_map_cell(x+hsize,y+isize)] = round((\
|
||||
map[get_map_cell(x,y+isize)] + \
|
||||
map[get_map_cell(x+isize,y+isize)] \
|
||||
map[TRANSLATE_COORD(x+hsize,y+isize)] = round((\
|
||||
map[TRANSLATE_COORD(x,y+isize)] + \
|
||||
map[TRANSLATE_COORD(x+isize,y+isize)] \
|
||||
)/2)
|
||||
|
||||
map[get_map_cell(x+hsize,y)] = round(( \
|
||||
map[get_map_cell(x,y)] + \
|
||||
map[get_map_cell(x+isize,y)] \
|
||||
map[TRANSLATE_COORD(x+hsize,y)] = round(( \
|
||||
map[TRANSLATE_COORD(x,y)] + \
|
||||
map[TRANSLATE_COORD(x+isize,y)] \
|
||||
)/2)
|
||||
|
||||
map[get_map_cell(x,y+hsize)] = round(( \
|
||||
map[get_map_cell(x,y+isize)] + \
|
||||
map[get_map_cell(x,y)] \
|
||||
map[TRANSLATE_COORD(x,y+isize)] + \
|
||||
map[TRANSLATE_COORD(x,y)] \
|
||||
)/2)
|
||||
|
||||
map[get_map_cell(x+isize,y+hsize)] = round(( \
|
||||
map[get_map_cell(x+isize,y+isize)] + \
|
||||
map[get_map_cell(x+isize,y)] \
|
||||
map[TRANSLATE_COORD(x+isize,y+hsize)] = round(( \
|
||||
map[TRANSLATE_COORD(x+isize,y+isize)] + \
|
||||
map[TRANSLATE_COORD(x+isize,y)] \
|
||||
)/2)
|
||||
|
||||
// Centre value becomes the average of all other values + possible random variance.
|
||||
var/current_cell = get_map_cell(x+hsize,y+hsize)
|
||||
var/current_cell = TRANSLATE_COORD(x+hsize,y+hsize)
|
||||
map[current_cell] = round(( \
|
||||
map[get_map_cell(x+hsize,y+isize)] + \
|
||||
map[get_map_cell(x+hsize,y)] + \
|
||||
map[get_map_cell(x,y+hsize)] + \
|
||||
map[get_map_cell(x+isize,y)] \
|
||||
map[TRANSLATE_COORD(x+hsize,y+isize)] + \
|
||||
map[TRANSLATE_COORD(x+hsize,y)] + \
|
||||
map[TRANSLATE_COORD(x,y+hsize)] + \
|
||||
map[TRANSLATE_COORD(x+isize,y)] \
|
||||
)/4)
|
||||
|
||||
if(prob(random_variance_chance))
|
||||
@@ -104,58 +105,58 @@
|
||||
|
||||
// Recurse until size is too small to subdivide.
|
||||
if(isize>3)
|
||||
if(!priority_process) sleep(-1)
|
||||
if(!priority_process)
|
||||
CHECK_TICK
|
||||
iteration++
|
||||
subdivide(iteration, x, y, hsize)
|
||||
subdivide(iteration, x+hsize, y, hsize)
|
||||
subdivide(iteration, x, y+hsize, hsize)
|
||||
subdivide(iteration, x+hsize, y+hsize, hsize)
|
||||
|
||||
#define NOISE2VALUE(X) CLAMP(round(((X)/cell_range)*10), 0, 9)
|
||||
/datum/random_map/noise/cleanup()
|
||||
|
||||
for(var/i = 1;i<=smoothing_iterations;i++)
|
||||
var/is_not_border_left
|
||||
var/is_not_border_right
|
||||
for(var/i = 1 to smoothing_iterations)
|
||||
var/list/next_map[limit_x*limit_y]
|
||||
for(var/x = 1, x <= limit_x, x++)
|
||||
for(var/y = 1, y <= limit_y, y++)
|
||||
|
||||
var/current_cell = get_map_cell(x,y)
|
||||
for(var/x = 1 to limit_x)
|
||||
for(var/y = 1 to limit_y)
|
||||
var/current_cell = TRANSLATE_COORD(x,y)
|
||||
next_map[current_cell] = map[current_cell]
|
||||
var/val_count = 0
|
||||
var/total = 0
|
||||
var/val_count = 1
|
||||
var/total = map[current_cell]
|
||||
|
||||
is_not_border_left = (x != 1)
|
||||
is_not_border_right = (x != limit_x)
|
||||
|
||||
// Center row. Center value's already been done above.
|
||||
if (is_not_border_left)
|
||||
total += map[TRANSLATE_COORD(x - 1, y)]
|
||||
++val_count
|
||||
if (is_not_border_right)
|
||||
total += map[TRANSLATE_COORD(x + 1, y)]
|
||||
++val_count
|
||||
|
||||
if (y != 1) // top row
|
||||
total += map[TRANSLATE_COORD(x, y - 1)]
|
||||
++val_count
|
||||
if (is_not_border_left)
|
||||
total += map[TRANSLATE_COORD(x - 1, y - 1)]
|
||||
++val_count
|
||||
if (is_not_border_right)
|
||||
total += map[TRANSLATE_COORD(x + 1, y - 1)]
|
||||
++val_count
|
||||
|
||||
if (y != limit_y) // bottom row
|
||||
total += map[TRANSLATE_COORD(x, y + 1)]
|
||||
++val_count
|
||||
if (is_not_border_left)
|
||||
total += map[TRANSLATE_COORD(x - 1, y + 1)]
|
||||
++val_count
|
||||
if (is_not_border_right)
|
||||
total += map[TRANSLATE_COORD(x + 1, y + 1)]
|
||||
++val_count
|
||||
|
||||
// Get the average neighboring value.
|
||||
var/tmp_cell = get_map_cell(x+1,y+1)
|
||||
if(tmp_cell)
|
||||
total += map[tmp_cell]
|
||||
val_count++
|
||||
tmp_cell = get_map_cell(x-1,y-1)
|
||||
if(tmp_cell)
|
||||
total += map[tmp_cell]
|
||||
val_count++
|
||||
tmp_cell = get_map_cell(x+1,y-1)
|
||||
if(tmp_cell)
|
||||
total += map[tmp_cell]
|
||||
val_count++
|
||||
tmp_cell = get_map_cell(x-1,y+1)
|
||||
if(tmp_cell)
|
||||
total += map[tmp_cell]
|
||||
val_count++
|
||||
tmp_cell = get_map_cell(x-1,y)
|
||||
if(tmp_cell)
|
||||
total += map[tmp_cell]
|
||||
val_count++
|
||||
tmp_cell = get_map_cell(x,y-1)
|
||||
if(tmp_cell)
|
||||
total += map[tmp_cell]
|
||||
val_count++
|
||||
tmp_cell = get_map_cell(x+1,y)
|
||||
if(tmp_cell)
|
||||
total += map[tmp_cell]
|
||||
val_count++
|
||||
tmp_cell = get_map_cell(x,y+1)
|
||||
if(tmp_cell)
|
||||
total += map[tmp_cell]
|
||||
val_count++
|
||||
total = round(total/val_count)
|
||||
|
||||
if(abs(map[current_cell]-total) <= cell_smooth_amt)
|
||||
@@ -165,4 +166,35 @@
|
||||
else if(map[current_cell] < total)
|
||||
map[current_cell]-=cell_smooth_amt
|
||||
map[current_cell] = max(0,min(cell_range,map[current_cell]))
|
||||
map = next_map
|
||||
map = next_map
|
||||
|
||||
if(smooth_single_tiles)
|
||||
var/list/buddies = list()
|
||||
for(var/x in 1 to limit_x - 1)
|
||||
for(var/y in 1 to limit_y - 1)
|
||||
var/mapcell = get_map_cell(x,y)
|
||||
var/list/neighbors = get_neighbors(x, y)
|
||||
buddies.Cut()
|
||||
var/mapcellval = NOISE2VALUE(map[mapcell])
|
||||
for(var/cell in neighbors)
|
||||
if(NOISE2VALUE(map[cell]) == mapcellval)
|
||||
buddies |= cell
|
||||
if(!length(buddies))
|
||||
map[mapcell] = map[pick(neighbors)]
|
||||
#undef NOISE2VALUE
|
||||
|
||||
/datum/random_map/noise/proc/get_neighbors(x, y, include_diagonals)
|
||||
. = list()
|
||||
if(!include_diagonals)
|
||||
var/static/list/ortho_offsets = list(list(-1, 0), list(1, 0), list(0, 1), list(0,-1))
|
||||
for(var/list/offset in ortho_offsets)
|
||||
var/tmp_cell = get_map_cell(x+offset[1],y+offset[2])
|
||||
if(tmp_cell)
|
||||
. += tmp_cell
|
||||
else
|
||||
for(var/dx in -1 to 1)
|
||||
for(var/dy in -1 to 1)
|
||||
var/tmp_cell = get_map_cell(x+dx,y+dy)
|
||||
if(tmp_cell)
|
||||
. += tmp_cell
|
||||
. -= get_map_cell(x,y)
|
||||
|
||||
Reference in New Issue
Block a user