This commit is contained in:
2025-04-27 00:33:01 +09:00
parent c26e8979ab
commit c6fcc0cab8
8 changed files with 60 additions and 58 deletions

View File

@@ -1,3 +1,10 @@
---------------------------------------------------------------------------------------------------
Version: 3.0.97
Date: 2025-04-29
Changes:
- [MB] Moved EQ group into MB group for settings.
--------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------
Version: 3.0.96 Version: 3.0.96
Date: 2025-04-29 Date: 2025-04-29

View File

@@ -263,7 +263,7 @@ local items = {
ref_name = 'battery-mk2-equipment', ref_name = 'battery-mk2-equipment',
tech = 'battery-mk2-equipment', tech = 'battery-mk2-equipment',
min = 3, min = 3,
max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
}, },
['discharge-defense-equipment'] = { ['discharge-defense-equipment'] = {
enabled = settings.startup['PHI-EQ'].value, enabled = settings.startup['PHI-EQ'].value,
@@ -274,7 +274,7 @@ local items = {
ref_name = 'discharge-defense-equipment', ref_name = 'discharge-defense-equipment',
tech = 'discharge-defense-equipment', tech = 'discharge-defense-equipment',
min = 2, min = 2,
max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
}, },
['energy-shield-equipment'] = { ['energy-shield-equipment'] = {
enabled = settings.startup['PHI-EQ'].value, enabled = settings.startup['PHI-EQ'].value,
@@ -285,7 +285,7 @@ local items = {
ref_name = 'energy-shield-mk2-equipment', ref_name = 'energy-shield-mk2-equipment',
tech = 'energy-shield-mk2-equipment', tech = 'energy-shield-mk2-equipment',
min = 3, min = 3,
max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
}, },
['exoskeleton-equipment'] = { ['exoskeleton-equipment'] = {
enabled = settings.startup['PHI-EQ'].value, enabled = settings.startup['PHI-EQ'].value,
@@ -296,7 +296,7 @@ local items = {
ref_name = 'exoskeleton-equipment', ref_name = 'exoskeleton-equipment',
tech = 'exoskeleton-equipment', tech = 'exoskeleton-equipment',
min = 2, min = 2,
max = math.min(tonumber(settings.startup['PHI-EQ-EQUIPMENT-TIER'].value) or 1, 2) max = math.min(tonumber(settings.startup['PHI-MB-EQUIPMENT-TIER'].value) or 1, 2)
}, },
['fission-reactor-equipment'] = { ['fission-reactor-equipment'] = {
enabled = settings.startup['PHI-EQ'].value, enabled = settings.startup['PHI-EQ'].value,
@@ -307,7 +307,7 @@ local items = {
ref_name = 'fission-reactor-equipment', ref_name = 'fission-reactor-equipment',
tech = 'fission-reactor-equipment', tech = 'fission-reactor-equipment',
min = 2, min = 2,
max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
}, },
['night-vision-equipment'] = { ['night-vision-equipment'] = {
enabled = settings.startup['PHI-EQ'].value, enabled = settings.startup['PHI-EQ'].value,
@@ -318,7 +318,7 @@ local items = {
ref_name = 'night-vision-equipment', ref_name = 'night-vision-equipment',
tech = 'night-vision-equipment', tech = 'night-vision-equipment',
min = 2, min = 2,
max = math.min(tonumber(settings.startup['PHI-EQ-EQUIPMENT-TIER'].value) or 1, 2) max = math.min(tonumber(settings.startup['PHI-MB-EQUIPMENT-TIER'].value) or 1, 2)
}, },
['personal-laser-defense-equipment'] = { ['personal-laser-defense-equipment'] = {
enabled = settings.startup['PHI-EQ'].value, enabled = settings.startup['PHI-EQ'].value,
@@ -329,7 +329,7 @@ local items = {
ref_name = 'personal-laser-defense-equipment', ref_name = 'personal-laser-defense-equipment',
tech = 'personal-laser-defense-equipment', tech = 'personal-laser-defense-equipment',
min = 2, min = 2,
max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
}, },
['personal-roboport-equipment'] = { ['personal-roboport-equipment'] = {
enabled = settings.startup['PHI-EQ'].value, enabled = settings.startup['PHI-EQ'].value,
@@ -340,7 +340,7 @@ local items = {
ref_name = 'personal-roboport-mk2-equipment', ref_name = 'personal-roboport-mk2-equipment',
tech = 'personal-roboport-mk2-equipment', tech = 'personal-roboport-mk2-equipment',
min = 3, min = 3,
max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
}, },
['solar-panel-equipment'] = { ['solar-panel-equipment'] = {
enabled = settings.startup['PHI-EQ'].value, enabled = settings.startup['PHI-EQ'].value,
@@ -351,7 +351,7 @@ local items = {
ref_name = 'solar-panel-equipment', ref_name = 'solar-panel-equipment',
tech = 'solar-panel-equipment', tech = 'solar-panel-equipment',
min = 2, min = 2,
max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value, max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value,
base = 30, base = 30,
graphics_name = 'solar-panel-equipment' graphics_name = 'solar-panel-equipment'
} }
@@ -859,7 +859,7 @@ if mods and mods['space-age'] then
ref_name = 'fusion-reactor-equipment', ref_name = 'fusion-reactor-equipment',
tech = 'fusion-reactor-equipment', tech = 'fusion-reactor-equipment',
min = 2, min = 2,
max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
} }
items['equipment']['toolbelt-equipment'] = { items['equipment']['toolbelt-equipment'] = {
@@ -871,7 +871,7 @@ if mods and mods['space-age'] then
ref_name = 'toolbelt-equipment', ref_name = 'toolbelt-equipment',
tech = 'toolbelt-equipment', tech = 'toolbelt-equipment',
min = 2, min = 2,
max = math.min(tonumber(settings.startup['PHI-EQ-EQUIPMENT-TIER'].value) or 1, 2) max = math.min(tonumber(settings.startup['PHI-MB-EQUIPMENT-TIER'].value) or 1, 2)
} }
items['equipment']['battery-equipment'].ref_name = 'battery-mk3-equipment' items['equipment']['battery-equipment'].ref_name = 'battery-mk3-equipment'

View File

@@ -1,6 +1,6 @@
{ {
"name": "PHI-CL", "name": "PHI-CL",
"version": "3.0.96", "version": "3.0.97",
"factorio_version": "2.0", "factorio_version": "2.0",
"date": "2025-04-29", "date": "2025-04-29",
"title": "Phidias Collection", "title": "Phidias Collection",

View File

@@ -102,12 +102,11 @@ PHI-MB-MACHINE=[color=255,254,42]MBM[/color]
PHI-MB-MACHINE-TIER=[color=54,228,255]MBM1[/color] PHI-MB-MACHINE-TIER=[color=54,228,255]MBM1[/color]
PHI-MB-WEAPON=[color=255,254,42]MBW[/color] PHI-MB-WEAPON=[color=255,254,42]MBW[/color]
PHI-MB-WEAPON-TIER=[color=54,228,255]MBW1[/color] PHI-MB-WEAPON-TIER=[color=54,228,255]MBW1[/color]
PHI-MB-EQUIPMENT=[color=255,254,42]MBQ[/color]
PHI-EQ=[color=255,254,42]EQ[/color] PHI-MB-EQUIPMENT-TIER=[color=54,228,255]MBQ1[/color]
PHI-EQ-POWER-TIER=[color=54,228,255]EQ1[/color] PHI-MB-EQUIPMENT-UTILITY-TIER=[color=54,228,255]MBQ2[/color]
PHI-EQ-UTILITY-TIER=[color=54,228,255]EQ2[/color] PHI-MB-EQUIPMENT-ARMOR=[color=54,228,255]MBQ3[/color]
PHI-EQ-ARMOR=[color=54,228,255]EQ3[/color] PHI-MB-EQUIPMENT-SIZE=[color=54,228,255]MBQ4[/color]
PHI-EQ-SIZE=[color=54,228,255]EQ4[/color]
PHI-MI=[color=255,254,42]MI[/color] PHI-MI=[color=255,254,42]MI[/color]
PHI-MI-LANDFILL=[color=54,228,255]MI1[/color] PHI-MI-LANDFILL=[color=54,228,255]MI1[/color]
@@ -145,12 +144,11 @@ PHI-MB-MACHINE=[color=255,254,42]Enable compound machine[/color]
PHI-MB-MACHINE-TIER=Machine tier PHI-MB-MACHINE-TIER=Machine tier
PHI-MB-WEAPON=[color=255,254,42]Enable military defense[/color] PHI-MB-WEAPON=[color=255,254,42]Enable military defense[/color]
PHI-MB-WEAPON-TIER=Military tier PHI-MB-WEAPON-TIER=Military tier
PHI-MB-EQUIPMENT=[color=255,254,42]Armor equipment[/color]
PHI-EQ=[color=255,254,42]Armor equipment[/color] PHI-MB-EQUIPMENT-TIER=Equipment tier
PHI-EQ-POWER-TIER=Equipment tier PHI-MB-EQUIPMENT-UTILITY-TIER=Utility tier
PHI-EQ-UTILITY-TIER=Utility tier PHI-MB-EQUIPMENT-ARMOR=Enable armor
PHI-EQ-ARMOR=Enable armor PHI-MB-EQUIPMENT-SIZE=Small equipment
PHI-EQ-SIZE=Small equipment
PHI-MI=[color=255,254,42]Miscellaneous change[/color] PHI-MI=[color=255,254,42]Miscellaneous change[/color]
PHI-MI-LANDFILL=Landfill requirement PHI-MI-LANDFILL=Landfill requirement
@@ -179,7 +177,7 @@ PHI-CT-TILE=Enable map generation world tile
PHI-CT-TILE-CHOICE=Map generation tile choice PHI-CT-TILE-CHOICE=Map generation tile choice
[mod-setting-description] [mod-setting-description]
PHI-EQ-SIZE=1x1 PHI-MB-EQUIPMENT-SIZE=1x1
PHI-MI-LANDFILL=50 PHI-MI-LANDFILL=50
PHI-MI-ROCKET-CAPACITY='000 KG PHI-MI-ROCKET-CAPACITY='000 KG
PHI-SA-SPOIL-FREEZE-RATIO=x0.1 PHI-SA-SPOIL-FREEZE-RATIO=x0.1

View File

@@ -102,12 +102,11 @@ PHI-MB-MACHINE=[color=255,254,42]複合機械を有効にする[/color]
PHI-MB-MACHINE-TIER=機械の最高等級 PHI-MB-MACHINE-TIER=機械の最高等級
PHI-MB-WEAPON=[color=255,254,42]軍事防衛を有効にする[/color] PHI-MB-WEAPON=[color=255,254,42]軍事防衛を有効にする[/color]
PHI-MB-WEAPON-TIER=軍事防衛の最高等級 PHI-MB-WEAPON-TIER=軍事防衛の最高等級
PHI-MB-EQUIPMENT=[color=255,254,42]アーマー設備を有効にする[/color]
PHI-EQ=[color=255,254,42]アーマー設備を有効にする[/color] PHI-MB-EQUIPMENT-TIER=アーマー設備の最高等級
PHI-EQ-POWER-TIER=アーマー設備の最高等級 PHI-MB-EQUIPMENT-UTILITY-TIER=ユーティリティモジュールの最高等級
PHI-EQ-UTILITY-TIER=ユーティリティモジュールの最高等級 PHI-MB-EQUIPMENT-ARMOR=アーマーを有効にする
PHI-EQ-ARMOR=アーマーを有効にする PHI-MB-EQUIPMENT-SIZE=小さなアーマー設備
PHI-EQ-SIZE=小さなアーマー設備
PHI-MI=[color=255,254,42]その他の変更[/color] PHI-MI=[color=255,254,42]その他の変更[/color]
PHI-MI-LANDFILL=埋立地要件 PHI-MI-LANDFILL=埋立地要件

View File

@@ -102,12 +102,11 @@ PHI-MB-MACHINE=[color=255,254,42]啟用複合機器[/color]
PHI-MB-MACHINE-TIER=機器的最高等級 PHI-MB-MACHINE-TIER=機器的最高等級
PHI-MB-WEAPON=[color=255,254,42]啟用軍事防禦[/color] PHI-MB-WEAPON=[color=255,254,42]啟用軍事防禦[/color]
PHI-MB-WEAPON-TIER=軍事防禦的最高等級 PHI-MB-WEAPON-TIER=軍事防禦的最高等級
PHI-MB-EQUIPMENT=[color=255,254,42]啟用裝甲設備[/color]
PHI-EQ=[color=255,254,42]啟用裝甲設備[/color] PHI-MB-EQUIPMENT-TIER=裝甲設備的最高等級
PHI-EQ-POWER-TIER=裝甲設備的最高等級 PHI-MB-EQUIPMENT-UTILITY-TIER=雜項的最高等級
PHI-EQ-UTILITY-TIER=雜項的最高等級 PHI-MB-EQUIPMENT-ARMOR=啟用護甲
PHI-EQ-ARMOR=啟用護甲 PHI-MB-EQUIPMENT-SIZE=小型裝甲裝備
PHI-EQ-SIZE=小型裝甲裝備
PHI-MI=[color=255,254,42]雜項小變化[/color] PHI-MI=[color=255,254,42]雜項小變化[/color]
PHI-MI-LANDFILL=人造陸地需求 PHI-MI-LANDFILL=人造陸地需求

View File

@@ -102,12 +102,11 @@ PHI-MB-MACHINE=[color=255,254,42]啟用複合機器[/color]
PHI-MB-MACHINE-TIER=機器的最高等級 PHI-MB-MACHINE-TIER=機器的最高等級
PHI-MB-WEAPON=[color=255,254,42]啟用軍事防禦[/color] PHI-MB-WEAPON=[color=255,254,42]啟用軍事防禦[/color]
PHI-MB-WEAPON-TIER=軍事防禦的最高等級 PHI-MB-WEAPON-TIER=軍事防禦的最高等級
PHI-MB-EQUIPMENT=[color=255,254,42]啟用裝甲設備[/color]
PHI-EQ=[color=255,254,42]啟用裝甲設備[/color] PHI-MB-EQUIPMENT-TIER=裝甲設備的最高等級
PHI-EQ-POWER-TIER=裝甲設備的最高等級 PHI-MB-EQUIPMENT-UTILITY-TIER=雜項的最高等級
PHI-EQ-UTILITY-TIER=雜項的最高等級 PHI-MB-EQUIPMENT-ARMOR=啟用護甲
PHI-EQ-ARMOR=啟用護甲 PHI-MB-EQUIPMENT-SIZE=小型裝甲裝備
PHI-EQ-SIZE=小型裝甲裝備
PHI-MI=[color=255,254,42]雜項小變化[/color] PHI-MI=[color=255,254,42]雜項小變化[/color]
PHI-MI-LANDFILL=人造陸地需求 PHI-MI-LANDFILL=人造陸地需求

View File

@@ -69,41 +69,41 @@ data:extend({
order = 'AC01' order = 'AC01'
}, { }, {
type = 'bool-setting', type = 'bool-setting',
name = 'PHI-EQ', name = 'PHI-MB-EQUIPMENT',
setting_type = 'startup', setting_type = 'startup',
default_value = false, default_value = false,
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ'}, {'mod-setting-name.PHI-EQ'}}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT'}, {'mod-setting-name.PHI-MB-EQUIPMENT'}},
order = 'B00' order = 'AD00'
}, { }, {
type = 'int-setting', type = 'int-setting',
name = 'PHI-EQ-EQUIPMENT-TIER', name = 'PHI-MB-EQUIPMENT-TIER',
setting_type = 'startup', setting_type = 'startup',
default_value = 2, default_value = 2,
allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-EQUIPMENT-TIER'}, {'mod-setting-name.PHI-EQ-EQUIPMENT-TIER'}}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT-TIER'}, {'mod-setting-name.PHI-MB-EQUIPMENT-TIER'}},
order = 'B01' order = 'AD01'
}, { }, {
type = 'int-setting', type = 'int-setting',
name = 'PHI-EQ-UTILITY-TIER', name = 'PHI-MB-EQUIPMENT-UTILITY-TIER',
setting_type = 'startup', setting_type = 'startup',
default_value = 2, default_value = 2,
allowed_values = {1, 2}, allowed_values = {1, 2},
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-UTILITY-TIER'}, {'mod-setting-name.PHI-EQ-UTILITY-TIER'}}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT-UTILITY-TIER'}, {'mod-setting-name.PHI-MB-EQUIPMENT-UTILITY-TIER'}},
order = 'B02' order = 'AD02'
}, { }, {
type = 'bool-setting', type = 'bool-setting',
name = 'PHI-EQ-ARMOR', name = 'PHI-MB-EQUIPMENT-ARMOR',
setting_type = 'startup', setting_type = 'startup',
default_value = true, default_value = true,
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-ARMOR'}, {'mod-setting-name.PHI-EQ-ARMOR'}}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT-ARMOR'}, {'mod-setting-name.PHI-MB-EQUIPMENT-ARMOR'}},
order = 'B03' order = 'AD03'
}, { }, {
type = 'bool-setting', type = 'bool-setting',
name = 'PHI-EQ-SIZE', name = 'PHI-MB-EQUIPMENT-SIZE',
setting_type = 'startup', setting_type = 'startup',
default_value = false, default_value = false,
localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-SIZE'}, {'mod-setting-name.PHI-EQ-SIZE'}}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT-SIZE'}, {'mod-setting-name.PHI-MB-EQUIPMENT-SIZE'}},
order = 'B04' order = 'AD04'
}, { }, {
type = 'bool-setting', type = 'bool-setting',
name = 'PHI-MI', name = 'PHI-MI',