diff --git a/control.lua b/control.lua index 12f0d8a8..bd0f64b0 100644 --- a/control.lua +++ b/control.lua @@ -162,10 +162,6 @@ end --require 'features.snake.control' -_G.Server = require 'features.server' - -require 'features.restart_command' - -- Debug-only modules if _DEBUG then require 'features.scenario_data_manipulation' diff --git a/features/restart_command.lua b/features/restart_command.lua index 6b1cff05..c26b32b7 100644 --- a/features/restart_command.lua +++ b/features/restart_command.lua @@ -288,7 +288,9 @@ local function draw_main_frame(player) local name_flow = main_frame.add {type = 'flow', direction = 'horizontal'} name_flow.add {type = 'label', caption = 'Name:'} - name_flow.add {type = 'textfield', name = name_textfield_name, text = start_game_data.name} + local name_textfield = name_flow.add {type = 'textfield', name = name_textfield_name, text = start_game_data.name} + name_textfield.style.horizontally_stretchable = true + name_textfield.style.maximal_width = 600 local is_set_mod_pack = start_game_data.mod_pack ~= nil local set_mod_pack_checkbox = main_frame.add { diff --git a/map_gen/maps/danger_ores/presets/danger_ore_landfill.lua b/map_gen/maps/danger_ores/presets/danger_ore_landfill.lua index 9a087635..79849cec 100644 --- a/map_gen/maps/danger_ores/presets/danger_ore_landfill.lua +++ b/map_gen/maps/danger_ores/presets/danger_ore_landfill.lua @@ -113,9 +113,6 @@ restart_command({scenario_name = 'danger-ore-landfill'}) 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 config = { spawn_shape = b.circle(64), start_ore_shape = b.circle(68), diff --git a/map_gen/maps/danger_ores/presets/danger_ore_normal_science.lua b/map_gen/maps/danger_ores/presets/danger_ore_normal_science.lua index 9eaf928a..64f9b492 100644 --- a/map_gen/maps/danger_ores/presets/danger_ore_normal_science.lua +++ b/map_gen/maps/danger_ores/presets/danger_ore_normal_science.lua @@ -140,7 +140,7 @@ local rocket_launched = require 'map_gen.maps.danger_ores.modules.rocket_launche rocket_launched({win_satellite_count = 5000}) local restart_command = require 'map_gen.maps.danger_ores.modules.restart_command' -restart_command({scenario_name = 'danger_ore_normal_science'}) +restart_command({scenario_name = 'danger-ore-normal-science'}) local container_dump = require 'map_gen.maps.danger_ores.modules.container_dump' container_dump({entity_name = 'coal'}) diff --git a/scenario_templates/danger_ore_normal_science/map_selection.lua b/scenario_templates/danger-ore-normal-science/map_selection.lua similarity index 100% rename from scenario_templates/danger_ore_normal_science/map_selection.lua rename to scenario_templates/danger-ore-normal-science/map_selection.lua