diff --git a/TODO b/TODO index 716e321..52bf5a6 100644 --- a/TODO +++ b/TODO @@ -5,3 +5,4 @@ do hardcore testing models & art space elevator compat railloader compat +major bug with copy-paste when the operation is changed by blueprint but it gets copied to the old settings before it's checked for update diff --git a/cybersyn/changelog.txt b/cybersyn/changelog.txt index 31d9eb8..8640985 100644 --- a/cybersyn/changelog.txt +++ b/cybersyn/changelog.txt @@ -20,8 +20,13 @@ Date: 2022-11-13 Features: - Added warmup period on just built stations --------------------------------------------------------------------------------------------------- -Version: 0.3.0 +Version: 0.4.0 Date: 2022-11-15 Features: - Fixed copy-paste - Added alert sounds +--------------------------------------------------------------------------------------------------- +Version: 0.4.1 +Date: 2022-11-20 + Features: + - Bugfix with train blacklisting diff --git a/cybersyn/info.json b/cybersyn/info.json index 6343fd8..e27bf34 100644 --- a/cybersyn/info.json +++ b/cybersyn/info.json @@ -1,6 +1,6 @@ { "name": "cybersyn", - "version": "0.4.0", + "version": "0.4.1", "title": "Project Cybersyn", "author": "Mami", "factorio_version": "1.1", diff --git a/cybersyn/prototypes/entity.lua b/cybersyn/prototypes/entity.lua index 44ebb83..c5fd57c 100644 --- a/cybersyn/prototypes/entity.lua +++ b/cybersyn/prototypes/entity.lua @@ -12,7 +12,7 @@ combinator_entity.radius_visualisation_specification = { distance = 1.5, } combinator_entity.active_energy_usage = "10KW" -combinator_entity.allow_copy_paste = true +combinator_entity.allow_copy_paste = false diff --git a/cybersyn/scripts/main.lua b/cybersyn/scripts/main.lua index 4ea2bea..a68b927 100644 --- a/cybersyn/scripts/main.lua +++ b/cybersyn/scripts/main.lua @@ -419,9 +419,9 @@ function on_combinator_updated(map_data, comb, new_params) local is_pr_state = floor(bits/2)%3 station.is_p = is_pr_state == 0 or is_pr_state == 1 station.is_r = is_pr_state == 0 or is_pr_state == 2 - local allow_all_trains = bits%2 == 1 - if station.allow_all_trains ~= allow_all_trains then - station.allow_all_trains = allow_all_trains + local allows_all_trains = bits%2 == 1 + if station.allows_all_trains ~= allows_all_trains then + station.allows_all_trains = allows_all_trains update_station_if_auto(map_data, station) end end @@ -862,8 +862,8 @@ local function main() flib_event.register({defines.events.on_pre_surface_deleted, defines.events.on_pre_surface_cleared}, on_surface_removed) - flib_event.register(defines.events.on_entity_settings_pasted, on_paste) - flib_event.register(defines.events.on_player_cursor_stack_changed, on_cursor_stack_changed) + --flib_event.register(defines.events.on_entity_settings_pasted, on_paste) + --flib_event.register(defines.events.on_player_cursor_stack_changed, on_cursor_stack_changed) local nth_tick = math.ceil(60/mod_settings.tps); flib_event.on_nth_tick(nth_tick, function() diff --git a/cybersyn/scripts/migrations.lua b/cybersyn/scripts/migrations.lua index d6d0db7..1b0679c 100644 --- a/cybersyn/scripts/migrations.lua +++ b/cybersyn/scripts/migrations.lua @@ -40,6 +40,15 @@ local migrations_table = { map_data.to_comb_params[id] = get_comb_params(comb) end end, + ["0.4.1"] = function() + ---@type MapData + local map_data = global + map_data.tick_state = STATE_INIT + for id, station in pairs(map_data.stations) do + station.allows_all_trains = station.allow_all_trains or station.allows_all_trains + station.allow_all_trains = nil + end + end, } ---@param data ConfigurationChangedData