From 297e8e2e58cdbe5d24e54013461bf7a2fa74b291 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Sat, 2 Nov 2024 00:40:45 +0900 Subject: [PATCH] .. --- PHI-CL/config.lua | 10 ---------- PHI-CL/data-updates.lua | 40 ++++++++++++++++++---------------------- PHI-CL/data.lua | 6 ------ PHI-CL/info.json | 4 ++-- 4 files changed, 20 insertions(+), 40 deletions(-) diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index 7233cdf..88b8062 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -2,16 +2,6 @@ local items = { ['general'] = { ['graphics_location'] = '__PHI-CL__/graphics/' }, - ['handle'] = { - [2] = { - ['item'] = false, - ['equipment'] = false, - }, - [3] = { - ['item'] = false, - ['equipment'] = false, - } - }, ['research_modifier'] = { --[[ ['electric-turret'] = { diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index 7902880..7a0b0a7 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -2,34 +2,30 @@ local items = require 'config' local main = require 'main' local file_stage = 2 -if items['handle'][file_stage]['item'] then - for _, v in pairs(items['item']) do - if (v.stage == file_stage) and v.enabled and (v.max >= v.min) then - v.category = 'item' +for _, v in pairs(items['item']) do + if (v.stage == file_stage) and v.enabled and (v.max >= v.min) then + v.category = 'item' - for j=v.min, v.max, 1 do - main.EEE(v, j) - main.EI(v, j) - main.ER(v, j) - main.ET(v, j) - end - - main.EL(v) + for j=v.min, v.max, 1 do + main.EEE(v, j) + main.EI(v, j) + main.ER(v, j) + main.ET(v, j) end + + main.EL(v) end end -if items['handle'][file_stage]['equipment'] then - for _, v in pairs(items['equipment']) do - if (v.stage == file_stage) and v.enabled and (v.max >= v.min) then - v.category = 'equipment' +for _, v in pairs(items['equipment']) do + if (v.stage == file_stage) and v.enabled and (v.max >= v.min) then + v.category = 'equipment' - for j=v.min, v.max, 1 do - main.EEQ(v, j) - main.EI(v, j) - main.ER(v, j) - main.ET(v, j) - end + for j=v.min, v.max, 1 do + main.EEQ(v, j) + main.EI(v, j) + main.ER(v, j) + main.ET(v, j) end end end diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index d1e6227..1ded0e0 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -729,9 +729,6 @@ for _, v in pairs(items['item']) do end main.EL(v) - - else - items['handle'][v.stage]['item'] = true end end @@ -745,8 +742,5 @@ for _, v in pairs(items['equipment']) do main.ER(v, j) main.ET(v, j) end - - else - items['handle'][v.stage]['equipment'] = true end end diff --git a/PHI-CL/info.json b/PHI-CL/info.json index fe9c32b..beec031 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -1,8 +1,8 @@ { "name": "PHI-CL", - "version": "3.0.9", + "version": "3.0.10", "factorio_version": "2.0", - "date": "2024-11-01", + "date": "2024-11-02", "title": "Phidias Collection", "author": "PHIDIAS0303", "contributers": "",