diff --git a/map_gen/maps/danger_ores/config/deadlock_beltboxes_ores_landfill.lua b/map_gen/maps/danger_ores/config/deadlock_beltboxes_ores_landfill.lua new file mode 100644 index 00000000..c2d6cea0 --- /dev/null +++ b/map_gen/maps/danger_ores/config/deadlock_beltboxes_ores_landfill.lua @@ -0,0 +1,64 @@ +local b = require 'map_gen.shared.builders' +local start_value = b.euclidean_value(0, 0.35) +local value = b.exponential_value(0, 0.06, 1.55) + +return { + { + name = 'copper-ore', + ['tiles'] = { + [1] = 'landfill' + }, + ['start'] = start_value, + ['weight'] = 1, + ['ratios'] = { + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 15}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 70}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 10}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 5} + } + }, + { + name = 'coal', + ['tiles'] = { + [1] = 'landfill' + }, + ['start'] = start_value, + ['weight'] = 1, + ['ratios'] = { + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 18}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 9}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 8}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 65} + } + }, + { + name = 'iron-ore', + ['tiles'] = { + [1] = 'landfill' + }, + ['start'] = start_value, + ['weight'] = 1, + ['ratios'] = { + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 75}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 13}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 7}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 5} + } + }, + --[[ { + name = 'stone', + ['tiles'] = { + [1] = 'sand-1', + [2] = 'sand-2', + [3] = 'sand-3' + }, + ['start'] = start_value, + ['weight'] = 1, + ['ratios'] = { + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 25}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 60}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 5} + } + } ]] +} diff --git a/map_gen/maps/danger_ores/config/vanilla_ores_landfill.lua b/map_gen/maps/danger_ores/config/vanilla_ores_landfill.lua new file mode 100644 index 00000000..c70be770 --- /dev/null +++ b/map_gen/maps/danger_ores/config/vanilla_ores_landfill.lua @@ -0,0 +1,64 @@ +local b = require 'map_gen.shared.builders' +local start_value = b.euclidean_value(0, 0.35) +local value = b.exponential_value(0, 0.07, 1.45) + +return { + { + name = 'copper-ore', + ['tiles'] = { + [1] = 'landfill' + }, + ['start'] = start_value, + ['weight'] = 1, + ['ratios'] = { + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 15}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 70}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 10}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 5} + } + }, + { + name = 'coal', + ['tiles'] = { + [1] = 'landfill' + }, + ['start'] = start_value, + ['weight'] = 1, + ['ratios'] = { + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 18}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 9}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 8}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 65} + } + }, + { + name = 'iron-ore', + ['tiles'] = { + [1] = 'landfill' + }, + ['start'] = start_value, + ['weight'] = 1, + ['ratios'] = { + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 75}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 13}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 7}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 5} + } + }, + --[[ { + name = 'stone', + ['tiles'] = { + [1] = 'sand-1', + [2] = 'sand-2', + [3] = 'sand-3' + }, + ['start'] = start_value, + ['weight'] = 1, + ['ratios'] = { + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 25}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 60}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 5} + } + } ]] +} diff --git a/map_gen/maps/danger_ores/presets/danger_ore_landfill.lua b/map_gen/maps/danger_ores/presets/danger_ore_landfill.lua index e8bf8b36..29c31d71 100644 --- a/map_gen/maps/danger_ores/presets/danger_ore_landfill.lua +++ b/map_gen/maps/danger_ores/presets/danger_ore_landfill.lua @@ -52,7 +52,7 @@ ScenarioInfo.set_new_info([[ ]]) local map = require 'map_gen.maps.danger_ores.modules.map' -local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores' +local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores_landfill' local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches' local resource_patches_config = require 'map_gen.maps.danger_ores.config.vanilla_resource_patches' local trees = require 'map_gen.maps.danger_ores.modules.trees' diff --git a/map_gen/maps/danger_ores/presets/danger_ore_spiral.lua b/map_gen/maps/danger_ores/presets/danger_ore_spiral.lua index b7bc1df1..5d0718e4 100644 --- a/map_gen/maps/danger_ores/presets/danger_ore_spiral.lua +++ b/map_gen/maps/danger_ores/presets/danger_ore_spiral.lua @@ -52,7 +52,7 @@ ScenarioInfo.set_new_info([[ ]]) local map = require 'map_gen.maps.danger_ores.modules.map' -local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores' +local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores_landfill' local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches' local resource_patches_config = require 'map_gen.maps.danger_ores.config.vanilla_resource_patches' local trees = require 'map_gen.maps.danger_ores.modules.trees' diff --git a/map_gen/maps/danger_ores/presets/danger_ore_spiral_beltboxes_ore_only.lua b/map_gen/maps/danger_ores/presets/danger_ore_spiral_beltboxes_ore_only.lua index 91c81a24..4d6727aa 100644 --- a/map_gen/maps/danger_ores/presets/danger_ore_spiral_beltboxes_ore_only.lua +++ b/map_gen/maps/danger_ores/presets/danger_ore_spiral_beltboxes_ore_only.lua @@ -54,7 +54,7 @@ ScenarioInfo.set_new_info([[ global.config.redmew_qol.loaders = false local map = require 'map_gen.maps.danger_ores.modules.map' -local main_ores_config = require 'map_gen.maps.danger_ores.config.deadlock_beltboxes_ores' +local main_ores_config = require 'map_gen.maps.danger_ores.config.deadlock_beltboxes_ores_landfill' local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches' local resource_patches_config = require 'map_gen.maps.danger_ores.config.deadlock_beltboxes_resource_patches' local trees = require 'map_gen.maps.danger_ores.modules.trees'