diff --git a/map_gen/maps/danger_ores/modules/main_ores_circles.lua b/map_gen/maps/danger_ores/modules/main_ores_circles.lua index 867802aa..76593dc4 100644 --- a/map_gen/maps/danger_ores/modules/main_ores_circles.lua +++ b/map_gen/maps/danger_ores/modules/main_ores_circles.lua @@ -8,6 +8,7 @@ return function(config) local main_ores_rotate = config.main_ores_rotate or 0 local start_ore_shape = config.start_ore_shape local circle_thickenss = config.circle_thickness or 16 + local circle_grow_factor = config.circle_grow_factor or 768 main_ores = Helper.split_ore(main_ores, main_ores_split_count) @@ -39,7 +40,7 @@ return function(config) end local starting_ores = b.segment_weighted_pattern(starting_ores_list) - local ores = b.ring_weighted_pattern(shapes, circle_thickenss) + local ores = b.ring_weighted_grow_pattern(shapes, circle_thickenss, circle_grow_factor) if main_ores_rotate ~= 0 then -- Only makes sense to rotate starting ores as the main ores are a circle. diff --git a/map_gen/maps/danger_ores/presets/danger_ore_circles.lua b/map_gen/maps/danger_ores/presets/danger_ore_circles.lua index 7f7d3cc5..682c5b47 100644 --- a/map_gen/maps/danger_ores/presets/danger_ore_circles.lua +++ b/map_gen/maps/danger_ores/presets/danger_ore_circles.lua @@ -58,7 +58,7 @@ local resource_patches_config = require 'map_gen.maps.danger_ores.config.vanilla local water = require 'map_gen.maps.danger_ores.modules.water' local trees = require 'map_gen.maps.danger_ores.modules.trees' local enemy = require 'map_gen.maps.danger_ores.modules.enemy' ---local dense_patches = require 'map_gen.maps.danger_ores.modules.dense_patches' +-- local dense_patches = require 'map_gen.maps.danger_ores.modules.dense_patches' local banned_entities = require 'map_gen.maps.danger_ores.modules.banned_entities' local allowed_entities = require 'map_gen.maps.danger_ores.config.vanilla_allowed_entities' @@ -80,7 +80,7 @@ Config.player_rewards.enabled = false Config.player_create.starting_items = {} Config.dump_offline_inventories = { enabled = true, - offline_timout_mins = 30, -- time after which a player logs off that their inventory is provided to the team + offline_timout_mins = 30 -- time after which a player logs off that their inventory is provided to the team } Config.paint.enabled = false @@ -122,8 +122,9 @@ concrete_on_landfill({tile = 'blue-refined-concrete'}) local main_ores_builder = require 'map_gen.maps.danger_ores.modules.main_ores_circles' local config = { - spawn_shape = b.circle(64), - start_ore_shape = b.circle(68), + spawn_shape = b.circle(36), + start_ore_shape = b.circle(44), + no_resource_patch_shape = b.circle(80), main_ores_builder = main_ores_builder, main_ores = main_ores_config, main_ores_shuffle_order = true, @@ -143,11 +144,12 @@ local config = { enemy_max_chance = 1 / 6, enemy_scale_factor = 32, fish_spawn_rate = 0.025, - --dense_patches = dense_patches, + -- dense_patches = dense_patches, dense_patches_scale = 1 / 48, dense_patches_threshold = 0.55, dense_patches_multiplier = 25, - circle_thickness = 16 -- Thickness of the rings at weight 1 + circle_thickness = 16, -- Thickness of the rings at weight 1 + circle_grow_factor = 768 -- How much distance before the thickness doubles. } return map(config) diff --git a/map_gen/maps/danger_ores/presets/danger_ore_circles_beltboxes_ore_only.lua b/map_gen/maps/danger_ores/presets/danger_ore_circles_beltboxes_ore_only.lua new file mode 100644 index 00000000..d046201c --- /dev/null +++ b/map_gen/maps/danger_ores/presets/danger_ore_circles_beltboxes_ore_only.lua @@ -0,0 +1,161 @@ +local RS = require 'map_gen.shared.redmew_surface' +local MGSP = require 'resources.map_gen_settings' +local Event = require 'utils.event' +local b = require 'map_gen.shared.builders' +local Config = require 'config' + +local ScenarioInfo = require 'features.gui.info' +ScenarioInfo.set_map_name('Danger Ore Circles Beltboxes (ore only)') +ScenarioInfo.set_map_description([[ +Clear the ore to expand the base, +focus mining efforts on specific sectors to ensure +proper material ratios, expand the map with pollution! +]]) +ScenarioInfo.add_map_extra_info([[ +This map is split in three sectors [item=iron-ore] [item=copper-ore] [item=coal]. +Each sector has a main resource and the other resources at a lower ratio. + +You may not build the factory on ore patches. Exceptions: + [item=burner-mining-drill] [item=electric-mining-drill] [item=pumpjack] [item=small-electric-pole] [item=medium-electric-pole] [item=big-electric-pole] [item=substation] [item=car] [item=tank] [item=spidertron] [item=locomotive] [item=cargo-wagon] [item=fluid-wagon] [item=artillery-wagon] + [item=transport-belt] [item=fast-transport-belt] [item=express-transport-belt] [item=underground-belt] [item=fast-underground-belt] [item=express-underground-belt] [item=rail] [item=rail-signal] [item=rail-chain-signal] [item=train-stop] + +The map size is restricted to the pollution generated. A significant amount of +pollution must affect a section of the map before it is revealed. Pollution +does not affect biter evolution.]]) + +ScenarioInfo.set_new_info([[ +2019-04-24: + - Stone ore density reduced by 1/2 + - Ore quadrants randomized + - Increased time factor of biter evolution from 5 to 7 + - Added win conditions (+5% evolution every 5 rockets until 100%, +100 rockets until biters are wiped) + +2019-03-30: + - Uranium ore patch threshold increased slightly + - Bug fix: Cars and tanks can now be placed onto ore! + - Starting minimum pollution to expand map set to 650 + View current pollution via Debug Settings [F4] show-pollution-values, + then open map and turn on pollution via the red box. + - Starting water at spawn increased from radius 8 to radius 16 circle. + +2019-03-27: + - Ore arranged into quadrants to allow for more controlled resource gathering. + +2020-09-02: + - Destroyed chests dump their content as coal ore. + +2020-12-28: + - Changed win condition. First satellite kills all biters, launch 500 to win the map. + +2021-04-06: + - Rail signals and train stations now allowed on ore. +]]) + +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 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 water = require 'map_gen.maps.danger_ores.modules.water' +local trees = require 'map_gen.maps.danger_ores.modules.trees' +local enemy = require 'map_gen.maps.danger_ores.modules.enemy' +-- local dense_patches = require 'map_gen.maps.danger_ores.modules.dense_patches' + +local banned_entities = require 'map_gen.maps.danger_ores.modules.banned_entities' +local allowed_entities = require 'map_gen.maps.danger_ores.config.deadlock_betlboxes_allowed_entities' +banned_entities(allowed_entities) + +RS.set_map_gen_settings({ + MGSP.grass_only, + MGSP.enable_water, + {terrain_segmentation = 'normal', water = 'normal'}, + MGSP.starting_area_very_low, + MGSP.ore_oil_none, + MGSP.enemy_none, + MGSP.cliff_none, + MGSP.tree_none +}) + +Config.market.enabled = false +Config.player_rewards.enabled = false +Config.player_create.starting_items = {} +Config.dump_offline_inventories = { + enabled = true, + offline_timout_mins = 30 -- time after which a player logs off that their inventory is provided to the team +} +Config.paint.enabled = false + +Event.on_init(function() + --game.draw_resource_selection = false + game.forces.player.technologies['mining-productivity-1'].enabled = false + game.forces.player.technologies['mining-productivity-2'].enabled = false + game.forces.player.technologies['mining-productivity-3'].enabled = false + game.forces.player.technologies['mining-productivity-4'].enabled = false + + game.difficulty_settings.technology_price_multiplier = 35 + game.forces.player.technologies.logistics.researched = true + game.forces.player.technologies.automation.researched = true + + game.map_settings.enemy_evolution.time_factor = 0.000007 -- default 0.000004 + game.map_settings.enemy_evolution.destroy_factor = 0.000010 -- default 0.002 + game.map_settings.enemy_evolution.pollution_factor = 0.000000 -- Pollution has no affect on evolution default 0.0000009 + + game.forces.player.manual_mining_speed_modifier = 1 + + RS.get_surface().always_day = true + RS.get_surface().peaceful_mode = true +end) + +local terraforming = require 'map_gen.maps.danger_ores.modules.terraforming' +terraforming({start_size = 8 * 32, min_pollution = 400, max_pollution = 16000, pollution_increment = 6}) + +local rocket_launched = require 'map_gen.maps.danger_ores.modules.rocket_launched_simple' +rocket_launched({win_satellite_count = 850}) + +local restart_command = require 'map_gen.maps.danger_ores.modules.restart_command' +restart_command({scenario_name = 'danger-ore-circles-beltboxes-ore-only'}) + +local container_dump = require 'map_gen.maps.danger_ores.modules.container_dump' +container_dump({entity_name = 'coal'}) + +local concrete_on_landfill = require 'map_gen.maps.danger_ores.modules.concrete_on_landfill' +concrete_on_landfill({tile = 'blue-refined-concrete'}) + +local remove_non_ore_stacked_recipes = require 'map_gen.maps.danger_ores.modules.remove_non_ore_stacked_recipes' +remove_non_ore_stacked_recipes() + +local main_ores_builder = require 'map_gen.maps.danger_ores.modules.main_ores_circles' + +local config = { + spawn_shape = b.circle(36), + start_ore_shape = b.circle(44), + no_resource_patch_shape = b.circle(80), + main_ores_builder = main_ores_builder, + main_ores = main_ores_config, + main_ores_shuffle_order = true, + main_ores_rotate = 30, + resource_patches = resource_patches, + resource_patches_config = resource_patches_config, + water = water, + water_scale = 1 / 96, + water_threshold = 0.45, + deepwater_threshold = 0.5, + trees = trees, + trees_scale = 1 / 64, + trees_threshold = 0.4, + trees_chance = 0.875, + enemy = enemy, + enemy_factor = 10 / (768 * 32), + enemy_max_chance = 1 / 6, + enemy_scale_factor = 32, + fish_spawn_rate = 0.025, + -- dense_patches = dense_patches, + dense_patches_scale = 1 / 48, + dense_patches_threshold = 0.55, + dense_patches_multiplier = 25, + circle_thickness = 16, -- Thickness of the rings at weight 1 + circle_grow_factor = 768 -- How much distance before the thickness doubles. +} + +return map(config) diff --git a/map_gen/shared/builders.lua b/map_gen/shared/builders.lua index 33c3675c..9540d298 100644 --- a/map_gen/shared/builders.lua +++ b/map_gen/shared/builders.lua @@ -1585,6 +1585,34 @@ function Builders.ring_weighted_pattern(pattern, thickness) end end +function Builders.ring_weighted_grow_pattern(pattern, thickness, grow_factor) + local weights = Builders.prepare_weighted_array(pattern) + local total = weights.total + local scale = 1 / thickness + local inv_grow_factor = 1 / grow_factor + + return function(x, y, world) + local d = sqrt(x * x + y * y) + local factor = 1 + (d * inv_grow_factor) + local i = (d * scale / factor) % total + + local index = binary_search(weights, i) + if index < 0 then + index = bnot(index) + end + + local data = pattern[index] + local shape + if data then + shape = data.shape + end + + shape = shape or Builders.empty_shape + + return shape(x, y, world) + end +end + local function rotate_cords(angle) local qx = cos(angle) local qy = sin(angle) diff --git a/scenario_templates/danger-ore-circles-beltboxes-ore-only/map_selection.lua b/scenario_templates/danger-ore-circles-beltboxes-ore-only/map_selection.lua new file mode 100644 index 00000000..b856d7cb --- /dev/null +++ b/scenario_templates/danger-ore-circles-beltboxes-ore-only/map_selection.lua @@ -0,0 +1 @@ +return require 'map_gen.maps.danger_ores.presets.danger_ore_circles_beltboxes_ore_only' \ No newline at end of file