Merge pull request #1082 from grilledham/danger_ores_balance_changes

Terrafroming danger ore balance changes.

map_gen/maps/danger_ores/config/vanilla_allowed_entities.lua

@@ -14,5 +14,11 @@ return {
     'pumpjack',
     'car',
     'tank',
-    'spidertron'
+    'spidertron',
+    'straight-rail',
+    'curved-rail',
+    'locomotive',
+    'cargo-wagon',
+    'fluid-wagon',
+    'artillery-wagon'
 }

map_gen/maps/danger_ores/config/vanilla_ores.lua

@@ -31,8 +31,8 @@ return {
         ['start'] = value(75, 0),
         ['weight'] = 1,
         ['ratios'] = {
-            {resource = b.resource(b.full_shape, 'iron-ore', value(0, 0.5)), weight = 20},
-            {resource = b.resource(b.full_shape, 'copper-ore', value(0, 0.5)), weight = 20},
+            {resource = b.resource(b.full_shape, 'iron-ore', value(0, 0.5)), weight = 25},
+            {resource = b.resource(b.full_shape, 'copper-ore', value(0, 0.5)), weight = 15},
             {resource = b.resource(b.full_shape, 'stone', value(0, 0.5)), weight = 3},
             {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 57}
         }
@@ -62,8 +62,8 @@ return {
         ['start'] = value(75, 0),
         ['weight'] = 1,
         ['ratios'] = {
-            {resource = b.resource(b.full_shape, 'iron-ore', value(0, 0.5)), weight = 20},
-            {resource = b.resource(b.full_shape, 'copper-ore', value(0, 0.5)), weight = 20},
+            {resource = b.resource(b.full_shape, 'iron-ore', value(0, 0.5)), weight = 25},
+            {resource = b.resource(b.full_shape, 'copper-ore', value(0, 0.5)), weight = 15},
             {resource = b.resource(b.full_shape, 'stone', value(0, 0.5)), weight = 50},
             {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 10}
         }

map_gen/maps/danger_ores/config/vanilla_resource_patches.lua

@@ -7,7 +7,7 @@ return {
     {
         scale = 1 / 64,
         threshold = 0.6,
-        resource = b.resource(oil_shape, 'crude-oil', value(250000, 150))
+        resource = b.resource(oil_shape, 'crude-oil', value(375000, 225))
     },
     {
         scale = 1 / 72,

map_gen/maps/danger_ores/modules/enemy.lua

@@ -1,4 +1,5 @@
 local Perlin = require 'map_gen.shared.perlin_noise'
+local ShareGlobals = require 'map_gen.maps.danger_ores.modules.shared_globals'
 local math = require 'utils.math'
 local seed_provider = require 'map_gen.maps.danger_ores.modules.seed_provider'
 
@@ -9,7 +10,7 @@ local ceil = math.ceil
 local perlin_noise = Perlin.noise
 local random = math.random
 
-return function(config, shared_globals)
+return function(config)
     local worm_names =
         config.worm_names or {'small-worm-turret', 'medium-worm-turret', 'big-worm-turret', 'behemoth-worm-turret'}
     local spawner_names = config.spawner_names or {'biter-spawner', 'spitter-spawner'}
@@ -22,7 +23,7 @@ return function(config, shared_globals)
     local m = 1 / 850
 
     return function(x, y, world)
-        if shared_globals.biters_disabled then
+        if ShareGlobals.data.biters_disabled then
             return nil
         end
 

map_gen/maps/danger_ores/modules/map.lua

@@ -47,7 +47,7 @@ local function empty_builder()
     return b.empty_shape
 end
 
-return function(config, shared_globals)
+return function(config)
     local start_ore_shape
     local resource_patches
     local dense_patches
@@ -94,9 +94,10 @@ return function(config, shared_globals)
             local water_shape = (config.water or empty_builder)(config)
             local tile_builder = tile_builder_factory(config)
             local trees_shape = (config.trees or no_op)(config)
-            local enemy_shape = (config.enemy or no_op)(config, shared_globals)
+            local enemy_shape = (config.enemy or no_op)(config)
             local fish_spawn_rate = config.fish_spawn_rate
             local main_ores = config.main_ores
+            local main_ores_rotate = config.main_ores_rotate or 0
 
             start_ore_shape = config.start_ore_shape or b.circle(68)
             resource_patches = (config.resource_patches or no_op)(config) or b.empty_shape
@@ -126,6 +127,10 @@ return function(config, shared_globals)
 
             local ores = b.segment_weighted_pattern(shapes)
 
+            if main_ores_rotate ~= 0 then
+                ores = b.rotate(ores, math.rad(main_ores_rotate))
+            end
+
             map = b.any {spawn_shape, water_shape, ores}
 
             if enemy_shape then

map_gen/maps/danger_ores/modules/rocket_launched.lua

@@ -7,8 +7,9 @@ local RS = require 'map_gen.shared.redmew_surface'
 local Task = require 'utils.task'
 local Token = require 'utils.token'
 local Server = require 'features.server'
+local ShareGlobals = require 'map_gen.maps.danger_ores.modules.shared_globals'
 
-return function(config, shared_globals)
+return function(config)
     local recent_chunks = Queue.new() -- Keeps track of recently revealed chunks
     local recent_chunks_max = config.recent_chunks_max or 10 -- Maximum number of chunks to track
     local ticks_between_waves = config.ticks_between_waves or 60 * 30
@@ -20,8 +21,7 @@ return function(config, shared_globals)
         extra_rockets = config.extra_rockets or 100
     }
 
-    shared_globals.biters_disabled = false
-
+    ShareGlobals.data.biters_disabled = false
     _G.rocket_launched_win_data = win_data
 
     Global.register(
@@ -72,7 +72,7 @@ return function(config, shared_globals)
     do_wave =
         Token.register(
         function(data)
-            if shared_globals.biters_disabled then
+            if ShareGlobals.data.biters_disabled then
                 return false
             end
 
@@ -177,7 +177,7 @@ return function(config, shared_globals)
             return
         end
 
-        if shared_globals.biters_disabled then
+        if ShareGlobals.data.biters_disabled then
             return
         end
 
@@ -219,9 +219,10 @@ return function(config, shared_globals)
         game.print(win_message)
         Server.to_discord_bold(win_message)
 
-        shared_globals.biters_disabled = true
+        ShareGlobals.data.biters_disabled = true
 
-        for key, enemy_entity in pairs(RS.get_surface().find_entities_filtered({force = 'enemy'})) do
+        game.forces.enemy.kill_all_units()
+        for _, enemy_entity in pairs(RS.get_surface().find_entities_filtered({force = 'enemy'})) do
             enemy_entity.destroy()
         end
     end

map_gen/maps/danger_ores/modules/shared_globals.lua

@@ -0,0 +1,17 @@
+local Global = require 'utils.global'
+
+local Public = {
+    data = {}
+}
+
+_G.danger_ore_shared_globals = Public.data
+
+Global.register(
+    Public.data,
+    function(tbl)
+        Public.data = tbl
+        _G.danger_ore_shared_globals = tbl
+    end
+)
+
+return Public

map_gen/maps/danger_ores/presets/danger_bobangels_ores.lua

@@ -2,7 +2,6 @@ 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 Token = require 'utils.token'
 
 local ScenarioInfo = require 'features.gui.info'
 ScenarioInfo.set_map_name('Danger Bobs & Angels Ore Quadrants')
@@ -34,10 +33,6 @@ proper material ratios, expand the map with pollution!
 ]]
 )
 
-local shared_globals = {}
-Token.register_global(shared_globals)
-_G.danger_ore_shared_globals = shared_globals
-
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.bobangels_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'
@@ -125,8 +120,7 @@ rocket_launched(
         enemy_factor = 5,
         max_enemies_per_wave_per_chunk = 60,
         extra_rockets = 100
-    },
-    shared_globals
+    }
 )
 
 local container_dump = require 'map_gen.maps.danger_ores.modules.container_dump'
