Remove oil/uranium spawn from danger ore maps. (#1287)

map_gen/maps/danger_ores/modules/main_ores_xmas_tree.lua

@@ -46,7 +46,7 @@ return function(config)
         local icons = {baubel_1, baubel_2, baubel_3, baubel_4}
 
         local icons_count = #icons
-        local value = b.euclidean_value
+        -- local value = b.euclidean_value
         local ore_value = b.exponential_value(0, 0.3, 1.3)
 
         local function non_transform(shape)
@@ -66,9 +66,9 @@ return function(config)
             {transform = non_transform, resource = 'copper-ore', value = ore_value, weight = 10},
             {transform = non_transform, resource = 'stone', value = ore_value, weight = 2},
             {transform = non_transform, resource = 'coal', value = ore_value, weight = 10},
-            {transform = non_transform, resource = 'uranium-ore', value = value(100, 1.55), weight = 5},
-            {transform = non_transform, resource = 'crude-oil', value = value(100000, 3500), weight = 15},
-            {transform = empty_transform, weight = 100}
+            -- {transform = non_transform, resource = 'uranium-ore', value = value(100, 1.55), weight = 5},
+            -- {transform = non_transform, resource = 'crude-oil', value = value(100000, 3500), weight = 15},
+            {transform = empty_transform, weight = 80}
         }
 
         local total_weights = {}

map_gen/maps/danger_ores/presets/danger_ore_3way_beltboxes_ore_only.lua

