From 01269ec755dbb62630d9fd28a78dc2c72129760e Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Fri, 18 Apr 2025 23:19:14 +0900 Subject: [PATCH] . --- exp_legacy/module/config/research.lua | 16 +++++++++++----- exp_legacy/module/modules/gui/research.lua | 18 ++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/exp_legacy/module/config/research.lua b/exp_legacy/module/config/research.lua index 6e0d7d1c..8d0e639c 100644 --- a/exp_legacy/module/config/research.lua +++ b/exp_legacy/module/config/research.lua @@ -12,16 +12,22 @@ return { -- this enable 20 more inventory for each mining productivity level up to 4 bonus_inventory = { enabled = true, - res = { - -- Mining Productivity + log = { ["base"] = { ["name"] = "mining-productivity-4", - ["level"] = 4, + ["level"] = 4 }, ["space-age"] = { ["name"] = "mining-productivity-3", - ["level"] = 3, - } + ["level"] = 3 + }, + }, + res = { + -- Mining Productivity + ["mining-productivity"] = true, + ["mining-productivity-2"] = true, + ["mining-productivity-3"] = true, + ["mining-productivity-4"] = true }, name = "character_inventory_slots_bonus", rate = 5, diff --git a/exp_legacy/module/modules/gui/research.lua b/exp_legacy/module/modules/gui/research.lua index e08b3004..b294da30 100644 --- a/exp_legacy/module/modules/gui/research.lua +++ b/exp_legacy/module/modules/gui/research.lua @@ -90,15 +90,11 @@ end local function research_notification(event) if config.inf_res[config.mod_set][event.research.name] then if event.research.name == config.bonus_inventory.res[config.mod_set].name then - if event.research.level == config.bonus_inventory.res[config.mod_set].level + 1 then + if event.research.level == config.bonus_inventory.log[config.mod_set].level + 1 then -- Add run result to log research_add_log() end - if config.bonus_inventory.enabled then - event.research.force[config.bonus_inventory.name] = math.max((event.research.level - 1) * config.bonus_inventory.rate, config.bonus_inventory.limit) - end - if config.pollution_ageing_by_research then game.map_settings.pollution.ageing = math.min(10, event.research.level / 5) end @@ -107,14 +103,12 @@ local function research_notification(event) if not (event.by_script) then game.print{ "research.inf", research_time_format(game.tick), event.research.name, event.research.level - 1 } end - else - if not (event.by_script) then - game.print{ "research.msg", research_time_format(game.tick), event.research.name } - end + elseif not (event.by_script) then + game.print{ "research.msg", research_time_format(game.tick), event.research.name } + end - if config.bonus_inventory.enabled and (event.research.name == "mining-productivity-1" or event.research.name == "mining-productivity-2" or event.research.name == "mining-productivity-3") then - event.research.force[config.bonus_inventory.name] = event.research.level * config.bonus_inventory.rate - end + if config.bonus_inventory.enabled and config.bonus_inventory.res[event.research.name] then + event.research.force[config.bonus_inventory.name] = math.min((event.research.level - 1) * config.bonus_inventory.rate, config.bonus_inventory.limit) end end