games/RedMew
1
0
Fork 0
mirror of https://github.com/Refactorio/RedMew.git synced 2025-11-06 09:09:26 +02:00
Code Issues Releases Activity

Merge branch 'develop_island_threaded' into develop

Browse Source 
# Conflicts:
#	locale/gen_combined/island_resort.lua
This commit is contained in:
Valansch
2017-10-14 23:47:36 +02:00
parent 65fd551e27 4ea1c60465
commit 348096bb87
3 changed files with 320 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
locale/gen_combined/borg_planet_v2.lua
View File

@@ -7,7 +7,6 @@ local Thread = require "locale.utils.Thread"
wreck_item_pool = {}
wreck_item_pool = {{name="iron-gear-wheel", count=32},{name="iron-plate", count=64},{name="rocket-control-unit", count=1},{name="rocket-fuel", count=7} ,{name="coal", count=8},{name="rocket-launcher", count=1},{name="rocket", count=32},{name="copper-cable", count=128},{name="land-mine", count=64},{name="railgun", count=1},{name="railgun-dart", count=128},{name="fast-inserter", count=8},{name="stack-filter-inserter", count=2},{name="belt-immunity-equipment", count=1},{name="fusion-reactor-equipment", count=1},{name="electric-engine-unit", count=8},{name="exoskeleton-equipment", count=1},{name="rocket-fuel", count=10},{name="used-up-uranium-fuel-cell", count=3},{name="uranium-fuel-cell", count=2},{name="power-armor", count=1},{name="modular-armor", count=1},{name="water-barrel", count=4},{name="sulfuric-acid-barrel", count=6},{name="crude-oil-barrel", count=8},{name="energy-shield-equipment", count=1},{name="explosive-rocket", count=32}}
global.perlin_noise_seed = 50000 --math.random(1000,1000000)
local function place_entities(surface, entity_list)
local directions = {defines.direction.north, defines.direction.east, defines.direction.south, defines.direction.west}
for _, entity in pairs(entity_list) do

187
locale/gen_combined/island_resort.lua
View File

