From 3fe1b61cd9b65b15d412f9c708dc0b1b9284bdaa Mon Sep 17 00:00:00 2001 From: grilledham Date: Sat, 12 Feb 2022 22:21:23 +0000 Subject: [PATCH] Update danger bobs ore. (#1289) --- map_gen/maps/danger_ores/config/bob_ores.lua | 621 +++++++++--------- .../config/bob_resource_patches.lua | 14 +- map_gen/maps/danger_ores/modules/map_poll.lua | 3 +- .../danger_ores/presets/danger_bobs_ores.lua | 102 ++- .../danger-bobs-ores/map_selection.lua | 1 + 5 files changed, 362 insertions(+), 379 deletions(-) create mode 100644 scenario_templates/danger-bobs-ores/map_selection.lua diff --git a/map_gen/maps/danger_ores/config/bob_ores.lua b/map_gen/maps/danger_ores/config/bob_ores.lua index 3c9b7582..2dee66e0 100644 --- a/map_gen/maps/danger_ores/config/bob_ores.lua +++ b/map_gen/maps/danger_ores/config/bob_ores.lua @@ -1,5 +1,6 @@ local b = require 'map_gen.shared.builders' -local value = b.euclidean_value +local value = b.exponential_value(0, 0.07, 1.45) +local start_value = b.euclidean_value(0, 0.35) return { { @@ -10,26 +11,26 @@ return { [3] = 'grass-3', [4] = 'grass-4' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['weight'] = 15, ['ratios'] = { - {resource = b.resource(b.full_shape, 'iron-ore', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'copper-ore', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 120}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -40,26 +41,26 @@ return { [3] = 'red-desert-2', [4] = 'red-desert-3' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['weight'] = 10, ['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 = 120}, - {resource = b.resource(b.full_shape, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 120}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -73,26 +74,26 @@ return { [6] = 'dirt-6', [7] = 'dirt-7' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['weight'] = 10, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 120}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -102,26 +103,26 @@ return { [2] = 'sand-2', [3] = 'sand-3' }, - ['start'] = value(125, 0), - ['weight'] = 10, + ['start'] = start_value, + ['weight'] = 2, ['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, 'stone', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 120}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -132,26 +133,26 @@ return { [3] = 'grass-3', [4] = 'grass-4' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['weight'] = 2, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 120}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -162,26 +163,26 @@ return { [3] = 'red-desert-2', [4] = 'red-desert-3' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['weight'] = 0.05, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 120}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -195,26 +196,26 @@ return { [6] = 'dirt-6', [7] = 'dirt-7' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['weight'] = 0.05, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 120}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -224,26 +225,26 @@ return { [2] = 'sand-2', [3] = 'sand-3' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 120}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -254,26 +255,26 @@ return { [3] = 'grass-3', [4] = 'grass-4' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['weight'] = 2, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 120}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -284,26 +285,26 @@ return { [3] = 'red-desert-2', [4] = 'red-desert-3' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['weight'] = 2, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 120}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -317,26 +318,26 @@ return { [6] = 'dirt-6', [7] = 'dirt-7' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['weight'] = 2, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 120}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -346,26 +347,26 @@ return { [2] = 'sand-2', [3] = 'sand-3' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 120}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -376,29 +377,29 @@ return { [3] = 'grass-3', [4] = 'grass-4' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 120}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, - { + --[[ { name = 'sulfur', ['tiles'] = { [1] = 'red-desert-0', @@ -406,28 +407,28 @@ return { [3] = 'red-desert-2', [4] = 'red-desert-3' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'sulfur', value), weight = 120}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } - }, + }, ]] { name = 'tin-ore', ['tiles'] = { @@ -439,26 +440,26 @@ return { [6] = 'dirt-6', [7] = 'dirt-7' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['weight'] = 2, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 120}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -468,26 +469,26 @@ return { [2] = 'sand-2', [3] = 'sand-3' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 120}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 3} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 120}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 3} } }, { @@ -498,26 +499,26 @@ return { [3] = 'grass-3', [4] = 'grass-4' }, - ['start'] = value(125, 0), + ['start'] = start_value, ['weight'] = 2, ['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, 'stone', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'coal', value(0, 0.5)), weight = 20}, - {resource = b.resource(b.full_shape, 'bauxite-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'cobalt-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gem-ore', value(0, 0.5)), weight = 0.1}, - {resource = b.resource(b.full_shape, 'gold-ore', value(0, 0.5)), weight = 7}, - {resource = b.resource(b.full_shape, 'lead-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'nickel-ore', value(0, 0.5)), weight = 3}, - {resource = b.resource(b.full_shape, 'quartz', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'rutile-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'silver-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'sulfur', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'tin-ore', value(0, 0.5)), weight = 10}, - {resource = b.resource(b.full_shape, 'tungsten-ore', value(0, 0.5)), weight = 5}, - {resource = b.resource(b.full_shape, 'zinc-ore', value(0, 0.5)), weight = 120} + {resource = b.resource(b.full_shape, 'iron-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'copper-ore', value), weight = 20}, + {resource = b.resource(b.full_shape, 'stone', value), weight = 20}, + {resource = b.resource(b.full_shape, 'coal', value), weight = 20}, + {resource = b.resource(b.full_shape, 'bauxite-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'cobalt-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gem-ore', value), weight = 0.1}, + {resource = b.resource(b.full_shape, 'gold-ore', value), weight = 7}, + {resource = b.resource(b.full_shape, 'lead-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'nickel-ore', value), weight = 3}, + {resource = b.resource(b.full_shape, 'quartz', value), weight = 5}, + {resource = b.resource(b.full_shape, 'rutile-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'silver-ore', value), weight = 5}, + --{resource = b.resource(b.full_shape, 'sulfur', value), weight = 5}, + {resource = b.resource(b.full_shape, 'tin-ore', value), weight = 10}, + {resource = b.resource(b.full_shape, 'tungsten-ore', value), weight = 5}, + {resource = b.resource(b.full_shape, 'zinc-ore', value), weight = 120} } } } diff --git a/map_gen/maps/danger_ores/config/bob_resource_patches.lua b/map_gen/maps/danger_ores/config/bob_resource_patches.lua index 34c7111a..e600eec7 100644 --- a/map_gen/maps/danger_ores/config/bob_resource_patches.lua +++ b/map_gen/maps/danger_ores/config/bob_resource_patches.lua @@ -1,22 +1,24 @@ local b = require 'map_gen.shared.builders' local value = b.euclidean_value -local oil_shape = b.throttle_world_xy(b.full_shape, 1, 7, 1, 7) +local full_oil_shape = b.translate(b.throttle_xy(b.full_shape, 3, 6, 3, 6), -1, -1) +full_oil_shape = b.use_world_as_local(full_oil_shape) +local oil_shape = b.throttle_world_xy(b.full_shape, 1, 6, 1, 6) return { { scale = 1 / 64, threshold = 0.6, - resource = b.resource(oil_shape, 'crude-oil', value(250000, 150)) + resource = b.any{b.resource(oil_shape, 'crude-oil', value(100000, 2500)), full_oil_shape} }, { scale = 1 / 72, - threshold = 0.63, - resource = b.resource(b.full_shape, 'uranium-ore', value(200, 1)) + threshold = 0.66, + resource = b.resource(b.full_shape, 'uranium-ore', value(100, 1.5)) }, { scale = 1 / 72, - threshold = 0.63, - resource = b.resource(b.full_shape, 'thorium-ore', value(200, 1)) + threshold = 0.66, + resource = b.resource(b.full_shape, 'thorium-ore', value(100, 1.5)) } } diff --git a/map_gen/maps/danger_ores/modules/map_poll.lua b/map_gen/maps/danger_ores/modules/map_poll.lua index ed2eaea6..a8348187 100644 --- a/map_gen/maps/danger_ores/modules/map_poll.lua +++ b/map_gen/maps/danger_ores/modules/map_poll.lua @@ -31,7 +31,8 @@ Event.add(Server.events.on_server_started, function() 'spiral (without void)', 'landfill (all tiles)', 'patches (ore islands in coal)', - 'xmas tree (triangle)' + 'xmas tree (triangle)', + 'bob\'s mod (default map)' } }) end) diff --git a/map_gen/maps/danger_ores/presets/danger_bobs_ores.lua b/map_gen/maps/danger_ores/presets/danger_bobs_ores.lua index 38527c89..952d7835 100644 --- a/map_gen/maps/danger_ores/presets/danger_bobs_ores.lua +++ b/map_gen/maps/danger_ores/presets/danger_bobs_ores.lua @@ -57,7 +57,7 @@ local resource_patches_config = require 'map_gen.maps.danger_ores.config.bob_res 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.bob_allowed_entities' @@ -71,7 +71,7 @@ local ores_names = { 'stone', 'uranium-ore', 'bauxite-ore', - 'cobalt-ore', + --'cobalt-ore', 'gem-ore', 'gold-ore', 'lead-ore', @@ -79,7 +79,7 @@ local ores_names = { 'quartz', 'rutile-ore', 'silver-ore', - 'sulfur', + --'sulfur', 'tin-ore', 'tungsten-ore', 'zinc-ore', @@ -87,81 +87,56 @@ local ores_names = { } local ore_oil_none = {} for _, v in pairs(ores_names) do - ore_oil_none[v] = { - frequency = 1, - richness = 1, - size = 0 - } + ore_oil_none[v] = {frequency = 1, richness = 1, size = 0} end ore_oil_none = {autoplace_controls = ore_oil_none} -RS.set_map_gen_settings( - { - MGSP.grass_only, - MGSP.enable_water, - { - terrain_segmentation = 'normal', - water = 'normal' - }, - MGSP.starting_area_very_low, - 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, + 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 = 5 - game.forces.player.technologies.logistics.researched = true - game.forces.player.technologies.automation.researched = true + game.difficulty_settings.technology_price_multiplier = 10 + 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 - 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 = 20000, - pollution_increment = 4 - } -) +terraforming({start_size = 10 * 32, min_pollution = 400, max_pollution = 20000, pollution_increment = 6}) -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 = 5, - max_enemies_per_wave_per_chunk = 60, - extra_rockets = 100 - } -) +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-bobs-ores'}) @@ -172,9 +147,12 @@ 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'}) +require 'map_gen.maps.danger_ores.modules.map_poll' + local config = { - spawn_shape = b.circle(80), - start_ore_shape = b.circle(86), + spawn_shape = b.circle(40), + start_ore_shape = b.circle(48), + no_resource_patch_shape = b.circle(80), main_ores = main_ores_config, main_ores_shuffle_order = true, resource_patches = resource_patches, @@ -193,7 +171,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.5, dense_patches_multiplier = 50 diff --git a/scenario_templates/danger-bobs-ores/map_selection.lua b/scenario_templates/danger-bobs-ores/map_selection.lua new file mode 100644 index 00000000..c004cad8 --- /dev/null +++ b/scenario_templates/danger-bobs-ores/map_selection.lua @@ -0,0 +1 @@ +return require 'map_gen.maps.danger_ores.presets.danger_bobs_ores' \ No newline at end of file