From f768b263d657bdc738c15e8f3e29f29a78ce451b Mon Sep 17 00:00:00 2001
From: PHIDIAS <phidias@aperx.org>
Date: Thu, 19 Sep 2024 00:38:35 +0900
Subject: [PATCH] .

---
 PHI-CL/data-updates.lua |  4 ++--
 PHI-CL/data.lua         | 13 +++++++------
 PHI-CL/main.lua         |  1 -
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua
index d4b75df..5516751 100644
--- a/PHI-CL/data-updates.lua
+++ b/PHI-CL/data-updates.lua
@@ -392,7 +392,7 @@ end
 
 for _, v in pairs(items['item']) do
     if v.stage == file_stage then
-        if v['setting'] then
+        if v.enabled and v['setting'] then
             local v2 = settings.startup[v['setting']].value
 
             if v2 >= v.min then
@@ -413,7 +413,7 @@ end
 
 for _, v in pairs(items['equipment']) do
     if v.stage == file_stage then
-        if v['setting'] then
+        if v.enabled and v['setting'] then
             local v2 = settings.startup[v['setting']].value
 
             if v2 >= v.min then
diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua
index 3c15d6b..d9e6f60 100644
--- a/PHI-CL/data.lua
+++ b/PHI-CL/data.lua
@@ -1,4 +1,5 @@
 local items = require 'config'
+local graphics_location = '__PHI-CL__/graphics/'
 local main = require 'main'
 local file_stage = 1
 
@@ -367,7 +368,7 @@ end
 if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRAIN'].value then
     local item = table.deepcopy(data.raw['item']['used-up-uranium-fuel-cell'])
     item.name = 'empty-train-battery'
-    item.icon = '__PHI-CL__/graphics/battery.png'
+    item.icon = graphics_location .. 'battery.png'
     item.order = 'qa'
     item.stack_size = 100
     data:extend({item})
@@ -377,7 +378,7 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRAIN'].value t
         name = 'empty-train-battery',
         energy_required = 30,
         enabled = true,
-        icon = '__PHI-CL__/graphics/battery.png',
+        icon = graphics_location .. 'battery.png',
         icon_size = 64,
         icon_mipmaps = 4,
         subgroup = 'intermediate-product',
@@ -401,7 +402,7 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRAIN'].value t
     item.name = 'charged-train-battery'
     item.burnt_result = 'empty-train-battery'
     item.fuel_value = '1GJ'
-    item.icon = '__PHI-CL__/graphics/battery.png'
+    item.icon = graphics_location .. 'battery.png'
     item.order = 'qb'
     item.stack_size = 10
     data:extend({item})
@@ -411,7 +412,7 @@ if settings.startup['PHI-CT'].value and settings.startup['PHI-CT-TRAIN'].value t
         name = 'charged-train-battery',
         energy_required = 60,
         enabled = true,
-        icon = '__PHI-CL__/graphics/battery.png',
+        icon = graphics_location .. 'battery.png',
         icon_size = 64,
         icon_mipmaps = 4,
         subgroup = 'intermediate-product',
@@ -616,7 +617,7 @@ end
 
 for _, v in pairs(items['item']) do
     if v.stage == file_stage then
-        if v['setting'] then
+        if v.enabled and v['setting'] then
             local v2 = settings.startup[v['setting']].value
 
             if v2 >= v.min then
@@ -637,7 +638,7 @@ end
 
 for _, v in pairs(items['equipment']) do
     if v.stage == file_stage then
-        if v['setting'] then
+        if v.enabled and v['setting'] then
             local v2 = settings.startup[v['setting']].value
 
             if v2 >= v.min then
diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua
index 9354862..4d2ffb5 100644
--- a/PHI-CL/main.lua
+++ b/PHI-CL/main.lua
@@ -1,5 +1,4 @@
 local alpha_order = {'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm'}
--- local graphics_location = '__PHI-CL__/graphics/'
 local items = require 'config'
 local main = {}