Ignore techonolgy enabled status for sync

Technologies that were disabled were ignored completely by research sync
due to a missunderstanding of what disabled means.  Disabled does not
mean the tech is somehow inaccessible and completely out of play, it
only means it can't be selected in the technology screen.

Ignore the enabled status of technologies in research_sync to fix a
crash that happened when a mod enables a disabled by default technology
and the player attempts to research it.
This commit is contained in:
Hornwitser committed 2023-02-20 04:45:18 +01:00
1 parent c60abdc349
commit 475182efd0
1 file changed
+15 -19
+15 -19
View File
@@ -32,14 +32,12 @@ sync.events[clusterio_api.events.on_server_startup] = function(event)
local force = game.forces["player"] local force = game.forces["player"]
for _, tech in pairs(force.technologies) do for _, tech in pairs(force.technologies) do
if tech.enabled then local progress = get_technology_progress(tech)
local progress = get_technology_progress(tech) global.research_sync.technologies[tech.name] = {
global.research_sync.technologies[tech.name] = { level = tech.level,
level = tech.level, researched = tech.researched,
researched = tech.researched, progress = progress,
progress = progress, }
}
end
end end
end end
@@ -112,14 +110,12 @@ function research_sync.dump_technologies()
local techs = {} local techs = {}
for _, tech in pairs(force.technologies) do for _, tech in pairs(force.technologies) do
if tech.enabled then table.insert(techs, {
table.insert(techs, { name = tech.name,
name = tech.name, level = tech.level,
level = tech.level, progress = get_technology_progress(tech),
progress = get_technology_progress(tech), researched = tech.researched,
researched = tech.researched, })
})
end
end end
if #techs == 0 then if #techs == 0 then
@@ -140,7 +136,7 @@ function research_sync.sync_technologies(data)
global.research_sync.ignore_research_finished = true global.research_sync.ignore_research_finished = true
for _, tech_data in pairs(game.json_to_table(data)) do for _, tech_data in pairs(game.json_to_table(data)) do
local tech = force.technologies[tech_data[nameIndex]] local tech = force.technologies[tech_data[nameIndex]]
if tech and tech.enabled and tech.level <= tech_data[levelIndex] then if tech and tech.level <= tech_data[levelIndex] then
tech.level = math.min(tech_data[levelIndex], tech.prototype.max_level) tech.level = math.min(tech_data[levelIndex], tech.prototype.max_level)
local progress local progress
@@ -171,7 +167,7 @@ function research_sync.update_progress(data)
for _, masterTech in ipairs(techs) do for _, masterTech in ipairs(techs) do
local tech = force.technologies[masterTech.name] local tech = force.technologies[masterTech.name]
if tech and tech.enabled and tech.level == masterTech.level then if tech and tech.level == masterTech.level then
send_contribution(tech) send_contribution(tech)
set_technology_progress(tech, masterTech.progress) set_technology_progress(tech, masterTech.progress)
global.research_sync.technologies[tech.name] = { global.research_sync.technologies[tech.name] = {
@@ -185,7 +181,7 @@ end
function research_sync.research_technology(name, level) function research_sync.research_technology(name, level)
local force = game.forces["player"] local force = game.forces["player"]
local tech = force.technologies[name] local tech = force.technologies[name]
if not tech or not tech.enabled or tech.level > level then if not tech or tech.level > level then
return return
end end