mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 00:13:12 +09:00
Merge pull request #168 from MrRozdor/spread_researching
Make any node be able to research anything
This commit is contained in:
7 files changed
+342
-141
No files matched your search
@@ -64,3 +64,6 @@ sharedPlugins/scenario_loader/scenarios
|
|||||||
sharedPlugins/*/DISABLED
|
sharedPlugins/*/DISABLED
|
||||||
|
|
||||||
\.cache-require-paths\.json
|
\.cache-require-paths\.json
|
||||||
|
|
||||||
|
# IDE
|
||||||
|
.idea/
|
||||||
@@ -378,8 +378,13 @@ app.post("/api/getSlaveMeta", function (req, res) {
|
|||||||
endpointHitCounter.labels(req.route.path).inc();
|
endpointHitCounter.labels(req.route.path).inc();
|
||||||
console.log("body", req.body);
|
console.log("body", req.body);
|
||||||
if(req.body && req.body.instanceID && req.body.password){
|
if(req.body && req.body.instanceID && req.body.password){
|
||||||
console.log("returning meta for ", req.body.instanceID);
|
if (slaves[req.body.instanceID]) {
|
||||||
res.send(JSON.stringify(slaves[req.body.instanceID].meta))
|
console.log("returning meta for ", req.body.instanceID);
|
||||||
|
res.send(JSON.stringify(slaves[req.body.instanceID].meta))
|
||||||
|
} else {
|
||||||
|
res.status(404)
|
||||||
|
res.send('{"status": 404, "info": "Slave not registered"}')
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
res.status(400);
|
res.status(400);
|
||||||
res.send('{"INVALID REQUEST":1}');
|
res.send('{"INVALID REQUEST":1}');
|
||||||
|
|||||||
@@ -1,13 +1,24 @@
|
|||||||
/silent-command
|
|
||||||
|
|
||||||
local data = {};
|
local data = {};
|
||||||
|
local force = game.forces["player"];
|
||||||
|
|
||||||
for _, tech in pairs(game.forces["player"].technologies) do
|
for _, tech in pairs(force.technologies) do
|
||||||
if tech.enabled == true and tech.prototype.max_level == 4294967295 then
|
local progress;
|
||||||
table.insert(data, tech.name .. ":" .. tostring(tech.researched) .. ":" .. tostring(tech.level) .. ":true");
|
if tech == force.current_research then
|
||||||
|
progress = force.research_progress
|
||||||
else
|
else
|
||||||
table.insert(data, tech.name .. ":" .. tostring(tech.researched) .. ":" .. tostring(tech.level) .. ":false");
|
progress = force.get_saved_technology_progress(tech.name);
|
||||||
end
|
end
|
||||||
|
local infinite = tech.enabled == true and tech.prototype.max_level == 4294967295;
|
||||||
|
local tech_data = {
|
||||||
|
tech.name,
|
||||||
|
tostring(tech.researched),
|
||||||
|
tostring(tech.level),
|
||||||
|
tostring(progress),
|
||||||
|
tostring(infinite),
|
||||||
|
}
|
||||||
|
tech_data = table.concat(tech_data, ':')
|
||||||
|
table.insert(data, tech_data);
|
||||||
end
|
end
|
||||||
|
|
||||||
game.write_file("researchSync.txt", table.concat(data, "\n"), false, 0)
|
game.write_file("researchSync.txt", table.concat(data, "\n"), false, 0)
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
/silent-command
|
|
||||||
if game.forces['player'].technologies['{tech_name}'] then
|
if game.forces['player'].technologies['{tech_name}'] then
|
||||||
if 1 == {tech_infinite} then
|
if 1 == {tech_infinite} then
|
||||||
game.forces['player'].technologies['{tech_name}'].level = {tech_level}
|
game.forces['player'].technologies['{tech_name}'].level = {tech_level}
|
||||||
|
|||||||
+279
-130
@@ -1,162 +1,311 @@
|
|||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const needle = require("needle");
|
const needle = require("needle");
|
||||||
|
|
||||||
|
|
||||||
class ResearchSync {
|
class ResearchSync {
|
||||||
constructor(slaveConfig, messageInterface, extras = {}) {
|
constructor(slaveConfig, messageInterface, extras = {}){
|
||||||
this.config = slaveConfig;
|
this.config = slaveConfig;
|
||||||
this.messageInterface = messageInterface;
|
this.messageInterface = messageInterface;
|
||||||
this.functions = this.loadFunctions();
|
this.functions = {
|
||||||
|
dumpResearch: this.loadFunc("dumpResearch.lua"),
|
||||||
|
enableResearch: this.loadFunc("enableResearch.lua"),
|
||||||
|
updateProgress: this.loadFunc("updateProgress.lua")
|
||||||
|
}
|
||||||
|
|
||||||
this.research = {};
|
this.research = {};
|
||||||
|
this.prev_research = {};
|
||||||
setInterval(
|
this.initial_request_own_data(
|
||||||
() => {
|
() => this.setup_sync_task(extras)
|
||||||
this.pollResearch();
|
)
|
||||||
setTimeout(this.doSync.bind(this), 5000);
|
|
||||||
},
|
|
||||||
extras.researchSyncPollInterval || 30000
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pollResearch() {
|
initial_request_own_data(callback) {
|
||||||
// this.messageInterface("Polling Research\n")
|
const url = `${this.config.masterIP}:${this.config.masterPort}/api/getSlaveMeta`
|
||||||
this.messageInterface(this.functions.dumpResearch);
|
const data = {
|
||||||
}
|
instanceID: this.config.unique,
|
||||||
|
password: this.config.clientPassword,
|
||||||
doSync() {
|
}
|
||||||
needle.get(this.config.masterIP + ':' + this.config.masterPort + '/api/slaves', (err, resp, slaveData) => {
|
const options = {
|
||||||
|
headers: {'x-access-token': this.config.masterAuthToken},
|
||||||
|
json: true
|
||||||
|
}
|
||||||
|
needle.post(url, data, options, (err, res, techs) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
this.messageInterface("Unable to post JSON master/api/slaves, master might be unreachable");
|
console.log(`Can't get own slave data:`)
|
||||||
return false;
|
console.error(err)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
if (resp.statusCode !== 200) {
|
if (res.statusCode === 404) {
|
||||||
this.messageInterface("got error when calling slaves", resp.statusCode, resp.body);
|
console.log('researchSync: slave is not registered yet. Delaying for 5 secs')
|
||||||
return;
|
setTimeout(
|
||||||
|
() => this.initial_request_own_data(callback),
|
||||||
|
5000
|
||||||
|
)
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
if (res.statusCode !== 200) {
|
||||||
|
console.log(`Can't get own slave data:`)
|
||||||
|
console.error(`status code ${res.statusCode}, ${res.body}`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
techs = JSON.parse(techs)
|
||||||
|
if (typeof techs.research === 'object')
|
||||||
|
this.research = techs.research
|
||||||
|
console.log('researchSync: techs imported from master')
|
||||||
|
callback()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
let needResearch = {};
|
setup_sync_task(extras) {
|
||||||
|
const timeout = extras.researchSyncPollInterval || 5000
|
||||||
|
setInterval(() => this.sync_task(), timeout);
|
||||||
|
}
|
||||||
|
|
||||||
Object.keys(slaveData).forEach(instanceKey => {
|
sync_task() {
|
||||||
if (slaveData[instanceKey].unique === this.config.unique.toString()) {
|
this.messageInterface(this.functions.dumpResearch);
|
||||||
return;
|
setTimeout(this.request_cluster_data.bind(this), 2000);
|
||||||
}
|
}
|
||||||
if (!slaveData[instanceKey].hasOwnProperty('meta')
|
|
||||||
|| !slaveData[instanceKey].meta.hasOwnProperty('research')
|
|
||||||
) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let researchList = slaveData[instanceKey].meta.research;
|
|
||||||
if (researchList) {
|
|
||||||
Object.keys(researchList).forEach(researchName => {
|
|
||||||
if (
|
|
||||||
isNaN(researchList[researchName].researched)
|
|
||||||
|| isNaN(researchList[researchName].level)
|
|
||||||
|| isNaN(researchList[researchName].infinite))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (needResearch.hasOwnProperty(researchName)) {
|
|
||||||
if (
|
|
||||||
needResearch[researchName].infinite === 1
|
|
||||||
&& needResearch[researchName].level < parseInt(researchList[researchName].level)
|
|
||||||
) {
|
|
||||||
needResearch[researchName].level = parseInt(researchList[researchName].level);
|
|
||||||
} else if (
|
|
||||||
needResearch[researchName].researched === 0
|
|
||||||
&& parseInt(researchList[researchName].researched) === 1
|
|
||||||
) {
|
|
||||||
needResearch[researchName].researched = 1
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
needResearch[researchName] = {
|
|
||||||
researched: parseInt(researchList[researchName].researched),
|
|
||||||
level : parseInt(researchList[researchName].level),
|
|
||||||
infinite : parseInt(researchList[researchName].infinite)
|
|
||||||
};
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
let difference = this.filterResearchDiff(this.research, needResearch);
|
request_cluster_data() {
|
||||||
|
const slaves_data_url = `${this.config.masterIP}:${this.config.masterPort}/api/slaves`
|
||||||
|
needle.get(slaves_data_url, this.sync_researches.bind(this))
|
||||||
|
}
|
||||||
|
|
||||||
let count = Object.keys(difference).length;
|
sync_researches(err, resp, slaves_data) {
|
||||||
let counter = 1;
|
if (err) {
|
||||||
Object.keys(difference).forEach((key) => {
|
this.messageInterface("Unable to post JSON master/api/slaves, master might be unreachable");
|
||||||
if (this.research[key]) {
|
return false;
|
||||||
let command = this.functions.enableResearch;
|
}
|
||||||
while (command.includes("{tech_name}")) {
|
if (resp.statusCode !== 200) {
|
||||||
command = command.replace("{tech_name}", key);
|
this.messageInterface("got error when calling slaves", resp.statusCode, resp.body);
|
||||||
command = command.replace("{tech_researched}", difference[key].researched);
|
return;
|
||||||
command = command.replace("{tech_level}", difference[key].level);
|
}
|
||||||
command = command.replace("{tech_infinite}", difference[key].infinite);
|
|
||||||
command = command.replace("{notify}", count > 1 || count === counter ? 'false' : 'true');
|
|
||||||
}
|
|
||||||
this.messageInterface(command);
|
|
||||||
let log_message = '';
|
|
||||||
if (difference[key].infinite === 1) {
|
|
||||||
log_message = 'Unlocking infinite research ' + key + 'at level ' + this.research[key].level;
|
|
||||||
} else {
|
|
||||||
log_message = 'Unlocking research ' + key;
|
|
||||||
}
|
|
||||||
console.log(log_message);
|
|
||||||
this.messageInterface(log_message);
|
|
||||||
this.research[key] = difference[key];
|
|
||||||
++counter;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
needle.post(this.config.masterIP + ':' + this.config.masterPort + '/api/editSlaveMeta', {
|
slaves_data = Object.values(slaves_data)
|
||||||
instanceID: this.config.unique,
|
slaves_data = slaves_data.filter(
|
||||||
password : this.config.clientPassword,
|
slave_data => slave_data.unique !== this.config.unique.toString()
|
||||||
meta : {research: this.research}
|
&& slave_data.meta && slave_data.meta.research
|
||||||
}, {headers: {'x-access-token': this.config.masterAuthToken}}, function (err, resp) {
|
)
|
||||||
// success?
|
|
||||||
});
|
this.clear_contribution_to_researched_techs()
|
||||||
|
let cluster_techs = this.get_cluster_techs(slaves_data)
|
||||||
|
this.recount_cluster_research_progress(slaves_data, cluster_techs)
|
||||||
|
|
||||||
|
let to_research = this.filter_researched_techs(cluster_techs)
|
||||||
|
let to_update_progress = this.filter_updated_techs(cluster_techs, to_research)
|
||||||
|
|
||||||
|
this.research_technologies(to_research)
|
||||||
|
this.update_technologies_progress(to_update_progress)
|
||||||
|
|
||||||
|
this.print_own_contribution()
|
||||||
|
|
||||||
|
needle.post(this.config.masterIP + ':' + this.config.masterPort + '/api/editSlaveMeta', {
|
||||||
|
instanceID: this.config.unique,
|
||||||
|
password: this.config.clientPassword,
|
||||||
|
meta: {research: this.research}
|
||||||
|
}, {headers: {'x-access-token': this.config.masterAuthToken}, json: true}, function (err, resp) {
|
||||||
|
// it doesn't get called
|
||||||
|
if (err)
|
||||||
|
console.error(err)
|
||||||
|
else
|
||||||
|
console.log('sent')
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
filterResearchDiff(localResearch, remoteResearch) {
|
clear_contribution_to_researched_techs() {
|
||||||
let diff = {};
|
// if between updates tech was researched
|
||||||
Object.keys(localResearch).forEach((key) => {
|
if (!this.prev_research)
|
||||||
if (remoteResearch.hasOwnProperty(key)) {
|
return
|
||||||
if (
|
for (let [name, research] of Object.entries(this.research)) {
|
||||||
(localResearch[key].infinite === 0 && localResearch[key].researched === 0 && remoteResearch[key].researched === 1)
|
let researched
|
||||||
||
|
if (research.infinite)
|
||||||
(localResearch[key].infinite === 1 && localResearch[key].level < remoteResearch[key].level)
|
researched = this.prev_research[name].level < research.level
|
||||||
) {
|
else
|
||||||
if (!isNaN(remoteResearch[key].researched) && !isNaN(remoteResearch[key].level) && !isNaN(remoteResearch[key].infinite)) {
|
researched = this.prev_research[name].researched < research.researched
|
||||||
diff[key] = {researched: remoteResearch[key].researched, level: remoteResearch[key].level, infinite: remoteResearch[key].infinite};
|
|
||||||
|
if (researched)
|
||||||
|
research.contribution = 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
get_cluster_techs(slavesData) {
|
||||||
|
let cluster_techs = {}
|
||||||
|
for (let slave_data of slavesData) {
|
||||||
|
let node_researches = slave_data.meta.research
|
||||||
|
for (let [name, node_tech] of Object.entries(node_researches)) {
|
||||||
|
if (isNaN(node_tech.researched) || isNaN(node_tech.level) || isNaN(node_tech.infinite))
|
||||||
|
continue
|
||||||
|
|
||||||
|
if (cluster_techs[name]) {
|
||||||
|
if (cluster_techs[name].infinite === 1 && cluster_techs[name].level < node_tech.level) {
|
||||||
|
cluster_techs[name].level = node_tech.level
|
||||||
|
} else if (node_tech.researched > cluster_techs[name].researched) {
|
||||||
|
cluster_techs[name].researched = 1
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
cluster_techs[name] = node_tech
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
return diff;
|
return cluster_techs
|
||||||
}
|
}
|
||||||
|
|
||||||
loadFunctions() {
|
recount_cluster_research_progress(slaves_data, cluster_researches) {
|
||||||
return {
|
for (let [name, research] of Object.entries(cluster_researches))
|
||||||
dumpResearch : this.loadFunc("dumpResearch.lua"),
|
research.progress = this.research[name].contribution
|
||||||
enableResearch: this.loadFunc("enableResearch.lua"),
|
|
||||||
};
|
for (let slave_data of slaves_data)
|
||||||
|
for (let [name, research] of Object.entries(slave_data.meta.research))
|
||||||
|
if (!isNaN(cluster_researches[name].progress) && !isNaN(research.contribution))
|
||||||
|
cluster_researches[name].progress += research.contribution
|
||||||
|
|
||||||
|
for (let [name, research] of Object.entries(cluster_researches)) {
|
||||||
|
if (research.progress > 1) {
|
||||||
|
research.progress = null
|
||||||
|
research.researched = 1
|
||||||
|
this.research[name].contribution = 0
|
||||||
|
research.contribution = 0
|
||||||
|
if (this.research[name].level >= research.level)
|
||||||
|
research.level = this.research[name].level + 1
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
loadFunc(path) {
|
filter_researched_techs(cluster_researches) {
|
||||||
return fs.readFileSync("sharedPlugins/researchSync/" + path, 'utf-8').replace(/\r?\n|\r/g, ' ');
|
let local_researches = this.research
|
||||||
|
let result = {};
|
||||||
|
for (let key in local_researches) {
|
||||||
|
if (!cluster_researches[key])
|
||||||
|
continue
|
||||||
|
if (isNaN(cluster_researches[key].researched) || isNaN(cluster_researches[key].level))
|
||||||
|
continue
|
||||||
|
|
||||||
|
let researched
|
||||||
|
if (local_researches[key].infinite)
|
||||||
|
researched = local_researches[key].level < cluster_researches[key].level
|
||||||
|
else
|
||||||
|
researched = local_researches[key].researched < cluster_researches[key].researched
|
||||||
|
|
||||||
|
if (researched)
|
||||||
|
result[key] = cluster_researches[key]
|
||||||
|
}
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
filter_updated_techs(cluster_techs, to_research) {
|
||||||
|
let local_techs = this.research
|
||||||
|
let result = {}
|
||||||
|
for (let name in local_techs) {
|
||||||
|
if (name in to_research || !cluster_techs[name])
|
||||||
|
continue
|
||||||
|
if (isNaN(cluster_techs[name].progress))
|
||||||
|
continue
|
||||||
|
if (local_techs[name].progress < cluster_techs[name].progress)
|
||||||
|
result[name] = cluster_techs[name]
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
research_technologies(to_research) {
|
||||||
|
for (let name of Object.keys(to_research))
|
||||||
|
if (!this.research[name])
|
||||||
|
delete to_research[name]
|
||||||
|
|
||||||
|
const notify = Object.keys(to_research).length === 1
|
||||||
|
for (let [name, tech] of Object.entries(to_research)) {
|
||||||
|
this.research[name].contribution = 0
|
||||||
|
this.research[name].progress = null
|
||||||
|
let command = this.functions.enableResearch;
|
||||||
|
command = command.replace(/{tech_name}/g, name);
|
||||||
|
command = command.replace(/{tech_researched}/g, tech.researched);
|
||||||
|
command = command.replace(/{tech_level}/g, tech.level);
|
||||||
|
command = command.replace(/{tech_infinite}/g, tech.infinite);
|
||||||
|
command = command.replace(/{notify}/g, notify);
|
||||||
|
this.messageInterface(command);
|
||||||
|
let log_message = tech.infinite
|
||||||
|
? `Unlocking infinite research ${name} at level ${this.research[name].level}`
|
||||||
|
: `Unlocking research ${name}`
|
||||||
|
console.log(log_message);
|
||||||
|
this.messageInterface(log_message);
|
||||||
|
this.research[name] = tech;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
update_technologies_progress(to_update) {
|
||||||
|
for (let [name, tech] of Object.entries(to_update)) {
|
||||||
|
if (!this.research[name])
|
||||||
|
continue
|
||||||
|
let progress = this.research[name].progress
|
||||||
|
if (progress === null)
|
||||||
|
progress = 'nil'
|
||||||
|
let command = this.functions.updateProgress
|
||||||
|
command = command.replace(/{tech_name}/g, name)
|
||||||
|
command = command.replace(/{last_check_progress}/g, progress)
|
||||||
|
command = command.replace(/{new_progress}/g, tech.progress)
|
||||||
|
this.messageInterface(command);
|
||||||
|
console.log(
|
||||||
|
`Updating ${name}: ${this.research[name].progress} += ${tech.progress - this.research[name].progress}`
|
||||||
|
);
|
||||||
|
this.research[name].progress = tech.progress
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
print_own_contribution() {
|
||||||
|
if (!this.prev_research)
|
||||||
|
return
|
||||||
|
for (let [name, tech] of Object.entries(this.research)) {
|
||||||
|
if (!this.prev_research[name])
|
||||||
|
continue
|
||||||
|
let diff = this.research[name].contribution - this.prev_research[name].contribution
|
||||||
|
if (Math.abs(diff) > Number.EPSILON * 1000)
|
||||||
|
console.log(`Own research ${name}: ${this.research[name].progress} += ${diff}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
loadFunc(path, silent=true) {
|
||||||
|
let command = fs.readFileSync("sharedPlugins/researchSync/" + path,'utf-8')
|
||||||
|
command = command.replace(/\r?\n|\r/g,' ')
|
||||||
|
command = (silent ? '/silent-command ' : '/c ') + command
|
||||||
|
return command;
|
||||||
|
}
|
||||||
scriptOutput(data) {
|
scriptOutput(data) {
|
||||||
let kv = data.split(":");
|
let [name, researched, level, progress, infinite] = data.split(":")
|
||||||
let name = kv[0];
|
researched = +(researched === 'true')
|
||||||
let researched = ('true' !== kv[1]
|
infinite = +(infinite === 'true')
|
||||||
? 0
|
level = parseInt(level);
|
||||||
: 1);
|
if (progress === 'nil')
|
||||||
let level = parseInt(kv[2]);
|
progress = null
|
||||||
let infinite = ('true' !== kv[3]
|
else
|
||||||
? 0
|
progress = parseFloat(progress)
|
||||||
: 1);
|
|
||||||
if (!isNaN(level) && !isNaN(researched)) {
|
if (isNaN(level) || isNaN(researched))
|
||||||
this.research[name] = {researched: researched, level: level, infinite: infinite};
|
return
|
||||||
|
this.prev_research[name] = this.research[name]
|
||||||
|
if (!this.prev_research[name]) {
|
||||||
|
this.prev_research[name] = {
|
||||||
|
researched: null,
|
||||||
|
level: null,
|
||||||
|
progress: null,
|
||||||
|
contribution: 0,
|
||||||
|
infinite,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this.research[name] = {
|
||||||
|
researched,
|
||||||
|
level,
|
||||||
|
progress,
|
||||||
|
contribution: this.prev_research[name].contribution,
|
||||||
|
infinite
|
||||||
|
}
|
||||||
|
if (this.prev_research[name].progress && this.research[name].progress) {
|
||||||
|
// this.prev_research[name].progress gets updated to overall cluster progress
|
||||||
|
// therefore contribution should be own research progress change over sync interval
|
||||||
|
let contribution = this.research[name].progress - this.prev_research[name].progress
|
||||||
|
this.research[name].contribution += contribution
|
||||||
|
}
|
||||||
|
if (Math.abs(this.research[name].contribution) < Number.EPSILON * 1000) {
|
||||||
|
// if contribution should be 0 but because of floating-point precision is e.g. 2.2564e-18
|
||||||
|
this.research[name].contribution = 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ describe("researchSync/index.js", ()=>{
|
|||||||
assert.equal(typeof researchSync, "function");
|
assert.equal(typeof researchSync, "function");
|
||||||
});
|
});
|
||||||
describe("class researchSync()", ()=>{
|
describe("class researchSync()", ()=>{
|
||||||
it(".filterResearchDiff(object1, object2) returns research that needs enabling on the local instance", ()=>{
|
it(".filter_researched_techs(object1, object2) returns research that needs enabling on the local instance", ()=>{
|
||||||
let reSync = new researchSync({}, function(){});
|
let reSync = new researchSync({}, function(){});
|
||||||
|
|
||||||
let obj1 = {
|
let obj1 = {
|
||||||
@@ -24,9 +24,9 @@ describe("researchSync/index.js", ()=>{
|
|||||||
c:{researched: false, level: 0},
|
c:{researched: false, level: 0},
|
||||||
e:{researched: false, level: 50},
|
e:{researched: false, level: 50},
|
||||||
};
|
};
|
||||||
assert(typeof reSync.filterResearchDiff == "function");
|
assert(typeof reSync.filter_researched_techs == "function");
|
||||||
|
|
||||||
let diffResult = reSync.filterResearchDiff(obj1, obj2);
|
let diffResult = reSync.filter_researched_techs(obj1, obj2);
|
||||||
|
|
||||||
assert(diffResult.a === undefined);
|
assert(diffResult.a === undefined);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
|
||||||
|
local function get_tech_progress(force, tech)
|
||||||
|
if tech == force.current_research then
|
||||||
|
return force.research_progress
|
||||||
|
else
|
||||||
|
return force.get_saved_technology_progress(tech.name);
|
||||||
|
end
|
||||||
|
end
|
||||||
|
local function set_tech_progress(force, tech, progress)
|
||||||
|
if tech == force.current_research then
|
||||||
|
force.research_progress = progress
|
||||||
|
else
|
||||||
|
force.set_saved_technology_progress(tech.name, progress);
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local force = game.forces['player']
|
||||||
|
local tech_name = '{tech_name}'
|
||||||
|
local tech = force.technologies[tech_name]
|
||||||
|
local last_check_progress = {last_check_progress}
|
||||||
|
local new_progress = {new_progress}
|
||||||
|
|
||||||
|
local progress_delta = get_tech_progress(force, tech)
|
||||||
|
if last_check_progress ~= nil then
|
||||||
|
progress_delta = progress_delta - last_check_progress
|
||||||
|
end
|
||||||
|
if progress_delta ~= nil then
|
||||||
|
new_progress = new_progress + progress_delta
|
||||||
|
end
|
||||||
|
if new_progress > 1 then
|
||||||
|
new_progress = 1
|
||||||
|
end
|
||||||
|
set_tech_progress(force, tech, new_progress)
|
||||||
Reference in new issue
Block a user