games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2024-12-26 22:56:43 +02:00
Code Issues Releases Activity

terrain stuff

Browse Source
This commit is contained in:
MewMew 2020-11-07 07:40:36 +01:00
parent 7affbd2be1
commit 9f976d2579
4 changed files with 59 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maps/cave_miner_v2/constants.lua
View File

@ -104,7 +104,7 @@ Public.spawn_market_items = {
{price = {{"raw-fish", 2}}, offer = {type = 'give-item', item = 'small-lamp'}},
{price = {{"raw-fish", 1}}, offer = {type = 'give-item', item = 'firearm-magazine', count = 2}},
{price = {{"raw-fish", 2}}, offer = {type = 'give-item', item = 'piercing-rounds-magazine'}},
{price = {{"raw-fish", 1}}, offer = {type = 'give-item', item = 'grenade'}},
{price = {{"raw-fish", 2}}, offer = {type = 'give-item', item = 'grenade'}},
{price = {{"raw-fish", 1}}, offer = {type = 'give-item', item = 'land-mine'}},
{price = {{"raw-fish", 1}}, offer = {type = 'give-item', item = 'explosives', count = 4}},
{price = {{"raw-fish", 1}}, offer = {type = 'give-item', item = 'wood', count = 10}},

2
maps/cave_miner_v2/market.lua
View File

@ -119,7 +119,7 @@ function Public.offer_bought(event, cave_miner)
end
function Public.spawn_random_cave_market(surface, position)
local r = 48
local r = 64
if surface.count_entities_filtered({name = "market", area = {{position.x - r, position.y - r}, {position.x + r, position.y + r}}}) > 0 then return end
local difficulty_modifier = Functions.get_difficulty_modifier(position)

84
maps/cave_miner_v2/terrain.lua
View File

@ -56,6 +56,12 @@ function Public.out_of_map(event)
event.surface.set_tiles(tiles, false)
end
local function place_rock(surface, position)
local a = (-49 + math_random(0, 98)) * 0.01
local b = (-49 + math_random(0, 98)) * 0.01
surface.create_entity({name = rock_raffle[math_random(1, size_of_rock_raffle)], position = {position.x + a, position.y + b}})
end
local biomes = {}
function biomes.oasis(surface, seed, position, square_distance, noise)
@ -69,11 +75,7 @@ function biomes.oasis(surface, seed, position, square_distance, noise)
if math_random(1, 16) == 1 and math_abs(noise_decoratives) > 0.17 then surface.create_entity({name = "tree-04", position = position}) end
if math_random(1, 128) == 1 then Functions.place_crude_oil(surface, position, 1) end
if noise < 0.73 then
local a = (-49 + math_random(0, 98)) * 0.01
local b = (-49 + math_random(0, 98)) * 0.01
surface.create_entity({name = rock_raffle[math_random(1, size_of_rock_raffle)], position = {position.x + a, position.y + b}})
end
if noise < 0.73 then place_rock(surface, position) end
end
function biomes.void(surface, seed, position)
@ -90,18 +92,14 @@ function biomes.pond_cave(surface, seed, position, square_distance, noise)
end
if math_abs(noise_2) > 0.25 and math_random(1, 2) > 1 then
local a = (-49 + math_random(0, 98)) * 0.01
local b = (-49 + math_random(0, 98)) * 0.01
surface.create_entity({name = rock_raffle[math_random(1, size_of_rock_raffle)], position = {position.x + a, position.y + b}})
place_rock(surface, position)
return
end
if noise > -0.53 then
local a = (-49 + math_random(0, 98)) * 0.01
local b = (-49 + math_random(0, 98)) * 0.01
surface.create_entity({name = rock_raffle[math_random(1, size_of_rock_raffle)], position = {position.x + a, position.y + b}})
--place_rock(surface, position)
else
if math_random(1, 128) == 1 then
if math_random(1, 256) == 1 then
Market.spawn_random_cave_market(surface, position)
end
end
@ -118,21 +116,17 @@ function biomes.spawn(surface, seed, position, square_distance)
end
if math_abs(noise) > 0.25 and math_random(1, 2) > 1 then
local a = (-49 + math_random(0, 98)) * 0.01
local b = (-49 + math_random(0, 98)) * 0.01
surface.create_entity({name = rock_raffle[math_random(1, size_of_rock_raffle)], position = {position.x + a, position.y + b}})
place_rock(surface, position)
return
end
if square_distance > 1750 then
local a = (-49 + math_random(0, 98)) * 0.01
local b = (-49 + math_random(0, 98)) * 0.01
surface.create_entity({name = rock_raffle[math_random(1, size_of_rock_raffle)], position = {position.x + a, position.y + b}})
place_rock(surface, position)
end
end
function biomes.ocean(surface, seed, position, square_distance, noise)
if noise > 0.68 then
if noise > 0.66 then
surface.set_tiles({{name = "deepwater", position = position}}, true, false, false, false)
if math_random(1, 32) == 1 then surface.create_entity({name = "fish", position = position}) end
return
@ -143,18 +137,45 @@ function biomes.ocean(surface, seed, position, square_distance, noise)
return
end
if math_random(1, 3) > 1 then
local a = (-49 + math_random(0, 98)) * 0.01
local b = (-49 + math_random(0, 98)) * 0.01
surface.create_entity({name = rock_raffle[math_random(1, size_of_rock_raffle)], position = {position.x + a, position.y + b}})
place_rock(surface, position)
end
end
function biomes.worm_desert(surface, seed, position, square_distance, noise)
if noise > -0.65 then
if math_random(1, 3) > 1 then
place_rock(surface, position)
end
return
end
local i = math_floor((GetNoise("decoratives", position, seed) * 8) % 3) + 1
surface.set_tiles({{name = "sand-" .. i, position = position}}, true, false, false, false)
if math_random(1, 64) == 1 then
local e = Functions.place_worm(surface, position, 1)
e.active = false
return
end
if math_random(1, 32) == 1 then
local n = GetNoise("decoratives", position, seed + 10000)
if n > 0.2 then
local trees = {"dead-grey-trunk", "dead-grey-trunk", "dry-tree"}
surface.create_entity({name = trees[math_random(1, 3)], position = position})
return
end
end
if math_random(1, 512) == 1 then Functions.loot_crate(surface, position, "wooden-chest") return end
if math_random(1, 1024) == 1 then Functions.loot_crate(surface, position, "iron-chest") return end
end
function biomes.cave(surface, seed, position, square_distance, noise)
local noise_cave_rivers1 = GetNoise("cave_rivers_2", position, seed + 100000)
if math_abs(noise_cave_rivers1) < 0.025 then
local noise_cave_rivers2 = GetNoise("cave_rivers_3", position, seed + 200000)
if noise_cave_rivers2 > 0 then
surface.set_tiles({{name = "water-shallow", position = position}}, true, false, false, false)
surface.set_tiles({{name = "water-shallow", position = position}}, true, false, false, false)
if math_random(1, 16) == 1 then surface.create_entity({name = "fish", position = position}) end
return
end
@ -204,21 +225,22 @@ local function get_biome(surface, seed, position)
local d = position.x ^ 2 + position.y ^ 2
if d < 1024 then return biomes.spawn, d end
local cm_ocean = GetNoise("cm_ocean", position, seed + 100000)
if cm_ocean > 0.6 then return biomes.ocean, d, cm_ocean end
local noise = GetNoise("cave_miner_01", position, seed)
local abs_noise = math_abs(noise)
if abs_noise < 0.088 then return biomes.cave, d, noise end
if abs_noise < 0.075 then return biomes.cave, d, noise end
if abs_noise > 0.25 then
if abs_noise > 0.25 then
local noise = GetNoise("cave_rivers", position, seed)
if noise > 0.72 then return biomes.oasis, d, noise end
if noise < -0.5 then return biomes.pond_cave, d, noise end
if noise > 0.72 then return biomes.oasis, d, noise end
if cm_ocean < -0.6 then return biomes.worm_desert, d, cm_ocean end
if noise < -0.5 then return biomes.pond_cave, d, noise end
end
local noise = GetNoise("cm_ocean", position, seed + 100000)
if noise > 0.6 then return biomes.ocean, d, noise end
local noise = GetNoise("cave_miner_02", position, seed)
if math_abs(noise) < 0.1 then return biomes.cave, d, noise end
if math_abs(noise) < 0.085 then return biomes.cave, d, noise end
return biomes.void
end

8
utils/get_noise.lua
View File

@ -100,10 +100,10 @@ local noises = {
{modifier = 0.1, weight = 0.025}
},
['cave_miner_01'] = {
{modifier = 0.002, weight = 1},
{modifier = 0.003, weight = 0.5},
{modifier = 0.01, weight = 0.01},
{modifier = 0.1, weight = 0.015}
{modifier = 0.0015, weight = 1},
{modifier = 0.0030, weight = 0.15},
{modifier = 0.0100, weight = 0.025},
{modifier = 0.1000, weight = 0.01}
},
['cave_miner_02'] = {
{modifier = 0.006, weight = 1},