Danger Ores: shared main-ores factory, standardized numbers (A-F), fluent API (G)

map_gen/maps/danger_ores/config/joker_starter_area.lua

@@ -1,92 +1,30 @@
+-- The Joker starter area: canonical mixes with time-budgeted richness -- each patch
+-- holds roughly a day of a single electric mining drill's output. Plus a token
+-- super-rich uranium entry.
 local b = require 'map_gen.shared.builders'
+local Factory = require 'map_gen.maps.danger_ores.config.main_ores_factory'
 
 local mine_speed = 0.5 / 10 -- 0.5 ore/s per electric mining drill
-local low = 60 * 60 * 4 * mine_speed -- 4h
 local medium = 60 * 60 * 24 * mine_speed -- 24h
 
-local low_value = b.exponential_value(low, 0.07, 1.45)
 local medium_value = b.exponential_value(medium, 0.07, 1.45)
 
-return {
-    {
-        name = 'copper-ore',
-        tiles = {
-            [1] = 'red-desert-0',
-            [2] = 'red-desert-1',
-            [3] = 'red-desert-2',
-            [4] = 'red-desert-3'
-        },
-        start = 1,
-        weight = 1,
-        ratios = {
-            {resource = b.resource(b.full_shape, 'iron-ore', medium_value), weight = 15},
-            {resource = b.resource(b.full_shape, 'copper-ore', medium_value), weight = 70},
-            {resource = b.resource(b.full_shape, 'stone', medium_value), weight = 10},
-            {resource = b.resource(b.full_shape, 'coal', medium_value), weight = 5}
-        }
-    },
-    {
-        name = 'coal',
-        tiles = {
-            [1] = 'dirt-1',
-            [2] = 'dirt-2',
-            [3] = 'dirt-3',
-            [4] = 'dirt-4',
-            [5] = 'dirt-5',
-            [6] = 'dirt-6',
-            [7] = 'dirt-7'
-        },
-        start = 1,
-        weight = 1,
-        ratios = {
-            {resource = b.resource(b.full_shape, 'iron-ore', low_value), weight = 18},
-            {resource = b.resource(b.full_shape, 'copper-ore', low_value), weight = 9},
-            {resource = b.resource(b.full_shape, 'stone', low_value), weight = 8},
-            {resource = b.resource(b.full_shape, 'coal', low_value), weight = 65}
-        }
-    },
-    {
-        name = 'iron-ore',
-        tiles = {
-            [1] = 'grass-1',
-            [2] = 'grass-2',
-            [3] = 'grass-3',
-            [4] = 'grass-4'
-        },
-        start = 1,
-        weight = 1,
-        ratios = {
-            {resource = b.resource(b.full_shape, 'iron-ore', medium_value), weight = 75},
-            {resource = b.resource(b.full_shape, 'copper-ore', medium_value), weight = 13},
-            {resource = b.resource(b.full_shape, 'stone', medium_value), weight = 7},
-            {resource = b.resource(b.full_shape, 'coal', medium_value), weight = 5}
-        }
-    },
-    {
-        name = 'stone',
-        tiles = {
-            [1] = 'sand-1',
-            [2] = 'sand-2',
-            [3] = 'sand-3'
-        },
-        start = 1,
-        weight = 1,
-        ratios = {
-            {resource = b.resource(b.full_shape, 'iron-ore', medium_value), weight = 25},
-            {resource = b.resource(b.full_shape, 'copper-ore', medium_value), weight = 10},
-            {resource = b.resource(b.full_shape, 'stone', medium_value), weight = 60},
-            {resource = b.resource(b.full_shape, 'coal', medium_value), weight = 5}
-        }
-    },
-    {
-        name = 'uranium-ore',
-        start = 1,
-        weight = 1,
-        ratios = {
-            {
-                resource = b.resource(b.full_shape, 'uranium-ore', function() return 1e6 end),
-                weight = 1
-            },
+local config = Factory.main_ores {
+    ores = {'copper-ore', 'coal', 'iron-ore', 'stone'},
+    start = 1,
+    value = medium_value
+}
+
+config[#config + 1] = {
+    name = 'uranium-ore',
+    start = 1,
+    weight = 1,
+    ratios = {
+        {
+            resource = b.resource(b.full_shape, 'uranium-ore', function() return 1e6 end),
+            weight = 1
         }
     }
 }
+
+return config

map_gen/maps/danger_ores/config/main_ores_factory.lua

@@ -0,0 +1,95 @@
+-- Factory for the standard danger-ores main-ore configs. Most of them use the same
+-- per-ore floor tiles and the same dominant+minor resource mixes, differing only in
+-- richness curves, ore order, entry weights or tile skins. This module holds those
+-- canonical numbers once; each config composes its entries from here.
+local b = require 'map_gen.shared.builders'
+
+local Public = {}
+
+-- Per-ore floor tiles.
+local tile_sets = {
+    ['iron-ore'] = {'grass-1', 'grass-2', 'grass-3', 'grass-4'},
+    ['copper-ore'] = {'red-desert-0', 'red-desert-1', 'red-desert-2', 'red-desert-3'},
+    ['coal'] = {'dirt-1', 'dirt-2', 'dirt-3', 'dirt-4', 'dirt-5', 'dirt-6', 'dirt-7'},
+    ['stone'] = {'sand-1', 'sand-2', 'sand-3'}
+}
+
+-- Dominant + minor mixes as {resource name, ratio weight} pairs, in canonical order.
+local mixes = {
+    ['iron-ore'] = {{'iron-ore', 75}, {'copper-ore', 13}, {'stone', 7}, {'coal', 5}},
+    ['copper-ore'] = {{'iron-ore', 15}, {'copper-ore', 70}, {'stone', 10}, {'coal', 5}},
+    ['coal'] = {{'iron-ore', 18}, {'copper-ore', 9}, {'stone', 8}, {'coal', 65}},
+    ['stone'] = {{'iron-ore', 25}, {'copper-ore', 10}, {'stone', 60}, {'coal', 5}}
+}
+Public.mixes = mixes
+
+local function copy_array(array)
+    local copy = {}
+    for i, v in ipairs(array) do
+        copy[i] = v
+    end
+    return copy
+end
+
+-- Fresh copy per call: the runtime must never share mutable tables between entries.
+function Public.tiles(ore_name)
+    return copy_array(tile_sets[ore_name])
+end
+
+-- Build a ratios table from a mix. make_resource(resource_name) -> resource shape.
+function Public.ratios(mix_name, make_resource)
+    local ratios = {}
+    for i, mix in ipairs(mixes[mix_name]) do
+        ratios[i] = {resource = make_resource(mix[1]), weight = mix[2]}
+    end
+    return ratios
+end
+
+-- The common case: plain full-shape resources with one richness curve.
+function Public.full_shape_resource(value)
+    return function(resource_name)
+        return b.resource(b.full_shape, resource_name, value)
+    end
+end
+
+-- One main-ore entry. params: name (required), start (required), and either value or
+-- make_resource; mix (defaults to name), tiles (defaults to the ore's tile set) and
+-- weight (defaults to 1) optional.
+function Public.entry(params)
+    local name = params.name
+    local make_resource = params.make_resource
+    if not make_resource then
+        assert(params.value, 'main_ores_factory.entry: either value or make_resource is required')
+        make_resource = Public.full_shape_resource(params.value)
+    end
+    return {
+        name = name,
+        tiles = params.tiles or Public.tiles(name),
+        start = params.start,
+        weight = params.weight or 1,
+        ratios = Public.ratios(params.mix or name, make_resource)
+    }
+end
+
+-- A whole main-ores config in one call. ores is an array of ore names or per-entry
+-- params tables; start/value/weight/tiles/make_resource act as defaults for every entry.
+function Public.main_ores(params)
+    local config = {}
+    for i, ore in ipairs(params.ores) do
+        if type(ore) == 'string' then
+            ore = {name = ore}
+        end
+        config[i] = Public.entry {
+            name = ore.name,
+            mix = ore.mix,
+            tiles = ore.tiles or (params.tiles and copy_array(params.tiles)),
+            start = ore.start or params.start,
+            value = ore.value or params.value,
+            weight = ore.weight or params.weight,
+            make_resource = ore.make_resource or params.make_resource
+        }
+    end
+    return config
+end
+
+return Public