From 8e07f96b32e91aaf2ee35f66031f5d9e8195f43d Mon Sep 17 00:00:00 2001 From: James Gillham Date: Sun, 12 Dec 2021 16:22:42 +0000 Subject: [PATCH 1/3] Add danger ore gradient beltboxes ore only. --- .../deadlock_beltboxes_gradient_ores.lua | 42 ++++ .../modules/main_ores_gradient.lua | 5 +- ...danger_ore_gradient_beltboxes_ore_only.lua | 193 ++++++++++++++++++ .../map_selection.lua | 1 + utils/table.lua | 19 +- 5 files changed, 257 insertions(+), 3 deletions(-) create mode 100644 map_gen/maps/danger_ores/config/deadlock_beltboxes_gradient_ores.lua create mode 100644 map_gen/maps/danger_ores/presets/danger_ore_gradient_beltboxes_ore_only.lua create mode 100644 scenario_templates/danger-ore-gradient-beltboxes-ore-only/map_selection.lua diff --git a/map_gen/maps/danger_ores/config/deadlock_beltboxes_gradient_ores.lua b/map_gen/maps/danger_ores/config/deadlock_beltboxes_gradient_ores.lua new file mode 100644 index 00000000..95ddb3dd --- /dev/null +++ b/map_gen/maps/danger_ores/config/deadlock_beltboxes_gradient_ores.lua @@ -0,0 +1,42 @@ +local b = require 'map_gen.shared.builders' +local start_value = b.exponential_value(0, 0.15, 1.3) +local value = b.exponential_value(0, 0.15, 1.3) + +return { + { + name = 'iron-ore', + tiles = {'grass-1', 'grass-2', 'grass-3', 'grass-4'}, + start = start_value, + shape = b.resource(b.full_shape, 'iron-ore', value), + weight = function(v) + return 4 * (v ^ 4) + 0.25 + end + }, + { + name = 'coal', + tiles = {'dirt-1', 'dirt-2', 'dirt-3', 'dirt-4', 'dirt-5', 'dirt-6', 'dirt-7'}, + start = start_value, + shape = b.resource(b.full_shape, 'coal', value), + weight = function(v) + return 4 * (v ^ 4) + 0.2 + end + }, + { + name = 'copper-ore', + tiles = {'red-desert-0', 'red-desert-1', 'red-desert-2', 'red-desert-3'}, + start = start_value, + shape = b.resource(b.full_shape, 'copper-ore', value), + weight = function(v) + return 4 * (v ^ 4) + 0.2 + end + }, + { + name = 'stone', + tiles = {'sand-1', 'sand-2', 'sand-3'}, + start = start_value, + shape = b.resource(b.full_shape, 'stone', value), + weight = function(v) + return 0.5 * (v ^ 8) + 0.1 + end + } +} diff --git a/map_gen/maps/danger_ores/modules/main_ores_gradient.lua b/map_gen/maps/danger_ores/modules/main_ores_gradient.lua index 5dd29a5e..4b1f0e6c 100644 --- a/map_gen/maps/danger_ores/modules/main_ores_gradient.lua +++ b/map_gen/maps/danger_ores/modules/main_ores_gradient.lua @@ -17,7 +17,7 @@ return function(config) local start_ore_shape = config.start_ore_shape or b.circle(68) - local function apply_resource_patches(x,y, world, entity) + local function apply_resource_patches(x, y, world, entity) local resource_patches_entity = resource_patches(x, y, world) if resource_patches_entity ~= false then return resource_patches_entity @@ -31,7 +31,8 @@ return function(config) return function(tile_builder, _, spawn_shape, water_shape, random_gen) if shuffle_order then - table.shuffle_table(main_ores, random_gen) + local rot = random_gen(#main_ores) + main_ores = table.rotate_table(main_ores, rot) end local start_ore_shapes = {} diff --git a/map_gen/maps/danger_ores/presets/danger_ore_gradient_beltboxes_ore_only.lua b/map_gen/maps/danger_ores/presets/danger_ore_gradient_beltboxes_ore_only.lua new file mode 100644 index 00000000..fcf21a65 --- /dev/null +++ b/map_gen/maps/danger_ores/presets/danger_ore_gradient_beltboxes_ore_only.lua @@ -0,0 +1,193 @@ +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 Config = require 'config' + +local ScenarioInfo = require 'features.gui.info' +ScenarioInfo.set_map_name('Danger Ore Gradient Beltboxes (ore only)') +ScenarioInfo.set_map_description([[ +Clear the ore to expand the base, +focus mining efforts on specific sectors to ensure +proper material ratios, expand the map with pollution! +]]) +ScenarioInfo.add_map_extra_info([[ +This map is split in three sectors [item=iron-ore] [item=copper-ore] [item=coal]. +Each sector has a main resource and the other resources at a lower ratio. + +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=locomotive] [item=cargo-wagon] [item=fluid-wagon] [item=artillery-wagon] + [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 +does not affect biter evolution.]]) + +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. + +2020-12-28: + - Changed win condition. First satellite kills all biters, launch 500 to win the map. + +2021-04-06: + - Rail signals and train stations now allowed on 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.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 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.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 +}) + +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 +} +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 + + 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.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 + + RS.get_surface().always_day = true + RS.get_surface().peaceful_mode = true +end) + +local allowed_recipes = { + ["deadlock-stacks-stack-iron-ore"] = true, + ["deadlock-stacks-unstack-iron-ore"] = true, + ["deadlock-stacks-stack-copper-ore"] = true, + ["deadlock-stacks-unstack-copper-ore"] = true, + ["deadlock-stacks-stack-stone"] = true, + ["deadlock-stacks-unstack-stone"] = true, + ["deadlock-stacks-stack-coal"] = true, + ["deadlock-stacks-unstack-coal"] = true, + ["deadlock-stacks-stack-uranium-ore"] = true, + ["deadlock-stacks-unstack-uranium-ore"] = true +} + +Event.add(defines.events.on_research_finished, function(event) + local research = event.research + if not research.valid then + return + end + + for _, effect in pairs(research.effects) do + if effect.type ~= 'unlock-recipe' then + goto continue + end + + local name = effect.recipe + if allowed_recipes[name] then + goto continue + end + + if name:sub(1, #'deadlock-stacks') == 'deadlock-stacks' then + game.forces.player.recipes[name].enabled = false + end + + ::continue:: + end +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}) + +local rocket_launched = require 'map_gen.maps.danger_ores.modules.rocket_launched_simple' +rocket_launched({win_satellite_count = 750}) + +local restart_command = require 'map_gen.maps.danger_ores.modules.restart_command' +restart_command({scenario_name = 'danger-ore-gradient-beltboxes-ore-only'}) + +local container_dump = require 'map_gen.maps.danger_ores.modules.container_dump' +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'}) + +local main_ores_builder = require 'map_gen.maps.danger_ores.modules.main_ores_gradient' + +local config = { + spawn_shape = b.circle(36), + start_ore_shape = b.circle(44), + no_resource_patch_shape = b.circle(80), + main_ores_builder = main_ores_builder, + main_ores = main_ores_config, + main_ores_shuffle_order = true, + main_ores_rotate = 0, + resource_patches = resource_patches, + resource_patches_config = resource_patches_config, + water = water, + water_scale = 1 / 96, + water_threshold = 0.45, + deepwater_threshold = 0.5, + 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 = 25 +} + +return map(config) diff --git a/scenario_templates/danger-ore-gradient-beltboxes-ore-only/map_selection.lua b/scenario_templates/danger-ore-gradient-beltboxes-ore-only/map_selection.lua new file mode 100644 index 00000000..80366e0c --- /dev/null +++ b/scenario_templates/danger-ore-gradient-beltboxes-ore-only/map_selection.lua @@ -0,0 +1 @@ +return require 'map_gen.maps.danger_ores.presets.danger_ore_gradient_beltboxes_ore_only' \ No newline at end of file diff --git a/utils/table.lua b/utils/table.lua index c0f8396d..b1274828 100644 --- a/utils/table.lua +++ b/utils/table.lua @@ -1,4 +1,3 @@ ---luacheck: globals table local random = math.random local floor = math.floor local remove = table.remove @@ -185,6 +184,24 @@ function table.shuffle_table(t, rng) end end +--- Returns a new table with the elements rotated by rot positions. +-- @param t to shuffle +-- @param rot how many spaces to rotate each element. +function table.rotate_table(t, rot) + local size = #t + if size == 0 then + error('Not a sequential table') + end + + local copy = {} + for i = 1, size do + local pos = (i - rot - 1) % size + 1 + copy[i] = t[pos] + end + + return copy +end + --- Clears all existing entries in a table -- @param t
to clear -- @param array to indicate whether the table is an array or not From e9228b72a535036a679fca89c9de415c0c0d3560 Mon Sep 17 00:00:00 2001 From: James Gillham Date: Sun, 12 Dec 2021 16:29:31 +0000 Subject: [PATCH 2/3] Add module to remove non stacke recipes. --- .../remove_non_ore_stacked_recipes.lua | 41 +++++++++++++++++++ ...danger_ore_deadlock_beltboxes_ore_only.lua | 40 ++---------------- ...danger_ore_gradient_beltboxes_ore_only.lua | 40 ++---------------- ...nger_ore_hub_spiral_beltboxes_ore_only.lua | 40 ++---------------- ...anger_ore_xmas_tree_beltboxes_ore_only.lua | 40 ++---------------- 5 files changed, 53 insertions(+), 148 deletions(-) create mode 100644 map_gen/maps/danger_ores/modules/remove_non_ore_stacked_recipes.lua diff --git a/map_gen/maps/danger_ores/modules/remove_non_ore_stacked_recipes.lua b/map_gen/maps/danger_ores/modules/remove_non_ore_stacked_recipes.lua new file mode 100644 index 00000000..627260dc --- /dev/null +++ b/map_gen/maps/danger_ores/modules/remove_non_ore_stacked_recipes.lua @@ -0,0 +1,41 @@ +-- This module removes the non ore stacking recipes used by deadlock's beltboxes. +local Event = require 'utils.event' + +return function() + local allowed_recipes = { + ["deadlock-stacks-stack-iron-ore"] = true, + ["deadlock-stacks-unstack-iron-ore"] = true, + ["deadlock-stacks-stack-copper-ore"] = true, + ["deadlock-stacks-unstack-copper-ore"] = true, + ["deadlock-stacks-stack-stone"] = true, + ["deadlock-stacks-unstack-stone"] = true, + ["deadlock-stacks-stack-coal"] = true, + ["deadlock-stacks-unstack-coal"] = true, + ["deadlock-stacks-stack-uranium-ore"] = true, + ["deadlock-stacks-unstack-uranium-ore"] = true + } + + Event.add(defines.events.on_research_finished, function(event) + local research = event.research + if not research.valid then + return + end + + for _, effect in pairs(research.effects) do + if effect.type ~= 'unlock-recipe' then + goto continue + end + + local name = effect.recipe + if allowed_recipes[name] then + goto continue + end + + if name:sub(1, #'deadlock-stacks') == 'deadlock-stacks' then + game.forces.player.recipes[name].enabled = false + end + + ::continue:: + end + end) +end diff --git a/map_gen/maps/danger_ores/presets/danger_ore_deadlock_beltboxes_ore_only.lua b/map_gen/maps/danger_ores/presets/danger_ore_deadlock_beltboxes_ore_only.lua index 418ceada..9088a47e 100644 --- a/map_gen/maps/danger_ores/presets/danger_ore_deadlock_beltboxes_ore_only.lua +++ b/map_gen/maps/danger_ores/presets/danger_ore_deadlock_beltboxes_ore_only.lua @@ -109,43 +109,6 @@ Event.on_init(function() RS.get_surface().peaceful_mode = true end) -local allowed_recipes = { - ["deadlock-stacks-stack-iron-ore"] = true, - ["deadlock-stacks-unstack-iron-ore"] = true, - ["deadlock-stacks-stack-copper-ore"] = true, - ["deadlock-stacks-unstack-copper-ore"] = true, - ["deadlock-stacks-stack-stone"] = true, - ["deadlock-stacks-unstack-stone"] = true, - ["deadlock-stacks-stack-coal"] = true, - ["deadlock-stacks-unstack-coal"] = true, - ["deadlock-stacks-stack-uranium-ore"] = true, - ["deadlock-stacks-unstack-uranium-ore"] = true -} - -Event.add(defines.events.on_research_finished, function(event) - local research = event.research - if not research.valid then - return - end - - for _, effect in pairs(research.effects) do - if effect.type ~= 'unlock-recipe' then - goto continue - end - - local name = effect.recipe - if allowed_recipes[name] then - goto continue - end - - if name:sub(1, #'deadlock-stacks') == 'deadlock-stacks' then - game.forces.player.recipes[name].enabled = false - end - - ::continue:: - end -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}) @@ -161,6 +124,9 @@ 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'}) +local remove_non_ore_stacked_recipes = require 'map_gen.maps.danger_ores.modules.remove_non_ore_stacked_recipes' +remove_non_ore_stacked_recipes() + local config = { spawn_shape = b.circle(36), start_ore_shape = b.circle(44), diff --git a/map_gen/maps/danger_ores/presets/danger_ore_gradient_beltboxes_ore_only.lua b/map_gen/maps/danger_ores/presets/danger_ore_gradient_beltboxes_ore_only.lua index fcf21a65..8d6d5bf3 100644 --- a/map_gen/maps/danger_ores/presets/danger_ore_gradient_beltboxes_ore_only.lua +++ b/map_gen/maps/danger_ores/presets/danger_ore_gradient_beltboxes_ore_only.lua @@ -107,43 +107,6 @@ Event.on_init(function() RS.get_surface().peaceful_mode = true end) -local allowed_recipes = { - ["deadlock-stacks-stack-iron-ore"] = true, - ["deadlock-stacks-unstack-iron-ore"] = true, - ["deadlock-stacks-stack-copper-ore"] = true, - ["deadlock-stacks-unstack-copper-ore"] = true, - ["deadlock-stacks-stack-stone"] = true, - ["deadlock-stacks-unstack-stone"] = true, - ["deadlock-stacks-stack-coal"] = true, - ["deadlock-stacks-unstack-coal"] = true, - ["deadlock-stacks-stack-uranium-ore"] = true, - ["deadlock-stacks-unstack-uranium-ore"] = true -} - -Event.add(defines.events.on_research_finished, function(event) - local research = event.research - if not research.valid then - return - end - - for _, effect in pairs(research.effects) do - if effect.type ~= 'unlock-recipe' then - goto continue - end - - local name = effect.recipe - if allowed_recipes[name] then - goto continue - end - - if name:sub(1, #'deadlock-stacks') == 'deadlock-stacks' then - game.forces.player.recipes[name].enabled = false - end - - ::continue:: - end -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}) @@ -159,6 +122,9 @@ 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'}) +local remove_non_ore_stacked_recipes = require 'map_gen.maps.danger_ores.modules.remove_non_ore_stacked_recipes' +remove_non_ore_stacked_recipes() + local main_ores_builder = require 'map_gen.maps.danger_ores.modules.main_ores_gradient' local config = { diff --git a/map_gen/maps/danger_ores/presets/danger_ore_hub_spiral_beltboxes_ore_only.lua b/map_gen/maps/danger_ores/presets/danger_ore_hub_spiral_beltboxes_ore_only.lua index 1f42fa83..ed4f3cb1 100644 --- a/map_gen/maps/danger_ores/presets/danger_ore_hub_spiral_beltboxes_ore_only.lua +++ b/map_gen/maps/danger_ores/presets/danger_ore_hub_spiral_beltboxes_ore_only.lua @@ -114,43 +114,6 @@ Event.on_init( end ) -local allowed_recipes = { - ["deadlock-stacks-stack-iron-ore"] = true, - ["deadlock-stacks-unstack-iron-ore"] = true, - ["deadlock-stacks-stack-copper-ore"] = true, - ["deadlock-stacks-unstack-copper-ore"] = true, - ["deadlock-stacks-stack-stone"] = true, - ["deadlock-stacks-unstack-stone"] = true, - ["deadlock-stacks-stack-coal"] = true, - ["deadlock-stacks-unstack-coal"] = true, - ["deadlock-stacks-stack-uranium-ore"] = true, - ["deadlock-stacks-unstack-uranium-ore"] = true -} - -Event.add(defines.events.on_research_finished, function(event) - local research = event.research - if not research.valid then - return - end - - for _, effect in pairs(research.effects) do - if effect.type ~= 'unlock-recipe' then - goto continue - end - - local name = effect.recipe - if allowed_recipes[name] then - goto continue - end - - if name:sub(1, #'deadlock-stacks') == 'deadlock-stacks' then - game.forces.player.recipes[name].enabled = false - end - - ::continue:: - end -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}) @@ -166,6 +129,9 @@ 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'}) +local remove_non_ore_stacked_recipes = require 'map_gen.maps.danger_ores.modules.remove_non_ore_stacked_recipes' +remove_non_ore_stacked_recipes() + local main_ores_builder = require 'map_gen.maps.danger_ores.modules.main_ores_hub_spiral' local sqrt = math.sqrt diff --git a/map_gen/maps/danger_ores/presets/danger_ore_xmas_tree_beltboxes_ore_only.lua b/map_gen/maps/danger_ores/presets/danger_ore_xmas_tree_beltboxes_ore_only.lua index 0e1a63ec..2b4318ec 100644 --- a/map_gen/maps/danger_ores/presets/danger_ore_xmas_tree_beltboxes_ore_only.lua +++ b/map_gen/maps/danger_ores/presets/danger_ore_xmas_tree_beltboxes_ore_only.lua @@ -118,43 +118,6 @@ Event.on_init( end ) -local allowed_recipes = { - ["deadlock-stacks-stack-iron-ore"] = true, - ["deadlock-stacks-unstack-iron-ore"] = true, - ["deadlock-stacks-stack-copper-ore"] = true, - ["deadlock-stacks-unstack-copper-ore"] = true, - ["deadlock-stacks-stack-stone"] = true, - ["deadlock-stacks-unstack-stone"] = true, - ["deadlock-stacks-stack-coal"] = true, - ["deadlock-stacks-unstack-coal"] = true, - ["deadlock-stacks-stack-uranium-ore"] = true, - ["deadlock-stacks-unstack-uranium-ore"] = true -} - -Event.add(defines.events.on_research_finished, function(event) - local research = event.research - if not research.valid then - return - end - - for _, effect in pairs(research.effects) do - if effect.type ~= 'unlock-recipe' then - goto continue - end - - local name = effect.recipe - if allowed_recipes[name] then - goto continue - end - - if name:sub(1, #'deadlock-stacks') == 'deadlock-stacks' then - game.forces.player.recipes[name].enabled = false - end - - ::continue:: - end -end) - local terraforming = require 'map_gen.maps.danger_ores.modules.terraforming' terraforming({start_size = 12 * 32, min_pollution = 250, max_pollution = 16000, pollution_increment = 6}) @@ -170,6 +133,9 @@ 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'}) +local remove_non_ore_stacked_recipes = require 'map_gen.maps.danger_ores.modules.remove_non_ore_stacked_recipes' +remove_non_ore_stacked_recipes() + local main_ores_builder = require 'map_gen.maps.danger_ores.modules.main_ores_xmas_tree' --local sqrt = math.sqrt From cb1f3766a3ed4970b3d160a9d453e0b723292f8e Mon Sep 17 00:00:00 2001 From: James Gillham Date: Sun, 12 Dec 2021 16:34:16 +0000 Subject: [PATCH 3/3] Fix luacheck --- utils/table.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/table.lua b/utils/table.lua index b1274828..8b2c9d4d 100644 --- a/utils/table.lua +++ b/utils/table.lua @@ -1,3 +1,4 @@ +local table = _G.table local random = math.random local floor = math.floor local remove = table.remove