@@ -159,4 +153,4 @@ local config = {
     dense_patches_multiplier = 50
 }
 
-return map(config, shared_globals)
+return map(config)

map_gen/maps/danger_ores/presets/danger_bobs_ores.lua

@@ -2,7 +2,6 @@ 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 Token = require 'utils.token'
 
 local ScenarioInfo = require 'features.gui.info'
 ScenarioInfo.set_map_name('Terraforming Danger Ore')
@@ -35,10 +34,6 @@ proper material ratios, expand the map with pollution!
 ]]
 )
 
-local shared_globals = {}
-Token.register_global(shared_globals)
-_G.danger_ore_shared_globals = shared_globals
-
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.bob_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'
@@ -136,8 +131,7 @@ rocket_launched(
         enemy_factor = 5,
         max_enemies_per_wave_per_chunk = 60,
         extra_rockets = 100
-    },
-    shared_globals
+    }
 )
 
 local container_dump = require 'map_gen.maps.danger_ores.modules.container_dump'
@@ -170,4 +164,4 @@ local config = {
     dense_patches_multiplier = 50
 }
 
-return map(config, shared_globals)
+return map(config)

map_gen/maps/danger_ores/presets/danger_ore deadlock_beltboxes.lua

@@ -0,0 +1,162 @@
+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 ScenarioInfo = require 'features.gui.info'
+ScenarioInfo.set_map_name('Terraforming Danger Ore')
+ScenarioInfo.set_map_description(
+    [[
+Clear the ore to expand the base,
+focus mining efforts on specific quadrants to ensure
+proper material ratios, expand the map with pollution!
+]]
+)
+ScenarioInfo.add_map_extra_info(
+    [[
+This map is split in four quadrants. Each quadrant has a main resource.
+ [item=iron-ore] north, [item=copper-ore] south, [item=coal] east, [item=stone] west
+
+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=transport-belt] [item=fast-transport-belt] [item=express-transport-belt]  [item=underground-belt] [item=fast-underground-belt] [item=express-underground-belt] [item=rail]
+
+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_map_description(
+    [[
+Clear the ore to expand the base,
+focus mining efforts on specific quadrants to ensure
+proper material ratios, expand the map with pollution!
+]]
+)
+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.
+]]
+)
+
+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.vanilla_ores'
+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 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.vanilla_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
+    }
+)
+
+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 = 30
+        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
+
+        RS.get_surface().always_day = true
+    end
+)
+
+local terraforming = require 'map_gen.maps.danger_ores.modules.terraforming'
+terraforming(
+    {
+        start_size = 8 * 32,
+        min_pollution = 400,
+        max_pollution = 4000,
+        pollution_increment = 2.5
+    }
+)
+
+local rocket_launched = require 'map_gen.maps.danger_ores.modules.rocket_launched'
+rocket_launched(
+    {
+        recent_chunks_max = 10,
+        ticks_between_waves = 60 * 30,
+        enemy_factor = 3,
+        max_enemies_per_wave_per_chunk = 80,
+        extra_rockets = 150
+    }
+)
+
+local container_dump = require 'map_gen.maps.danger_ores.modules.container_dump'
+container_dump({entity_name = 'coal'})
+
+local config = {
+    spawn_shape = b.circle(64),
+    start_ore_shape = b.circle(68),
+    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,
+    water_scale = 1 / 96,
+    water_threshold = 0.5,
+    deepwater_threshold = 0.55,
+    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 = 50
+}
+
+return map(config)

