games/RedMew
games/RedMew
1
0
Fork 0
mirror of https://github.com/Refactorio/RedMew.git synced 2025-01-18 03:21:47 +02:00
Code Issues Releases Activity

Merge pull request #691 from plague006/island_resort_optimizations

Browse Source 
Optimize island_resort: localize functions, get rid of inserts
This commit is contained in:
Matthew 2019-02-03 01:04:25 -05:00 committed by GitHub
commit e70230fa07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
map_gen/maps/island_resort.lua
View File

@ -1,9 +1,14 @@
--Author: MewMew
-- Original author: MewMew
local perlin = require 'map_gen.shared.perlin_noise'
local b = require 'map_gen.shared.builders'
local RS = require 'map_gen.shared.redmew_surface'
local MGSP = require 'resources.map_gen_settings' -- map gen settings presets
local random = math.random
local max = math.max
local abs = math.abs
local noise = perlin.noise
local radius = 129
local radsquare = radius * radius
@ -28,53 +33,53 @@ local function map(x, y, world)
local seed_increment = 10000
seed = seed + seed_increment
local noise_island_starting_1 = perlin.noise(((x + seed) / 30), ((y + seed) / 30), 0)
local noise_island_starting_1 = noise(((x + seed) / 30), ((y + seed) / 30), 0)
seed = seed + seed_increment
local noise_island_starting_2 = perlin.noise(((x + seed) / 10), ((y + seed) / 10), 0)
local noise_island_starting_2 = noise(((x + seed) / 10), ((y + seed) / 10), 0)
seed = seed + seed_increment
local noise_island_starting = noise_island_starting_1 + (noise_island_starting_2 * 0.3)
noise_island_starting = noise_island_starting * 8000
seed = seed + seed_increment
local noise_island_iron_and_copper_1 = perlin.noise(((x + seed) / 300), ((y + seed) / 300), 0)
local noise_island_iron_and_copper_1 = noise(((x + seed) / 300), ((y + seed) / 300), 0)
seed = seed + seed_increment
local noise_island_iron_and_copper_2 = perlin.noise(((x + seed) / 40), ((y + seed) / 40), 0)
local noise_island_iron_and_copper_2 = noise(((x + seed) / 40), ((y + seed) / 40), 0)
seed = seed + seed_increment
local noise_island_iron_and_copper_3 = perlin.noise(((x + seed) / 10), ((y + seed) / 10), 0)
local noise_island_iron_and_copper_3 = noise(((x + seed) / 10), ((y + seed) / 10), 0)
local noise_island_iron_and_copper = noise_island_iron_and_copper_1 + (noise_island_iron_and_copper_2 * 0.1) + (noise_island_iron_and_copper_3 * 0.05)
seed = seed + seed_increment
local noise_island_stone_and_coal_1 = perlin.noise(((x + seed) / 300), ((y + seed) / 300), 0)
local noise_island_stone_and_coal_1 = noise(((x + seed) / 300), ((y + seed) / 300), 0)
seed = seed + seed_increment
local noise_island_stone_and_coal_2 = perlin.noise(((x + seed) / 40), ((y + seed) / 40), 0)
local noise_island_stone_and_coal_2 = noise(((x + seed) / 40), ((y + seed) / 40), 0)
seed = seed + seed_increment
local noise_island_stone_and_coal_3 = perlin.noise(((x + seed) / 10), ((y + seed) / 10), 0)
local noise_island_stone_and_coal_3 = noise(((x + seed) / 10), ((y + seed) / 10), 0)
local noise_island_stone_and_coal = noise_island_stone_and_coal_1 + (noise_island_stone_and_coal_2 * 0.1) + (noise_island_stone_and_coal_3 * 0.05)
seed = seed + seed_increment
local noise_island_oil_and_uranium_1 = perlin.noise(((x + seed) / 300), ((y + seed) / 300), 0)
local noise_island_oil_and_uranium_1 = noise(((x + seed) / 300), ((y + seed) / 300), 0)
seed = seed + seed_increment
local noise_island_oil_and_uranium_2 = perlin.noise(((x + seed) / 40), ((y + seed) / 40), 0)
local noise_island_oil_and_uranium_2 = noise(((x + seed) / 40), ((y + seed) / 40), 0)
seed = seed + seed_increment
local noise_island_oil_and_uranium_3 = perlin.noise(((x + seed) / 10), ((y + seed) / 10), 0)
local noise_island_oil_and_uranium_3 = noise(((x + seed) / 10), ((y + seed) / 10), 0)
local noise_island_oil_and_uranium = noise_island_oil_and_uranium_1 + (noise_island_oil_and_uranium_2 * 0.1) + (noise_island_oil_and_uranium_3 * 0.05)
seed = seed + seed_increment
local noise_island_resource = perlin.noise(((x + seed) / 60), ((y + seed) / 60), 0)
local noise_island_resource = noise(((x + seed) / 60), ((y + seed) / 60), 0)
seed = seed + seed_increment
local noise_island_resource_2 = perlin.noise(((x + seed) / 10), ((y + seed) / 10), 0)
local noise_island_resource_2 = noise(((x + seed) / 10), ((y + seed) / 10), 0)
noise_island_resource = noise_island_resource + noise_island_resource_2 * 0.15
seed = seed + seed_increment
local noise_trees_1 = perlin.noise(((x + seed) / 30), ((y + seed) / 30), 0)
local noise_trees_1 = noise(((x + seed) / 30), ((y + seed) / 30), 0)
seed = seed + seed_increment
local noise_trees_2 = perlin.noise(((x + seed) / 10), ((y + seed) / 10), 0)
local noise_trees_2 = noise(((x + seed) / 10), ((y + seed) / 10), 0)
local noise_trees = noise_trees_1 + noise_trees_2 * 0.5
seed = seed + seed_increment
local noise_decoratives_1 = perlin.noise(((x + seed) / 50), ((y + seed) / 50), 0)
local noise_decoratives_1 = noise(((x + seed) / 50), ((y + seed) / 50), 0)
seed = seed + seed_increment
local noise_decoratives_2 = perlin.noise(((x + seed) / 10), ((y + seed) / 10), 0)
local noise_decoratives_2 = noise(((x + seed) / 10), ((y + seed) / 10), 0)
local noise_decoratives = noise_decoratives_1 + noise_decoratives_2 * 0.5
local tile_to_insert = 'water'
@ -135,26 +140,26 @@ local function map(x, y, world)
tree = 'dry-tree'
end
if tile_to_insert == 'red-desert-0' then
if math.random(1, 3) == 1 then
if random(1, 3) == 1 then
tree = 'sand-rock-big'
else
tree = 'sand-rock-big'
end
end
if math.random(1, 8) == 1 then
table.insert(entities, {name = tree})
if random(1, 8) == 1 then
entities[#entities + 1] = {name = tree}
end
end
end
if tile_to_insert == 'sand-1' or tile_to_insert == 'sand-3' then
if math.random(1, 200) == 1 then
table.insert(entities, {name = 'rock-big'})
if random(1, 200) == 1 then
entities[#entities + 1] = {name = 'rock-big'}
end
end
if tile_to_insert == 'grass-1' or tile_to_insert == 'grass-2' or tile_to_insert == 'grass-3' then
if math.random(1, 2000) == 1 then
table.insert(entities, {name = 'rock-big'})
if random(1, 2000) == 1 then
entities[#entities + 1] = {name = 'rock-big'}
end
end
@ -183,49 +188,49 @@ local function map(x, y, world)
if tile_to_insert == 'red-desert-0' then
decorative = 'red-asterisk'
end
if math.random(1, 5) == 1 then
table.insert(decoratives, {name = decorative, position = {x, y}, amount = 1})
if random(1, 5) == 1 then
decoratives[#decoratives + 1] = {name = decorative, position = {x, y}, amount = 1}
end
end
if tile_to_insert == 'red-desert-0' then
if math.random(1, 50) == 1 then
table.insert(decoratives, {name = 'rock-medium', position = {x, y}, amount = 1})
if random(1, 50) == 1 then
decoratives[#decoratives + 1] = {name = 'rock-medium', position = {x, y}, amount = 1}
end
end
end
--Placement of Island Resources
if tile_to_insert ~= 'water' then
local c = math.max(math.abs(world.x), math.abs(world.y))
local c = max(abs(world.x), abs(world.y))
local resource_amount_distance_multiplicator = (((c + 1) / 75) / 75) + 1
local noise_resource_amount_modifier = perlin.noise(((world.x + seed) / 200), ((world.y + seed) / 200), 0)
local noise_resource_amount_modifier = noise(((world.x + seed) / 200), ((world.y + seed) / 200), 0)
local resource_amount = 1 + ((500 + (500 * noise_resource_amount_modifier * 0.2)) * resource_amount_distance_multiplicator)
if tile_to_insert == 'sand-1' or tile_to_insert == 'sand-3' then
if noise_island_iron_and_copper > 0.5 and noise_island_resource > 0.2 then
table.insert(entities, {name = 'iron-ore', amount = resource_amount})
entities[#entities + 1] = {name = 'iron-ore', amount = resource_amount}
end
if noise_island_iron_and_copper < -0.5 and noise_island_resource > 0.2 then
table.insert(entities, {name = 'copper-ore', amount = resource_amount})
entities[#entities + 1] = {name = 'copper-ore', amount = resource_amount}
end
end
if tile_to_insert == 'grass-3' or tile_to_insert == 'grass-2' then
if noise_island_stone_and_coal > 0.5 and noise_island_resource > 0.2 then
table.insert(entities, {name = 'stone', amount = resource_amount})
entities[#entities + 1] = {name = 'stone', amount = resource_amount}
end
if noise_island_stone_and_coal < -0.5 and noise_island_resource > 0.2 then
table.insert(entities, {name = 'coal', amount = resource_amount})
entities[#entities + 1] = {name = 'coal', amount = resource_amount}
end
end
if tile_to_insert == 'red-desert-1' or tile_to_insert == 'red-desert-0' then
if noise_island_oil_and_uranium > 0.55 and noise_island_resource > 0.25 and math.random(60) == 1 then
table.insert(entities, {name = 'crude-oil', amount = resource_amount * 400})
if noise_island_oil_and_uranium > 0.55 and noise_island_resource > 0.25 and random(60) == 1 then
entities[#entities + 1] = {name = 'crude-oil', amount = resource_amount * 400}
end
if noise_island_oil_and_uranium < -0.55 and noise_island_resource > 0.35 then
table.insert(entities, {name = 'uranium-ore', amount = resource_amount})
entities[#entities + 1] = {name = 'uranium-ore', amount = resource_amount}
end
end
@ -233,19 +238,19 @@ local function map(x, y, world)
--Starting Resources
if tile_distance_to_center <= radsquare then
if tile_distance_to_center + noise_island_starting > radsquare * 0.09 and tile_distance_to_center + noise_island_starting <= radsquare * 0.15 then
table.insert(entities, {name = 'stone', amount = resource_amount * 1.5})
entities[#entities + 1] = {name = 'stone', amount = resource_amount * 1.5}
end
if tile_distance_to_center + noise_island_starting > radsquare * 0.05 and tile_distance_to_center + noise_island_starting <= radsquare * 0.09 then
table.insert(entities, {name = 'coal', amount = resource_amount * 1.5})
entities[#entities + 1] = {name = 'coal', amount = resource_amount * 1.5}
end
if tile_distance_to_center + noise_island_starting > radsquare * 0.02 and tile_distance_to_center + noise_island_starting <= radsquare * 0.05 then
table.insert(entities, {name = 'iron-ore', amount = resource_amount * 1.5})
entities[#entities + 1] = {name = 'iron-ore', amount = resource_amount * 1.5}
end
if tile_distance_to_center + noise_island_starting > radsquare * 0.003 and tile_distance_to_center + noise_island_starting <= radsquare * 0.02 then
table.insert(entities, {name = 'copper-ore', amount = resource_amount * 1.5})
entities[#entities + 1] = {name = 'copper-ore', amount = resource_amount * 1.5}
end
if tile_distance_to_center + noise_island_starting <= radsquare * 0.002 then
table.insert(entities, {name = 'crude-oil', amount = resource_amount * 400})
entities[#entities + 1] = {name = 'crude-oil', amount = resource_amount * 400}
end
end
end