danger ore updates

map_gen/maps/danger_ores/config/vanilla_allowed_entities.lua

@@ -17,6 +17,9 @@ return {
     'spidertron',
     'straight-rail',
     'curved-rail',
+    'rail-signal',
+    'rail-chain-signal',
+    'train-stop',
     'locomotive',
     'cargo-wagon',
     'fluid-wagon',

map_gen/maps/danger_ores/config/vanilla_ore_no_stone.lua

@@ -13,9 +13,9 @@ return {
         ['weight'] = 1,
         ['ratios'] = {
             {resource = b.resource(b.full_shape, 'iron-ore', value(0, 0.75)), weight = 15},
-            {resource = b.resource(b.full_shape, 'copper-ore', value(0, 0.75)), weight = 70},
-            {resource = b.resource(b.full_shape, 'stone', value(0, 0.75)), weight = 10},
-            {resource = b.resource(b.full_shape, 'coal', value(0, 0.75)), weight = 5}
+            {resource = b.resource(b.full_shape, 'copper-ore', value(0, 0.75)), weight = 72},
+            {resource = b.resource(b.full_shape, 'stone', value(0, 0.75)), weight = 6},
+            {resource = b.resource(b.full_shape, 'coal', value(0, 0.75)), weight = 7}
         }
     },
     ['coal'] = {
@@ -31,10 +31,10 @@ return {
         ['start'] = value(50, 0),
         ['weight'] = 1,
         ['ratios'] = {
-            {resource = b.resource(b.full_shape, 'iron-ore', value(0, 0.75)), weight = 25},
-            {resource = b.resource(b.full_shape, 'copper-ore', value(0, 0.75)), weight = 10},
-            {resource = b.resource(b.full_shape, 'stone', value(0, 0.75)), weight = 10},
-            {resource = b.resource(b.full_shape, 'coal', value(0, 0.75)), weight = 55}
+            {resource = b.resource(b.full_shape, 'iron-ore', value(0, 0.75)), weight = 21},
+            {resource = b.resource(b.full_shape, 'copper-ore', value(0, 0.75)), weight = 8},
+            {resource = b.resource(b.full_shape, 'stone', value(0, 0.75)), weight = 6},
+            {resource = b.resource(b.full_shape, 'coal', value(0, 0.75)), weight = 65}
         }
     },
     ['iron-ore'] = {
@@ -47,10 +47,10 @@ return {
         ['start'] = value(50, 0),
         ['weight'] = 1,
         ['ratios'] = {
-            {resource = b.resource(b.full_shape, 'iron-ore', value(0, 0.75)), weight = 70},
+            {resource = b.resource(b.full_shape, 'iron-ore', value(0, 0.75)), weight = 72},
             {resource = b.resource(b.full_shape, 'copper-ore', value(0, 0.75)), weight = 15},
-            {resource = b.resource(b.full_shape, 'stone', value(0, 0.75)), weight = 10},
-            {resource = b.resource(b.full_shape, 'coal', value(0, 0.75)), weight = 5}
+            {resource = b.resource(b.full_shape, 'stone', value(0, 0.75)), weight = 6},
+            {resource = b.resource(b.full_shape, 'coal', value(0, 0.75)), weight = 7}
         }
     }
 }

map_gen/maps/danger_ores/modules/main_ores_hub_spiral.lua

@@ -27,12 +27,12 @@ return function(config)
             table.shuffle_table(shapes, random_gen)
         end
 
-        local ores = b.circular_spiral_grow_pattern(24, 32, 384, shapes)
+        local ores = b.circular_spiral_grow_pattern(24, 24, 384, shapes)
 
         if main_ores_rotate ~= 0 then
             ores = b.rotate(ores, math.rad(main_ores_rotate))
         end
 
-        return b.any {spawn_shape, ores, water_shape}
+        return b.any {spawn_shape, water_shape, ores}
     end
 end

map_gen/maps/danger_ores/modules/restart_command.lua

@@ -11,7 +11,7 @@ local Core = require 'utils.core'
 local ShareGlobals = require 'map_gen.maps.danger_ores.modules.shared_globals'
 
 return function(config)
-    local default_name = config.scenario_name or 'terraforming-danger-ore'
+    local default_name = config.scenario_name or 'danger-ore-next'
 
     local map_promotion_channel = Discord.channel_names.map_promotion
     local danger_ore_role_mention = Discord.role_mentions.danger_ore

map_gen/maps/danger_ores/presets/danger_ore_hub_spiral.lua

@@ -59,7 +59,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_ore_no_stone'
 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'
@@ -112,14 +112,14 @@ Event.on_init(
 )
 
 local terraforming = require 'map_gen.maps.danger_ores.modules.terraforming'
-terraforming(
+--[[ terraforming(
     {
         start_size = 8 * 32,
         min_pollution = 400,
         max_pollution = 5000,
         pollution_increment = 2.5
     }
-)
+) ]]
 local rocket_launched = require 'map_gen.maps.danger_ores.modules.rocket_launched'
 rocket_launched(
     {
@@ -148,12 +148,9 @@ local config = {
     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_scale = 1 / 96,
+    water_threshold = 0.4,
+    deepwater_threshold = 0.45,
     trees = trees,
     trees_scale = 1 / 64,
     trees_threshold = 0.35,

map_gen/maps/danger_ores/presets/danger_ore_no_stone.lua

@@ -17,7 +17,7 @@ This map is split in four quadrants. Each quadrant has a main resource.
 
 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]
+ [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
@@ -106,7 +106,7 @@ local rocket_launched = require 'map_gen.maps.danger_ores.modules.rocket_launche
 rocket_launched({win_satellite_count = 500})
 
 local restart_command = require 'map_gen.maps.danger_ores.modules.restart_command'
-restart_command({scenario_name = 'terraforming-danger-ore'})
+restart_command({scenario_name = 'danger-ore-next'})
 
 local container_dump = require 'map_gen.maps.danger_ores.modules.container_dump'
 container_dump({entity_name = 'coal'})