aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2026-05-28 06:09:54 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'aperx' into main

Browse Source
This commit is contained in:
phidias
2026-05-21 22:56:47 +09:00
committed by GitHub
parent 9a120aad39 c9b3ead906
commit 49b36b9bd9
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
exp_scenario/controller.ts
+1 -1
View File
@@ -1,5 +1,5 @@
import * as lib from "@clusterio/lib"; import * as lib from "@clusterio/lib";
import { BaseControllerPlugin, InstanceInfo } from "@clusterio/controller"; import { BaseControllerPlugin } from "@clusterio/controller";
export class ControllerPlugin extends BaseControllerPlugin { export class ControllerPlugin extends BaseControllerPlugin {
async init() { async init() {
exp_scenario/module/control.lua
+1 -1
View File
@@ -78,6 +78,6 @@ add(require("modules/exp_scenario/gui/production_stats"))
add(require("modules/exp_scenario/gui/quick_actions")) add(require("modules/exp_scenario/gui/quick_actions"))
add(require("modules/exp_scenario/gui/readme")) add(require("modules/exp_scenario/gui/readme"))
add(require("modules/exp_scenario/gui/research_milestones")) add(require("modules/exp_scenario/gui/research_milestones"))
add(require("modules/exp_scenario/gui/science_production")) -- add(require("modules/exp_scenario/gui/science_production"))
add(require("modules/exp_scenario/gui/surveillance")) add(require("modules/exp_scenario/gui/surveillance"))
add(require("modules/exp_scenario/gui/task_list")) add(require("modules/exp_scenario/gui/task_list"))
exp_scenario/module/control/extra_logging.lua
+1 -1
View File
@@ -38,7 +38,7 @@ local function on_pre_player_died(event)
local cause = event.cause local cause = event.cause
if cause then if cause then
if cause.type == "character" then if cause.type == "character" then
add_log_line("[DEATH]", player.name, "died because of", cause.player.name) add_log_line("[DEATH]", player.name, "died because of", (cause.player and cause.player.name) or cause.name)
else else
add_log_line("[DEATH]", player.name, "died because of", cause.name) add_log_line("[DEATH]", player.name, "died because of", cause.name)
end end
exp_server_ups/instance.ts
+6 -6
View File
@@ -1,3 +1,4 @@
// @ts-nocheck
import * as lib from "@clusterio/lib"; import * as lib from "@clusterio/lib";
import { BaseInstancePlugin } from "@clusterio/host"; import { BaseInstancePlugin } from "@clusterio/host";
@@ -20,7 +21,7 @@ export class InstancePlugin extends BaseInstancePlugin {
this.clearInterval(); this.clearInterval();
this.setInterval(); this.setInterval();
} else if (field === "exp_server_ups.average_interval") { } else if (field === "exp_server_ups.average_interval") {
this.gameTimes.splice(curr as number); this.gameTimes = [];
} }
} }
@@ -51,8 +52,7 @@ export class InstancePlugin extends BaseInstancePlugin {
if (collected > 0) { if (collected > 0) {
const minTick = this.gameTimes[0]; const minTick = this.gameTimes[0];
const maxTick = this.gameTimes[collected]; const maxTick = this.gameTimes[collected];
const interval = this.instance.config.get("exp_server_ups.update_interval") / 1000; ups = (maxTick - minTick) / (collected * (this.instance.config.get("exp_server_ups.update_interval") / 1000));
ups = (maxTick - minTick) / (collected * interval);
} }
try { try {
@@ -61,9 +61,9 @@ export class InstancePlugin extends BaseInstancePlugin {
} catch (error: any) { } catch (error: any) {
this.logger.error(`Failed to receive new game time: ${error}`); this.logger.error(`Failed to receive new game time: ${error}`);
} }
if (collected > this.instance.config.get("exp_server_ups.average_interval")) { if (collected > this.instance.config.get("exp_server_ups.average_interval")) {
this.gameTimes.shift(); this.gameTimes.shift();
} }
} }
} }