Merge pull request #163 from psihius/master

Mass sync does not spam
This commit is contained in:
Daniel authored and GitHub committed 2019-07-14 15:58:07 +02:00
commit c978e8e748
2 files changed
+17 -11

No files matched your search

+13 -11
View File
@@ -1,15 +1,17 @@
/silent-command
if game.forces['player'].technologies['{tech_name}'] then
if 1 == {tech_infinite} then
game.forces['player'].technologies['{tech_name}'].level = {tech_level}
else
game.forces['player'].technologies['{tech_name}'].researched = true
end
script.raise_event(defines.events.on_research_finished, {research=game.forces['player'].technologies['{tech_name}'], by_script=true})
game.play_sound({path="utility/research_completed"})
if 1 == {tech_infinite} then
game.print("Infinite technology {tech_name} level {tech_level} unlocked")
else
game.print("Technology {tech_name} researched")
end
game.forces['player'].technologies['{tech_name}'].level = {tech_level}
else
game.forces['player'].technologies['{tech_name}'].researched = true
end
script.raise_event(defines.events.on_research_finished, {research=game.forces['player'].technologies['{tech_name}'], by_script=true})
if {notify} then
if 1 == {tech_infinite} then
game.print("Infinite technology {tech_name} level {tech_level} unlocked")
else
game.print("Technology {tech_name} researched")
end
game.play_sound({path="utility/research_completed"})
end
end
+4
View File
@@ -80,6 +80,8 @@ class ResearchSync {
let difference = this.filterResearchDiff(this.research, needResearch);
let count = Object.keys(difference).length;
let counter = 1;
Object.keys(difference).forEach((key) => {
if (this.research[key]) {
let command = this.functions.enableResearch;
@@ -88,6 +90,7 @@ class ResearchSync {
command = command.replace("{tech_researched}", difference[key].researched);
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 = '';
@@ -99,6 +102,7 @@ class ResearchSync {
console.log(log_message);
this.messageInterface(log_message);
this.research[key] = difference[key];
++counter;
}
});