From f8394e3008a06724a0fa15911e9251a26ec27d67 Mon Sep 17 00:00:00 2001
From: PHIDIAS <phidias@aperx.org>
Date: Fri, 18 Apr 2025 19:06:45 +0900
Subject: [PATCH] .

---
 PHI-CL/changelog.txt           | 1 +
 PHI-CL/control.lua             | 2 +-
 PHI-CL/data-final-fixes.lua    | 6 +++---
 PHI-CL/locale/en/locale.cfg    | 2 --
 PHI-CL/locale/ja/locale.cfg    | 1 -
 PHI-CL/locale/zh-CN/locale.cfg | 1 -
 PHI-CL/locale/zh-TW/locale.cfg | 1 -
 PHI-CL/settings.lua            | 7 -------
 8 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt
index 6cfd691..80826f9 100644
--- a/PHI-CL/changelog.txt
+++ b/PHI-CL/changelog.txt
@@ -5,6 +5,7 @@ Date: 2025-04-20
   Changes:
     - [CT] Changed the hidden status of some creative items.
     - [CL] Changed the some locale logic.
+    - [CL] Moved some grouping of the settings.
     - [MI] Fixed heating tower also applied the nuclear reactor scale energy usage flag.
 
 ---------------------------------------------------------------------------------------------------
diff --git a/PHI-CL/control.lua b/PHI-CL/control.lua
index 2a9f94d..9a50db0 100644
--- a/PHI-CL/control.lua
+++ b/PHI-CL/control.lua
@@ -68,7 +68,7 @@ if settings.startup['PHI-CT'].value then
     script.on_event(defines.events.on_player_cheat_mode_disabled, hidden_recipe_enable)
 end
 
-if settings.startup['PHI-CT'].value or settings.startup['PHI-MI'].value or (settings.startup['PHI-SA'].value and settings.startup['PHI-SA-RESTRICTION'].value) or (settings.startup['PHI-VP'].value and settings.startup['PHI-VP-MAIN'].value) then
+if settings.startup['PHI-CT'].value or settings.startup['PHI-MI'].value or (settings.startup['PHI-SA'].value and settings.startup['PHI-SA-RESTRICTION'].value) or settings.startup['PHI-VP'].value then
     function gui_create(player)
         if player.gui.relative.inserter_config then
             player.gui.relative.inserter_config.destroy()
diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua
index f153e65..83cf9b5 100644
--- a/PHI-CL/data-final-fixes.lua
+++ b/PHI-CL/data-final-fixes.lua
@@ -2,15 +2,15 @@
 -- local main = require 'main'
 
 do
-    local vp = settings.startup['PHI-VP'].value and settings.startup['PHI-VP-MAIN'].value
     local sa = settings.startup['PHI-SA'].value and settings.startup['PHI-SA-GENERIC'].value
+    local p = settings.startup['PHI-VP'].value or sa
 
     for k, v in pairs(data.raw.recipe) do
-        if vp and v.category == 'recycling' then
+        if settings.startup['PHI-VP'].value and v.category == 'recycling' then
             data.raw.recipe[k] = nil
         end
 
-        if (vp or sa) and v.maximum_productivity then
+        if p and v.maximum_productivity then
             v.maximum_productivity = 999
         end
     end
diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg
index f360eed..f687982 100644
--- a/PHI-CL/locale/en/locale.cfg
+++ b/PHI-CL/locale/en/locale.cfg
@@ -134,7 +134,6 @@ PHI-SA-RESTRICTION=[color=54,228,255]SA7[/color]
 PHI-SA-GENERIC=[color=54,228,255]SA8[/color]
 
 PHI-VP=[color=255,254,42]VP[/color]
-PHI-VP-MAIN=[color=54,228,255]VP1[/color]
 
 PHI-CT=[color=255,254,42]CT[/color]
 PHI-CT-TILE=[color=54,228,255]CT1[/color]
@@ -182,7 +181,6 @@ PHI-SA-QUALITY=Quality chance multiplier
 PHI-SA-MAX-QUALITY=Max quality
 
 PHI-VP=[color=255,254,42]Vanilla Plus[/color]
-PHI-VP-MAIN=Main changes
 
 PHI-CT=[color=255,254,42]Creative testing tools[/color]
 PHI-CT-TILE=Enable map generation world tile
diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg
index d81317b..3524c4a 100644
--- a/PHI-CL/locale/ja/locale.cfg
+++ b/PHI-CL/locale/ja/locale.cfg
@@ -134,7 +134,6 @@ PHI-SA-QUALITY=品質確率マルチプライヤ
 PHI-SA-MAX-QUALITY=最大品質
 
 PHI-VP=[color=255,254,42]バニラプラス[/color]
-PHI-VP-MAIN=主な変更点
 
 PHI-CT=[color=255,254,42]クリエイティブテストツール[/color]
 PHI-CT-TILE=マップ生成ワールドタイルを有効にする
diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg
index d84dcd5..d2fffcc 100644
--- a/PHI-CL/locale/zh-CN/locale.cfg
+++ b/PHI-CL/locale/zh-CN/locale.cfg
@@ -134,7 +134,6 @@ PHI-SA-QUALITY=品質概率倍數
 PHI-SA-MAX-QUALITY=最大品質
 
 PHI-VP=[color=255,254,42]原版加[/color]
-PHI-VP-MAIN=主要更改
 
 PHI-CT=[color=255,254,42]創意測試工具[/color]
 PHI-CT-TILE=啟用地圖生成世界地磚
diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg
index d84dcd5..d2fffcc 100644
--- a/PHI-CL/locale/zh-TW/locale.cfg
+++ b/PHI-CL/locale/zh-TW/locale.cfg
@@ -134,7 +134,6 @@ PHI-SA-QUALITY=品質概率倍數
 PHI-SA-MAX-QUALITY=最大品質
 
 PHI-VP=[color=255,254,42]原版加[/color]
-PHI-VP-MAIN=主要更改
 
 PHI-CT=[color=255,254,42]創意測試工具[/color]
 PHI-CT-TILE=啟用地圖生成世界地磚
diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua
index d16032f..93b3976 100644
--- a/PHI-CL/settings.lua
+++ b/PHI-CL/settings.lua
@@ -286,13 +286,6 @@ data:extend({
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-VP'}, {'mod-setting-name.PHI-VP'}},
   order = 'E00'
 },  {
-  type = 'bool-setting',
-  name = 'PHI-VP-MAIN',
-  setting_type = 'startup',
-  default_value = false,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-VP-MAIN'}, {'mod-setting-name.PHI-VP-MAIN'}},
-  order = 'E01'
-}, {
   type = 'bool-setting',
   name = 'PHI-CT',
   setting_type = 'startup',