diff --git a/control.lua b/control.lua index 7b33815e..27ec1e64 100644 --- a/control.lua +++ b/control.lua @@ -103,7 +103,7 @@ end if config.turret_active_delay.enabled then require 'features.turret_active_delay' end -if config.autofill then +if config.autofill.enabled then require 'features.gui.autofill' end diff --git a/map_gen/data/.map_previews/loading_screen_845x845.PNG b/map_gen/data/.map_previews/loading_screen_845x845.PNG new file mode 100644 index 00000000..9af0b2c2 Binary files /dev/null and b/map_gen/data/.map_previews/loading_screen_845x845.PNG differ diff --git a/map_gen/data/.map_previews/rectangular_spiral_2048by2048.PNG b/map_gen/data/.map_previews/square_spiral_2048by2048.PNG similarity index 100% rename from map_gen/data/.map_previews/rectangular_spiral_2048by2048.PNG rename to map_gen/data/.map_previews/square_spiral_2048by2048.PNG diff --git a/map_gen/maps/connected_dots.lua b/map_gen/maps/connected_dots.lua index dcfd8f41..e44cd5db 100644 --- a/map_gen/maps/connected_dots.lua +++ b/map_gen/maps/connected_dots.lua @@ -20,6 +20,12 @@ RS.set_map_gen_settings( } ) +local allowed_landfill_tiles = { + ['water'] = true +} + +require 'map_gen.shared.restrict_landfill_tile'(allowed_landfill_tiles) + local small_ore_patch = b.circle(12) local medium_ore_patch = b.circle(24) local big_ore_patch = b.subtract(b.circle(36), b.circle(16)) diff --git a/map_gen/maps/crash_site/scenario.lua b/map_gen/maps/crash_site/scenario.lua index 7b0de16f..ef3eddae 100644 --- a/map_gen/maps/crash_site/scenario.lua +++ b/map_gen/maps/crash_site/scenario.lua @@ -774,8 +774,6 @@ local function init() local bounds = b.rectangle(grid_block_size * (grid_number_of_blocks) + 1) map = b.choose(bounds, map, b.empty_shape) - map = b.remove_entities_by_name(map, 'stone-wall') - return map end diff --git a/map_gen/maps/danger_ores.lua b/map_gen/maps/danger_ores.lua index 6e84e2c8..97787580 100644 --- a/map_gen/maps/danger_ores.lua +++ b/map_gen/maps/danger_ores.lua @@ -42,8 +42,8 @@ Global.register_init( uranium_seed = seed * 2 density_seed = seed * 3 game.map_settings.enemy_evolution.time_factor = 0.000002 - game.map_settings.enemy_evolution.destroy_factor = 0.000010 - game.map_settings.enemy_evolution.pollution_factor = 0.000075 + game.map_settings.enemy_evolution.destroy_factor = 0.0009 + game.map_settings.enemy_evolution.pollution_factor = 0.0000015 end ) diff --git a/map_gen/maps/default.lua b/map_gen/maps/default.lua index 3192177a..ddb91f64 100644 --- a/map_gen/maps/default.lua +++ b/map_gen/maps/default.lua @@ -1 +1,12 @@ -- A blank file to allow map_selection to have a default + +-- Added warning to help guide newcomers +local Event = require 'utils.event' + +Event.add( + defines.events.on_player_joined_game, + function() + game.print('[color=red]THIS IS THE DEFAULT MAP! IT CONTAINS NO CUSTOM MAP GEN![/color]') + game.print('[color=yellow]Visit https://redmew.com/guide and follow step 3[/color]') + end +) diff --git a/map_gen/maps/diggy/feature/diggy_cave_collapse.lua b/map_gen/maps/diggy/feature/diggy_cave_collapse.lua index 04a46390..4175c704 100644 --- a/map_gen/maps/diggy/feature/diggy_cave_collapse.lua +++ b/map_gen/maps/diggy/feature/diggy_cave_collapse.lua @@ -335,8 +335,9 @@ end @param global_config Table {@see Diggy.Config}. ]] +--Special thanks to justarandomgeek from the main factorio discord guild for helping to teach orange how image classes work. function DiggyCaveCollapse.register(cfg) - ScoreTracker.register(cave_collapses_name, {'diggy.score_cave_collapses'}, '[img=entity.assembler-wreck]') + ScoreTracker.register(cave_collapses_name, {'diggy.score_cave_collapses'}, '[img=entity.small-remnants]') local global_to_show = global.config.score.global_to_show global_to_show[#global_to_show + 1] = cave_collapses_name diff --git a/map_gen/maps/fish_islands.lua b/map_gen/maps/fish_islands.lua index e15ef9fa..ca9b40cc 100644 --- a/map_gen/maps/fish_islands.lua +++ b/map_gen/maps/fish_islands.lua @@ -3,6 +3,7 @@ local math = require 'utils.math' local table = require 'utils.table' local RS = require 'map_gen.shared.redmew_surface' local MGSP = require 'resources.map_gen_settings' +local ScenarioInfo = require 'features.gui.info' local degrees = math.degrees @@ -19,6 +20,28 @@ RS.set_map_gen_settings( } ) +ScenarioInfo.set_map_name('Fish Islands') +ScenarioInfo.set_map_description( +[[ +What a lovely day for a fishing trip. +I hope we brought enough Soy Sauce! +]] +) +ScenarioInfo.set_map_extra_info( +[[ +Fish islands are spread around in the water + +The fishes heads contains high amount of resources + +Some one placed worms around the lit of our soy sauce +Exterminate them so we can enjoy our fish with some delicious +soy sauce! (Not sponsered by Kikkoman) + +(Kikkoman is a registered trademark under Kikkoman Corporation, Japan) +]] +) + + local value = b.exponential_value local pic = require 'map_gen.data.presets.fish' diff --git a/map_gen/maps/fractal_balls.lua b/map_gen/maps/fractal_balls.lua index c882d976..0ef234a6 100644 --- a/map_gen/maps/fractal_balls.lua +++ b/map_gen/maps/fractal_balls.lua @@ -1,6 +1,7 @@ local b = require 'map_gen.shared.builders' local RS = require 'map_gen.shared.redmew_surface' local MGSP = require 'resources.map_gen_settings' +local ScenarioInfo = require 'features.gui.info' local degrees = require 'utils.math'.degrees @@ -11,6 +12,14 @@ RS.set_map_gen_settings( } ) +ScenarioInfo.set_map_name('Fractal Balls') +ScenarioInfo.set_map_description( +[[ +These balls just keeps on going! +Always part of something bigger. +]] +) + local function value(base, mult) return function(x, y) return mult * (math.abs(x) + math.abs(y)) + base diff --git a/map_gen/maps/fruit_loops.lua b/map_gen/maps/fruit_loops.lua index 9619dfd3..8a715e45 100644 --- a/map_gen/maps/fruit_loops.lua +++ b/map_gen/maps/fruit_loops.lua @@ -3,6 +3,7 @@ local math = require 'utils.math' local table = require 'utils.table' local RS = require 'map_gen.shared.redmew_surface' local MGSP = require 'resources.map_gen_settings' +local ScenarioInfo = require 'features.gui.info' -- change these to change the pattern. local seed1 = 17000 @@ -16,6 +17,15 @@ RS.set_map_gen_settings( } ) +ScenarioInfo.set_map_name('Fruit Loops') +ScenarioInfo.set_map_description( +[[ +It's like swimming in a bowl of cereal! +[...] +What monster uses water in their cereal? +]] +) + local function value(base, mult, pow) return function(x, y) local d_sq = x * x + y * y diff --git a/map_gen/maps/gears.lua b/map_gen/maps/gears.lua index 6b955493..6a445370 100644 --- a/map_gen/maps/gears.lua +++ b/map_gen/maps/gears.lua @@ -3,6 +3,7 @@ local pic = require "map_gen.data.presets.gears" local RS = require 'map_gen.shared.redmew_surface' local MGSP = require 'resources.map_gen_settings' +local ScenarioInfo = require 'features.gui.info' RS.set_map_gen_settings( { @@ -11,6 +12,15 @@ RS.set_map_gen_settings( } ) +ScenarioInfo.set_map_name('Gears') +ScenarioInfo.set_map_description( +[[ +Am I inside an assembling machine? + +This is like a huge maze of never ending gears! +]] +) + pic = b.decompress(pic) local shape = b.picture(pic) diff --git a/map_gen/maps/loading_screen.lua b/map_gen/maps/loading_screen.lua index b3c263ca..e17ce5a6 100644 --- a/map_gen/maps/loading_screen.lua +++ b/map_gen/maps/loading_screen.lua @@ -1,4 +1,13 @@ local b = require "map_gen.shared.builders" +local ScenarioInfo = require 'features.gui.info' + +ScenarioInfo.set_map_name('Loading Screen') +ScenarioInfo.set_map_description( +[[ +Did I, or did I not enter a server? +Why am I still seeing the menu background??? +]] +) local pic = require "map_gen.data.presets.factory" pic = b.decompress(pic) diff --git a/resources/map_settings.lua b/resources/map_settings.lua index c18de210..5e377ee5 100644 --- a/resources/map_settings.lua +++ b/resources/map_settings.lua @@ -18,7 +18,7 @@ return { enabled = true, time_factor = 0.000004, destroy_factor = 0.002, - pollution_factor = 0.000015 + pollution_factor = 0.0000009 }, enemy_expansion = { enabled = true,