From f5cd2d1c5267229910153df72f927b22b61c380e Mon Sep 17 00:00:00 2001 From: Monica Moniot Date: Wed, 30 Nov 2022 14:54:55 -0500 Subject: [PATCH] allowed more settings to be floating point numbers --- cybersyn/scripts/global.lua | 4 ++-- cybersyn/scripts/main.lua | 10 +++++----- cybersyn/settings.lua | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cybersyn/scripts/global.lua b/cybersyn/scripts/global.lua index 9b10cf1..4404d60 100644 --- a/cybersyn/scripts/global.lua +++ b/cybersyn/scripts/global.lua @@ -80,8 +80,8 @@ ---@field public update_rate int ---@field public r_threshold int ---@field public network_flag int ----@field public warmup_time int ----@field public stuck_train_time int +---@field public warmup_time double +---@field public stuck_train_time double ---@type CybersynModSettings mod_settings = {} diff --git a/cybersyn/scripts/main.lua b/cybersyn/scripts/main.lua index 3d08d51..f20b70d 100644 --- a/cybersyn/scripts/main.lua +++ b/cybersyn/scripts/main.lua @@ -837,12 +837,12 @@ end local function on_settings_changed(event) - mod_settings.tps = settings.global["cybersyn-ticks-per-second"].value --[[@as int]] + mod_settings.tps = settings.global["cybersyn-ticks-per-second"].value --[[@as double]] mod_settings.update_rate = settings.global["cybersyn-update-rate"].value --[[@as int]] mod_settings.r_threshold = settings.global["cybersyn-request-threshold"].value--[[@as int]] mod_settings.network_flag = settings.global["cybersyn-network-flag"].value--[[@as int]] - mod_settings.warmup_time = settings.global["cybersyn-warmup-time"].value--[[@as int]] - mod_settings.stuck_train_time = settings.global["cybersyn-stuck-train-time"].value--[[@as int]] + mod_settings.warmup_time = settings.global["cybersyn-warmup-time"].value--[[@as double]] + mod_settings.stuck_train_time = settings.global["cybersyn-stuck-train-time"].value--[[@as double]] if event.setting == "cybersyn-ticks-per-second" then flib_event.on_nth_tick(nil) if mod_settings.tps > DELTA then @@ -875,8 +875,8 @@ local function main() mod_settings.update_rate = settings.global["cybersyn-update-rate"].value --[[@as int]] mod_settings.r_threshold = settings.global["cybersyn-request-threshold"].value--[[@as int]] mod_settings.network_flag = settings.global["cybersyn-network-flag"].value--[[@as int]] - mod_settings.warmup_time = settings.global["cybersyn-warmup-time"].value--[[@as int]] - mod_settings.stuck_train_time = settings.global["cybersyn-stuck-train-time"].value--[[@as int]] + mod_settings.warmup_time = settings.global["cybersyn-warmup-time"].value--[[@as double]] + mod_settings.stuck_train_time = settings.global["cybersyn-stuck-train-time"].value--[[@as double]] --NOTE: There is a concern that it is possible to build or destroy important entities without one of these events being triggered, in which case the mod will have undefined behavior flib_event.register(defines.events.on_built_entity, on_built, filter_built) diff --git a/cybersyn/settings.lua b/cybersyn/settings.lua index 24d25f3..b90e60a 100644 --- a/cybersyn/settings.lua +++ b/cybersyn/settings.lua @@ -46,7 +46,7 @@ data:extend({ maximum_value = 2147483647, }, { - type = "int-setting", + type = "double-setting", name = "cybersyn-warmup-time", order = "ae", setting_type = "runtime-global", @@ -55,7 +55,7 @@ data:extend({ maximum_value = 2147483647, }, { - type = "int-setting", + type = "double-setting", name = "cybersyn-stuck-train-time", order = "af", setting_type = "runtime-global",