diff --git a/maps/scrapyard/terrain.lua b/maps/scrapyard/terrain.lua index b9cf0bbb..0696a19b 100644 --- a/maps/scrapyard/terrain.lua +++ b/maps/scrapyard/terrain.lua @@ -21,6 +21,7 @@ local rock_raffle = {"sand-rock-big","sand-rock-big", "rock-big","rock-big","roc local scrap_buildings = {"nuclear-reactor", "centrifuge", "beacon", "chemical-plant", "assembling-machine-1", "assembling-machine-2", "assembling-machine-3", "oil-refinery", "arithmetic-combinator", "constant-combinator", "decider-combinator", "programmable-speaker", "steam-turbine", "steam-engine", "chemical-plant", "assembling-machine-1", "assembling-machine-2", "assembling-machine-3", "oil-refinery", "arithmetic-combinator", "constant-combinator", "decider-combinator", "programmable-speaker", "steam-turbine", "steam-engine"} local spawner_raffle = {"biter-spawner", "biter-spawner", "biter-spawner", "spitter-spawner"} local trees = {"dead-grey-trunk", "dead-grey-trunk", "dry-tree"} +local colors = {"black", "orange", "red", "yellow"} local noises = { ["no_rocks"] = {{modifier = 0.0033, weight = 1}, {modifier = 0.01, weight = 0.22}, {modifier = 0.05, weight = 0.05}, {modifier = 0.1, weight = 0.04}}, @@ -498,7 +499,8 @@ local function process_level_1_position(surface, p, seed, tiles, entities, fishe end if noise_cave_ponds > 0.76 then - tiles[#tiles + 1] = {name = "dirt-" .. math_random(4, 6), position = p} + tiles[#tiles + 1] = {name = colors[math_random(1, #colors)].. "-refined-concrete", position = p} + --tiles[#tiles + 1] = {name = "dirt-" .. math_random(4, 6), position = p} return end @@ -518,7 +520,8 @@ local function process_level_1_position(surface, p, seed, tiles, entities, fishe if no_rocks < 0.08 and no_rocks > -0.08 then if small_caves > 0.35 then insert(r_area, {x = p.x, y = p.y}) - tiles[#tiles + 1] = {name = "dirt-" .. math_floor(noise_cave_ponds * 32) % 7 + 1, position = p} + tiles[#tiles + 1] = {name = colors[math_random(1, #colors)].. "-refined-concrete", position = p} + --tiles[#tiles + 1] = {name = "dirt-" .. math_floor(noise_cave_ponds * 32) % 7 + 1, position = p} if math_random(1,450) == 1 then entities[#entities + 1] = {name = "crude-oil", position = p, amount = get_oil_amount(p)} end if math_random(1,96) == 1 then Biters.wave_defense_set_worm_raffle(math_abs(p.y) * worm_level_modifier) @@ -534,14 +537,16 @@ local function process_level_1_position(surface, p, seed, tiles, entities, fishe --Main Terrain local no_rocks_2 = get_noise("no_rocks_2", p, seed + 75000) if no_rocks_2 > 0.70 or no_rocks_2 < -0.70 then - tiles[#tiles + 1] = {name = "dirt-" .. math_floor(no_rocks_2 * 8) % 2 + 5, position = p} + tiles[#tiles + 1] = {name = colors[math_random(1, #colors)].. "-refined-concrete", position = p} + --tiles[#tiles + 1] = {name = "dirt-" .. math_floor(no_rocks_2 * 8) % 2 + 5, position = p} if math_random(1,32) == 1 then entities[#entities + 1] = {name = trees[math_random(1, #trees)], position=p} end if math_random(1,512) == 1 then treasure[#treasure + 1] = p end return end if math_random(1,2048) == 1 then treasure[#treasure + 1] = p end - tiles[#tiles + 1] = {name = "dirt-7", position = p} + tiles[#tiles + 1] = {name = colors[math_random(1, #colors)].. "-refined-concrete", position = p} + -- tiles[#tiles + 1] = {name = "dirt-7", position = p} if math_random(1,2048) == 1 then place_random_scrap_entity(surface, p) end if math_random(1,100) > 30 then entities[#entities + 1] = {name = "mineable-wreckage", position = p} end end @@ -680,14 +685,31 @@ local function generate_spawn_area(surface, position_left_top) for r = 1, 12 do for k, v in pairs(circles[r]) do - local t_insert = false local pos = {x = position_left_top.x + v.x, y = position_left_top.y+20 + v.y} if pos.x > -15 and pos.x < 15 and pos.y < 40 then - t_insert = "stone-path" + insert(tiles, {name = colors[math_random(1, #colors)].. "-refined-concrete", position = pos}) end - if t_insert then - insert(tiles, {name = t_insert, position = pos}) + if pos.x > -30 and pos.x < 30 and pos.y < 40 then + insert(tiles, {name = colors[math_random(1, #colors)].. "-refined-concrete", position = pos}) end + if pos.x > -60 and pos.x < 60 and pos.y < 40 then + insert(tiles, {name = colors[math_random(1, #colors)].. "-refined-concrete", position = pos}) + end + if pos.x > -90 and pos.x < 90 and pos.y < 40 then + insert(tiles, {name = colors[math_random(1, #colors)].. "-refined-concrete", position = pos}) + end + if pos.x > -120 and pos.x < 120 and pos.y < 40 then + insert(tiles, {name = colors[math_random(1, #colors)].. "-refined-concrete", position = pos}) + end + if pos.x > -150 and pos.x < 150 and pos.y < 40 then + insert(tiles, {name = colors[math_random(1, #colors)].. "-refined-concrete", position = pos}) + end + if pos.x > -180 and pos.x < 180 and pos.y < 40 then + insert(tiles, {name = colors[math_random(1, #colors)].. "-refined-concrete", position = pos}) + end + --if t_insert then + -- insert(tiles, {name = t_insert, position = pos}) + --end end end surface.set_tiles(tiles, true)