From b01a77004e6dd38c6f163df06d945d3c36f9b902 Mon Sep 17 00:00:00 2001
From: PHIDIAS <phidias@aperx.org>
Date: Wed, 21 May 2025 22:48:34 +0900
Subject: [PATCH] .

---
 PHI-CL/changelog.txt |  1 +
 PHI-CL/settings.lua  | 23 ++++-------------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt
index e04d77e..1081201 100644
--- a/PHI-CL/changelog.txt
+++ b/PHI-CL/changelog.txt
@@ -4,6 +4,7 @@ Date: 2025-05-24
 
   Changes:
     - [MB] Combined a tier setting for power.
+    - [MB] Combined setting for compound machine and turret.
     - [SA] Further changes for the space age generic settings.
     - [SA] Support for heat pipe heat radius is dropped.
 
diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua
index 91b5e14..3d84067 100644
--- a/PHI-CL/settings.lua
+++ b/PHI-CL/settings.lua
@@ -44,28 +44,13 @@ data:extend({
   allowed_values = {1, 2, 3},
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-MACHINE-TIER'}, {'mod-setting-name.PHI-MB-MACHINE-TIER'}},
   order = 'AB01'
-}, {
-  type = 'bool-setting',
-  name = 'PHI-MB-WEAPON',
-  setting_type = 'startup',
-  default_value = false,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-WEAPON'}, {'mod-setting-name.PHI-MB-WEAPON'}},
-  order = 'AC00'
-}, {
-  type = 'int-setting',
-  name = 'PHI-MB-WEAPON-TIER',
-  setting_type = 'startup',
-  default_value = 3,
-  allowed_values = {1, 2, 3},
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-WEAPON-TIER'}, {'mod-setting-name.PHI-MB-WEAPON-TIER'}},
-  order = 'AC01'
 }, {
   type = 'bool-setting',
   name = 'PHI-MB-EQUIPMENT',
   setting_type = 'startup',
   default_value = false,
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT'}, {'mod-setting-name.PHI-MB-EQUIPMENT'}},
-  order = 'AD00'
+  order = 'AC00'
 }, {
   type = 'int-setting',
   name = 'PHI-MB-EQUIPMENT-TIER',
@@ -73,21 +58,21 @@ data:extend({
   default_value = 2,
   allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT-TIER'}, {'mod-setting-name.PHI-MB-EQUIPMENT-TIER'}},
-  order = 'AD01'
+  order = 'AC01'
 }, {
   type = 'bool-setting',
   name = 'PHI-MB-EQUIPMENT-ARMOR',
   setting_type = 'startup',
   default_value = true,
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT-ARMOR'}, {'mod-setting-name.PHI-MB-EQUIPMENT-ARMOR'}},
-  order = 'AD02'
+  order = 'AC02'
 }, {
   type = 'bool-setting',
   name = 'PHI-MB-EQUIPMENT-SIZE',
   setting_type = 'startup',
   default_value = false,
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT-SIZE'}, {'mod-setting-name.PHI-MB-EQUIPMENT-SIZE'}},
-  order = 'AD03'
+  order = 'AC03'
 }, {
   type = 'bool-setting',
   name = 'PHI-MI',