Skip to content

Update RedMew scenarios to Factorio 2.1 #1569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RedRafe wants to merge 18 commits into
base: 2.1
Choose a base branch
from
Open

Update RedMew scenarios to Factorio 2.1 #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a7ee60c
Update LuaEntity::active API
RedRafe Jun 17, 2026
de874d2
Update to Factorio 2.1 API
RedRafe Jul 1, 2026
f25cfe8
Merge branch 'develop' into 2.1
RedRafe Jul 1, 2026
e4276af
DO:Bob's fix tungsten ore internal name
RedRafe Jul 1, 2026
28caabf
Fix modpack requirements for DO:Safety
RedRafe Jul 1, 2026
e525580
Update DO changelog
RedRafe Jul 1, 2026
4219b99
AF: update alien biomes compatibility
RedRafe Jul 2, 2026
15efac3
Add mod compatibility module
RedRafe Jul 2, 2026
a2be897
Implement missing gui handlers for gui lib
RedRafe Jul 2, 2026
dd2e9e3
Bump luacheckrc versions
RedRafe Jul 2, 2026
8eccda1
Add event handlers registry debug to event module
RedRafe Jul 2, 2026
8c058b4
Add Danger Ores - Tetrominoes map (#1567)
lex Jul 6, 2026
7f66152
Add Danger Ores - Voronoi map (#1568)
lex Jul 6, 2026
4bc501d
Add Danger Ores - Omnimatter Maze map (#1570)
lex Jul 7, 2026
af70820
Add Danger Ores - Scrapworld Maze map (#1571)
lex Jul 7, 2026
5fc9e40
Merge branch 'develop' into 2.1
RedRafe Jul 7, 2026
50f97f7
Formatting
RedRafe Jul 7, 2026
30e3978
DO: update mod compatibility requirements
RedRafe Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 104 additions & 12 deletions .luacheckrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
-- For more information, please refer to <http://unlicense.org/>
-- ]]

-- Current Factorio Version 0.17.0, luacheck version 0.23.0
-- Current Factorio Version 2.1.9, luacheck version 1.1.1

-------------------------------------------------------------------------------
--[Set Defaults]--
Expand Down Expand Up @@ -217,6 +217,7 @@ stds.factorio_control = {
'get_event_order',
'level',
'mod_name',
'new_notification_queue',
'on_configuration_changed',
'raise_biter_base_built',
'raise_console_chat',
Expand Down Expand Up @@ -261,6 +262,7 @@ stds.factorio_control = {
'draw_arc',
'draw_polygon',
'draw_sprite',
'draw_animation',
'draw_light',
'destroy',
'is_font_valid',
Expand Down Expand Up @@ -340,7 +342,9 @@ stds.factorio_control = {
'get_intensity',
'set_intensity',
'get_minimum_darkness',
'set_minimum_darkness'
'set_minimum_darkness',
'get_light_mode',
'set_light_mode'
}
},

Expand All @@ -349,15 +353,24 @@ stds.factorio_control = {
read_only = true,
fields = {
"check_prototype_translations",
"compare_versions",
"create_profiler",
"decode_string",
"direction_to_string",
"encode_string",
"evaluate_expression",
"game_version",
"is_valid_ambient_sound",
"is_valid_animation_path",
"is_valid_sound_path",
"is_valid_sprite_path",
"json_to_table",
"multilingual_to_lower",
"parse_map_exchange_string",
"recv_udp",
"remove_path",
"send_udp",
"stage",
"table_to_json",
"write_file",
}
Expand All @@ -370,13 +383,14 @@ stds.factorio_control = {
other_fields = false,
read_only = false,
fields = {
"allow_debug_settings",
"auto_save",
"ban_player",
"check_consistency",
"check_consistency",
"create_force",
"create_profiler",
"create_random_generator",
"create_surface",
"delete_blueprint_library",
"delete_surface",
"desync_players",
"disable_replay",
Expand All @@ -399,6 +413,7 @@ stds.factorio_control = {
"mute_player",
"planet",
"planets",
"play_music",
"play_sound",
"print_stack_size",
"print",
Expand Down Expand Up @@ -503,6 +518,7 @@ stds.factorio_control = {
technology = {read_only = true, other_fields = true},
tile = {read_only = true, other_fields = true},
trivial_smoke = {read_only = true, other_fields = true},
utility_constants = {read_only = true, other_fields = true},
virtual_signal = {read_only = true, other_fields = true},
"max_beacon_supply_area_distance",
"max_electric_pole_connection_distance",
Expand Down Expand Up @@ -841,6 +857,45 @@ stds.factorio_defines = {
'wall'
}
},
constant = {
fields = {
'default_icon_size'
}
},
electric_interface_mode = {
fields = {
'accumulator',
'primary_input',
'primary_output',
'secondary_input',
'secondary_output',
'solar_output',
'tertiary_input',
'tertiary_input_output',
'tertiary_output'
}
},
inventory_actions = {
fields = {
'cursor_split',
'cursor_transfer',
'inventory_split',
'inventory_transfer',
'open_item',
'open_mod_item',
'send_stack_to_trash',
'send_stacks_to_trash',
'stack_split',
'stack_transfer'
}
},
target_type = {
fields = {
'electric_network',
'electric_sub_network',
'force'
}
},
command = {
fields = {
'attack',
Expand Down Expand Up @@ -921,6 +976,16 @@ stds.factorio_defines = {
}
}
},
radar = {
fields = {
mode = {
fields = {
'surface',
'universe'
}
}
}
},
train_stop = {
fields = {
circuit_mode_of_operation = {
Expand All @@ -947,19 +1012,23 @@ stds.factorio_defines = {
fields = {
'accumulator',
'arithmetic_combinator',
'boiler',
'constant_combinator',
'container',
'decider_combinator',
'generic_on_off',
'heat_pipe',
'inserter',
'lab',
'lamp',
'land_mine',
'logistic_container',
'mining_drill',
'programmable_speaker',
'rail_chain_signal',
'rail_signal',
'roboport',
'storage_tank',
'single_fluid_box',
'train_stop',
'transport_belt',
'wall'
Expand Down Expand Up @@ -1093,6 +1162,11 @@ stds.factorio_defines = {
'waiting_to_launch_rocket',
'waiting_for_source_items',
'waiting_for_space_in_destination',
'hatches_blocked_by_elevated_rail',
'too_far_from_pad_to_unload',
'waiting_for_upgrade',
'waiting_to_clear_drop_slots',
'armed',
}
},
render_mode = {
Expand All @@ -1108,6 +1182,7 @@ stds.factorio_defines = {
'on_ai_command_completed',
'on_area_cloned',
'on_biter_base_built',
'on_blueprint_settings_pasted',
'on_built_entity',
'on_cancelled_deconstruction',
'on_cancelled_upgrade',
Expand Down Expand Up @@ -1138,8 +1213,14 @@ stds.factorio_defines = {
'on_gui_checked_state_changed',
'on_gui_click',
'on_gui_closed',
'on_gui_confirmed',
'on_gui_elem_changed',
'on_gui_hover',
'on_gui_inventory_action',
'on_gui_leave',
'on_gui_location_changed',
'on_gui_opened',
'on_gui_selected_tab_changed',
'on_gui_selection_state_changed',
'on_gui_switch_state_changed',
'on_gui_text_changed',
Expand All @@ -1163,6 +1244,7 @@ stds.factorio_defines = {
'on_player_changed_surface',
'on_player_cheat_mode_disabled',
'on_player_cheat_mode_enabled',
'on_player_color_changed',
'on_player_configured_blueprint',
'on_player_controller_changed',
'on_player_crafted_item',
Expand All @@ -1185,6 +1267,7 @@ stds.factorio_defines = {
'on_player_mined_entity',
'on_player_mined_item',
'on_player_mined_tile',
'on_player_music_changed',
'on_player_muted',
'on_player_pipette',
'on_player_placed_equipment',
Expand Down Expand Up @@ -1253,6 +1336,7 @@ stds.factorio_defines = {
'on_train_schedule_changed',
'on_trigger_created_entity',
'on_trigger_fired_artillery',
'on_udp_packet_received',
'on_undo_applied',
'on_unit_added_to_group',
'on_unit_group_created',
Expand Down Expand Up @@ -1286,6 +1370,7 @@ stds.factorio_defines = {
gui_type = {
fields = {
'achievement',
'alerts_config',
'blueprint_library',
'bonus',
'controller',
Expand Down Expand Up @@ -1320,6 +1405,7 @@ stds.factorio_defines = {
'achievement_gui',
'additional_entity_info_gui',
'admin_gui',
'alerts_config_gui',
'arithmetic_combinator_gui',
'armor_gui',
'assembling_machine_gui',
Expand All @@ -1328,6 +1414,7 @@ stds.factorio_defines = {
'blueprint_book_gui',
'blueprint_library_gui',
'blueprint_setup_gui',
'boiler_gui',
'bonus_gui',
'burner_equipment_gui',
'car_gui',
Expand All @@ -1336,6 +1423,7 @@ stds.factorio_defines = {
'controller_gui',
'decider_combinator_gui',
'deconstruction_item_gui',
'electric_energy_interface_equipment_gui',
'electric_energy_interface_gui',
'electric_network_gui',
'entity_variations_gui',
Expand All @@ -1360,6 +1448,7 @@ stds.factorio_defines = {
'power_switch_gui',
'production_gui',
'programmable_speaker_gui',
'radar_gui',
'rail_chain_signal_gui',
'rail_signal_gui',
'reactor_gui',
Expand All @@ -1371,7 +1460,6 @@ stds.factorio_defines = {
'spider_vehicle_gui',
'splitter_gui',
'standalone_character_gui',
'storage_tank_gui',
'tile_variations_gui',
'train_gui',
'train_stop_gui',
Expand Down Expand Up @@ -1565,33 +1653,37 @@ stds.factorio_defines = {
},
inventory = {
fields = {
'agricultural_tower_input',
'agricultural_tower_output',
'artillery_turret_ammo',
'artillery_wagon_ammo',
'assembling_machine_input',
'assembling_machine_modules',
'assembling_machine_output',
'asteroid_collector_output',
'beacon_modules',
'burnt_result',
'car_ammo',
'car_trunk',
'cargo_wagon',
'character_corpse',
'chest',
'crafter_input',
'crafter_modules',
'crafter_output',
'crafter_trash',
'fuel',
'furnace_modules',
'furnace_result',
'furnace_source',
'god_main',
'item_main',
'lab_input',
'lab_modules',
'lab_trash',
'linked_container_main',
'mining_drill_modules',
'character_ammo',
'character_armor',
'character_guns',
'character_main',
'character_trash',
'character_vehicle',
'proxy_main',
'roboport_material',
'roboport_robot',
'robot_cargo',
Expand Down
7 changes: 5 additions & 2 deletions features/auto_stash.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ local function get_nearby_chests(player, a, furnace, wagon)

if furnace then
container_type = { 'furnace' }
inventory_type = defines.inventory.furnace_source
inventory_type = defines.inventory.crafter_input
end
if wagon then
container_type = { 'cargo-wagon', 'logistic-container' }
Expand Down Expand Up @@ -570,8 +570,11 @@ function Public.auto_stash(player, event)
this.floating_text_y_offsets = {}

local hotbar_items = {}
local quick_bar_width = player.quick_bar_width
for i = 1, 100, 1 do
local prototype = player.get_quick_bar_slot(i)
local page = math.ceil(i / quick_bar_width)
local slot = i - (page - 1) * quick_bar_width
local prototype = player.get_quick_bar_slot(page, slot)
if prototype then
hotbar_items[prototype.name] = true
end
Expand Down
2 changes: 1 addition & 1 deletion features/dump_offline_inventories.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ local function spawn_player_corpse(player, banned, timeout_minutes)
inventory_size = #inv_contents,
player_index = player_index
}
corpse.active = false
corpse.disabled_by_script = true

local inv_corpse = corpse.get_inventory(defines.inventory.character_corpse)
for _, item_stack in pairs(inv_contents) do
Expand Down
2 changes: 1 addition & 1 deletion features/enemy_turret.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function Public.register(entity, refill_name)
if data.is_fluid then
data.fluid_stack = {
name = data.refill,
amount = data.entity.fluidbox.get_capacity(1) or 100
amount = data.entity.get_fluid_capacity(1) or 100
}
else
data.item_stack = {
Expand Down
2 changes: 1 addition & 1 deletion features/infinite_storage_chest.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ local function built_entity(event)
return
end

entity.active = false
entity.disabled_by_script = true

chests[entity.unit_number] = {entity = entity, storage = {}}
end
Expand Down
Loading