games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-10 00:43:27 +02:00
Code Issues Releases Activity

Rename r to spawn_wall_radius

Browse Source 
Remove magic numbers
This commit is contained in:
Matthias Neumayer 2020-01-05 19:33:51 +01:00
parent d03910d2d9
commit 95f14b9c1b
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
maps/biter_battles_v2/terrain.lua
View File

@ -158,19 +158,20 @@ end
local function generate_starting_area(pos, distance_to_center, surface) local function generate_starting_area(pos, distance_to_center, surface)
-- assert(distance_to_center >= spawn_circle_size) == true -- assert(distance_to_center >= spawn_circle_size) == true
local r = 116 local spawn_wall_radius = 116
local min_noise = -20 local noise_multiplier = 15
local min_noise = -noise_multiplier * 1.25
-- Avoid calculating noise, see comment below -- Avoid calculating noise, see comment below
if (distance_to_center + min_noise - r) > 4.5 then if (distance_to_center + min_noise - spawn_wall_radius) > 4.5 then
return return
end end
local noise = get_noise(2, pos) * 15 -- noise is in about [-18, 18] local noise = get_noise(2, pos) * noise_multiplier
local delta_spawn_wall_r = distance_to_center + noise - r local distance_from_spawn_wall = distance_to_center + noise - spawn_wall_radius
-- delta_spawn_wall_r is the difference between the distance_to_center (with added noise) -- distance_from_spawn_wall is the difference between the distance_to_center (with added noise)
-- and our spawn_wall radius (r=116), i.e. how far are we from the ring with radius r. -- and our spawn_wall radius (spawn_wall_radius=116), i.e. how far are we from the ring with radius spawn_wall_radius.
-- The following shows what happens depending on delta_spawn_wall_r: -- The following shows what happens depending on distance_from_spawn_wall:
-- min max -- min max
-- N/A -10 => replace water -- N/A -10 => replace water
-- if noise_2 > -0.5: -- if noise_2 > -0.5:
@ -178,11 +179,11 @@ local function generate_starting_area(pos, distance_to_center, surface)
-- else: -- else:
-- -6 -3 => 1/16 chance of turrent or turret-remnants -- -6 -3 => 1/16 chance of turrent or turret-remnants
-- -1.95 0 => wall -- -1.95 0 => wall
-- 0 4.5 => chest-remnants with 1/3, chest with 1/(delta_spawn_wall_r+2) -- 0 4.5 => chest-remnants with 1/3, chest with 1/(distance_from_spawn_wall+2)
-- --
-- => We never do anything for (distance_to_center + min_noise - r) > 4.5 -- => We never do anything for (distance_to_center + min_noise - spawn_wall_radius) > 4.5
if delta_spawn_wall_r < -10 and not is_horizontal_border_river(pos) then if distance_from_spawn_wall < -10 and not is_horizontal_border_river(pos) then
local tile_name = surface.get_tile(pos).name local tile_name = surface.get_tile(pos).name
if tile_name == "water" or tile_name == "deepwater" then if tile_name == "water" or tile_name == "deepwater" then
surface.set_tiles({{name = get_replacement_tile(surface, pos), position = pos}}, true) surface.set_tiles({{name = get_replacement_tile(surface, pos), position = pos}}, true)
@ -194,20 +195,20 @@ local function generate_starting_area(pos, distance_to_center, surface)
local noise_2 = get_noise(3, pos) local noise_2 = get_noise(3, pos)
if noise_2 < 0.25 then if noise_2 < 0.25 then
if noise_2 > -0.5 then if noise_2 > -0.5 then
if delta_spawn_wall_r > -1.75 and delta_spawn_wall_r < 0 then if distance_from_spawn_wall > -1.75 and distance_from_spawn_wall < 0 then
surface.create_entity({name = "stone-wall", position = pos, force = "north"}) surface.create_entity({name = "stone-wall", position = pos, force = "north"})
end end
else else
if delta_spawn_wall_r > -1.95 and delta_spawn_wall_r < 0 then if distance_from_spawn_wall > -1.95 and distance_from_spawn_wall < 0 then
surface.create_entity({name = "stone-wall", position = pos, force = "north"}) surface.create_entity({name = "stone-wall", position = pos, force = "north"})
elseif delta_spawn_wall_r > 0 and delta_spawn_wall_r < 4.5 then elseif distance_from_spawn_wall > 0 and distance_from_spawn_wall < 4.5 then
local name = "wooden-chest" local name = "wooden-chest"
local r_max = math.floor(math.abs(delta_spawn_wall_r)) + 2 local r_max = math.floor(math.abs(distance_from_spawn_wall)) + 2
if math_random(1,3) == 1 then name = name .. "-remnants" end if math_random(1,3) == 1 then name = name .. "-remnants" end
if math_random(1,r_max) == 1 then surface.create_entity({name = name, position = pos, force = "north"}) end if math_random(1,r_max) == 1 then surface.create_entity({name = name, position = pos, force = "north"}) end
elseif delta_spawn_wall_r > -6 and delta_spawn_wall_r < -3 then elseif distance_from_spawn_wall > -6 and distance_from_spawn_wall < -3 then
if math_random(1, 16) == 1 then if math_random(1, 16) == 1 then
if surface.can_place_entity({name = "gun-turret", position = pos}) then if surface.can_place_entity({name = "gun-turret", position = pos}) then
local t = surface.create_entity({name = "gun-turret", position = pos, force = "north"}) local t = surface.create_entity({name = "gun-turret", position = pos, force = "north"})