@@ -1,25 +1,52 @@
--Author: MewMew
require "locale.gen_shared.perlin_noise"
local Thread = require "locale.utils.Thread"
local radius = 129
local radsquare = radius*radius
function run_combined_module(event)
if not global.perlin_noise_seed then global.perlin_noise_seed = math.random(1000,1000000) end
local entities = event.surface.find_entities(event.area)
local tiles = {}
local decoratives = {}
for _, entity in pairs(entities) do
if entity.type == "simple-entity" or entity.type == "resource" or entity.type == "tree" then
entity.destroy()
end
end
Thread.queue_action("run_island_init", {} )
for x = 0, 31, 1 do
Thread.queue_action("run_island", {area = event.area, surface = event.surface, x = x})
-- run_island( {area = event.area, surface = event.surface, x = x})
end
Thread.queue_action("run_island_place_tiles", {surface = event.surface})
end
global.island_tiles_hold = {}
global.island_decoratives_hold = {}
function run_island_init(params)
global.island_tiles_hold = {}
global.island_decoratives_hold = {}
end
function run_island_place_tiles(params)
local surface = params.surface
surface.set_tiles(global.island_tiles_hold)
for _,deco in pairs(global.island_decoratives_hold) do
surface.create_decoratives{check_collision=false, decoratives={deco}}
end
end
function run_island( params )
local area = params.area
local surface = params.surface
local x = params.x
local pos_x = area.left_top.x + x
for y = 0, 31, 1 do
local pos_x = event.area.left_top.x + x
local pos_y = event.area.left_top.y + y
local seed = global.perlin_noise_seed
local pos_y = area.left_top.y + y
local seed = surface.map_gen_settings.seed
local seed_increment = 10000
seed = seed + seed_increment
@@ -80,7 +107,6 @@ function run_combined_module(event)
local a = pos_y * pos_y
local b = pos_x * pos_x
local tile_distance_to_center = a + b
if tile_distance_to_center + noise_island_starting <= radsquare then
tile_to_insert = "grass"
end
@@ -90,89 +116,111 @@ function run_combined_module(event)
if noise_island_oil_and_uranium > 0.53 then
tile_to_insert = "red-desert"
elseif noise_island_oil_and_uranium < -0.53 then
end
if noise_island_oil_and_uranium < -0.53 then
tile_to_insert = "red-desert-dark"
end
if noise_island_stone_and_coal > 0.47 then
tile_to_insert = "grass-medium"
elseif noise_island_stone_and_coal < -0.47 then
end
if noise_island_stone_and_coal < -0.47 then
tile_to_insert = "grass-dry"
end
if noise_island_iron_and_copper > 0.47 then
tile_to_insert = "sand"
elseif noise_island_iron_and_copper < -0.47 then
end
if noise_island_iron_and_copper < -0.47 then
tile_to_insert = "sand-dark"
end
end
--Placement of Trees
if tile_to_insert ~= "water" and noise_trees > 0.1 and math.random(1,8) == 1 then
if tile_to_insert ~= "water" then
if noise_trees > 0.1 then
local tree = "tree-01"
if tile_to_insert == "grass" then
tree = "tree-05"
elseif tile_to_insert == "grass-dry" then
end
if tile_to_insert == "grass-dry" then
tree = "tree-02"
elseif tile_to_insert == "grass-medium" then
end
if tile_to_insert == "grass-medium" then
tree = "tree-04"
elseif tile_to_insert == "sand" then
end
if tile_to_insert == "sand" then
tree = "tree-07"
elseif tile_to_insert == "sand-dark" then
end
if tile_to_insert == "sand-dark" then
tree = "dry-hairy-tree"
elseif tile_to_insert == "red-desert" then
end
if tile_to_insert == "red-desert" then
tree = "dry-tree"
elseif tile_to_insert == "red-desert-dark" then
end
if tile_to_insert == "red-desert-dark" then
if math.random(1,3) == 1 then
tree = "red-desert-rock-huge-01"
else
tree = "red-desert-rock-big-01"
end
end
if event.surface.can_place_entity {name=tree, position={pos_x,pos_y}} then
event.surface.create_entity {name=tree, position={pos_x,pos_y}}
if math.random(1,8) == 1 then
if surface.can_place_entity {name=tree, position={pos_x,pos_y}} then
surface.create_entity {name=tree, position={pos_x,pos_y}}
end
end
end
end
if tile_to_insert == "sand" or tile_to_insert == "sand-dark" then
if math.random(1,200) == 1 then
if event.surface.can_place_entity {name="stone-rock", position={pos_x,pos_y}} then
event.surface.create_entity {name="stone-rock", position={pos_x,pos_y}}
if surface.can_place_entity {name="stone-rock", position={pos_x,pos_y}} then
surface.create_entity {name="stone-rock", position={pos_x,pos_y}}
end
end
elseif tile_to_insert == "grass" or tile_to_insert == "grass-dry" or tile_to_insert == "grass-medium" then
end
if tile_to_insert == "grass" or tile_to_insert == "grass-dry" or tile_to_insert == "grass-medium" then
if math.random(1,2000) == 1 then
if event.surface.can_place_entity {name="stone-rock", position={pos_x,pos_y}} then
event.surface.create_entity {name="stone-rock", position={pos_x,pos_y}}
if surface.can_place_entity {name="stone-rock", position={pos_x,pos_y}} then
surface.create_entity {name="stone-rock", position={pos_x,pos_y}}
end
end
end
--Placement of Decoratives
if tile_to_insert ~= "water" and math.random(1,5) == 1 then
if tile_to_insert ~= "water" then
if noise_decoratives > 0.3 then
local decorative = "green-carpet-grass"
if tile_to_insert == "grass" then
decorative = "green-pita"
elseif tile_to_insert == "grass-dry" then
end
if tile_to_insert == "grass-dry" then
decorative = "green-pita"
elseif tile_to_insert == "grass-medium" then
end
if tile_to_insert == "grass-medium" then
decorative = "green-pita"
elseif tile_to_insert == "sand" then
end
if tile_to_insert == "sand" then
decorative = "green-asterisk"
elseif tile_to_insert == "sand-dark" then
end
if tile_to_insert == "sand-dark" then
decorative = "green-asterisk"
elseif tile_to_insert == "red-desert" then
decorative = "red-asterisk"
elseif tile_to_insert == "red-desert-dark" then
end
if tile_to_insert == "red-desert" then
decorative = "red-asterisk"
end
table.insert(decoratives, {name=decorative, position={pos_x,pos_y}, amount=1})
if tile_to_insert == "red-desert-dark" then
decorative = "red-asterisk"
end
if math.random(1,5) == 1 then
table.insert(global.island_decoratives_hold, {name=decorative, position={pos_x,pos_y}, amount=1})
end
end
if tile_to_insert == "red-desert-dark" then
if math.random(1,50) == 1 then
table.insert(decoratives, {name="red-desert-rock-medium", position={pos_x,pos_y}, amount=1})
table.insert(global.island_decoratives_hold, {name="red-desert-rock-medium", position={pos_x,pos_y}, amount=1})
end
end
end
@@ -182,8 +230,8 @@ function run_combined_module(event)
local a = pos_x
local b = pos_y
local c = 1
if event.area.right_bottom.x < 0 then a = event.area.right_bottom.x * -1 end
if event.area.right_bottom.y < 0 then b = event.area.right_bottom.y * -1 end
if area.right_bottom.x < 0 then a = area.right_bottom.x * -1 end
if area.right_bottom.y < 0 then b = area.right_bottom.y * -1 end
if a > b then c = a else c = b end
local resource_amount_distance_multiplicator = (((c + 1) / 75) / 75) + 1
local noise_resource_amount_modifier = perlin:noise(((pos_x+seed)/200),((pos_y+seed)/200),0)
@@ -191,88 +239,87 @@ function run_combined_module(event)
if tile_to_insert == "sand" or tile_to_insert == "sand-dark" then
if noise_island_iron_and_copper > 0.5 and noise_island_resource > 0.2 then
if event.surface.can_place_entity {name="iron-ore", position={pos_x,pos_y}} then
event.surface.create_entity {name="iron-ore", position={pos_x,pos_y}, amount=resource_amount}
if surface.can_place_entity {name="iron-ore", position={pos_x,pos_y}} then
surface.create_entity {name="iron-ore", position={pos_x,pos_y}, amount=resource_amount}
end
end
if noise_island_iron_and_copper < -0.5 and noise_island_resource > 0.2 then
if event.surface.can_place_entity {name="copper-ore", position={pos_x,pos_y}} then
event.surface.create_entity {name="copper-ore", position={pos_x,pos_y}, amount=resource_amount}
if surface.can_place_entity {name="copper-ore", position={pos_x,pos_y}} then
surface.create_entity {name="copper-ore", position={pos_x,pos_y}, amount=resource_amount}
end
end
end
if tile_to_insert == "grass-medium" or tile_to_insert == "grass-dry" then
if noise_island_stone_and_coal > 0.5 and noise_island_resource > 0.2 then
if event.surface.can_place_entity {name="stone", position={pos_x,pos_y}} then
event.surface.create_entity {name="stone", position={pos_x,pos_y}, amount=resource_amount*1.5}
if surface.can_place_entity {name="stone", position={pos_x,pos_y}} then
surface.create_entity {name="stone", position={pos_x,pos_y}, amount=resource_amount*1.5}
end
end
if noise_island_stone_and_coal < -0.5 and noise_island_resource > 0.2 then
if event.surface.can_place_entity {name="coal", position={pos_x,pos_y}} then
event.surface.create_entity {name="coal", position={pos_x,pos_y}, amount=resource_amount}
if surface.can_place_entity {name="coal", position={pos_x,pos_y}} then
surface.create_entity {name="coal", position={pos_x,pos_y}, amount=resource_amount}
end
end
end
if tile_to_insert == "red-desert" or tile_to_insert == "red-desert-dark" then
if noise_island_oil_and_uranium > 0.55 and noise_island_resource > 0.25 then
if event.surface.can_place_entity {name="crude-oil", position={pos_x,pos_y}} then
if surface.can_place_entity {name="crude-oil", position={pos_x,pos_y}} then
if math.random(1,60) == 1 then
event.surface.create_entity {name="crude-oil", position={pos_x,pos_y}, amount=resource_amount*400}
surface.create_entity {name="crude-oil", position={pos_x,pos_y}, amount=resource_amount*400}
end
end
end
if noise_island_oil_and_uranium < -0.55 and noise_island_resource > 0.35 then
if event.surface.can_place_entity {name="uranium-ore", position={pos_x,pos_y}} then
event.surface.create_entity {name="uranium-ore", position={pos_x,pos_y}, amount=resource_amount}
if surface.can_place_entity {name="uranium-ore", position={pos_x,pos_y}} then
surface.create_entity {name="uranium-ore", position={pos_x,pos_y}, amount=resource_amount}
end
end
end
noise_island_starting = noise_island_starting * 0.08
--Starting Resources
if tile_distance_to_center <= radsquare then
noise_island_starting = noise_island_starting * 0.08
if tile_distance_to_center + noise_island_starting > radsquare * 0.09 and tile_distance_to_center + noise_island_starting <= radsquare * 0.15 then
if event.surface.can_place_entity {name="stone", position={pos_x,pos_y}} then
event.surface.create_entity {name="stone", position={pos_x,pos_y}, amount=resource_amount*1.5}
if surface.can_place_entity {name="stone", position={pos_x,pos_y}} then
surface.create_entity {name="stone", position={pos_x,pos_y}, amount=resource_amount*1.5}
end
end
if tile_distance_to_center + noise_island_starting > radsquare * 0.05 and tile_distance_to_center + noise_island_starting <= radsquare * 0.09 then
if event.surface.can_place_entity {name="coal", position={pos_x,pos_y}} then
event.surface.create_entity {name="coal", position={pos_x,pos_y}, amount=resource_amount*1.5}
if surface.can_place_entity {name="coal", position={pos_x,pos_y}} then
surface.create_entity {name="coal", position={pos_x,pos_y}, amount=resource_amount*1.5}
end
end
if tile_distance_to_center + noise_island_starting > radsquare * 0.02 and tile_distance_to_center + noise_island_starting <= radsquare * 0.05 then
if event.surface.can_place_entity {name="iron-ore", position={pos_x,pos_y}} then
event.surface.create_entity {name="iron-ore", position={pos_x,pos_y}, amount=resource_amount*1.5}
if surface.can_place_entity {name="iron-ore", position={pos_x,pos_y}} then
surface.create_entity {name="iron-ore", position={pos_x,pos_y}, amount=resource_amount*1.5}
end
end
if tile_distance_to_center + noise_island_starting > radsquare * 0.003 and tile_distance_to_center + noise_island_starting <= radsquare * 0.02 then
if event.surface.can_place_entity {name="copper-ore", position={pos_x,pos_y}} then
event.surface.create_entity {name="copper-ore", position={pos_x,pos_y}, amount=resource_amount*1.5}
if surface.can_place_entity {name="copper-ore", position={pos_x,pos_y}} then
surface.create_entity {name="copper-ore", position={pos_x,pos_y}, amount=resource_amount*1.5}
end
end
if tile_distance_to_center + noise_island_starting <= radsquare * 0.002 then
if event.surface.can_place_entity {name="crude-oil", position={pos_x,pos_y}} then
if math.random(1,16) == 1 then event.surface.create_entity {name="crude-oil", position={pos_x,pos_y}, amount=resource_amount*400} end
if surface.can_place_entity {name="crude-oil", position={pos_x,pos_y}} then
if math.random(1,16) == 1 then surface.create_entity {name="crude-oil", position={pos_x,pos_y}, amount=resource_amount*400} end
end
end
end
end
if tile_to_insert == "water" then
table.insert(tiles, {name = tile_to_insert, position = {pos_x + 1, pos_y}})
table.insert(tiles, {name = tile_to_insert, position = {pos_x, pos_y + 1}})
table.insert(tiles, {name = tile_to_insert, position = {pos_x - 1, pos_y}})
table.insert(tiles, {name = tile_to_insert, position = {pos_x, pos_y - 1}})
local a = pos_x + 1
table.insert(global.island_tiles_hold, {name = tile_to_insert, position = {a,pos_y}})
local a = pos_y + 1
table.insert(global.island_tiles_hold, {name = tile_to_insert, position = {pos_x,a}})
local a = pos_x - 1
table.insert(global.island_tiles_hold, {name = tile_to_insert, position = {a,pos_y}})
local a = pos_y - 1
table.insert(global.island_tiles_hold, {name = tile_to_insert, position = {pos_x,a}})
end
table.insert(tiles, {name = tile_to_insert, position = {pos_x,pos_y}})
end
end
event.surface.set_tiles(tiles)
for _,deco in pairs(decoratives) do
event.surface.create_decoratives{check_collision=false, decoratives={deco}}
table.insert(global.island_tiles_hold, {name = tile_to_insert, position = {pos_x,pos_y}})
end
end

7
locale/resources/regulars.lua
View File

@@ -111,4 +111,11 @@ return
["griffinonetwo"] = "",
["stat0x00"] = "",
["gynox"] = "",
["miniman10000"] = "",
["aliiien0110"] = "",
["gespenstdermaschine"] = "",
["brathahn"] = "",
["leadhades27"] = "",
["sl"] = "",
["phountix"] = "",
}