diff --git a/.gitignore b/.gitignore index c6f9a44..83717a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .vscode/settings.json +PHI-CL/.vscode/settings.json diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index 812ad10..346becb 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -181,6 +181,67 @@ if settings.startup['PHI-CT'].value then result = 'large-area-electric-mining-drill' }}) end + + if settings.startup['PHI-CT-LINKED'].value then + local item = table.deepcopy(data.raw['item']['linked-chest']) + item.order = 'a[items]-d[linked-chest]' + data:extend({item}) + + local entity = table.deepcopy(data.raw['linked-container']['linked-chest']) + entity.inventory_size = 48 + entity.gui_mode = 'all' + data:extend({entity}) + + data:extend({{ + type = 'recipe', + name = 'linked-chest', + energy_required = 2, + enabled = false, + ingredients = {{'steel-chest', 1}}, + result = 'linked-chest' + }}) + + data:extend({{ + type = 'recipe', + name = 'linked-chest-return', + energy_required = 2, + enabled = false, + ingredients = {{'linked-chest', 1}}, + result = 'steel-chest' + }}) + + table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='linked-chest'}) + table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='linked-chest-return'}) + end + + if settings.startup['PHI-CT-LOADER'].value then + data.raw.recipe['loader'].hidden = false + data.raw.recipe['fast-loader'].hidden = false + data.raw.recipe['express-loader'].hidden = false + + data.raw.recipe['loader'].ingredients = { + {'iron-plate', 5}, + {'electronic-circuit', 5}, + {'transport-belt', 2}, + {'inserter', 2} + } + data.raw.recipe['fast-loader'].ingredients = { + {'iron-gear-wheel', 10}, + {'electronic-circuit', 10}, + {'advanced-circuit', 1}, + {'loader', 1} + } + + data.raw.recipe['express-loader'].ingredients = { + {'iron-gear-wheel', 10}, + {'advanced-circuit', 10}, + {'fast-loader', 1} + } + + table.insert(data.raw.technology['logistics'].effects, {type='unlock-recipe', recipe='loader'}) + table.insert(data.raw.technology['logistics-2'].effects, {type='unlock-recipe', recipe='fast-loader'}) + table.insert(data.raw.technology['logistics-3'].effects, {type='unlock-recipe', recipe='express-loader'}) + end end if settings.startup['PHI-EQ-ARMOR'].value then diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 8cb3bfd..9a21c9c 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -90,35 +90,6 @@ if settings.startup['PHI-MI'].value then data.raw['repair-tool']['repair-pack'].durability = 300 * settings.startup['PHI-MI-REPAIR'].value end - if settings.startup['PHI-MI-LOADER'].value then - data.raw.recipe['loader'].hidden = false - data.raw.recipe['fast-loader'].hidden = false - data.raw.recipe['express-loader'].hidden = false - - data.raw.recipe['loader'].ingredients = { - {'iron-plate', 5}, - {'electronic-circuit', 5}, - {'transport-belt', 2}, - {'inserter', 2} - } - data.raw.recipe['fast-loader'].ingredients = { - {'iron-gear-wheel', 10}, - {'electronic-circuit', 10}, - {'advanced-circuit', 1}, - {'loader', 1} - } - - data.raw.recipe['express-loader'].ingredients = { - {'iron-gear-wheel', 10}, - {'advanced-circuit', 10}, - {'fast-loader', 1} - } - - table.insert(data.raw.technology['logistics'].effects, {type='unlock-recipe', recipe='loader'}) - table.insert(data.raw.technology['logistics-2'].effects, {type='unlock-recipe', recipe='fast-loader'}) - table.insert(data.raw.technology['logistics-3'].effects, {type='unlock-recipe', recipe='express-loader'}) - end - data.raw.recipe['landfill'].ingredients = {{'stone', tonumber(settings.startup['PHI-MI-LANDFILL'].value)}} if settings.startup['PHI-MI-EFFCY'].value then diff --git a/PHI-CL/info.json b/PHI-CL/info.json index ac5d3a8..6d28272 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -1,8 +1,8 @@ { "name": "PHI-CL", - "version": "2.0.12", + "version": "2.0.13", "factorio_version": "1.1", - "date": "2024-08-10", + "date": "2024-08-11", "title": "Phidias Collection", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index a02ebad..79e3e3a 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -863,7 +863,6 @@ PHI-EQ-NIGHT-TIER=Nightvision equipment, max grade PHI-EQ-EXO-TIER=Exoskeleton, max grade PHI-EQ-ARMOR=Power armor 3 enable -PHI-MI-LOADER=Loader enable PHI-MI-LANDFILL=Landfill requirement PHI-MI-EFFCY=Efficiency module efficiency PHI-MI-NUCLEAR=Nuclear adjustable output @@ -906,6 +905,7 @@ PHI-CT-TILE=World tile PHI-CT-TILE-CHOICE=Tile choice PHI-CT-TRASH=Trash chest PHI-CT-MINER=Large miner +PHI-CT-LOADER=Loader enable [mod-setting-description] PHI-EN-SOLAR-TIER=Default 8 ; Disable 1 diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index e6729b4..e2a452e 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -863,7 +863,6 @@ PHI-EQ-NIGHT-TIER=暗視モジュールの最高等級 PHI-EQ-EXO-TIER=強化外骨格モジュールの最高等級 PHI-EQ-ARMOR=パワーアーマー3代を有効にする -PHI-MI-LOADER=ローダーを有効にする PHI-MI-LANDFILL=埋立地要件 PHI-MI-EFFCY=エネルギー効率モジュール効率 PHI-MI-NUCLEAR=原子炉出力の調整可能 @@ -906,6 +905,7 @@ PHI-CT-TILE=ワールドタイル PHI-CT-TILE-CHOICE=ドタイル選択 PHI-CT-TRASH=ごみチェスト PHI-CT-MINER=大型電動掘削機 +PHI-CT-LOADER=ローダーを有効にする [mod-setting-description] PHI-EN-SOLAR-TIER=デフォルト 8 ; 止める 1 diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index a59c6ee..82cfc3d 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -863,7 +863,6 @@ PHI-EQ-NIGHT-TIER=夜視鏡的最高等級 PHI-EQ-EXO-TIER=動力外骨骼的最高等級 PHI-EQ-ARMOR=動力護甲3代啟用 -PHI-MI-LOADER=裝卸機啟用 PHI-MI-LANDFILL=人造陸地需求 PHI-MI-EFFCY=節能組件效率 PHI-MI-NUCLEAR=核能反應爐可調輸出 @@ -906,6 +905,7 @@ PHI-CT-TILE=世界地磚 PHI-CT-TILE-CHOICE=地磚選擇 PHI-CT-TRASH=垃圾箱 PHI-CT-MINER=大型電能採礦機 +PHI-CT-LOADER=裝卸機啟用 [mod-setting-description] PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index a59c6ee..82cfc3d 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -863,7 +863,6 @@ PHI-EQ-NIGHT-TIER=夜視鏡的最高等級 PHI-EQ-EXO-TIER=動力外骨骼的最高等級 PHI-EQ-ARMOR=動力護甲3代啟用 -PHI-MI-LOADER=裝卸機啟用 PHI-MI-LANDFILL=人造陸地需求 PHI-MI-EFFCY=節能組件效率 PHI-MI-NUCLEAR=核能反應爐可調輸出 @@ -906,6 +905,7 @@ PHI-CT-TILE=世界地磚 PHI-CT-TILE-CHOICE=地磚選擇 PHI-CT-TRASH=垃圾箱 PHI-CT-MINER=大型電能採礦機 +PHI-CT-LOADER=裝卸機啟用 [mod-setting-description] PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 diff --git a/PHI-CL/migrations/PHI-CL_1.1.9.json b/PHI-CL/migrations/PHI-CL_1.1.9.json deleted file mode 100644 index 4af8d2e..0000000 --- a/PHI-CL/migrations/PHI-CL_1.1.9.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "entity": - [ - ["solar-panel-mk2", "solar-panel-2"], - ["solar-panel-mk3", "solar-panel-3"], - ["solar-panel-mk4", "solar-panel-4"], - ["solar-panel-mk5", "solar-panel-5"], - ["solar-panel-mk6", "solar-panel-6"], - ["solar-panel-mk7", "solar-panel-7"], - ["solar-panel-mk8", "solar-panel-8"], - ["accumulator-mk2", "accumulator-2"], - ["accumulator-mk3", "accumulator-3"], - ["accumulator-mk4", "accumulator-4"], - ["accumulator-mk5", "accumulator-5"], - ["accumulator-mk6", "accumulator-6"], - ["accumulator-mk7", "accumulator-7"], - ["accumulator-mk8", "accumulator-8"] - ], - "item": - [ - ["solar-panel-mk2", "solar-panel-2"], - ["solar-panel-mk3", "solar-panel-3"], - ["solar-panel-mk4", "solar-panel-4"], - ["solar-panel-mk5", "solar-panel-5"], - ["solar-panel-mk6", "solar-panel-6"], - ["solar-panel-mk7", "solar-panel-7"], - ["solar-panel-mk8", "solar-panel-8"], - ["accumulator-mk2", "accumulator-2"], - ["accumulator-mk3", "accumulator-3"], - ["accumulator-mk4", "accumulator-4"], - ["accumulator-mk5", "accumulator-5"], - ["accumulator-mk6", "accumulator-6"], - ["accumulator-mk7", "accumulator-7"], - ["accumulator-mk8", "accumulator-8"] - ] - } \ No newline at end of file diff --git a/PHI-CL/migrations/migrations.lua b/PHI-CL/migrations/migrations.lua index d7dbc1b..1652f3b 100644 --- a/PHI-CL/migrations/migrations.lua +++ b/PHI-CL/migrations/migrations.lua @@ -114,5 +114,22 @@ for _, force in pairs(game.forces) do recipes['large-area-electric-mining-drill'].enabled = true recipes['large-area-electric-mining-drill'].reload() end + + if settings.startup['PHI-CT-LOADER'].value then + if technologies['logistics'].researched then + recipes['loader'].enabled = true + recipes['loader'].reload() + end + + if technologies['logistics-2'].researched then + recipes['fast-loader'].enabled = true + recipes['fast-loader'].reload() + end + + if technologies['logistics-3'].researched then + recipes['express-loader'].enabled = true + recipes['express-loader'].reload() + end + end end end diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index d14182c..dcb9ddb 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -220,12 +220,6 @@ data:extend({ setting_type = 'startup', default_value = true, order = 'E09' - }, { - type = 'bool-setting', - name = 'PHI-MI-LOADER', - setting_type = 'startup', - default_value = true, - order = 'F01' }, { type = 'int-setting', name = 'PHI-MI-LANDFILL', @@ -233,59 +227,59 @@ data:extend({ default_value = 20, minimum_value = 1, maximum_value = 40, - order = 'F02' + order = 'F01' }, { type = 'bool-setting', name = 'PHI-MI-EFFCY', setting_type = 'startup', default_value = true, - order = 'F03' + order = 'F02' }, { type = 'bool-setting', name = 'PHI-MI-NUCLEAR', setting_type = 'startup', default_value = true, - order = 'F04' + order = 'F03' }, { type = 'bool-setting', name = 'PHI-MI-BOILER', setting_type = 'startup', default_value = true, - order = 'F05' + order = 'F04' }, { type = 'bool-setting', name = 'PHI-MI-CHEST', setting_type = 'startup', default_value = true, - order = 'F06' + order = 'F05' }, { type = 'int-setting', name = 'PHI-MI-REPAIR', setting_type = 'startup', default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'F07' + order = 'F06' }, { type = 'int-setting', name = 'PHI-MI-PIPE', setting_type = 'startup', default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'F08' + order = 'F07' }, { type = 'int-setting', name = 'PHI-MI-ROBOT', setting_type = 'startup', default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'F09' + order = 'F08' }, { type = 'int-setting', name = 'PHI-MI-TRAIN', setting_type = 'startup', default_value = 1, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'F10' + order = 'F09' }, { type = 'int-setting', name = 'PHI-RS-RECIPE-1', @@ -484,6 +478,18 @@ data:extend({ setting_type = 'startup', default_value = true, order = 'JA04' + }, { + type = 'bool-setting', + name = 'PHI-CT-LINKED', + setting_type = 'startup', + default_value = true, + order = 'JA05' + }, { + type = 'bool-setting', + name = 'PHI-MI-LOADER', + setting_type = 'startup', + default_value = true, + order = 'JA06' }, { type = 'bool-setting', name = 'PHI-CT-TILE',