@@ -55,8 +55,8 @@ 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.one_direction_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 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'
@@ -145,14 +145,14 @@ local main_ores_builder = require 'map_gen.maps.danger_ores.modules.main_ores_3w
 local config = {
     spawn_shape = b.rectangle(72),
     start_ore_shape = b.rotate(b.rectangle(88), math.rad(135)),
-    --post_map_func = post_map_func,
+    -- post_map_func = post_map_func,
     main_ores_builder = main_ores_builder,
     no_resource_patch_shape = b.rectangle(160),
     main_ores = main_ores_config,
     main_ores_shuffle_order = true,
-    --main_ores_rotate = 30,
-    resource_patches = resource_patches,
-    resource_patches_config = resource_patches_config,
+    -- main_ores_rotate = 30,
+    -- resource_patches = resource_patches,
+    -- resource_patches_config = resource_patches_config,
     -- water = water,
     water_scale = 1 / 96,
     water_threshold = 0.4,

map_gen/maps/danger_ores/presets/danger_ore_chessboard_uniform_beltboxes_ore_only.lua

@@ -55,12 +55,12 @@ 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 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 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'
@@ -87,7 +87,7 @@ Config.dump_offline_inventories = {
 Config.paint.enabled = false
 
 Event.on_init(function()
-    --game.draw_resource_selection = false
+    -- 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
@@ -136,8 +136,8 @@ local config = {
     main_ores_builder = main_ores_builder,
     main_ores = main_ores_config,
     main_ores_shuffle_order = false,
-    resource_patches = resource_patches,
-    resource_patches_config = resource_patches_config,
+    -- resource_patches = resource_patches,
+    -- resource_patches_config = resource_patches_config,
     water = water,
     water_scale = 1 / 96,
     water_threshold = 0.4,
@@ -151,7 +151,7 @@ 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

map_gen/maps/danger_ores/presets/danger_ore_circles_beltboxes_ore_only.lua

@@ -55,8 +55,8 @@ 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 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'
@@ -87,7 +87,7 @@ Config.dump_offline_inventories = {
 Config.paint.enabled = false
 
 Event.on_init(function()
-    --game.draw_resource_selection = false
+    -- 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
@@ -137,8 +137,8 @@ local config = {
     main_ores = main_ores_config,
     main_ores_shuffle_order = true,
     main_ores_rotate = 30,
-    resource_patches = resource_patches,
-    resource_patches_config = resource_patches_config,
+    -- resource_patches = resource_patches,
+    -- resource_patches_config = resource_patches_config,
     water = water,
     water_scale = 1 / 96,
     water_threshold = 0.45,

map_gen/maps/danger_ores/presets/danger_ore_deadlock_beltboxes_ore_only.lua

@@ -55,8 +55,8 @@ 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 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'
@@ -136,8 +136,8 @@ local config = {
     main_ores = main_ores_config,
     main_ores_shuffle_order = true,
     main_ores_rotate = 30,
-    --resource_patches = resource_patches,
-    --resource_patches_config = resource_patches_config,
+    -- resource_patches = resource_patches,
+    -- resource_patches_config = resource_patches_config,
     water = water,
     water_scale = 1 / 96,
     water_threshold = 0.4,

map_gen/maps/danger_ores/presets/danger_ore_gradient_beltboxes_ore_only.lua

@@ -55,12 +55,12 @@ 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_gradient_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 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 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'
@@ -82,12 +82,12 @@ 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
 
 Event.on_init(function()
-    --game.draw_resource_selection = false
+    -- 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
@@ -137,8 +137,8 @@ local config = {
     main_ores = main_ores_config,
     main_ores_shuffle_order = true,
     main_ores_rotate = 0,
-    resource_patches = resource_patches,
-    resource_patches_config = resource_patches_config,
+    -- resource_patches = resource_patches,
+    -- resource_patches_config = resource_patches_config,
     water = water,
     water_scale = 1 / 96,
     water_threshold = 0.45,
@@ -152,7 +152,7 @@ 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

map_gen/maps/danger_ores/presets/danger_ore_hub_spiral_beltboxes_ore_only.lua

@@ -55,64 +55,57 @@ 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 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 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
-    }
-)
+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
+    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
+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 = 25
-        game.forces.player.technologies.logistics.researched = true
-        game.forces.player.technologies.automation.researched = true
+    game.difficulty_settings.technology_price_multiplier = 25
+    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.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
+    game.forces.player.manual_mining_speed_modifier = 1
 
-        RS.get_surface().always_day = true
-        RS.get_surface().peaceful_mode = true
-    end
-)
+    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})
@@ -144,9 +137,9 @@ local config = {
     main_ores_builder = main_ores_builder,
     main_ores = main_ores_config,
     main_ores_shuffle_order = true,
-    --main_ores_rotate = 45,
-    resource_patches = resource_patches,
-    resource_patches_config = resource_patches_config,
+    -- main_ores_rotate = 45,
+    -- resource_patches = resource_patches,
+    -- resource_patches_config = resource_patches_config,
     water = water,
     water_scale = function(x, y)
         local d = sqrt(x * x + y * y)
@@ -163,7 +156,7 @@ 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 = 50

map_gen/maps/danger_ores/presets/danger_ore_one_direction_beltboxes_ore_only.lua

@@ -55,8 +55,8 @@ 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.one_direction_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 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'
@@ -163,8 +163,8 @@ local config = {
     main_ores = main_ores_config,
     main_ores_shuffle_order = true,
     -- main_ores_rotate = 30,
-    resource_patches = resource_patches,
-    resource_patches_config = resource_patches_config,
+    -- resource_patches = resource_patches,
+    -- resource_patches_config = resource_patches_config,
     -- water = water,
     water_scale = 1 / 96,
     water_threshold = 0.4,

map_gen/maps/danger_ores/presets/danger_ore_patches_beltboxes_ore_only.lua

@@ -55,9 +55,10 @@ 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_coal'
-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 main_ore_resource_patches_config = require 'map_gen.maps.danger_ores.config.deadlock_beltboxes_main_ore_resource_patches'
+-- 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 main_ore_resource_patches_config =
+    require 'map_gen.maps.danger_ores.config.deadlock_beltboxes_main_ore_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'
@@ -65,7 +66,8 @@ local enemy = require 'map_gen.maps.danger_ores.modules.enemy'
 
 local banned_entities = require 'map_gen.maps.danger_ores.modules.banned_entities'
 local allowed_entities = require 'map_gen.maps.danger_ores.config.patches_deadlock_betlboxes_allowed_entities'
-banned_entities(allowed_entities, 'You cannot build that on top of ores, only express belts and mining drills are allowed.')
+banned_entities(allowed_entities,
+    'You cannot build that on top of ores, only express belts and mining drills are allowed.')
 
 RS.set_map_gen_settings({
     MGSP.grass_only,
@@ -88,7 +90,7 @@ Config.dump_offline_inventories = {
 Config.paint.enabled = false
 
 Event.on_init(function()
-    --game.draw_resource_selection = false
+    -- 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
@@ -138,8 +140,8 @@ local config = {
     main_ores = main_ores_config,
     main_ores_shuffle_order = true,
     -- main_ores_rotate = 0,
-    resource_patches = resource_patches,
-    resource_patches_config = resource_patches_config,
+    -- resource_patches = resource_patches,
+    -- resource_patches_config = resource_patches_config,
     main_ore_resource_patches_config = main_ore_resource_patches_config,
     water = water,
     water_scale = 1 / 96,

map_gen/maps/danger_ores/presets/danger_ore_spiral_beltboxes_ore_only.lua

@@ -55,63 +55,56 @@ 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_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 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'
 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.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
-    }
-)
+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
+    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
+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.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.0000077 -- default 0.000004
-        game.map_settings.enemy_evolution.destroy_factor = 0.000011 -- default 0.002
-        game.map_settings.enemy_evolution.pollution_factor = 0.000000 -- Pollution has no affect on evolution default 0.0000009
+    game.map_settings.enemy_evolution.time_factor = 0.0000077 -- default 0.000004
+    game.map_settings.enemy_evolution.destroy_factor = 0.000011 -- 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
+    game.forces.player.manual_mining_speed_modifier = 1
 
-        RS.get_surface().always_day = true
-        RS.get_surface().peaceful_mode = true
-    end
-)
+    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})
@@ -143,9 +136,9 @@ local config = {
     main_ores_builder = main_ores_builder,
     main_ores = main_ores_config,
     main_ores_shuffle_order = true,
-    --main_ores_rotate = 45,
-    resource_patches = resource_patches,
-    resource_patches_config = resource_patches_config,
+    -- main_ores_rotate = 45,
+    -- resource_patches = resource_patches,
+    -- resource_patches_config = resource_patches_config,
     trees = trees,
     trees_scale = 1 / 64,
     trees_threshold = 0.35,
@@ -155,7 +148,7 @@ local config = {
     enemy_max_chance = 1 / 5,
     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 = 50

map_gen/maps/danger_ores/presets/danger_ore_xmas_tree_beltboxes_ore_only.lua

@@ -55,68 +55,61 @@ 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.one_direction_beltboxes_ores_xmas'
---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 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 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
-    }
-)
+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
+    offline_timout_mins = 30 -- time after which a player logs off that their inventory is provided to the team
 }
 Config.paint.enabled = false
 Config.day_night.enabled = true
 Config.day_night.use_fixed_brightness = true
 Config.day_night.fixed_brightness = 0.70
 
-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.forces.player.technologies['landfill'].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.forces.player.technologies['landfill'].enabled = false
 
-        game.difficulty_settings.technology_price_multiplier = 25
-        game.forces.player.technologies.logistics.researched = true
-        game.forces.player.technologies.automation.researched = true
+    game.difficulty_settings.technology_price_multiplier = 25
+    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.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
+    game.forces.player.manual_mining_speed_modifier = 1
 
-        --RS.get_surface().always_day = true
-        RS.get_surface().peaceful_mode = true
-    end
-)
+    -- 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 = 12 * 32, min_pollution = 300, max_pollution = 16000, pollution_increment = 9})
@@ -140,7 +133,7 @@ require 'map_gen.maps.danger_ores.modules.map_poll'
 
 local main_ores_builder = require 'map_gen.maps.danger_ores.modules.main_ores_xmas_tree'
 
---local sqrt = math.sqrt
+-- local sqrt = math.sqrt
 
 local config = {
     spawn_shape = b.circle(72),
@@ -148,16 +141,16 @@ local config = {
     main_ores_builder = main_ores_builder,
     main_ores = main_ores_config,
     main_ores_shuffle_order = true,
-    --main_ores_rotate = 45,
-    --resource_patches = resource_patches,
-    --resource_patches_config = resource_patches_config,
-    --water = water,
+    -- main_ores_rotate = 45,
+    -- resource_patches = resource_patches,
+    -- resource_patches_config = resource_patches_config,
+    -- water = water,
     --[[water_scale = function(x, y)
         local d = sqrt(x * x + y * y)
         return 1 / (24 + (0.1 * d))
     end,]]
-    --water_threshold = 0.35,
-    --deepwater_threshold = 0.4,
+    -- water_threshold = 0.35,
+    -- deepwater_threshold = 0.4,
     trees = trees,
     trees_scale = 1 / 64,
     trees_threshold = 0.35,
@@ -167,7 +160,7 @@ local config = {
     enemy_max_chance = 1 / 6,
     enemy_scale_factor = 32,
     fish_spawn_rate = 0.00625,
-    --dense_patches = dense_patches,
+    -- dense_patches = dense_patches,
     dense_patches_scale = 1 / 48,
     dense_patches_threshold = 0.55,
     dense_patches_multiplier = 50