map_gen/maps/danger_ores/presets/danger_ores.lua

@@ -2,7 +2,6 @@ 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 Token = require 'utils.token'
 
 local ScenarioInfo = require 'features.gui.info'
 ScenarioInfo.set_map_name('Danger Ores')
@@ -19,10 +18,6 @@ ScenarioInfo.add_map_extra_info(
  [item=transport-belt] [item=fast-transport-belt] [item=express-transport-belt]  [item=underground-belt] [item=fast-underground-belt] [item=express-underground-belt] ]]
 )
 
-local shared_globals = {}
-Token.register_global(shared_globals)
-_G.danger_ore_shared_globals = shared_globals
-
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'
@@ -48,7 +43,7 @@ Event.on_init(
         game.forces.player.technologies['mining-productivity-3'].enabled = false
         game.forces.player.technologies['mining-productivity-4'].enabled = false
 
-        game.difficulty_settings.technology_price_multiplier = 20
+        game.difficulty_settings.technology_price_multiplier = 25
         game.forces.player.technologies.logistics.researched = true
         game.forces.player.technologies.automation.researched = true
 
@@ -66,6 +61,7 @@ local config = {
     start_ore_shape = b.circle(68),
     main_ores = main_ores_config,
     --main_ores_shuffle_order = true,
+    --main_ores_rotate = 45,
     resource_patches = resource_patches,
     resource_patches_config = resource_patches_config,
     dense_patches = dense_patches,
@@ -74,4 +70,4 @@ local config = {
     dense_patches_multiplier = 50
 }
 
-return map(config, shared_globals)
+return map(config)

map_gen/maps/danger_ores/presets/terraforming_danger_ore.lua

@@ -2,7 +2,6 @@ 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 Token = require 'utils.token'
 
 local ScenarioInfo = require 'features.gui.info'
 ScenarioInfo.set_map_name('Terraforming Danger Ore')
@@ -16,11 +15,11 @@ proper material ratios, expand the map with pollution!
 ScenarioInfo.add_map_extra_info(
     [[
 This map is split in four quadrants. Each quadrant has a main resource.
- [item=iron-ore] north east, [item=copper-ore] south west, [item=coal] north west, [item=stone] south east
+ [item=iron-ore] north, [item=copper-ore] south, [item=coal] east, [item=stone] west
 
 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=transport-belt] [item=fast-transport-belt] [item=express-transport-belt]  [item=underground-belt] [item=fast-underground-belt] [item=express-underground-belt]
+ [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=transport-belt] [item=fast-transport-belt] [item=express-transport-belt]  [item=underground-belt] [item=fast-underground-belt] [item=express-underground-belt] [item=rail]
 
 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
@@ -58,10 +57,6 @@ ScenarioInfo.set_new_info(
 ]]
 )
 
-local shared_globals = {}
-Token.register_global(shared_globals)
-_G.danger_ore_shared_globals = shared_globals
-
 local map = require 'map_gen.maps.danger_ores.modules.map'
 local main_ores_config = require 'map_gen.maps.danger_ores.config.vanilla_ores'
 local resource_patches = require 'map_gen.maps.danger_ores.modules.resource_patches'
@@ -99,7 +94,7 @@ Event.on_init(
         game.forces.player.technologies['mining-productivity-3'].enabled = false
         game.forces.player.technologies['mining-productivity-4'].enabled = false
 
-        game.difficulty_settings.technology_price_multiplier = 20
+        game.difficulty_settings.technology_price_multiplier = 25
         game.forces.player.technologies.logistics.researched = true
         game.forces.player.technologies.automation.researched = true
 
@@ -116,7 +111,7 @@ terraforming(
     {
         start_size = 8 * 32,
         min_pollution = 400,
-        max_pollution = 3500,
+        max_pollution = 4000,
         pollution_increment = 2.5
     }
 )
@@ -126,11 +121,10 @@ rocket_launched(
     {
         recent_chunks_max = 10,
         ticks_between_waves = 60 * 30,
-        enemy_factor = 2,
-        max_enemies_per_wave_per_chunk = 60,
+        enemy_factor = 3,
+        max_enemies_per_wave_per_chunk = 80,
         extra_rockets = 100
-    },
-    shared_globals
+    }
 )
 
 local container_dump = require 'map_gen.maps.danger_ores.modules.container_dump'
@@ -141,6 +135,7 @@ local config = {
     start_ore_shape = b.circle(68),
     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,
@@ -158,8 +153,8 @@ local config = {
     fish_spawn_rate = 0.025,
     dense_patches = dense_patches,
     dense_patches_scale = 1 / 48,
-    dense_patches_threshold = 0.5,
+    dense_patches_threshold = 0.55,
     dense_patches_multiplier = 50
 }
 
-return map(config, shared_globals)
+return map(config)