diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..88a1a01 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,32 @@ +{ + "factorio.versions": [ + { + "name": "Steam", + "factorioPath": "C:\\Program Files (x86)\\Steam\\steamapps\\common\\Factorio\\bin\\x64\\factorio.exe", + "active": true + } + ], + "Lua.workspace.library": [ + "c:\\Program Files (x86)\\Steam\\steamapps\\common\\Factorio\\data", + "c:/Users/admin/AppData/Roaming/Code/User/workspaceStorage/dc51ebede133ecdead910d8af67219c2/justarandomgeek.factoriomod-debug/sumneko-3rd/factorio/library" + ], + "Lua.workspace.userThirdParty": [ + "c:\\Users\\admin\\AppData\\Roaming\\Code\\User\\workspaceStorage\\dc51ebede133ecdead910d8af67219c2\\justarandomgeek.factoriomod-debug\\sumneko-3rd" + ], + "Lua.runtime.builtin": { + "io": "disable", + "os": "disable", + "math": "disable", + "debug": "disable", + "coroutine": "disable", + "package": "disable" + }, + "Lua.runtime.version": "Lua 5.2", + "Lua.diagnostics.globals": [ + "__Profiler" + ], + "Lua.runtime.special": { + "__object_name": "type" + }, + "Lua.runtime.plugin": "c:/Users/admin/AppData/Roaming/Code/User/workspaceStorage/dc51ebede133ecdead910d8af67219c2/justarandomgeek.factoriomod-debug/sumneko-3rd/factorio/plugin.lua" +} \ No newline at end of file diff --git a/PHI-EN/config.lua b/PHI-EN/config.lua index eda24b9..11a2b46 100644 --- a/PHI-EN/config.lua +++ b/PHI-EN/config.lua @@ -32,6 +32,38 @@ local items = { ref_name = 'steam-engine', min = 2, max = 5 + }, + ['nuclear-reactor'] = { + enabled = true, + type = 'reactor', + name = 'nuclear-reactor', + ref_name = 'nuclear-reactor', + min = 2, + max = 5 + }, + ['heat-pipe'] = { + enabled = true, + type = 'heat-pipe', + name = 'heat-pipe', + ref_name = 'heat-pipe', + min = 2, + max = 5 + }, + ['heat-exchanger'] = { + enabled = true, + type = 'boiler', + name = 'heat-exchanger', + ref_name = 'heat-exchanger', + min = 2, + max = 5 + }, + ['steam-turbine'] = { + enabled = true, + type = 'generator', + name = 'steam-turbine', + ref_name = 'steam-turbine', + min = 2, + max = 5 } } diff --git a/PHI-EN/data-updates.lua b/PHI-EN/data-updates.lua index 4eb5348..5bf0fab 100644 --- a/PHI-EN/data-updates.lua +++ b/PHI-EN/data-updates.lua @@ -31,3 +31,31 @@ data.raw['generator']['steam-engine-2'].fast_replaceable_group = data.raw['gener data.raw['generator']['steam-engine-3'].fast_replaceable_group = data.raw['generator']['steam-engine-2'].fast_replaceable_group data.raw['generator']['steam-engine-4'].fast_replaceable_group = data.raw['generator']['steam-engine-3'].fast_replaceable_group data.raw['generator']['steam-engine-5'].fast_replaceable_group = data.raw['generator']['steam-engine-4'].fast_replaceable_group + +-- nuclear-reactor +data.raw['reactor']['nuclear-reactor'].fast_replaceable_group = 'reactor' +data.raw['reactor']['nuclear-reactor-2'].fast_replaceable_group = data.raw['reactor']['nuclear-reactor'].fast_replaceable_group +data.raw['reactor']['nuclear-reactor-3'].fast_replaceable_group = data.raw['reactor']['nuclear-reactor-2'].fast_replaceable_group +data.raw['reactor']['nuclear-reactor-4'].fast_replaceable_group = data.raw['reactor']['nuclear-reactor-3'].fast_replaceable_group +data.raw['reactor']['nuclear-reactor-5'].fast_replaceable_group = data.raw['reactor']['nuclear-reactor-4'].fast_replaceable_group + +-- heat-pipe +data.raw['heat-pipe']['heat-pipe'].fast_replaceable_group = 'heat-pipe' +data.raw['heat-pipe']['heat-pipe-2'].fast_replaceable_group = data.raw['heat-pipe']['heat-pipe'].fast_replaceable_group +data.raw['heat-pipe']['heat-pipe-3'].fast_replaceable_group = data.raw['heat-pipe']['heat-pipe-2'].fast_replaceable_group +data.raw['heat-pipe']['heat-pipe-4'].fast_replaceable_group = data.raw['heat-pipe']['heat-pipe-3'].fast_replaceable_group +data.raw['heat-pipe']['heat-pipe-5'].fast_replaceable_group = data.raw['heat-pipe']['heat-pipe-4'].fast_replaceable_group + +-- heat-exchanger +data.raw['boiler']['heat-exchanger'].fast_replaceable_group = 'heat-exchanger' +data.raw['boiler']['heat-exchanger-2'].fast_replaceable_group = data.raw['boiler']['heat-exchanger'].fast_replaceable_group +data.raw['boiler']['heat-exchanger-3'].fast_replaceable_group = data.raw['boiler']['heat-exchanger-2'].fast_replaceable_group +data.raw['boiler']['heat-exchanger-4'].fast_replaceable_group = data.raw['boiler']['heat-exchanger-3'].fast_replaceable_group +data.raw['boiler']['heat-exchanger-5'].fast_replaceable_group = data.raw['boiler']['heat-exchanger-4'].fast_replaceable_group + +-- steam-turbine +data.raw['generator']['steam-turbine'].fast_replaceable_group = 'steam-engine' +data.raw['generator']['steam-turbine-2'].fast_replaceable_group = data.raw['generator']['steam-turbine'].fast_replaceable_group +data.raw['generator']['steam-turbine-3'].fast_replaceable_group = data.raw['generator']['steam-turbine-2'].fast_replaceable_group +data.raw['generator']['steam-turbine-4'].fast_replaceable_group = data.raw['generator']['steam-turbine-3'].fast_replaceable_group +data.raw['generator']['steam-turbine-5'].fast_replaceable_group = data.raw['generator']['steam-turbine-4'].fast_replaceable_group diff --git a/PHI-EN/data.lua b/PHI-EN/data.lua index 8b6310f..7dcbd63 100644 --- a/PHI-EN/data.lua +++ b/PHI-EN/data.lua @@ -32,17 +32,44 @@ local function EE(source, tier) item.discharge_animation.layers[1].layers[1].hr_version.filename = item.picture.layers[1].hr_version.filename item.discharge_animation.layers[1].layers[1].hr_version.tint = {r = 1, g = 1, b = 1, a = 1} ]] + elseif (source.type == 'solar-panel') then item.production = (source.base * (4 ^ (tier - 1))) .. 'kW' + elseif (source.type == 'boiler') then - item.target_temperature = 15 + (150 * tier) item.fluid_box.height = 4 item.output_fluid_box.height = 4 item.output_fluid_box.base_level = 5 - item.energy_consumption = 1.8 * tier .. 'MW' + + if (source.name == 'boiler') then + item.target_temperature = 15 + (150 * tier) + item.energy_consumption = 1.8 * tier .. 'MW' + + elseif (source.name == 'heat-exchanger') then + item.target_temperature = 15 + (485 * tier) + item.energy_consumption = 10 * tier .. 'MW' + item.energy_source.max_temperature = 15 + (485 * tier) + item.energy_source.max_transfer = 1500 + (500 * tier) .. 'MW' + end + elseif (source.type == 'generator') then item.fluid_box.height = 4 - item.maximum_temperature = 15 + (150 * tier) + + if (source.name == 'steam-engine') then + item.maximum_temperature = 15 + (150 * tier) + + elseif (source.name == 'steam-turbine') then + item.maximum_temperature = 15 + (485 * tier) + end + + elseif (source.type == 'reactor') then + item.consumption = 40 * tier + item.heat_buffer.max_temperature = 500 + (500 * tier) + item.heat_buffer.max_transfer = 5 + (5 * tier) .. 'GW' + + elseif (source.type == 'heat-pipe') then + item.heat_buffer.max_temperature = 500 + (500 * tier) + item.heat_buffer.max_transfer = 500 + (500 * tier) .. 'MW' end if (tier <= source.max - 1) then diff --git a/PHI-EN/locale/en/locale.cfg b/PHI-EN/locale/en/locale.cfg index 94c8c55..d82b32d 100644 --- a/PHI-EN/locale/en/locale.cfg +++ b/PHI-EN/locale/en/locale.cfg @@ -25,6 +25,26 @@ steam-engine-3=Steam engine 3 steam-engine-4=Steam engine 4 steam-engine-5=Steam engine 5 +nuclear-reactor-2=Nuclear reactor 2 +nuclear-reactor-3=Nuclear reactor 3 +nuclear-reactor-4=Nuclear reactor 4 +nuclear-reactor-5=Nuclear reactor 5 + +heat-pipe-2=Heat pipe 2 +heat-pipe-3=Heat pipe 3 +heat-pipe-4=Heat pipe 4 +heat-pipe-5=Heat pipe 5 + +heat-exchanger-2=Heat exchanger 2 +heat-exchanger-3=Heat exchanger 3 +heat-exchanger-4=Heat exchanger 4 +heat-exchanger-5=Heat exchanger 5 + +steam-turbine-2=Steam turbine 2 +steam-turbine-3=Steam turbine 3 +steam-turbine-4=Steam turbine 4 +steam-turbine-5=Steam turbine 5 + [entity-name] accumulator-2=Accumulator 2 accumulator-3=Accumulator 3 @@ -52,6 +72,26 @@ steam-engine-3=Steam engine 3 steam-engine-4=Steam engine 4 steam-engine-5=Steam engine 5 +nuclear-reactor-2=Nuclear reactor 2 +nuclear-reactor-3=Nuclear reactor 3 +nuclear-reactor-4=Nuclear reactor 4 +nuclear-reactor-5=Nuclear reactor 5 + +heat-pipe-2=Heat pipe 2 +heat-pipe-3=Heat pipe 3 +heat-pipe-4=Heat pipe 4 +heat-pipe-5=Heat pipe 5 + +heat-exchanger-2=Heat exchanger 2 +heat-exchanger-3=Heat exchanger 3 +heat-exchanger-4=Heat exchanger 4 +heat-exchanger-5=Heat exchanger 5 + +steam-turbine-2=Steam turbine 2 +steam-turbine-3=Steam turbine 3 +steam-turbine-4=Steam turbine 4 +steam-turbine-5=Steam turbine 5 + [entity-description] accumulator-2=Stores a limited amount of energy when available production exceeds demand, and releases it in the opposite case. accumulator-3=Stores a limited amount of energy when available production exceeds demand, and releases it in the opposite case. @@ -79,6 +119,21 @@ steam-engine-3=Consumes steam to create electric energy. steam-engine-4=Consumes steam to create electric energy. steam-engine-5=Consumes steam to create electric energy. +nuclear-reactor-2=Uses uranium fuel cells to generate heat. The heat output increases when built next to other reactors. +nuclear-reactor-3=Uses uranium fuel cells to generate heat. The heat output increases when built next to other reactors. +nuclear-reactor-4=Uses uranium fuel cells to generate heat. The heat output increases when built next to other reactors. +nuclear-reactor-5=Uses uranium fuel cells to generate heat. The heat output increases when built next to other reactors. + +heat-exchanger-2=Uses heat energy to turn water into steam. +heat-exchanger-3=Uses heat energy to turn water into steam. +heat-exchanger-4=Uses heat energy to turn water into steam. +heat-exchanger-5=Uses heat energy to turn water into steam. + +steam-turbine-2=Consumes steam to create electric energy. +steam-turbine-3=Consumes steam to create electric energy. +steam-turbine-4=Consumes steam to create electric energy. +steam-turbine-5=Consumes steam to create electric energy. + [technology-name] compound-energy=Compound Energy compound-energy-1=Compound Energy diff --git a/PHI-EN/locale/ja/locale.cfg b/PHI-EN/locale/ja/locale.cfg index a8622ff..2385f31 100644 --- a/PHI-EN/locale/ja/locale.cfg +++ b/PHI-EN/locale/ja/locale.cfg @@ -25,6 +25,26 @@ steam-engine-3=蒸気機関 3 steam-engine-4=蒸気機関 4 steam-engine-5=蒸気機関 5 +nuclear-reactor-2=原子炉 2 +nuclear-reactor-3=原子炉 3 +nuclear-reactor-4=原子炉 4 +nuclear-reactor-5=原子炉 5 + +heat-pipe-2=ヒートパイプ 2 +heat-pipe-3=ヒートパイプ 3 +heat-pipe-4=ヒートパイプ 4 +heat-pipe-5=ヒートパイプ 5 + +heat-exchanger-2=熱交換器 2 +heat-exchanger-3=熱交換器 3 +heat-exchanger-4=熱交換器 4 +heat-exchanger-5=熱交換器 5 + +steam-turbine-2=蒸気タービン 2 +steam-turbine-3=蒸気タービン 3 +steam-turbine-4=蒸気タービン 4 +steam-turbine-5=蒸気タービン 5 + [entity-name] accumulator-2=蓄電池 2 accumulator-3=蓄電池 3 @@ -52,6 +72,26 @@ steam-engine-3=蒸気機関 3 steam-engine-4=蒸気機関 4 steam-engine-5=蒸気機関 5 +nuclear-reactor-2=原子炉 2 +nuclear-reactor-3=原子炉 3 +nuclear-reactor-4=原子炉 4 +nuclear-reactor-5=原子炉 5 + +heat-pipe-2=ヒートパイプ 2 +heat-pipe-3=ヒートパイプ 3 +heat-pipe-4=ヒートパイプ 4 +heat-pipe-5=ヒートパイプ 5 + +heat-exchanger-2=熱交換器 2 +heat-exchanger-3=熱交換器 3 +heat-exchanger-4=熱交換器 4 +heat-exchanger-5=熱交換器 5 + +steam-turbine-2=蒸気タービン 2 +steam-turbine-3=蒸気タービン 3 +steam-turbine-4=蒸気タービン 4 +steam-turbine-5=蒸気タービン 5 + [entity-description] accumulator-2=供給可能な電力が需要量を上回っている時に電力を貯蔵します。需要量が上回っている場合は放電します。 accumulator-3=供給可能な電力が需要量を上回っている時に電力を貯蔵します。需要量が上回っている場合は放電します。 @@ -79,6 +119,21 @@ steam-engine-3=蒸気を利用して発電します。 steam-engine-4=蒸気を利用して発電します。 steam-engine-5=蒸気を利用して発電します。 +nuclear-reactor-2=核燃料を使い熱を発生させます。他の原子炉と隣接させると,熱出力が増加します。 +nuclear-reactor-3=核燃料を使い熱を発生させます。他の原子炉と隣接させると,熱出力が増加します。 +nuclear-reactor-4=核燃料を使い熱を発生させます。他の原子炉と隣接させると,熱出力が増加します。 +nuclear-reactor-5=核燃料を使い熱を発生させます。他の原子炉と隣接させると,熱出力が増加します。 + +heat-exchanger-2=熱エネルギーを使って水を蒸気に変えます。 +heat-exchanger-3=熱エネルギーを使って水を蒸気に変えます。 +heat-exchanger-4=熱エネルギーを使って水を蒸気に変えます。 +heat-exchanger-5=熱エネルギーを使って水を蒸気に変えます。 + +steam-turbine-2=蒸気を利用して発電します。 +steam-turbine-3=蒸気を利用して発電します。 +steam-turbine-4=蒸気を利用して発電します。 +steam-turbine-5=蒸気を利用して発電します。 + [technology-name] compound-energy=複合発電 compound-energy-1=複合発電 diff --git a/PHI-EN/locale/zh-CN/locale.cfg b/PHI-EN/locale/zh-CN/locale.cfg index 0f8b24b..d84e80e 100644 --- a/PHI-EN/locale/zh-CN/locale.cfg +++ b/PHI-EN/locale/zh-CN/locale.cfg @@ -25,6 +25,26 @@ steam-engine-3=蒸汽發電機 3 steam-engine-4=蒸汽發電機 4 steam-engine-5=蒸汽發電機 5 +nuclear-reactor-2=核能反應爐 2 +nuclear-reactor-3=核能反應爐 3 +nuclear-reactor-4=核能反應爐 4 +nuclear-reactor-5=核能反應爐 5 + +heat-pipe-2=熱導管 2 +heat-pipe-3=熱導管 3 +heat-pipe-4=熱導管 4 +heat-pipe-5=熱導管 5 + +heat-exchanger-2=熱交換器 2 +heat-exchanger-3=熱交換器 3 +heat-exchanger-4=熱交換器 4 +heat-exchanger-5=熱交換器 5 + +steam-turbine-2=蒸汽渦輪發電機 2 +steam-turbine-3=蒸汽渦輪發電機 3 +steam-turbine-4=蒸汽渦輪發電機 4 +steam-turbine-5=蒸汽渦輪發電機 5 + [entity-name] accumulator-2=蓄電池 2 accumulator-3=蓄電池 3 @@ -79,6 +99,21 @@ steam-engine-3=利用蒸汽來發電。 steam-engine-4=利用蒸汽來發電。 steam-engine-5=利用蒸汽來發電。 +nuclear-reactor-2=以鈾燃料棒產生熱能。若和其他反應爐相鄰,可產生更多熱能。 +nuclear-reactor-3=以鈾燃料棒產生熱能。若和其他反應爐相鄰,可產生更多熱能。 +nuclear-reactor-4=以鈾燃料棒產生熱能。若和其他反應爐相鄰,可產生更多熱能。 +nuclear-reactor-5=以鈾燃料棒產生熱能。若和其他反應爐相鄰,可產生更多熱能。 + +heat-exchanger-2=利用熱能,把水煮成蒸汽。 +heat-exchanger-3=利用熱能,把水煮成蒸汽。 +heat-exchanger-4=利用熱能,把水煮成蒸汽。 +heat-exchanger-5=利用熱能,把水煮成蒸汽。 + +steam-turbine-2=利用蒸汽來發電。 +steam-turbine-3=利用蒸汽來發電。 +steam-turbine-4=利用蒸汽來發電。 +steam-turbine-5=利用蒸汽來發電。 + [technology-name] compound-energy=複合發電 compound-energy-1=複合發電 diff --git a/PHI-EN/locale/zh-TW/locale.cfg b/PHI-EN/locale/zh-TW/locale.cfg index 0f8b24b..d84e80e 100644 --- a/PHI-EN/locale/zh-TW/locale.cfg +++ b/PHI-EN/locale/zh-TW/locale.cfg @@ -25,6 +25,26 @@ steam-engine-3=蒸汽發電機 3 steam-engine-4=蒸汽發電機 4 steam-engine-5=蒸汽發電機 5 +nuclear-reactor-2=核能反應爐 2 +nuclear-reactor-3=核能反應爐 3 +nuclear-reactor-4=核能反應爐 4 +nuclear-reactor-5=核能反應爐 5 + +heat-pipe-2=熱導管 2 +heat-pipe-3=熱導管 3 +heat-pipe-4=熱導管 4 +heat-pipe-5=熱導管 5 + +heat-exchanger-2=熱交換器 2 +heat-exchanger-3=熱交換器 3 +heat-exchanger-4=熱交換器 4 +heat-exchanger-5=熱交換器 5 + +steam-turbine-2=蒸汽渦輪發電機 2 +steam-turbine-3=蒸汽渦輪發電機 3 +steam-turbine-4=蒸汽渦輪發電機 4 +steam-turbine-5=蒸汽渦輪發電機 5 + [entity-name] accumulator-2=蓄電池 2 accumulator-3=蓄電池 3 @@ -79,6 +99,21 @@ steam-engine-3=利用蒸汽來發電。 steam-engine-4=利用蒸汽來發電。 steam-engine-5=利用蒸汽來發電。 +nuclear-reactor-2=以鈾燃料棒產生熱能。若和其他反應爐相鄰,可產生更多熱能。 +nuclear-reactor-3=以鈾燃料棒產生熱能。若和其他反應爐相鄰,可產生更多熱能。 +nuclear-reactor-4=以鈾燃料棒產生熱能。若和其他反應爐相鄰,可產生更多熱能。 +nuclear-reactor-5=以鈾燃料棒產生熱能。若和其他反應爐相鄰,可產生更多熱能。 + +heat-exchanger-2=利用熱能,把水煮成蒸汽。 +heat-exchanger-3=利用熱能,把水煮成蒸汽。 +heat-exchanger-4=利用熱能,把水煮成蒸汽。 +heat-exchanger-5=利用熱能,把水煮成蒸汽。 + +steam-turbine-2=利用蒸汽來發電。 +steam-turbine-3=利用蒸汽來發電。 +steam-turbine-4=利用蒸汽來發電。 +steam-turbine-5=利用蒸汽來發電。 + [technology-name] compound-energy=複合發電 compound-energy-1=複合發電