diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua index 716cfcd..e3c722c 100644 --- a/PHI-CL/config.lua +++ b/PHI-CL/config.lua @@ -515,7 +515,6 @@ local items = { tech = 'night-vision-equipment', min = 2, max = 2, - base = 1, graphics_name = 'night-vision-equipment' }, ['exoskeleton-equipment'] = { @@ -558,271 +557,305 @@ local items = { } }, ['recipe'] = { - { - name='iron-plate', - tech='automation' + ['iron-plate'] = { + enabled = true, + tech = 'automation' }, - { - name='copper-plate', - tech='automation' + ['copper-plate'] = { + enabled = true, + tech = 'automation' }, - { - name='stone-brick', - tech='automation' + ['stone-brick'] = { + enabled = true, + tech = 'automation' }, - { - name='steel-plate', - tech='steel-processing' + ['steel-plate'] = { + enabled = true, + tech = 'steel-processing' }, - { - name='basic-oil-processing', - tech='oil-processing' + ['electronic-circuit'] = { + enabled = true, + tech = 'automation' }, - { - name='advanced-oil-processing', - tech='advanced-oil-processing' + ['advanced-circuit'] = { + enabled = true, + tech = 'advanced-electronics' }, - { - name='heavy-oil-cracking', - tech='advanced-oil-processing' + ['processing-unit'] = { + enabled = true, + tech = 'advanced-electronics-2' }, - { - name='light-oil-cracking', - tech='advanced-oil-processing' + ['copper-cable'] = { + enabled = true, + tech = 'automation' }, - { - name='solid-fuel-from-light-oil', - tech='advanced-oil-processing' + ['iron-stick'] = { + enabled = true, + tech = 'automation' }, - { - name='solid-fuel-from-heavy-oil', - tech='advanced-oil-processing' + ['iron-gear-wheel'] = { + enabled = true, + tech = 'automation' }, - { - name='solid-fuel-from-petroleum-gas', - tech='oil-processing' + ['pipe'] = { + enabled = true, + tech = 'automation' }, - { - name='coal-liquefaction', - tech='coal-liquefaction' + ['engine-unit'] = { + enabled = true, + tech = 'engine' }, - { - name='sulfur', - tech='sulfur-processing' + ['electric-engine-unit'] = { + enabled = true, + tech = 'electric-engine' }, - { - name='sulfuric-acid', - tech='sulfur-processing' + ['flying-robot-frame'] = { + enabled = true, + tech = 'robotics' }, - { - name='lubricant', - tech='lubricant' + ['low-density-structure'] = { + enabled = true, + tech = 'low-density-structure' }, - { - name='plastic-bar', - tech='plastics' + ['rocket-fuel'] = { + enabled = true, + tech = 'rocket-fuel' }, - { - name='battery', - tech='battery' + ['rocket-control-unit'] = { + enabled = true, + tech = 'rocket-control-unit' }, - { - name='explosives', - tech='explosives' + ['basic-oil-processing'] = { + enabled = true, + tech = 'oil-processing' }, - { - name='cliff-explosives', - tech='cliff-explosives' + ['advanced-oil-processing'] = { + enabled = true, + tech = 'advanced-oil-processing' }, - { - name='empty-barrel', - tech='fluid-handling' + ['heavy-oil-cracking'] = { + enabled = true, + tech = 'advanced-oil-processing' }, - { - name='copper-cable', - tech='automation' + ['light-oil-cracking'] = { + enabled = true, + tech = 'advanced-oil-processing' }, - { - name='iron-stick', - tech='automation' + ['solid-fuel-from-light-oil'] = { + enabled = true, + tech = 'advanced-oil-processing' }, - { - name='iron-gear-wheel', - tech='automation' + ['solid-fuel-from-heavy-oil'] = { + enabled = true, + tech = 'advanced-oil-processing' }, - { - name='pipe', - tech='automation' + ['solid-fuel-from-petroleum-gas'] = { + enabled = true, + tech = 'oil-processing' }, - { - name='electronic-circuit', - tech='automation' + ['coal-liquefaction'] = { + enabled = true, + tech = 'coal-liquefaction' }, - { - name='advanced-circuit', - tech='advanced-electronics' + ['sulfur'] = { + enabled = true, + tech = 'sulfur-processing' }, - { - name='processing-unit', - tech='advanced-electronics-2' + ['sulfuric-acid'] = { + enabled = true, + tech = 'sulfur-processing' }, - { - name='engine-unit', - tech='engine' + ['lubricant'] = { + enabled = true, + tech = 'lubricant' }, - { - name='electric-engine-unit', - tech='electric-engine' + ['plastic-bar'] = { + enabled = true, + tech = 'plastics' }, - { - name='flying-robot-frame', - tech='robotics' + ['battery'] = { + enabled = true, + tech = 'battery' }, - { - name='low-density-structure', - tech='low-density-structure' + ['explosives'] = { + enabled = true, + tech = 'explosives' }, - { - name='rocket-fuel', - tech='rocket-fuel' + ['cliff-explosives'] = { + enabled = true, + tech = 'cliff-explosives' }, - { - name='rocket-control-unit', - tech='rocket-control-unit' + ['empty-barrel'] = { + enabled = true, + tech = 'fluid-handling' }, - { - name='automation-science-pack', - tech='automation' + ['automation-science-pack'] = { + enabled = true, + tech = 'automation' }, - { - name='logistic-science-pack', - tech='logistic-science-pack' + ['logistic-science-pack'] = { + enabled = true, + tech = 'logistic-science-pack' }, - { - name='chemical-science-pack', - tech='chemical-science-pack' + ['chemical-science-pack'] = { + enabled = true, + tech = 'chemical-science-pack' }, - { - name='military-science-pack', - tech='military-science-pack' + ['military-science-pack'] = { + enabled = true, + tech = 'military-science-pack' }, - { - name='production-science-pack', - tech='production-science-pack' + ['production-science-pack'] = { + enabled = true, + tech = 'production-science-pack' }, - { - name='utility-science-pack', - tech='utility-science-pack' + ['utility-science-pack'] = { + enabled = true, + tech = 'utility-science-pack' }, - { - name='inserter', - tech='automation' + ['fast-inserter'] = { + enabled = false, + tech = 'fast-inserter' }, - { - name='transport-belt', - tech='automation' + ['filter-inserter'] = { + enabled = false, + tech = 'fast-inserter' }, - { - name='grenade', - tech='military-2' + ['long-handed-inserter'] = { + enabled = false, + tech = 'automation' }, - { - name='firearm-magazine', - tech='automation' + ['stack-inserter'] = { + enabled = false, + tech = 'stack-inserter' }, - { - name='piercing-rounds-magazine', - tech='military-2' + ['stack-filter-inserter'] = { + enabled = false, + tech = 'stack-inserter' }, - { - name='stone-wall', - tech='stone-wall' + ['inserter'] = { + enabled = true, + tech = 'automation' }, - { - name='rail', - tech='railway' + ['transport-belt'] = { + enabled = true, + tech = 'automation' }, - { - name='electric-furnace', - tech='advanced-material-processing-2' + ['grenade'] = { + enabled = true, + tech = 'military-2' }, - { - name='concrete', - tech='concrete' + ['firearm-magazine'] = { + enabled = true, + tech = 'automation' }, - { - name='uranium-processing', - tech='uranium-processing' + ['piercing-rounds-magazine'] = { + enabled = true, + tech = 'military-2' }, - { - name='uranium-fuel-cell', - tech='uranium-processing' + ['stone-wall'] = { + enabled = true, + tech = 'stone-wall' }, - { - name='nuclear-fuel-reprocessing', - tech='nuclear-fuel-reprocessing' + ['rail'] = { + enabled = true, + tech = 'railway' }, - { - name='kovarex-enrichment-process', - tech='kovarex-enrichment-process' + ['electric-furnace'] = { + enabled = true, + tech = 'advanced-material-processing-2' }, - { - name='nuclear-fuel', - tech='kovarex-enrichment-process' + ['concrete'] = { + enabled = true, + tech = 'concrete' }, - --[[ - { - name='fast-inserter', - tech='fast-inserter' - }, - { - name='filter-inserter', - tech='fast-inserter' - }, - { - name='long-handed-inserter', - tech='automation' - }, - { - name='stack-inserter', - tech='stack-inserter' - }, - { - name='stack-filter-inserter', - tech='stack-inserter' - }, - ]] - { - name='uranium-rounds-magazine', - tech='uranium-ammo' - }, - { - name='explosive-cannon-shell', - tech='tank' - }, - { - name='artillery-shell', - tech='artillery' - }, - { - name='rocket', - tech='rocketry' - }, - { - name='explosive-rocket', - tech='explosive-rocketry' - }, - { - name='solar-panel', - tech='solar-energy' - }, - { - name='accumulator', - tech='electric-energy-accumulators' - }, - { - name='radar', - tech='automation' + ['uranium-processing'] = { + enabled = true, + tech = 'uranium-processing' + }, + ['uranium-fuel-cell'] = { + enabled = true, + tech = 'uranium-processing' + }, + ['nuclear-fuel-reprocessing'] = { + enabled = true, + tech = 'nuclear-fuel-reprocessing' + }, + ['kovarex-enrichment-process'] = { + enabled = true, + tech = 'kovarex-enrichment-process' + }, + ['nuclear-fuel'] = { + enabled = true, + tech = 'kovarex-enrichment-process' + }, + ['uranium-rounds-magazine'] = { + enabled = true, + tech = 'uranium-ammo' + }, + ['explosive-cannon-shell'] = { + enabled = true, + tech = 'tank' + }, + ['artillery-shell'] = { + enabled = true, + tech = 'artillery' + }, + ['rocket'] = { + enabled = true, + tech = 'rocketry' + }, + ['explosive-rocket'] = { + enabled = true, + tech = 'explosive-rocketry' + }, + ['solar-panel'] = { + enabled = true, + tech = 'solar-energy' + }, + ['accumulator'] = { + enabled = true, + tech = 'electric-energy-accumulators' + }, + ['radar'] = { + enabled = true, + tech = 'automation' + }, + ['speed-module'] = { + enabled = false, + tech = 'speed-module' + }, + ['speed-module-2'] = { + enabled = false, + tech = 'speed-module-2' + }, + ['speed-module-3'] = { + enabled = false, + tech = 'speed-module-3' + }, + ['productivity-module'] = { + enabled = false, + tech = 'productivity-module' + }, + ['productivity-module-2'] = { + enabled = false, + tech = 'productivity-module-2' + }, + ['productivity-module-3'] = { + enabled = false, + tech = 'productivity-module-3' + }, + ['effectivity-module'] = { + enabled = false, + tech = 'effectivity-module' + }, + ['effectivity-module-2'] = { + enabled = false, + tech = 'effectivity-module-2' + }, + ['effectivity-module-3'] = { + enabled = false, + tech = 'effectivity-module-3' } } } @@ -956,17 +989,6 @@ if mods then max = 3 } - items['item']['se-core-miner-drill'] = { - enabled = settings.startup['PHI-MB'].value, - stage = 2, - type = 'mining-drill', - name = 'se-core-miner-drill', - ref_name = 'se-core-miner-drill', - tech = 'se-core-miner', - min = 2, - max = 3 - } - items['item']['se-space-decontamination-facility'] = { enabled = settings.startup['PHI-MB'].value, stage = 2, diff --git a/PHI-CL/control.lua b/PHI-CL/control.lua index d2540d1..8ab79ad 100644 --- a/PHI-CL/control.lua +++ b/PHI-CL/control.lua @@ -12,6 +12,39 @@ local function clock_display(sec) end end +local function trash_creation(event) + local entity = event.created_entity or event.entity + + if not entity then + return + end + + if not entity.valid then + return + end + + if entity.name == 'trash-chest' then + entity.infinity_container_filters = {} + entity.remove_unfiltered_items = true + + elseif entity.name == 'trash-pipe' then + entity.set_infinity_pipe_filter(nil) + end +end + +local function trash_check() + for _, surface in pairs(game.surfaces) do + for _, e in pairs(surface.find_entities_filtered{name='trash-chest'}) do + e.infinity_container_filters = {} + e.remove_unfiltered_items = true + end + + for _, e in pairs(surface.find_entities_filtered{name='trash-pipe'}) do + e.set_infinity_pipe_filter(nil) + end + end +end + if settings.startup['PHI-XC'].value then script.on_nth_tick(60, function(event) for _, player in pairs(game.connected_players) do @@ -63,3 +96,14 @@ if settings.startup['PHI-PB'].value then game.players[event.player_index].ticks_to_respawn = 120 end) end + +-- {{filter='name', name='trash-chest', mode='or'}, {filter='name', name='trash-pipe', mode='or'}} +if settings.startup['PHI-CT'].value then + if settings.startup['PHI-CT-TRASH'].value then + script.on_init(trash_check) + script.on_event(defines.events.on_built_entity, trash_creation, {{filter='name', name='trash-chest', mode='or'}, {filter='name', name='trash-pipe', mode='or'}}) + script.on_event(defines.events.on_robot_built_entity, trash_creation, {{filter='name', name='trash-chest', mode='or'}, {filter='name', name='trash-pipe', mode='or'}}) + script.on_event(defines.events.script_raised_built, trash_creation) + script.on_event(defines.events.script_raised_revive, trash_creation) + end +end diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua index d350a06..bbdddfb 100644 --- a/PHI-CL/data-final-fixes.lua +++ b/PHI-CL/data-final-fixes.lua @@ -1 +1,70 @@ -data.raw['utility-constants'].default.zoom_to_world_effect_strength = 0 \ No newline at end of file +local items = require 'config' +local main = require 'main' +local file_stage = 3 + +data.raw['utility-constants'].default.zoom_to_world_effect_strength = 0 + +for _,name in pairs({'furnace', 'lab', 'beacon'}) do + local entities = {} + + for _, entity in pairs(data.raw[name]) do + table.insert(entities, entity.name) + end + + for _, entity in pairs(data.raw[name]) do + entity.additional_pastable_entities = entities + end +end + +if settings.startup['PHI-CT-TILE'].value then + for _, tile in pairs (data.raw.tile) do + tile.autoplace = nil + end + + data.raw.tile[settings.startup['PHI-CT-TILE-CHOICE'].value].autoplace = {} + + for _, simple in pairs (data.raw['simple-entity']) do + simple.autoplace = nil + end + + for _, decor in pairs (data.raw['optimized-decorative']) do + decor.autoplace = nil + end + + for _, fish in pairs (data.raw['fish']) do + fish.autoplace = nil + end + + local autoplace_controls = {} + + for key, _ in pairs (data.raw['autoplace-control']) do + autoplace_controls[key] = { + size = 'none' + } + end + + data.raw['map-gen-presets']['default']['empty-world'] = { + order = 'zz', + basic_settings = { + autoplace_controls = autoplace_controls, + water = 'none', + cliff_settings = { + name = 'none', + cliff_elevation_interval = 100, + cliff_elevation_0 = 100, + richness = 0 + } + }, + advanced_settings = { + pollution = { + enabled = false + }, + enemy_evolution = { + enabled=false, + }, + enemy_expansion = { + enabled=false + } + } + } +end diff --git a/PHI-CL/data-updates.lua b/PHI-CL/data-updates.lua index c0a270e..a67469e 100644 --- a/PHI-CL/data-updates.lua +++ b/PHI-CL/data-updates.lua @@ -28,6 +28,133 @@ if settings.startup['PHI-XW-WATER'].value > 0 then end end +if settings.startup['PHI-CT'].value then + if settings.startup['PHI-CT-OIL'].value then + local item = table.deepcopy(data.raw['item']['offshore-pump']) + item.name = 'oil-pump' + item.place_result = 'oil-pump' + item.order = 'b[fluids]-a[offshore-pump]-2' + data:extend({item}) + + local entity = table.deepcopy(data.raw['offshore-pump']['offshore-pump']) + entity.name = 'oil-pump' + entity.minable.result = 'oil-pump' + entity.fluid = 'crude-oil' + entity.fluid_box.filter = 'crude-oil' + data:extend({entity}) + + data:extend({{ + type = 'recipe', + name = 'oil-pump', + energy_required = 2, + enabled = true, + ingredients = {{'electronic-circuit', 2}, {'pipe', 1}, {'iron-gear-wheel', 1}}, + result = 'oil-pump' + }}) + end + + if settings.startup['PHI-CT-RADAR'].value then + local item = table.deepcopy(data.raw['item']['radar']) + item.name = 'super-radar' + item.place_result = 'super-radar' + item.order = 'd[radar]-b[radar]' + data:extend({item}) + + local entity = table.deepcopy(data.raw['radar']['radar']) + entity.name = 'super-radar' + entity.minable.result = 'super-radar' + entity.max_distance_of_sector_revealed = 30 + entity.max_distance_of_nearby_sector_revealed = 30 + data:extend({entity}) + + data:extend({{ + type = 'recipe', + name = 'super-radar', + energy_required = 2, + enabled = true, + ingredients = {{'electronic-circuit', 5}, {'iron-gear-wheel', 5}, {'iron-plate', 10}}, + result = 'super-radar' + }}) + end + + if settings.startup['PHI-CT-TRASH'].value then + local item = table.deepcopy(data.raw['item']['steel-chest']) + item.name = 'trash-chest' + item.place_result = 'trash-chest' + item.order = 'b[storage]-e[trash-chest]' + data:extend({item}) + + local entity = table.deepcopy(data.raw['container']['steel-chest']) + entity.name = 'trash-chest' + entity.minable.result = 'trash-chest' + entity.inventory_size = 1 + entity.type = 'infinity-container' + entity.gui_mode = 'none' + entity.erase_contents_when_mined = true + entity.logistic_mode = nil + + data:extend({entity}) + + data:extend({{ + type = 'recipe', + name = 'trash-chest', + energy_required = 2, + enabled = true, + ingredients = {{'steel-chest', 1}}, + result = 'trash-chest' + }}) + + data:extend({{ + type = 'recipe', + name = 'trash-chest-return', + energy_required = 2, + enabled = true, + ingredients = {{'trash-chest', 1}}, + result = 'steel-chest' + }}) + + table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='trash-chest'}) + table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='trash-chest-return'}) + + item = table.deepcopy(data.raw['item']['pipe']) + item.name = 'trash-pipe' + item.place_result = 'trash-pipe' + item.order = 'a[pipe]-c[trash-pipe]' + data:extend({item}) + + entity = table.deepcopy(data.raw['pipe']['pipe']) + entity.name = 'trash-pipe' + entity.minable.result = 'trash-pipe' + entity.inventory_size = 1 + entity.type = 'infinity-pipe' + entity.gui_mode = 'none' + entity.erase_contents_when_mined = true + + data:extend({entity}) + + data:extend({{ + type = 'recipe', + name = 'trash-pipe', + energy_required = 2, + enabled = true, + ingredients = {{'iron-plate', 1}}, + result = 'trash-pipe' + }}) + + data:extend({{ + type = 'recipe', + name = 'trash-pipe-return', + energy_required = 2, + enabled = true, + ingredients = {{'trash-pipe', 1}}, + result = 'iron-plate' + }}) + + table.insert(data.raw.technology['automation'].effects, {type='unlock-recipe', recipe='trash-pipe'}) + table.insert(data.raw.technology['automation'].effects, {type='unlock-recipe', recipe='trash-pipe-return'}) + end +end + if settings.startup['PHI-EQ-ARMOR'].value then data:extend({ { @@ -42,10 +169,48 @@ if settings.startup['PHI-EQ-ARMOR'].value then name = 'power-armor-mk3', icon = '__base__/graphics/icons/power-armor-mk2.png', icon_size = 64, icon_mipmaps = 4, - resistances = {{type = 'physical', decrease = 20, percent = 50}, {type = 'acid', decrease = 20, percent = 80}, - {type = 'explosion', decrease = 70, percent = 60}, {type = 'fire', decrease = 20, percent = 80}, - {type = 'laser', decrease = 20, percent = 50}, {type = 'electric', decrease = 20, percent = 50}, - {type = 'impact', decrease = 20, percent = 50}, {type = 'poison', decrease = 20, percent = 50}}, + resistances = { + { + type = 'physical', + decrease = 20, + percent = 50 + }, + { + type = 'acid', + decrease = 20, + percent = 80 + }, + { + type = 'explosion', + decrease = 70, + percent = 60 + }, + { + type = 'fire', + decrease = 20, + percent = 80 + }, + { + type = 'laser', + decrease = 20, + percent = 50 + }, + { + type = 'electric', + decrease = 20, + percent = 50 + }, + { + type = 'impact', + decrease = 20, + percent = 50 + }, + { + type = 'poison', + decrease = 20, + percent = 50 + } + }, subgroup = 'armor', order = 'eb[power-armor-mk3]', stack_size = 1, @@ -60,9 +225,9 @@ if settings.startup['PHI-EQ-ARMOR'].value then data:extend({{ type = 'recipe', name = 'power-armor-mk3', - energy_required = 5, - enabled = 'false', - ingredients = {{'power-armor-mk2', 2}}, + energy_required = 2, + enabled = false, + ingredients = {{name='power-armor-mk2', amount=2}}, result = 'power-armor-mk3' }}) @@ -98,7 +263,7 @@ if settings.startup['PHI-RS'].value then name = 'electric-filter-furnace', energy_required = 2, enabled = false, - ingredients = {{'electric-furnace', 1}}, + ingredients = {{name='electric-furnace', amount=1}}, result = 'electric-filter-furnace', }}) @@ -107,7 +272,7 @@ if settings.startup['PHI-RS'].value then name = 'electric-furnace-return', energy_required = 2, enabled = false, - ingredients = {{'electric-filter-furnace', 1}}, + ingredients = {{name='electric-filter-furnace', amount=1}}, result = 'electric-furnace', }}) @@ -128,42 +293,15 @@ if settings.startup['PHI-RS'].value then data.raw['utility-constants'].default.maximum_recipe_overload_multiplier = settings.startup['PHI-RS-RECIPE-MAXROM'].value if settings.startup['PHI-RS-MODULE'].value then - table.insert(items['recipe'], { - name='speed-module', - tech='speed-module' - }) - table.insert(items['recipe'], { - name='speed-module-2', - tech='speed-module-2' - }) - table.insert(items['recipe'], { - name='speed-module-3', - tech='speed-module-3' - }) - table.insert(items['recipe'], { - name='productivity-module', - tech='productivity-module' - }) - table.insert(items['recipe'], { - name='productivity-module-2', - tech='productivity-module-2' - }) - table.insert(items['recipe'], { - name='productivity-module-3', - tech='productivity-module-3' - }) - table.insert(items['recipe'], { - name='effectivity-module', - tech='effectivity-module' - }) - table.insert(items['recipe'], { - name='effectivity-module-2', - tech='effectivity-module-2' - }) - table.insert(items['recipe'], { - name='effectivity-module-3', - tech='effectivity-module-3' - }) + items['recipe']['speed-module'].enabled = true + items['recipe']['speed-module-2'].enabled = true + items['recipe']['speed-module-3'].enabled = true + items['recipe']['productivity-module'].enabled = true + items['recipe']['productivity-module-2'].enabled = true + items['recipe']['productivity-module-3'].enabled = true + items['recipe']['effectivity-module'].enabled = true + items['recipe']['effectivity-module-2'].enabled = true + items['recipe']['effectivity-module-3'].enabled = true end local recipe_multiplier = {} @@ -179,29 +317,48 @@ if settings.startup['PHI-RS'].value then end if #recipe_multiplier > 0 then - for i=1, #items['recipe'], 1 do - if data.raw.recipe[items['recipe'][i].name] then + local prod_module_list = {} + + for k, v in pairs(data.raw.module) do + if v.limitation and string.find(v.name, 'productivity', 1, true) then + table.insert(prod_module_list, k) + end + end + + for k, v in pairs(items['recipe']) do + if v.enabled and data.raw.recipe[k] then for j=1, #recipe_multiplier, 1 do - item = table.deepcopy(data.raw.recipe[items['recipe'][i].name]) + item = table.deepcopy(data.raw.recipe[k]) item.enabled = false + item.name = k .. '-s' .. j + item.hide_from_player_crafting = true - if item.normal and item.normal then - for k, v in pairs(item.normal.ingredients) do - if v[1] and v[2] then - item.normal.ingredients[k][2] = v[2] * recipe_multiplier[j] + if item.energy_required then + item.energy_required = item.energy_required * recipe_multiplier[j] - else - item.normal.ingredients[k].amount = v.amount * recipe_multiplier[j] + else + item.energy_required = recipe_multiplier[j] + end + + if item.normal then + if item.normal.ingredients then + for ik, iv in pairs(item.normal.ingredients) do + if iv[1] and iv[2] then + item.normal.ingredients[ik][2] = iv[2] * recipe_multiplier[j] + + else + item.normal.ingredients[ik].amount = iv.amount * recipe_multiplier[j] + end end end if item.normal.results then - for k, v in pairs(item.normal.results) do - if v[1] and v[2] then - item.normal.results[k][2] = v[2] * recipe_multiplier[j] + for rk, rv in pairs(item.normal.results) do + if rv[1] and rv[2] then + item.normal.results[rk][2] = rv[2] * recipe_multiplier[j] else - item.normal.results[k].amount = v.amount * recipe_multiplier[j] + item.normal.results[rk].amount = rv.amount * recipe_multiplier[j] end end @@ -213,31 +370,27 @@ if settings.startup['PHI-RS'].value then item.normal.result_count = recipe_multiplier[j] end end + end - if item.normal.energy_required then - item.normal.energy_required = item.normal.energy_required * recipe_multiplier[j] + if item.expensive then + if item.expensive.ingredients then + for ik, iv in pairs(item.expensive.ingredients) do + if iv[1] and iv[2] then + item.expensive.ingredients[ik][2] = iv[2] * recipe_multiplier[j] - else - item.normal.energy_required = recipe_multiplier[j] / 2 - end - - elseif item.expensive and item.expensive then - for k, v in pairs(item.expensive.ingredients) do - if v[1] and v[2] then - item.expensive.ingredients[k][2] = v[2] * recipe_multiplier[j] - - else - item.expensive.ingredients[k].amount = v.amount * recipe_multiplier[j] + else + item.expensive.ingredients[ik].amount = iv.amount * recipe_multiplier[j] + end end end if item.expensive.results then - for k, v in pairs(item.expensive.results) do - if v[1] and v[2] then - item.expensive.results[k][2] = v[2] * recipe_multiplier[j] + for rk, rv in pairs(item.expensive.results) do + if rv[1] and rv[2] then + item.expensive.results[rk][2] = rv[2] * recipe_multiplier[j] else - item.expensive.results[k].amount = v.amount * recipe_multiplier[j] + item.expensive.results[rk].amount = rv.amount * recipe_multiplier[j] end end @@ -249,69 +402,82 @@ if settings.startup['PHI-RS'].value then item.expensive.result_count = recipe_multiplier[j] end end + end - if item.expensive.energy_required then - item.expensive.energy_required = item.expensive.energy_required * recipe_multiplier[j] + if item.ingredients then + for ik, iv in pairs(item.ingredients) do + if iv[1] and iv[2] then + item.ingredients[ik][2] = iv[2] * recipe_multiplier[j] - else - item.expensive.energy_required = recipe_multiplier[j] / 2 + else + item.ingredients[ik].amount = iv.amount * recipe_multiplier[j] + end + end + end + + if item.results then + for rk, rv in pairs(item.results) do + if rv[1] and rv[2] then + item.results[rk][2] = rv[2] * recipe_multiplier[j] + + else + item.results[rk].amount = rv.amount * recipe_multiplier[j] + end end else - for k, v in pairs(item.ingredients) do - if v[1] and v[2] then - item.ingredients[k][2] = v[2] * recipe_multiplier[j] - - else - item.ingredients[k].amount = v.amount * recipe_multiplier[j] - end - end - if item.results then - for k, v in pairs(item.results) do - if v[1] and v[2] then - item.results[k][2] = v[2] * recipe_multiplier[j] - - else - item.results[k].amount = v.amount * recipe_multiplier[j] - end - end + if item.result_count then + item.result_count = item.result_count * recipe_multiplier[j] else - if item.result_count then - item.result_count = item.result_count * recipe_multiplier[j] - - else - item.result_count = recipe_multiplier[j] - end - end - - if item.energy_required then - item.energy_required = item.energy_required * recipe_multiplier[j] - - else - item.energy_required = recipe_multiplier[j] / 2 + item.result_count = recipe_multiplier[j] end end - item.name = items['recipe'][i].name .. '-s' .. j - item.hide_from_player_crafting = true - data:extend({item}) - table.insert(data.raw.technology[items['recipe'][i].tech].effects, {type='unlock-recipe', recipe=item.name}) + table.insert(data.raw.technology[v.tech].effects, {type='unlock-recipe', recipe=item.name}) + + for l=1, #prod_module_list, 1 do + table.insert(data.raw.module[prod_module_list[l]].limitation, item.name) + end end end end end +end - local module_limitation = table.deepcopy(data.raw.module['productivity-module']['limitation']) +if settings.startup['PHI-MI-PIPE'].value then + for k, _ in pairs(data.raw) do + if data.raw[k] then + if data.raw[k].fluid_box then + if data.raw[k].fluid_box.height < settings.startup['PHI-MI-PIPE'].value then + data.raw[k].fluid_box.height = settings.startup['PHI-MI-PIPE'].value + end - if module_limitation then - for _, v in pairs(data.raw.module) do - if v.limitation and string.find(v.name, 'productivity', 1, true) then - for j=1, #recipe_multiplier, 1 do - for k, _ in pairs(module_limitation) do - if data.raw.recipe[module_limitation[k] .. '-s' .. j] ~= nil then - table.insert(v.limitation, module_limitation[k] .. '-s' .. j) + if data.raw[k].fluid_box.base_level < (1 + settings.startup['PHI-MI-PIPE'].value) then + data.raw[k].fluid_box.base_level = 1 + settings.startup['PHI-MI-PIPE'].value + end + end + + if data.raw[k].output_fluid_box then + if data.raw[k].output_fluid_box.height < settings.startup['PHI-MI-PIPE'].value then + data.raw[k].output_fluid_box.height = settings.startup['PHI-MI-PIPE'].value + end + + if data.raw[k].output_fluid_box.base_level > (-1 - settings.startup['PHI-MI-PIPE'].value) then + data.raw[k].output_fluid_box.base_level = (-1 - settings.startup['PHI-MI-PIPE'].value) + end + end + + if data.raw[k].fluid_boxes then + for k1, _ in pairs(data.raw[k].fluid_boxes) do + if data.raw[k].fluid_boxes[k1] ~= false and data.raw[k].fluid_boxes[k1] ~= true then + if data.raw[k].fluid_boxes[k1].production_type then + data.raw[k].fluid_boxes[k1].height = settings.startup['PHI-MI-PIPE'].value + + if data.raw[k].fluid_boxes[k1].base_level then + data.raw[k].fluid_boxes[k1].base_level = 1 + settings.startup['PHI-MI-PIPE'].value + end end end end @@ -320,42 +486,52 @@ if settings.startup['PHI-RS'].value then end end ---[[ -for k, _ in pairs(data.raw) do - if data.raw[k] ~= nil then - if data.raw[k].fluid_box ~= nil then - if data.raw[k].fluid_box.height < 4 then - data.raw[k].fluid_box.height = 4 - end - if data.raw[k].fluid_box.base_level < 5 then - data.raw[k].fluid_box.base_level = 5 - end - end - if data.raw[k].output_fluid_box ~= nil then - if data.raw[k].output_fluid_box.height < 4 then - data.raw[k].output_fluid_box.height = 4 - end - if data.raw[k].output_fluid_box.base_level > -5 then - data.raw[k].output_fluid_box.base_level = -5 - end - end +if settings.startup['PHI-MB'].value then + if settings.startup['PHI-MB-MINING-TIER'].value > 1 then + data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group = 'se-core-miner-drill' - if data.raw[k].fluid_boxes ~= nil then - for k1, _ in pairs(data.raw[k].fluid_boxes) do - if data.raw[k].fluid_boxes[k1] ~= false and data.raw[k].fluid_boxes[k1] ~= true then - if data.raw[k].fluid_boxes[k1].production_type ~= nil then - data.raw[k].fluid_boxes[k1].height = 4 + local se = { + type = 'mining-drill', + name = 'se-core-miner-drill', + ref_name = 'se-core-miner-drill', + min = 2, + max = 3 + } - if data.raw[k].fluid_boxes[k1].base_level ~= nil then - data.raw[k].fluid_boxes[k1].base_level = data.raw[k].fluid_boxes[k1].base_level * 4 - end - end - end + for i=2, settings.startup['PHI-MB-MINING-TIER'].value do + local miner_name = 'se-core-miner-' .. i + local drill_name = 'se-core-miner-drill-' .. i + + main.EEE(se, i) + data.raw['mining-drill'][drill_name].minable.result = miner_name + data.raw['mining-drill'][drill_name].placeable_by.item = miner_name + + local item = table.deepcopy(data.raw['item']['se-core-miner']) + item.name = 'se-core-miner-' .. i + item.place_result = drill_name + item.order = 'zzzz-core-miner-' .. i + data:extend({item}) + + local ing_n = 'se-core-miner' + + if i > 2 then + ing_n = ing_n .. '-' .. i end + + data:extend({{ + type = 'recipe', + name = miner_name, + energy_required = 2, + enabled = false, + ingredients = {{ing_n, 2}}, + result = miner_name + }}) + + data.raw['mining-drill'][drill_name].fast_replaceable_group = data.raw['mining-drill']['se-core-miner-drill'].fast_replaceable_group + table.insert(data.raw.technology['se-core-miner'].effects, {type='unlock-recipe', recipe=miner_name}) end end end -]] for _, v in pairs(items['item']) do if v.enabled then diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index 16180d4..ce367cf 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -2,13 +2,95 @@ local items = require 'config' local main = require 'main' local file_stage = 1 +if settings.startup['PHI-CT'].value then + data:extend({{ + type = 'recipe', + name = 'wood-production', + energy_required = 10, + enabled = true, + icon = '__base__/graphics/icons/wood.png', + icon_size = 64, + icon_mipmaps = 4, + subgroup = 'intermediate-product', + order = 'za', + ingredients = {{'wood', 60}}, + results = { + { + name = 'wood', + probability = 0.5, + amount = 10 + }, + { + name = 'wood', + probability = 0.5, + amount = 10 + }, + { + name = 'wood', + probability = 0.5, + amount = 10 + }, + { + name = 'wood', + probability = 0.5, + amount = 10 + } + } + }}) + + data:extend({{ + type = 'recipe', + name = 'fish-production', + energy_required = 10, + enabled = true, + icon = '__base__/graphics/icons/fish.png', + icon_size = 64, + icon_mipmaps = 4, + subgroup = 'intermediate-product', + order = 'zb', + ingredients = {{'raw-fish', 60}}, + results = { + { + name = 'raw-fish', + probability = 0.5, + amount = 10 + }, + { + name = 'raw-fish', + probability = 0.5, + amount = 10 + }, + { + name = 'raw-fish', + probability = 0.5, + amount = 10 + }, + { + name = 'raw-fish', + probability = 0.5, + amount = 10 + } + } + }}) + + for k, v in pairs(data.raw.module) do + if v.limitation and string.find(v.name, 'productivity', 1, true) then + table.insert(v.limitation, 'wood-production') + table.insert(v.limitation, 'fish-production') + end + end +end + if settings.startup['PHI-MI'].value then data.raw['arithmetic-combinator']['arithmetic-combinator'].energy_source.usage_priority = 'primary-input' data.raw['decider-combinator']['decider-combinator'].energy_source.usage_priority = 'primary-input' - --data.raw['repair-tool']['repair-pack'].speed = 4 - --data.raw['repair-tool']['repair-pack'].durability = 600 - if settings.startup['PHI-MI-LOADER'].value then + if settings.startup['PHI-MI-REPAIR'].value then + data.raw['repair-tool']['repair-pack'].speed = 2 * settings.startup['PHI-MI-REPAIR'].value + data.raw['repair-tool']['repair-pack'].durability = 300 * settings.startup['PHI-MI-REPAIR'].value + 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 @@ -49,72 +131,84 @@ if settings.startup['PHI-MI'].value then data.raw['reactor']['nuclear-reactor'].scale_energy_usage = true end - --[[ - data.raw['pipe']['pipe'].fluid_box.height = 4 - data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.height = 4 - data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.pipe_connections = {{position = {0, -1}}, {position = {0, 1}, max_underground_distance = 20}} - data.raw['pump']['pump'].fluid_box.height = 16 - data.raw['pump']['pump'].pumping_speed = 800 - -- data.raw['storage-tank']['storage-tank'].fluid_box.base_area = 500 - data.raw['storage-tank']['storage-tank'].fluid_box.height = 2 + if settings.startup['PHI-MI-PIPE'].value then + data.raw['pipe']['pipe'].fluid_box.height = settings.startup['PHI-MI-PIPE'].value + data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.height = settings.startup['PHI-MI-PIPE'].value + data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.pipe_connections = {{position = {0, -1}}, {position = {0, 1}, max_underground_distance = 10}} + data.raw['pump']['pump'].fluid_box.height = 4 * settings.startup['PHI-MI-PIPE'].value + data.raw['pump']['pump'].pumping_speed = 200 * settings.startup['PHI-MI-PIPE'].value + data.raw['storage-tank']['storage-tank'].fluid_box.height = settings.startup['PHI-MI-PIPE'].value + -- data.raw['storage-tank']['storage-tank'].fluid_box.base_area = 500 + end - data.raw['locomotive']['locomotive'].max_health = 2000 - data.raw['locomotive']['locomotive'].max_speed = 2 - data.raw['locomotive']['locomotive'].max_power = '1200kW' - data.raw['locomotive']['locomotive'].reversing_power_modifier = 1 - data.raw['locomotive']['locomotive'].braking_force = 20 - data.raw['locomotive']['locomotive'].friction_force = 0.25 - data.raw['locomotive']['locomotive'].air_resistance = 0.004 - data.raw['locomotive']['locomotive'].burner.effectivity = 2 - data.raw['locomotive']['locomotive'].burner.fuel_inventory_size = 3 - data.raw['cargo-wagon']['cargo-wagon'].max_health = 1000 - data.raw['cargo-wagon']['cargo-wagon'].inventory_size = 80 - data.raw['cargo-wagon']['cargo-wagon'].max_speed = 3.5 - data.raw['cargo-wagon']['cargo-wagon'].braking_force = 5 - data.raw['cargo-wagon']['cargo-wagon'].friction_force = 0.25 - data.raw['cargo-wagon']['cargo-wagon'].air_resistance = 0.005 - data.raw['fluid-wagon']['fluid-wagon'].max_health = 1000 - data.raw['fluid-wagon']['fluid-wagon'].capacity = 50000 - data.raw['fluid-wagon']['fluid-wagon'].max_speed = 3.5 - data.raw['fluid-wagon']['fluid-wagon'].braking_force = 5 - data.raw['fluid-wagon']['fluid-wagon'].friction_force = 0.25 - data.raw['fluid-wagon']['fluid-wagon'].air_resistance = 0.005 + if settings.startup['PHI-MI-ROBOT'].value then + data.raw['construction-robot']['construction-robot'].speed = 0.06 * settings.startup['PHI-MI-ROBOT'].value + data.raw['construction-robot']['construction-robot'].max_health = 100 * settings.startup['PHI-MI-ROBOT'].value + data.raw['construction-robot']['construction-robot'].max_payload_size = settings.startup['PHI-MI-ROBOT'].value + data.raw['construction-robot']['construction-robot'].max_energy = (1.5 * settings.startup['PHI-MI-ROBOT'].value) .. 'MJ' + data.raw['construction-robot']['construction-robot'].energy_per_move = '2kJ' + data.raw['construction-robot']['construction-robot'].speed_multiplier_when_out_of_energy = 0.2 + (0.05 * (settings.startup['PHI-MI-ROBOT'].value)) - data.raw['construction-robot']['construction-robot'].max_health = 600 - data.raw['construction-robot']['construction-robot'].max_payload_size = 3 - data.raw['construction-robot']['construction-robot'].max_energy = '6MJ' - data.raw['construction-robot']['construction-robot'].speed = 0.12 - data.raw['construction-robot']['construction-robot'].speed_multiplier_when_out_of_energy = 0.4 - data.raw['construction-robot']['construction-robot'].energy_per_move = '1kJ' + data.raw['logistic-robot']['logistic-robot'].speed = 0.06 * settings.startup['PHI-MI-ROBOT'].value + data.raw['logistic-robot']['logistic-robot'].max_health = 100 * settings.startup['PHI-MI-ROBOT'].value + data.raw['logistic-robot']['logistic-robot'].max_payload_size = settings.startup['PHI-MI-ROBOT'].value + data.raw['logistic-robot']['logistic-robot'].max_energy = (1.5 * settings.startup['PHI-MI-ROBOT'].value) .. 'MJ' + data.raw['logistic-robot']['logistic-robot'].energy_per_move = '2kJ' + data.raw['logistic-robot']['logistic-robot'].speed_multiplier_when_out_of_energy = 0.2 + (0.05 * (settings.startup['PHI-MI-ROBOT'].value)) - data.raw['logistic-robot']['logistic-robot'].max_health = 600 - data.raw['logistic-robot']['logistic-robot'].max_payload_size = 3 - data.raw['logistic-robot']['logistic-robot'].max_energy = '6MJ' - data.raw['logistic-robot']['logistic-robot'].speed = 0.12 - data.raw['logistic-robot']['logistic-robot'].speed_multiplier_when_out_of_energy = 0.4 - data.raw['logistic-robot']['logistic-robot'].energy_per_move = '1kJ' + data.raw['roboport']['roboport'].max_health = 500 * settings.startup['PHI-MI-ROBOT'].value + data.raw['roboport']['roboport'].energy_usage = 50 * settings.startup['PHI-MI-ROBOT'].value .. 'kW' + data.raw['roboport']['roboport'].energy_source.input_flow_limit = (10 * settings.startup['PHI-MI-ROBOT'].value) .. 'MW' + data.raw['roboport']['roboport'].energy_source.buffer_capacity = (200 * settings.startup['PHI-MI-ROBOT'].value) .. 'MJ' + data.raw['roboport']['roboport'].recharge_minimum = (80 * settings.startup['PHI-MI-ROBOT'].value) .. 'MJ' + data.raw['roboport']['roboport'].charging_energy = (5 * settings.startup['PHI-MI-ROBOT'].value) .. 'MW' + -- data.raw['roboport']['roboport'].logistics_radius = 25 + -- data.raw['roboport']['roboport'].construction_radius = 55 + data.raw['roboport']['roboport'].charging_offsets = { + {-1.5, -0.5}, + {1.5, -0.5}, + {1.5, 1.5}, + {-1.5, 1.5}, + {-2.5, -1.5}, + {2.5, -1.5}, + {2.5, 2.5}, + {-2.5, 2.5} + } + end - data.raw['roboport']['roboport'].max_health = 1000 - data.raw['roboport']['roboport'].energy_usage = '100kW' - data.raw['roboport']['roboport'].energy_source.input_flow_limit = '40MW' - data.raw['roboport']['roboport'].energy_source.buffer_capacity = '200MJ' - data.raw['roboport']['roboport'].recharge_minimum = '40MJ' - data.raw['roboport']['roboport'].charging_energy = '4000kW' - data.raw['roboport']['roboport'].robot_slots_count = 10 - data.raw['roboport']['roboport'].material_slots_count = 2 - -- data.raw['roboport']['roboport'].logistics_radius = 25 - -- data.raw['roboport']['roboport'].construction_radius = 55 - data.raw['roboport']['roboport'].charging_offsets = { - {-1.5, -0.5}, - {1.5, -0.5}, - {1.5, 1.5}, - {-1.5, 1.5}, - {-2.5, -1.5}, - {2.5, -1.5}, - {2.5, 2.5}, - {-2.5, 2.5} - } - ]] + if settings.startup['PHI-MI-TRAIN'].value then + data.raw['locomotive']['locomotive'].max_health = 500 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].max_speed = 0.6 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].max_power = (600 * settings.startup['PHI-MI-TRAIN'].value) .. 'kW' + data.raw['locomotive']['locomotive'].reversing_power_modifier = 1 + data.raw['locomotive']['locomotive'].energy_per_hit_point = 4 + settings.startup['PHI-MI-TRAIN'].value + data.raw['locomotive']['locomotive'].braking_force = 5 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].air_resistance = 0.0075 - (0.0007 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].burner.effectivity = 0.5 + (0.5 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['locomotive']['locomotive'].burner.fuel_inventory_size = 3 + + data.raw['cargo-wagon']['cargo-wagon'].max_health = 300 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['cargo-wagon']['cargo-wagon'].max_speed = 0.6 * (2 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['cargo-wagon']['cargo-wagon'].braking_force = 1.5 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['cargo-wagon']['cargo-wagon'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['cargo-wagon']['cargo-wagon'].air_resistance = 0.01 - (0.001 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['cargo-wagon']['cargo-wagon'].inventory_size = 5 * (7 + settings.startup['PHI-MI-TRAIN'].value) + + data.raw['fluid-wagon']['fluid-wagon'].max_health = 300 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['fluid-wagon']['fluid-wagon'].max_speed = 0.6 * (2 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['fluid-wagon']['fluid-wagon'].braking_force = 1.5 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['fluid-wagon']['fluid-wagon'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['fluid-wagon']['fluid-wagon'].air_resistance = 0.01 - (0.001 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['fluid-wagon']['fluid-wagon'].capacity = 3125 * (7 + settings.startup['PHI-MI-TRAIN'].value) + + data.raw['artillery-wagon']['artillery-wagon'].max_health = 300 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['artillery-wagon']['artillery-wagon'].max_speed = 0.6 * (2 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['artillery-wagon']['artillery-wagon'].braking_force = 1.5 * (1 + settings.startup['PHI-MI-TRAIN'].value) + data.raw['artillery-wagon']['artillery-wagon'].friction_force = 0.50 - (0.05 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['artillery-wagon']['artillery-wagon'].air_resistance = 0.015 - (0.0015 * settings.startup['PHI-MI-TRAIN'].value) + data.raw['artillery-wagon']['artillery-wagon'].turret_rotation_speed = 0.0005 * (1 + settings.startup['PHI-MI-TRAIN'].value) + end if settings.startup['PHI-MI-BOILER'].value then local item = table.deepcopy(data.raw['item']['boiler']) @@ -127,9 +221,13 @@ if settings.startup['PHI-MI'].value then entity.name = 'electric-boiler' entity.energy_consumption = '7200kW' entity.target_temperature = 165 - entity.fluid_box.height = 4 - entity.output_fluid_box.height = 4 - entity.output_fluid_box.base_level = 5 + + if settings.startup['PHI-MI-PIPE'].value then + entity.fluid_box.height = settings.startup['PHI-MI-PIPE'].value + entity.output_fluid_box.height = settings.startup['PHI-MI-PIPE'].value + entity.output_fluid_box.base_level = entity.output_fluid_box.base_level + settings.startup['PHI-MI-PIPE'].value + end + entity.minable = {hardness = 0.2, mining_time = 0.5, result = 'electric-boiler'} entity.emissions_per_minute = 0 entity.energy_source.type = 'electric' @@ -149,10 +247,19 @@ if settings.startup['PHI-MI'].value then name = 'electric-boiler', energy_required = 2, enabled = true, - ingredients = {{'boiler', 1}, {'electronic-circuit', 1}}, + ingredients = {{name='boiler', amount=1}, {name='electronic-circuit', amount=1}}, result = 'electric-boiler', }}) + data:extend({{ + type = 'recipe', + name = 'boiler-return', + energy_required = 2, + enabled = true, + ingredients = {{name='electric-boiler', amount=1}}, + result = 'boiler', + }}) + -- electric boiler data.raw['boiler']['boiler'].fast_replaceable_group = 'boiler' data.raw['boiler']['electric-boiler'].fast_replaceable_group = data.raw['boiler']['electric-boiler'].fast_replaceable_group @@ -209,19 +316,27 @@ if settings.startup['PHI-MI'].value then end table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='basic-steel-chest'}) + table.insert(data.raw.technology['steel-processing'].effects, {type='unlock-recipe', recipe='basic-steel-chest-return'}) table.insert(data.raw.technology['construction-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-passive-provider'}) table.insert(data.raw.technology['construction-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-storage'}) + table.insert(data.raw.technology['construction-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-passive-provider-return'}) + table.insert(data.raw.technology['construction-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-storage-return'}) table.insert(data.raw.technology['logistic-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-passive-provider'}) table.insert(data.raw.technology['logistic-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-storage'}) + table.insert(data.raw.technology['logistic-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-passive-provider-return'}) + table.insert(data.raw.technology['logistic-robotics'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-storage-return'}) table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-active-provider'}) table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-buffer'}) table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-requester'}) + table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-active-provider-return'}) + table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-buffer-return'}) + table.insert(data.raw.technology['logistic-system'].effects, {type='unlock-recipe', recipe='basic-logistic-chest-requester-return'}) end end for k, v in pairs(items['setting']) do for k2=1, #v.effect do - if items[v.effect[k2]] ~= nil then + if items[v.effect[k2]] then if settings.startup[k].value < items[v.effect[k2]].min then items[v.effect[k2]].enabled = false end diff --git a/PHI-CL/info.json b/PHI-CL/info.json index ae42f6b..ac5d3a8 100644 --- a/PHI-CL/info.json +++ b/PHI-CL/info.json @@ -1,8 +1,8 @@ { "name": "PHI-CL", - "version": "2.0.2", + "version": "2.0.12", "factorio_version": "1.1", - "date": "2024-06-26", + "date": "2024-08-10", "title": "Phidias Collection", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index 813bf47..b76feee 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -7,13 +7,13 @@ accumulator-6=Accumulator 6 accumulator-7=Accumulator 7 accumulator-8=Accumulator 8 -solar-panel-2=Solar Panel 2 -solar-panel-3=Solar Panel 3 -solar-panel-4=Solar Panel 4 -solar-panel-5=Solar Panel 5 -solar-panel-6=Solar Panel 6 -solar-panel-7=Solar Panel 7 -solar-panel-8=Solar Panel 8 +solar-panel-2=Solar panel 2 +solar-panel-3=Solar panel 3 +solar-panel-4=Solar panel 4 +solar-panel-5=Solar panel 5 +solar-panel-6=Solar panel 6 +solar-panel-7=Solar panel 7 +solar-panel-8=Solar panel 8 boiler-2=Boiler 2 boiler-3=Boiler 3 @@ -181,54 +181,56 @@ flamethrower-turret-3=Flamethrower turret 3 radar-2=Radar 2 radar-3=Radar 3 -solar-panel-mk2-equipment=Portable Solar Panel MK2 -solar-panel-mk3-equipment=Portable Solar Panel MK3 -solar-panel-mk4-equipment=Portable Solar Panel MK4 -solar-panel-mk5-equipment=Portable Solar Panel MK5 -solar-panel-mk6-equipment=Portable Solar Panel MK6 -solar-panel-mk7-equipment=Portable Solar Panel MK7 -solar-panel-mk8-equipment=Portable Solar Panel MK8 +solar-panel-mk2-equipment=Portable solar panel MK2 +solar-panel-mk3-equipment=Portable solar panel MK3 +solar-panel-mk4-equipment=Portable solar panel MK4 +solar-panel-mk5-equipment=Portable solar panel MK5 +solar-panel-mk6-equipment=Portable solar panel MK6 +solar-panel-mk7-equipment=Portable solar panel MK7 +solar-panel-mk8-equipment=Portable solar panel MK8 -battery-mk3-equipment=Personal Battery MK3 -battery-mk4-equipment=Personal Battery MK4 -battery-mk5-equipment=Personal Battery MK5 -battery-mk6-equipment=Personal Battery MK6 -battery-mk7-equipment=Personal Battery MK7 -battery-mk8-equipment=Personal Battery MK8 +battery-mk3-equipment=Personal battery MK3 +battery-mk4-equipment=Personal battery MK4 +battery-mk5-equipment=Personal battery MK5 +battery-mk6-equipment=Personal battery MK6 +battery-mk7-equipment=Personal battery MK7 +battery-mk8-equipment=Personal battery MK8 -fusion-reactor-mk2-equipment=Portable Fusion Reactor MK2 -fusion-reactor-mk3-equipment=Portable Fusion Reactor MK3 -fusion-reactor-mk4-equipment=Portable Fusion Reactor MK4 -fusion-reactor-mk5-equipment=Portable Fusion Reactor MK5 -fusion-reactor-mk6-equipment=Portable Fusion Reactor MK6 -fusion-reactor-mk7-equipment=Portable Fusion Reactor MK7 -fusion-reactor-mk8-equipment=Portable Fusion Reactor MK8 +fusion-reactor-mk2-equipment=Portable fusion reactor MK2 +fusion-reactor-mk3-equipment=Portable fusion reactor MK3 +fusion-reactor-mk4-equipment=Portable fusion reactor MK4 +fusion-reactor-mk5-equipment=Portable fusion reactor MK5 +fusion-reactor-mk6-equipment=Portable fusion reactor MK6 +fusion-reactor-mk7-equipment=Portable fusion reactor MK7 +fusion-reactor-mk8-equipment=Portable fusion reactor MK8 -energy-shield-mk3-equipment=Energy Shield MK3 -energy-shield-mk4-equipment=Energy Shield MK4 -energy-shield-mk5-equipment=Energy Shield MK5 -energy-shield-mk6-equipment=Energy Shield MK6 -energy-shield-mk7-equipment=Energy Shield MK7 -energy-shield-mk8-equipment=Energy Shield MK8 +energy-shield-mk3-equipment=Energy shield MK3 +energy-shield-mk4-equipment=Energy shield MK4 +energy-shield-mk5-equipment=Energy shield MK5 +energy-shield-mk6-equipment=Energy shield MK6 +energy-shield-mk7-equipment=Energy shield MK7 +energy-shield-mk8-equipment=Energy shield MK8 -personal-laser-defense-mk2-equipment=Personal Laser Defense MK2 -personal-laser-defense-mk3-equipment=Personal Laser Defense MK3 -personal-laser-defense-mk4-equipment=Personal Laser Defense MK4 -personal-laser-defense-mk5-equipment=Personal Laser Defense MK5 -personal-laser-defense-mk6-equipment=Personal Laser Defense MK6 -personal-laser-defense-mk7-equipment=Personal Laser Defense MK7 -personal-laser-defense-mk8-equipment=Personal Laser Defense MK8 +personal-laser-defense-mk2-equipment=Personal laser defense MK2 +personal-laser-defense-mk3-equipment=Personal laser defense MK3 +personal-laser-defense-mk4-equipment=Personal laser defense MK4 +personal-laser-defense-mk5-equipment=Personal laser defense MK5 +personal-laser-defense-mk6-equipment=Personal laser defense MK6 +personal-laser-defense-mk7-equipment=Personal laser defense MK7 +personal-laser-defense-mk8-equipment=Personal laser defense MK8 -personal-roboport-mk3-equipment=Personal Roboport MK3 -personal-roboport-mk4-equipment=Personal Roboport MK4 -personal-roboport-mk5-equipment=Personal Roboport MK5 -personal-roboport-mk6-equipment=Personal Roboport MK6 -personal-roboport-mk7-equipment=Personal Roboport MK7 -personal-roboport-mk8-equipment=Personal Roboport MK8 +personal-roboport-mk3-equipment=Personal roboport MK3 +personal-roboport-mk4-equipment=Personal roboport MK4 +personal-roboport-mk5-equipment=Personal roboport MK5 +personal-roboport-mk6-equipment=Personal roboport MK6 +personal-roboport-mk7-equipment=Personal roboport MK7 +personal-roboport-mk8-equipment=Personal roboport MK8 + +night-vision-mk2-equipment=Nightvision equipment MK2 -night-vision-mk2-equipment=Nightvision Equipment MK2 exoskeleton-mk2-equipment=Exoskeleton MK2 -power-armor-mk3=Power Armor MK3 + +power-armor-mk3=Power armor MK3 basic-steel-chest=Basic steel chest @@ -244,6 +246,14 @@ basic-logistic-chest-storage=Basic storage chest electric-boiler=Electric boiler +oil-pump=Oil pump + +super-radar=Super radars + +trash-chest=Trash chest + +trash-pipe=Trash pipe + [item-description] solar-panel-mk2-equipment=Provides power for equipment modules. solar-panel-mk3-equipment=Provides power for equipment modules. @@ -291,7 +301,9 @@ personal-roboport-mk7-equipment=Inserted into armor to allow many construction r personal-roboport-mk8-equipment=Inserted into armor to allow many construction robots to work from your inventory. night-vision-mk2-equipment=Allows you to see more clearly in darkness. + exoskeleton-mk2-equipment=Inserted into armor to increase movement speed. You can equip multiple exoskeletons at once. + power-armor-mk3=Armor with a huge equipment grid and inventory size bonus. [entity-name] @@ -303,13 +315,13 @@ accumulator-6=Accumulator 6 accumulator-7=Accumulator 7 accumulator-8=Accumulator 8 -solar-panel-2=Solar Panel 2 -solar-panel-3=Solar Panel 3 -solar-panel-4=Solar Panel 4 -solar-panel-5=Solar Panel 5 -solar-panel-6=Solar Panel 6 -solar-panel-7=Solar Panel 7 -solar-panel-8=Solar Panel 8 +solar-panel-2=Solar panel 2 +solar-panel-3=Solar panel 3 +solar-panel-4=Solar panel 4 +solar-panel-5=Solar panel 5 +solar-panel-6=Solar panel 6 +solar-panel-7=Solar panel 7 +solar-panel-8=Solar panel 8 boiler-2=Boiler 2 boiler-3=Boiler 3 @@ -491,6 +503,14 @@ basic-logistic-chest-storage=Basic storage chest electric-boiler=Electric boiler +oil-pump=Oil pump + +super-radar=Super radar + +trash-chest=Trash chest + +trash-pipe=Trash pipe + [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. @@ -683,145 +703,173 @@ basic-logistic-chest-requester=Requests specified items from the logistic networ electric-boiler=Burns fuel to turn water into steam. +oil-pump=Pumps fluid + +super-radar=Scans the nearby sectors, and actively reveals an area around it. + [equipment-name] -solar-panel-mk2-equipment=Portable Solar Panel MK2 -solar-panel-mk3-equipment=Portable Solar Panel MK3 -solar-panel-mk4-equipment=Portable Solar Panel MK4 -solar-panel-mk5-equipment=Portable Solar Panel MK5 -solar-panel-mk6-equipment=Portable Solar Panel MK6 -solar-panel-mk7-equipment=Portable Solar Panel MK7 -solar-panel-mk8-equipment=Portable Solar Panel MK8 +solar-panel-mk2-equipment=Portable solar panel MK2 +solar-panel-mk3-equipment=Portable solar panel MK3 +solar-panel-mk4-equipment=Portable solar panel MK4 +solar-panel-mk5-equipment=Portable solar panel MK5 +solar-panel-mk6-equipment=Portable solar panel MK6 +solar-panel-mk7-equipment=Portable solar panel MK7 +solar-panel-mk8-equipment=Portable solar panel MK8 -battery-mk3-equipment=Personal Battery MK3 -battery-mk4-equipment=Personal Battery MK4 -battery-mk5-equipment=Personal Battery MK5 -battery-mk6-equipment=Personal Battery MK6 -battery-mk7-equipment=Personal Battery MK7 -battery-mk8-equipment=Personal Battery MK8 +battery-mk3-equipment=Personal battery MK3 +battery-mk4-equipment=Personal battery MK4 +battery-mk5-equipment=Personal battery MK5 +battery-mk6-equipment=Personal battery MK6 +battery-mk7-equipment=Personal battery MK7 +battery-mk8-equipment=Personal battery MK8 -fusion-reactor-mk2-equipment=Portable Fusion Reactor MK2 -fusion-reactor-mk3-equipment=Portable Fusion Reactor MK3 -fusion-reactor-mk4-equipment=Portable Fusion Reactor MK4 -fusion-reactor-mk5-equipment=Portable Fusion Reactor MK5 -fusion-reactor-mk6-equipment=Portable Fusion Reactor MK6 -fusion-reactor-mk7-equipment=Portable Fusion Reactor MK7 -fusion-reactor-mk8-equipment=Portable Fusion Reactor MK8 +fusion-reactor-mk2-equipment=Portable fusion reactor MK2 +fusion-reactor-mk3-equipment=Portable fusion reactor MK3 +fusion-reactor-mk4-equipment=Portable fusion reactor MK4 +fusion-reactor-mk5-equipment=Portable fusion reactor MK5 +fusion-reactor-mk6-equipment=Portable fusion reactor MK6 +fusion-reactor-mk7-equipment=Portable fusion reactor MK7 +fusion-reactor-mk8-equipment=Portable fusion reactor MK8 -energy-shield-mk3-equipment=Energy Shield MK3 -energy-shield-mk4-equipment=Energy Shield MK4 -energy-shield-mk5-equipment=Energy Shield MK5 -energy-shield-mk6-equipment=Energy Shield MK6 -energy-shield-mk7-equipment=Energy Shield MK7 -energy-shield-mk8-equipment=Energy Shield MK8 +energy-shield-mk3-equipment=Energy shield MK3 +energy-shield-mk4-equipment=Energy shield MK4 +energy-shield-mk5-equipment=Energy shield MK5 +energy-shield-mk6-equipment=Energy shield MK6 +energy-shield-mk7-equipment=Energy shield MK7 +energy-shield-mk8-equipment=Energy shield MK8 -personal-laser-defense-mk2-equipment=Personal Laser Defense MK2 -personal-laser-defense-mk3-equipment=Personal Laser Defense MK3 -personal-laser-defense-mk4-equipment=Personal Laser Defense MK4 -personal-laser-defense-mk5-equipment=Personal Laser Defense MK5 -personal-laser-defense-mk6-equipment=Personal Laser Defense MK6 -personal-laser-defense-mk7-equipment=Personal Laser Defense MK7 -personal-laser-defense-mk8-equipment=Personal Laser Defense MK8 +personal-laser-defense-mk2-equipment=Personal laser defense MK2 +personal-laser-defense-mk3-equipment=Personal laser defense MK3 +personal-laser-defense-mk4-equipment=Personal laser defense MK4 +personal-laser-defense-mk5-equipment=Personal laser defense MK5 +personal-laser-defense-mk6-equipment=Personal laser defense MK6 +personal-laser-defense-mk7-equipment=Personal laser defense MK7 +personal-laser-defense-mk8-equipment=Personal laser defense MK8 -personal-roboport-mk3-equipment=Personal Roboport MK3 -personal-roboport-mk4-equipment=Personal Roboport MK4 -personal-roboport-mk5-equipment=Personal Roboport MK5 -personal-roboport-mk6-equipment=Personal Roboport MK6 -personal-roboport-mk7-equipment=Personal Roboport MK7 -personal-roboport-mk8-equipment=Personal Roboport MK8 +personal-roboport-mk3-equipment=Personal roboport MK3 +personal-roboport-mk4-equipment=Personal roboport MK4 +personal-roboport-mk5-equipment=Personal roboport MK5 +personal-roboport-mk6-equipment=Personal roboport MK6 +personal-roboport-mk7-equipment=Personal roboport MK7 +personal-roboport-mk8-equipment=Personal roboport MK8 + +night-vision-mk2-equipment=Nightvision equipment MK2 -night-vision-mk2-equipment=Nightvision Equipment MK2 exoskeleton-mk2-equipment=Exoskeleton MK2 [recipe-name] basic-oil-processing-s1=Basic oil processing basic-oil-processing-s2=Basic oil processing + advanced-oil-processing-s1=Advanced oil processing advanced-oil-processing-s2=Advanced oil processing + light-oil-cracking-s1=Light oil cracking to petroleum gas light-oil-cracking-s2=Light oil cracking to petroleum gas + heavy-oil-cracking-s1=Heavy oil cracking to light oil heavy-oil-cracking-s2=Heavy oil cracking to light oil + uranium-processing-s1=Uranium processing uranium-processing-s2=Uranium processing + kovarex-enrichment-process-s1=Kovarex enrichment process kovarex-enrichment-process-s2=Kovarex enrichment process + nuclear-fuel-reprocessing-s1=Nuclear fuel reprocessing nuclear-fuel-reprocessing-s2=Nuclear fuel reprocessing + coal-liquefaction-s1=Coal liquefaction coal-liquefaction-s2=Coal liquefaction +wood-production=Wood production + +fish-production=Fish production + [technology-name] -compound-energy=Compound Energy -compound-energy-1=Compound Energy -compound-energy-2=Compound Energy 2 -compound-energy-3=Compound Energy 3 -compound-energy-4=Compound Energy 4 -compound-energy-5=Compound Energy 5 -compound-energy-6=Compound Energy 6 -compound-energy-7=Compound Energy 7 +compound-energy=Compound energy +compound-energy-1=Compound energy +compound-energy-2=Compound energy 2 +compound-energy-3=Compound energy 3 +compound-energy-4=Compound energy 4 +compound-energy-5=Compound energy 5 +compound-energy-6=Compound energy 6 +compound-energy-7=Compound energy 7 [technology-description] -compound-energy=Source of free electric energy, but useless at night. -compound-energy-1=Source of free electric energy, but useless at night. -compound-energy-2=Source of free electric energy, but useless at night. -compound-energy-3=Source of free electric energy, but useless at night. -compound-energy-4=Source of free electric energy, but useless at night. -compound-energy-5=Source of free electric energy, but useless at night. -compound-energy-6=Source of free electric energy, but useless at night. -compound-energy-7=Source of free electric energy, but useless at night. +compound-energy=Compound energy allow reduction in total area. +compound-energy-1=Compound energy allow reduction in total area. +compound-energy-2=Compound energy allow reduction in total area. +compound-energy-3=Compound energy allow reduction in total area. +compound-energy-4=Compound energy allow reduction in total area. +compound-energy-5=Compound energy allow reduction in total area. +compound-energy-6=Compound energy allow reduction in total area. +compound-energy-7=Compound energy allow reduction in total area. [modifier-description] gun-turret-2-attack-bonus=Gun turret damage: +__1__ gun-turret-3-attack-bonus=Gun turret damage: +__1__ + flamethrower-turret-2-attack-bonus=Fire damage: +__1__ flamethrower-turret-3-attack-bonus=Fire damage: +__1__ +[map-gen-preset-name] +empty-world=Empty world + +[map-gen-preset-description] +empty-world=Useful for design + [mod-setting-name] PHI-EN=Energy PHI-MB=Megabase PHI-WE=Military PHI-EQ=Equipment -PHI-MI=Megabase Item +PHI-MI=Megabase item PHI-RS=Recipe PHI-XC=Clock PHI-PB=Bonus +PHI-CT=Creative -PHI-EN-SOLAR-TIER=Solar Panel -PHI-EN-STEAM-TIER=Steam engine -PHI-EN-NUCLEAR-TIER=Nuclear reactor +PHI-EN-SOLAR-TIER=Solar panel, max grade +PHI-EN-STEAM-TIER=Steam engine, max grade +PHI-EN-NUCLEAR-TIER=Nuclear reactor, max grade -PHI-MB-ASSEMBLING-TIER=Assembling machine -PHI-MB-FURNACE-TIER=Electric furnace -PHI-MB-OIL-TIER=Oil refinery -PHI-MB-CENTRIFUGE-TIER=Centrifuge -PHI-MB-LAB-TIER=Lab -PHI-MB-MINING-TIER=Electric mining drill -PHI-MB-SE-ASSEMBLING-TIER=Space assembling machine +PHI-MB-ASSEMBLING-TIER=Assembling machine, max grade +PHI-MB-FURNACE-TIER=Electric furnace, max grade +PHI-MB-OIL-TIER=Oil refinery, max grade +PHI-MB-CENTRIFUGE-TIER=Centrifuge, max grade +PHI-MB-LAB-TIER=Lab, max grade +PHI-MB-MINING-TIER=Electric mining drill, max grade +PHI-MB-SE-ASSEMBLING-TIER=Space exploration, max grade -PHI-WE-LASER-TIER=Laser turret -PHI-WE-FLAME-TIER=Flamethrower turret -PHI-WE-GUN-TIER=Gun turret -PHI-WE-RADAR-TIER=Radar +PHI-WE-LASER-TIER=Laser turret, max grade +PHI-WE-FLAME-TIER=Flamethrower turret, max grade +PHI-WE-GUN-TIER=Gun turret, max grade +PHI-WE-RADAR-TIER=Radar, max grade -PHI-EQ-SOLAR-TIER=Portable Solar Panel -PHI-EQ-BATTERY-TIER=Personal Battery -PHI-EQ-REACTOR-TIER=Portable Fusion Reactor -PHI-EQ-LASER-TIER=Personal Laser Defense -PHI-EQ-ROBOPORT-TIER=Personal Roboport -PHI-EQ-SHIELD-TIER=Energy Shield -PHI-EQ-NIGHT-TIER=Nightvision Equipment -PHI-EQ-EXO-TIER=Exoskeleton -PHI-EQ-ARMOR=Power armor +PHI-EQ-SOLAR-TIER=Portable solar panel, max grade +PHI-EQ-BATTERY-TIER=Personal battery, max grade +PHI-EQ-REACTOR-TIER=Portable fusion reactor, max grade +PHI-EQ-LASER-TIER=Personal laser defense, max grade +PHI-EQ-ROBOPORT-TIER=Personal roboport, max grade +PHI-EQ-SHIELD-TIER=Energy shield, max grade +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 -PHI-MI-LANDFILL=Landfill -PHI-MI-EFFCY=Efficiency Module -PHI-MI-NUCLEAR=Nuclear -PHI-MI-BOILER=Boiler -PHI-MI-CHEST=Chest +PHI-MI-LOADER=Loader enable +PHI-MI-LANDFILL=Landfill requirement +PHI-MI-EFFCY=Efficiency module efficiency +PHI-MI-NUCLEAR=Nuclear adjustable output +PHI-MI-BOILER=Electric boiler +PHI-MI-CHEST=Basic chest +PHI-MI-REPAIR=Repair efficiency +PHI-MI-PIPE=Pipe efficiency +PHI-MI-ROBOT=Robot efficiency +PHI-MI-TRAIN=Train efficiency -PHI-RS-RECIPE-1=Recipe 1 -PHI-RS-RECIPE-2=Recipe 2 +PHI-RS-RECIPE-1=Recipe scale 1 +PHI-RS-RECIPE-2=Recipe scale 2 PHI-RS-RECIPE-DROF=Dynamic Recipe Overload Factor PHI-RS-RECIPE-MINROM=Minimum Recipe Overload Multiplier PHI-RS-RECIPE-MAXROM=Maximum Recipe Overload Multiplier @@ -846,6 +894,12 @@ PHI-PB-FWRBM=Force worker robots battery modifier PHI-PB-FWRSB=Force worker robots storage bonus PHI-PB-FFRLM=Force following robots lifetime modifier +PHI-CT-OIL=Oil +PHI-CT-RADAR=Radar +PHI-CT-TILE=World Tile +PHI-CT-TILE-CHOICE=Tile choice +PHI-CT-TRASH=Trash Chest + [mod-setting-description] PHI-EN-SOLAR-TIER=Default 8 ; Disable 1 PHI-EN-STEAM-TIER=Default 5 ; Disable 1 @@ -874,6 +928,10 @@ PHI-EQ-NIGHT-TIER=Default 2 ; Disable 1 PHI-EQ-EXO-TIER=Default 2 ; Disable 1 PHI-MI-LANDFILL=Default 20 +PHI-MI-REPAIR=Default 1 +PHI-MI-PIPE=Default 1 +PHI-MI-ROBOT=Default 1 +PHI-MI-TRAIN=Default 1 PHI-RS-RECIPE-1=Default 4 ; Disable 1 PHI-RS-RECIPE-2=Default 8 ; Disable 1 diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg index 408f616..bebdf46 100644 --- a/PHI-CL/locale/ja/locale.cfg +++ b/PHI-CL/locale/ja/locale.cfg @@ -227,7 +227,9 @@ personal-roboport-mk7-equipment=携帯ロボットステーション7代 personal-roboport-mk8-equipment=携帯ロボットステーション8代 night-vision-mk2-equipment=暗視モジュール2代 + exoskeleton-mk2-equipment=強化外骨格モジュール2代 + power-armor-mk3=パワーアーマー3代 basic-steel-chest=基本的な鋼鉄製チェスト @@ -244,6 +246,14 @@ basic-logistic-chest-storage=基本的な貯蔵チェスト electric-boiler=電気ボイラー +oil-pump=オイルポンプ + +super-radar=スーパーレーダー + +trash-chest=ごみチェスト + +trash-pipe=ごみパイプ + [item-description] solar-panel-mk2-equipment=装備用モジュールに電力を供給します。 solar-panel-mk3-equipment=装備用モジュールに電力を供給します。 @@ -291,7 +301,9 @@ personal-roboport-mk7-equipment=アーマーに挿入して使い、インベン personal-roboport-mk8-equipment=アーマーに挿入して使い、インベントリから多くの建設ロボットを使えるようになります。 night-vision-equipment-mk2=アーマーに挿入して使い、夜間の視界を改善します。 + exoskeleton-equipment-mk2=プレイヤーの移動速度を上昇させます。 + power-armor-mk3=巨大な装備グリッドとインベントリサイズボーナス付きアーマー。 [entity-name] @@ -491,6 +503,14 @@ basic-logistic-chest-storage=基本的な貯蔵チェスト electric-boiler=電気ボイラー +oil-pump=オイルポンプ + +super-radar=スーパーレーダー + +trash-chest=ごみチェスト + +trash-pipe=ごみパイプ + [entity-description] accumulator-2=供給可能な電力が需要量を上回っている時に電力を貯蔵します。需要量が上回っている場合は放電します。 accumulator-3=供給可能な電力が需要量を上回っている時に電力を貯蔵します。需要量が上回っている場合は放電します。 @@ -683,6 +703,10 @@ basic-logistic-chest-requester=物流ネットワークから指定したアイ electric-boiler=燃料を燃やして水を蒸気に変えます。 +oil-pump=オイルポンプ + +super-radar=近隣の領域をスキャンし、その周囲のエリアを探索します。 + [equipment-name] solar-panel-mk2-equipment=携帯ソーラーパネルモジュール2代目 solar-panel-mk3-equipment=携帯ソーラーパネルモジュール3代目 @@ -730,26 +754,38 @@ personal-roboport-mk7-equipment=携帯ロボットステーション7代 personal-roboport-mk8-equipment=携帯ロボットステーション8代 night-vision-mk2-equipment=暗視モジュール2代 + exoskeleton-mk2-equipment=強化外骨格モジュール2代 [recipe-name] basic-oil-processing-s1=基本的な石油加工 basic-oil-processing-s2=基本的な石油加工 + advanced-oil-processing-s1=発展的な石油加工 advanced-oil-processing-s2=発展的な石油加工 + light-oil-cracking-s1=軽油を石油ガスに分解 light-oil-cracking-s2=軽油を石油ガスに分解 + heavy-oil-cracking-s1=重油を軽油に分解 heavy-oil-cracking-s2=重油を軽油に分解 + uranium-processing-s1=ウラン濃縮処理 uranium-processing-s2=ウラン濃縮処理 + kovarex-enrichment-process-s1=Kovarex濃縮プロセス kovarex-enrichment-process-s2=Kovarex濃縮プロセス + nuclear-fuel-reprocessing-s1=核燃料再処理 nuclear-fuel-reprocessing-s2=核燃料再処理 + coal-liquefaction-s1=石炭液化 coal-liquefaction-s2=石炭液化 +wood-production=木材生産 + +fish-production=魚の生産 + [technology-name] compound-energy=複合発電 compound-energy-1=複合発電 @@ -761,21 +797,28 @@ compound-energy-6=複合発電 6 compound-energy-7=複合発電 7 [technology-description] -compound-energy=クリーンで燃料が尽きることのない発電設備。夜間は発電しません。 -compound-energy-1=クリーンで燃料が尽きることのない発電設備。夜間は発電しません。 -compound-energy-2=クリーンで燃料が尽きることのない発電設備。夜間は発電しません。 -compound-energy-3=クリーンで燃料が尽きることのない発電設備。夜間は発電しません。 -compound-energy-4=クリーンで燃料が尽きることのない発電設備。夜間は発電しません。 -compound-energy-5=クリーンで燃料が尽きることのない発電設備。夜間は発電しません。 -compound-energy-6=クリーンで燃料が尽きることのない発電設備。夜間は発電しません。 -compound-energy-7=クリーンで燃料が尽きることのない発電設備。夜間は発電しません。 +compound-energy=複合発電により、総面積を削減できます。 +compound-energy-1=複合発電により、総面積を削減できます。 +compound-energy-2=複合発電により、総面積を削減できます。 +compound-energy-3=複合発電により、総面積を削減できます。 +compound-energy-4=複合発電により、総面積を削減できます。 +compound-energy-5=複合発電により、総面積を削減できます。 +compound-energy-6=複合発電により、総面積を削減できます。 +compound-energy-7=複合発電により、総面積を削減できます。 [modifier-description] gun-turret-2-attack-bonus=ガンタレットダメージ: +__1__ gun-turret-3-attack-bonus=ガンタレットダメージ: +__1__ + flamethrower-turret-2-attack-bonus=火炎放射タレット ダメージ: +__1__ flamethrower-turret-3-attack-bonus=火炎放射タレット ダメージ: +__1__ +[map-gen-preset-name] +empty-world=空の世界 + +[map-gen-preset-description] +empty-world=デザインに役立つ + [mod-setting-name] PHI-EN=エネルギー PHI-MB=メガベース @@ -785,43 +828,48 @@ PHI-MI=メガベースアイテム PHI-RS=レシピ PHI-XC=時計 PHI-PB=ボーナス +PHI-CT=クリエイティブ -PHI-EN-SOLAR-TIER=ソーラーパネル -PHI-EN-STEAM-TIER=蒸気機関 -PHI-EN-NUCLEAR-TIER=原子炉 +PHI-EN-SOLAR-TIER=ソーラーパネルの最高等級 +PHI-EN-STEAM-TIER=蒸気機関の最高等級 +PHI-EN-NUCLEAR-TIER=原子炉の最高等級 -PHI-MB-ASSEMBLING-TIER=組立機 -PHI-MB-FURNACE-TIER=電気炉 -PHI-MB-OIL-TIER=原油精製所 -PHI-MB-CENTRIFUGE-TIER=遠心分離機 -PHI-MB-LAB-TIER=研究所 -PHI-MB-MINING-TIER=電動掘削機 -PHI-MB-SE-ASSEMBLING-TIER=宇宙組立機 +PHI-MB-ASSEMBLING-TIER=組立機の最高等級 +PHI-MB-FURNACE-TIER=電気炉の最高等級 +PHI-MB-OIL-TIER=原油精製所の最高等級 +PHI-MB-CENTRIFUGE-TIER=遠心分離機の最高等級 +PHI-MB-LAB-TIER=研究所の最高等級 +PHI-MB-MINING-TIER=電動掘削機の最高等級 +PHI-MB-SE-ASSEMBLING-TIER=Space explorationの最高等級 -PHI-WE-LASER-TIER=レーザータレット -PHI-WE-FLAME-TIER=火炎放射タレット -PHI-WE-GUN-TIER=ガンタレット -PHI-WE-RADAR-TIER=レーダー +PHI-WE-LASER-TIER=レーザータレットの最高等級 +PHI-WE-FLAME-TIER=火炎放射タレットの最高等級 +PHI-WE-GUN-TIER=ガンタレットの最高等級 +PHI-WE-RADAR-TIER=レーダーの最高等級 -PHI-EQ-SOLAR-TIER=携帯ソーラーパネルモジュール -PHI-EQ-BATTERY-TIER=個人用バッテリー -PHI-EQ-REACTOR-TIER=携帯核融合炉モジュール -PHI-EQ-LASER-TIER=携帯レーザー防御モジュール -PHI-EQ-ROBOPORT-TIER=携帯ロボットステーション -PHI-EQ-SHIELD-TIER=エネルギーシールドモジュール -PHI-EQ-NIGHT-TIER=暗視モジュール -PHI-EQ-EXO-TIER=強化外骨格モジュール -PHI-EQ-ARMOR=パワーアーマー +PHI-EQ-SOLAR-TIER=携帯ソーラーパネルモジュールの最高等級 +PHI-EQ-BATTERY-TIER=個人用バッテリーの最高等級 +PHI-EQ-REACTOR-TIER=携帯核融合炉モジュールの最高等級 +PHI-EQ-LASER-TIER=携帯レーザー防御モジュールの最高等級 +PHI-EQ-ROBOPORT-TIER=携帯ロボットステーションの最高等級 +PHI-EQ-SHIELD-TIER=エネルギーシールドモジュールの最高等級 +PHI-EQ-NIGHT-TIER=暗視モジュールの最高等級 +PHI-EQ-EXO-TIER=強化外骨格モジュールの最高等級 +PHI-EQ-ARMOR=パワーアーマー3代を有効にする -PHI-MI-LOADER=ローダー -PHI-MI-LANDFILL=埋立地 -PHI-MI-EFFCY=エネルギー効率モジュール -PHI-MI-NUCLEAR=原子炉 +PHI-MI-LOADER=ローダーを有効にする +PHI-MI-LANDFILL=埋立地要件 +PHI-MI-EFFCY=エネルギー効率モジュール効率 +PHI-MI-NUCLEAR=原子炉出力の調整可能 PHI-MI-BOILER=電気ボイラー -PHI-MI-CHEST=貯蔵チェスト +PHI-MI-CHEST=基本的な貯蔵チェスト +PHI-MI-REPAIR=リペア効率 +PHI-MI-PIPE=パイプ効率 +PHI-MI-ROBOT=ロボット効率 +PHI-MI-TRAIN=列車効率 -PHI-RS-RECIPE-1=レシピ 1 -PHI-RS-RECIPE-2=レシピ 2 +PHI-RS-RECIPE-1=レシピ規模 1 +PHI-RS-RECIPE-2=レシピ規模 2 PHI-RS-RECIPE-DROF=Dynamic Recipe Overload Factor PHI-RS-RECIPE-MINROM=Minimum Recipe Overload Multiplier PHI-RS-RECIPE-MAXROM=Maximum Recipe Overload Multiplier @@ -846,6 +894,12 @@ PHI-PB-FWRBM=Force worker robots battery modifier PHI-PB-FWRSB=Force worker robots storage bonus PHI-PB-FFRLM=Force following robots lifetime modifier +PHI-CT-OIL=原油 +PHI-CT-RADAR=レーダー +PHI-CT-TILE=ワールドタイル +PHI-CT-TILE-CHOICE=ドタイル選択 +PHI-CT-TRASH=ごみチェスト + [mod-setting-description] PHI-EN-SOLAR-TIER=デフォルト 8 ; 止める 1 PHI-EN-STEAM-TIER=デフォルト 5 ; 止める 1 @@ -874,6 +928,10 @@ PHI-EQ-NIGHT-TIER=デフォルト 2 ; 止める 1 PHI-EQ-EXO-TIER=デフォルト 2 ; 止める 1 PHI-MI-LANDFILL=デフォルト 20 +PHI-MI-REPAIR=デフォルト 1 +PHI-MI-PIPE=デフォルト 1 +PHI-MI-ROBOT=デフォルト 1 +PHI-MI-TRAIN=デフォルト 1 PHI-RS-RECIPE-1=デフォルト 4 ; 止める 1 PHI-RS-RECIPE-2=デフォルト 8 ; 止める 1 diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg index 4fbc746..c9e0b80 100644 --- a/PHI-CL/locale/zh-CN/locale.cfg +++ b/PHI-CL/locale/zh-CN/locale.cfg @@ -227,7 +227,9 @@ personal-roboport-mk7-equipment=機動無人機調度站7代 personal-roboport-mk8-equipment=機動無人機調度站8代 night-vision-mk2-equipment=夜視鏡2代 + exoskeleton-mk2-equipment=動力外骨骼2代 + power-armor-mk3=動力護甲3代 basic-steel-chest=基本的鋼箱 @@ -244,6 +246,14 @@ basic-logistic-chest-storage=基本的回收箱 electric-boiler=電鍋爐 +oil-pump=抽油泵 + +super-radar=超級雷達 + +trash-chest=垃圾箱 + +trash-pipe=垃圾管 + [item-description] solar-panel-mk2-equipment=替裝備的模組供電。 solar-panel-mk3-equipment=替裝備的模組供電。 @@ -291,7 +301,9 @@ personal-roboport-mk7-equipment=用於放入裝甲，可讓建設無人機直接 personal-roboport-mk8-equipment=用於放入裝甲，可讓建設無人機直接從背包中飛出來作業。 night-vision-equipment-mk2=放入模組化裝甲可使玩家獲得夜視能力。 + exoskeleton-equipment-mk2=用於插入模組化裝甲，可提高玩家的移動速度。你可以同時裝備多個外骨骼模組。 + power-armor-mk3=具有巨大模組化插槽和背包容量加成的裝甲。 [entity-name] @@ -491,6 +503,14 @@ basic-logistic-chest-storage=基本的回收箱 electric-boiler=電鍋爐 +oil-pump=抽油泵 + +super-radar=超級雷達 + +trash-chest=垃圾箱 + +trash-pipe=垃圾管 + [entity-description] accumulator-2=在發電超出用電量時，可儲存有限電力；反之則會釋放電力。 accumulator-3=在發電超出用電量時，可儲存有限電力；反之則會釋放電力。 @@ -683,6 +703,10 @@ basic-logistic-chest-requester=從物流網路中收集指定的物品。 electric-boiler=燃燒燃料，把水煮成蒸汽。 +oil-pump=抽油泵 + +super-radar=掃描並顯示附近的未知區域。 + [equipment-name] solar-panel-mk2-equipment=攜帶式太陽能板2代 solar-panel-mk3-equipment=攜帶式太陽能板3代 @@ -730,26 +754,38 @@ personal-roboport-mk7-equipment=機動無人機調度站7代 personal-roboport-mk8-equipment=機動無人機調度站8代 night-vision-mk2-equipment=夜視鏡2代 + exoskeleton-mk2-equipment=動力外骨骼2代 [recipe-name] basic-oil-processing-s1=基礎石油加工 basic-oil-processing-s2=基礎石油加工 + advanced-oil-processing-s1=高等石油加工 advanced-oil-processing-s2=高等石油加工 + light-oil-cracking-s1=輕油裂解為石油氣 light-oil-cracking-s2=輕油裂解為石油氣 + heavy-oil-cracking-s1=重油裂解為輕油 heavy-oil-cracking-s2=重油裂解為輕油 + uranium-processing-s1=鈾濃縮加工 uranium-processing-s2=鈾濃縮加工 + kovarex-enrichment-process-s1=鈾增殖加工 kovarex-enrichment-process-s2=鈾增殖加工 + nuclear-fuel-reprocessing-s1=核燃料後加工 nuclear-fuel-reprocessing-s2=核燃料後加工 + coal-liquefaction-s1=液化煤 coal-liquefaction-s2=液化煤 +wood-production=木材生產 + +fish-production=魚類生產 + [technology-name] compound-energy=複合發電 compound-energy-1=複合發電 @@ -761,21 +797,28 @@ compound-energy-6=複合發電 6 compound-energy-7=複合發電 7 [technology-description] -compound-energy=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-1=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-2=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-3=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-4=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-5=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-6=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-7=取之不盡的電力來源，但在夜晚派不上用場。 +compound-energy=複合發電允許減少總面積。 +compound-energy-1=複合發電允許減少總面積。 +compound-energy-2=複合發電允許減少總面積。 +compound-energy-3=複合發電允許減少總面積。 +compound-energy-4=複合發電允許減少總面積。 +compound-energy-5=複合發電允許減少總面積。 +compound-energy-6=複合發電允許減少總面積。 +compound-energy-7=複合發電允許減少總面積。 [modifier-description] gun-turret-2-attack-bonus=機槍炮塔傷害：+__1__ gun-turret-3-attack-bonus=機槍炮塔傷害：+__1__ + flamethrower-turret-2-attack-bonus=火焰噴射炮塔傷害：+__1__ flamethrower-turret-3-attack-bonus=火焰噴射炮塔傷害：+__1__ +[map-gen-preset-name] +empty-world=空的世界 + +[map-gen-preset-description] +empty-world=對設計有用 + [mod-setting-name] PHI-EN=能量 PHI-MB=大型基地 @@ -785,43 +828,48 @@ PHI-MI=大型基地物品 PHI-RS=配方 PHI-XC=時鐘 PHI-PB=附加 +PHI-CT=創意 -PHI-EN-SOLAR-TIER=太陽能板 -PHI-EN-STEAM-TIER=蒸汽發電機 -PHI-EN-NUCLEAR-TIER=核能反應爐 +PHI-EN-SOLAR-TIER=太陽能板的最高等級 +PHI-EN-STEAM-TIER=蒸汽發電機的最高等級 +PHI-EN-NUCLEAR-TIER=核能反應爐的最高等級 -PHI-MB-ASSEMBLING-TIER=組裝機 -PHI-MB-FURNACE-TIER=電爐 -PHI-MB-OIL-TIER=煉油廠 -PHI-MB-CENTRIFUGE-TIER=離心機 -PHI-MB-LAB-TIER=實驗室 -PHI-MB-MINING-TIER=電能採礦機 -PHI-MB-SE-ASSEMBLING-TIER=太空組裝機 +PHI-MB-ASSEMBLING-TIER=組裝機的最高等級 +PHI-MB-FURNACE-TIER=電爐的最高等級 +PHI-MB-OIL-TIER=煉油廠的最高等級 +PHI-MB-CENTRIFUGE-TIER=離心機的最高等級 +PHI-MB-LAB-TIER=實驗室的最高等級 +PHI-MB-MINING-TIER=電能採礦機的最高等級 +PHI-MB-SE-ASSEMBLING-TIER=Space exploration的最高等級 -PHI-WE-LASER-TIER=雷射炮塔 -PHI-WE-FLAME-TIER=火焰噴射器 -PHI-WE-GUN-TIER=機槍炮塔 -PHI-WE-RADAR-TIER=雷達 +PHI-WE-LASER-TIER=雷射炮塔的最高等級 +PHI-WE-FLAME-TIER=火焰噴射器的最高等級 +PHI-WE-GUN-TIER=機槍炮塔的最高等級 +PHI-WE-RADAR-TIER=雷達的最高等級 -PHI-EQ-SOLAR-TIER=攜帶式太陽能板 -PHI-EQ-BATTERY-TIER=電池設備 -PHI-EQ-REACTOR-TIER=攜帶式核融合反應器 -PHI-EQ-LASER-TIER=個人雷射防禦 -PHI-EQ-ROBOPORT-TIER=機動無人機調度站 -PHI-EQ-SHIELD-TIER=能量護盾 -PHI-EQ-NIGHT-TIER=夜視鏡 -PHI-EQ-EXO-TIER=動力外骨骼 -PHI-EQ-ARMOR=動力護甲 +PHI-EQ-SOLAR-TIER=攜帶式太陽能板的最高等級 +PHI-EQ-BATTERY-TIER=電池設備的最高等級 +PHI-EQ-REACTOR-TIER=攜帶式核融合反應器的最高等級 +PHI-EQ-LASER-TIER=個人雷射防禦的最高等級 +PHI-EQ-ROBOPORT-TIER=機動無人機調度站的最高等級 +PHI-EQ-SHIELD-TIER=能量護盾的最高等級 +PHI-EQ-NIGHT-TIER=夜視鏡的最高等級 +PHI-EQ-EXO-TIER=動力外骨骼的最高等級 +PHI-EQ-ARMOR=動力護甲3代啟用 -PHI-MI-LOADER=裝卸機 -PHI-MI-LANDFILL=人造陸地 -PHI-MI-EFFCY=節能組件 -PHI-MI-NUCLEAR=核能反應爐 +PHI-MI-LOADER=裝卸機啟用 +PHI-MI-LANDFILL=人造陸地需求 +PHI-MI-EFFCY=節能組件效率 +PHI-MI-NUCLEAR=核能反應爐可調輸出 PHI-MI-BOILER=電鍋爐 -PHI-MI-CHEST=儲藏箱 +PHI-MI-CHEST=基本的儲藏箱 +PHI-MI-REPAIR=維修效率 +PHI-MI-PIPE=水管效率 +PHI-MI-ROBOT=無人機效率 +PHI-MI-TRAIN=火車效率 -PHI-RS-RECIPE-1=配方 1 -PHI-RS-RECIPE-2=配方 2 +PHI-RS-RECIPE-1=配方規模 1 +PHI-RS-RECIPE-2=配方規模 2 PHI-RS-RECIPE-DROF=Dynamic Recipe Overload Factor PHI-RS-RECIPE-MINROM=Minimum Recipe Overload Multiplier PHI-RS-RECIPE-MAXROM=Maximum Recipe Overload Multiplier @@ -846,6 +894,12 @@ PHI-PB-FWRBM=Force worker robots battery modifier PHI-PB-FWRSB=Force worker robots storage bonus PHI-PB-FFRLM=Force following robots lifetime modifier +PHI-CT-OIL=原油 +PHI-CT-RADAR=雷達 +PHI-CT-TILE=世界地磚 +PHI-CT-TILE-CHOICE=地磚選擇 +PHI-CT-TRASH=垃圾箱 + [mod-setting-description] PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 PHI-EN-STEAM-TIER=預設 5 ; 停用 1 @@ -874,6 +928,10 @@ PHI-EQ-NIGHT-TIER=預設 2 ; 停用 1 PHI-EQ-EXO-TIER=預設 2 ; 停用 1 PHI-MI-LANDFILL=預設 20 +PHI-MI-REPAIR=預設 1 +PHI-MI-PIPE=預設 1 +PHI-MI-ROBOT=預設 1 +PHI-MI-TRAIN=預設 1 PHI-RS-RECIPE-1=預設 4 ; 停用 1 PHI-RS-RECIPE-2=預設 8 ; 停用 1 diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg index 4fbc746..c9e0b80 100644 --- a/PHI-CL/locale/zh-TW/locale.cfg +++ b/PHI-CL/locale/zh-TW/locale.cfg @@ -227,7 +227,9 @@ personal-roboport-mk7-equipment=機動無人機調度站7代 personal-roboport-mk8-equipment=機動無人機調度站8代 night-vision-mk2-equipment=夜視鏡2代 + exoskeleton-mk2-equipment=動力外骨骼2代 + power-armor-mk3=動力護甲3代 basic-steel-chest=基本的鋼箱 @@ -244,6 +246,14 @@ basic-logistic-chest-storage=基本的回收箱 electric-boiler=電鍋爐 +oil-pump=抽油泵 + +super-radar=超級雷達 + +trash-chest=垃圾箱 + +trash-pipe=垃圾管 + [item-description] solar-panel-mk2-equipment=替裝備的模組供電。 solar-panel-mk3-equipment=替裝備的模組供電。 @@ -291,7 +301,9 @@ personal-roboport-mk7-equipment=用於放入裝甲，可讓建設無人機直接 personal-roboport-mk8-equipment=用於放入裝甲，可讓建設無人機直接從背包中飛出來作業。 night-vision-equipment-mk2=放入模組化裝甲可使玩家獲得夜視能力。 + exoskeleton-equipment-mk2=用於插入模組化裝甲，可提高玩家的移動速度。你可以同時裝備多個外骨骼模組。 + power-armor-mk3=具有巨大模組化插槽和背包容量加成的裝甲。 [entity-name] @@ -491,6 +503,14 @@ basic-logistic-chest-storage=基本的回收箱 electric-boiler=電鍋爐 +oil-pump=抽油泵 + +super-radar=超級雷達 + +trash-chest=垃圾箱 + +trash-pipe=垃圾管 + [entity-description] accumulator-2=在發電超出用電量時，可儲存有限電力；反之則會釋放電力。 accumulator-3=在發電超出用電量時，可儲存有限電力；反之則會釋放電力。 @@ -683,6 +703,10 @@ basic-logistic-chest-requester=從物流網路中收集指定的物品。 electric-boiler=燃燒燃料，把水煮成蒸汽。 +oil-pump=抽油泵 + +super-radar=掃描並顯示附近的未知區域。 + [equipment-name] solar-panel-mk2-equipment=攜帶式太陽能板2代 solar-panel-mk3-equipment=攜帶式太陽能板3代 @@ -730,26 +754,38 @@ personal-roboport-mk7-equipment=機動無人機調度站7代 personal-roboport-mk8-equipment=機動無人機調度站8代 night-vision-mk2-equipment=夜視鏡2代 + exoskeleton-mk2-equipment=動力外骨骼2代 [recipe-name] basic-oil-processing-s1=基礎石油加工 basic-oil-processing-s2=基礎石油加工 + advanced-oil-processing-s1=高等石油加工 advanced-oil-processing-s2=高等石油加工 + light-oil-cracking-s1=輕油裂解為石油氣 light-oil-cracking-s2=輕油裂解為石油氣 + heavy-oil-cracking-s1=重油裂解為輕油 heavy-oil-cracking-s2=重油裂解為輕油 + uranium-processing-s1=鈾濃縮加工 uranium-processing-s2=鈾濃縮加工 + kovarex-enrichment-process-s1=鈾增殖加工 kovarex-enrichment-process-s2=鈾增殖加工 + nuclear-fuel-reprocessing-s1=核燃料後加工 nuclear-fuel-reprocessing-s2=核燃料後加工 + coal-liquefaction-s1=液化煤 coal-liquefaction-s2=液化煤 +wood-production=木材生產 + +fish-production=魚類生產 + [technology-name] compound-energy=複合發電 compound-energy-1=複合發電 @@ -761,21 +797,28 @@ compound-energy-6=複合發電 6 compound-energy-7=複合發電 7 [technology-description] -compound-energy=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-1=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-2=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-3=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-4=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-5=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-6=取之不盡的電力來源，但在夜晚派不上用場。 -compound-energy-7=取之不盡的電力來源，但在夜晚派不上用場。 +compound-energy=複合發電允許減少總面積。 +compound-energy-1=複合發電允許減少總面積。 +compound-energy-2=複合發電允許減少總面積。 +compound-energy-3=複合發電允許減少總面積。 +compound-energy-4=複合發電允許減少總面積。 +compound-energy-5=複合發電允許減少總面積。 +compound-energy-6=複合發電允許減少總面積。 +compound-energy-7=複合發電允許減少總面積。 [modifier-description] gun-turret-2-attack-bonus=機槍炮塔傷害：+__1__ gun-turret-3-attack-bonus=機槍炮塔傷害：+__1__ + flamethrower-turret-2-attack-bonus=火焰噴射炮塔傷害：+__1__ flamethrower-turret-3-attack-bonus=火焰噴射炮塔傷害：+__1__ +[map-gen-preset-name] +empty-world=空的世界 + +[map-gen-preset-description] +empty-world=對設計有用 + [mod-setting-name] PHI-EN=能量 PHI-MB=大型基地 @@ -785,43 +828,48 @@ PHI-MI=大型基地物品 PHI-RS=配方 PHI-XC=時鐘 PHI-PB=附加 +PHI-CT=創意 -PHI-EN-SOLAR-TIER=太陽能板 -PHI-EN-STEAM-TIER=蒸汽發電機 -PHI-EN-NUCLEAR-TIER=核能反應爐 +PHI-EN-SOLAR-TIER=太陽能板的最高等級 +PHI-EN-STEAM-TIER=蒸汽發電機的最高等級 +PHI-EN-NUCLEAR-TIER=核能反應爐的最高等級 -PHI-MB-ASSEMBLING-TIER=組裝機 -PHI-MB-FURNACE-TIER=電爐 -PHI-MB-OIL-TIER=煉油廠 -PHI-MB-CENTRIFUGE-TIER=離心機 -PHI-MB-LAB-TIER=實驗室 -PHI-MB-MINING-TIER=電能採礦機 -PHI-MB-SE-ASSEMBLING-TIER=太空組裝機 +PHI-MB-ASSEMBLING-TIER=組裝機的最高等級 +PHI-MB-FURNACE-TIER=電爐的最高等級 +PHI-MB-OIL-TIER=煉油廠的最高等級 +PHI-MB-CENTRIFUGE-TIER=離心機的最高等級 +PHI-MB-LAB-TIER=實驗室的最高等級 +PHI-MB-MINING-TIER=電能採礦機的最高等級 +PHI-MB-SE-ASSEMBLING-TIER=Space exploration的最高等級 -PHI-WE-LASER-TIER=雷射炮塔 -PHI-WE-FLAME-TIER=火焰噴射器 -PHI-WE-GUN-TIER=機槍炮塔 -PHI-WE-RADAR-TIER=雷達 +PHI-WE-LASER-TIER=雷射炮塔的最高等級 +PHI-WE-FLAME-TIER=火焰噴射器的最高等級 +PHI-WE-GUN-TIER=機槍炮塔的最高等級 +PHI-WE-RADAR-TIER=雷達的最高等級 -PHI-EQ-SOLAR-TIER=攜帶式太陽能板 -PHI-EQ-BATTERY-TIER=電池設備 -PHI-EQ-REACTOR-TIER=攜帶式核融合反應器 -PHI-EQ-LASER-TIER=個人雷射防禦 -PHI-EQ-ROBOPORT-TIER=機動無人機調度站 -PHI-EQ-SHIELD-TIER=能量護盾 -PHI-EQ-NIGHT-TIER=夜視鏡 -PHI-EQ-EXO-TIER=動力外骨骼 -PHI-EQ-ARMOR=動力護甲 +PHI-EQ-SOLAR-TIER=攜帶式太陽能板的最高等級 +PHI-EQ-BATTERY-TIER=電池設備的最高等級 +PHI-EQ-REACTOR-TIER=攜帶式核融合反應器的最高等級 +PHI-EQ-LASER-TIER=個人雷射防禦的最高等級 +PHI-EQ-ROBOPORT-TIER=機動無人機調度站的最高等級 +PHI-EQ-SHIELD-TIER=能量護盾的最高等級 +PHI-EQ-NIGHT-TIER=夜視鏡的最高等級 +PHI-EQ-EXO-TIER=動力外骨骼的最高等級 +PHI-EQ-ARMOR=動力護甲3代啟用 -PHI-MI-LOADER=裝卸機 -PHI-MI-LANDFILL=人造陸地 -PHI-MI-EFFCY=節能組件 -PHI-MI-NUCLEAR=核能反應爐 +PHI-MI-LOADER=裝卸機啟用 +PHI-MI-LANDFILL=人造陸地需求 +PHI-MI-EFFCY=節能組件效率 +PHI-MI-NUCLEAR=核能反應爐可調輸出 PHI-MI-BOILER=電鍋爐 -PHI-MI-CHEST=儲藏箱 +PHI-MI-CHEST=基本的儲藏箱 +PHI-MI-REPAIR=維修效率 +PHI-MI-PIPE=水管效率 +PHI-MI-ROBOT=無人機效率 +PHI-MI-TRAIN=火車效率 -PHI-RS-RECIPE-1=配方 1 -PHI-RS-RECIPE-2=配方 2 +PHI-RS-RECIPE-1=配方規模 1 +PHI-RS-RECIPE-2=配方規模 2 PHI-RS-RECIPE-DROF=Dynamic Recipe Overload Factor PHI-RS-RECIPE-MINROM=Minimum Recipe Overload Multiplier PHI-RS-RECIPE-MAXROM=Maximum Recipe Overload Multiplier @@ -846,6 +894,12 @@ PHI-PB-FWRBM=Force worker robots battery modifier PHI-PB-FWRSB=Force worker robots storage bonus PHI-PB-FFRLM=Force following robots lifetime modifier +PHI-CT-OIL=原油 +PHI-CT-RADAR=雷達 +PHI-CT-TILE=世界地磚 +PHI-CT-TILE-CHOICE=地磚選擇 +PHI-CT-TRASH=垃圾箱 + [mod-setting-description] PHI-EN-SOLAR-TIER=預設 8 ; 停用 1 PHI-EN-STEAM-TIER=預設 5 ; 停用 1 @@ -874,6 +928,10 @@ PHI-EQ-NIGHT-TIER=預設 2 ; 停用 1 PHI-EQ-EXO-TIER=預設 2 ; 停用 1 PHI-MI-LANDFILL=預設 20 +PHI-MI-REPAIR=預設 1 +PHI-MI-PIPE=預設 1 +PHI-MI-ROBOT=預設 1 +PHI-MI-TRAIN=預設 1 PHI-RS-RECIPE-1=預設 4 ; 停用 1 PHI-RS-RECIPE-2=預設 8 ; 停用 1 diff --git a/PHI-CL/main.lua b/PHI-CL/main.lua index 811df95..295b5f5 100644 --- a/PHI-CL/main.lua +++ b/PHI-CL/main.lua @@ -3,6 +3,51 @@ local alpha_order = {'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm'} local items = require 'config' local main = {} +local tint = { + ['2'] = { + r = 0.2, + g = 0.9, + b = 0.2, + a = 0.7 + }, + ['3'] = { + r = 0.2, + g = 0.2, + b = 0.9, + a = 0.7 + }, + ['4'] = { + r = 0.2, + g = 0.9, + b = 0.9, + a = 0.7 + }, + ['5'] = { + r = 0.5, + g = 0, + b = 0.5, + a = 0.5 + }, + ['6'] = { + r = 0.9, + g = 0.7, + b = 0.2, + a = 0.7 + }, + ['7'] = { + r = 0.5, + g = 0.2, + b = 0, + a = 0.2 + }, + ['8'] = { + r = 0.5, + g = 0.2, + b = 0.5, + a = 0.2 + }, +} + -- entity function main.EEE(source, tier) local item = table.deepcopy(data.raw[source.type][source.ref_name]) @@ -37,14 +82,16 @@ function main.EEE(source, tier) end end - if item.fluid_boxes then - for k, _ in pairs(item.fluid_boxes) do - if (item.fluid_boxes[k] and (not item.fluid_boxes[k])) then - if item.fluid_boxes[k].production_type then - item.fluid_boxes[k].height = 4 + if settings.startup['PHI-MI-PIPE'].value then + if item.fluid_boxes then + for k, _ in pairs(item.fluid_boxes) do + if (item.fluid_boxes[k] and (not item.fluid_boxes[k])) then + if item.fluid_boxes[k].production_type then + item.fluid_boxes[k].height = settings.startup['PHI-MI-PIPE'].value - if item.fluid_boxes[k].base_level then - item.fluid_boxes[k].base_level = item.fluid_boxes[k].base_level * 4 + if item.fluid_boxes[k].base_level then + item.fluid_boxes[k].base_level = item.fluid_boxes[k].base_level + settings.startup['PHI-MI-PIPE'].value + end end end end @@ -72,9 +119,12 @@ function main.EEE(source, tier) item.production = (source.base * (4 ^ (tier - source.min + 1))) .. 'kW' elseif (source.type == 'boiler') then - item.fluid_box.height = 4 - item.output_fluid_box.height = 4 - item.output_fluid_box.base_level = 5 + if settings.startup['PHI-MI-PIPE'].value then + item.fluid_box.height = settings.startup['PHI-MI-PIPE'].value + item.output_fluid_box.height = settings.startup['PHI-MI-PIPE'].value + item.output_fluid_box.base_level = item.output_fluid_box.base_level + settings.startup['PHI-MI-PIPE'].value + end + item.energy_consumption = source.base * tier .. 'kW' item.target_temperature = 15 + (source.temp * tier) item.fluid_usage_per_tick = source.fluid @@ -86,6 +136,10 @@ function main.EEE(source, tier) end elseif (source.type == 'generator') then + if settings.startup['PHI-MI-PIPE'].value then + item.fluid_box.height = settings.startup['PHI-MI-PIPE'].value + end + item.fluid_box.height = 4 item.maximum_temperature = 15 + (source.base * tier) item.fluid_usage_per_tick = source.fluid @@ -127,6 +181,24 @@ function main.EEE(source, tier) item.type = 'assembling-machine' end + --[[ + if item.picture.layers then + if item.picture.layers[1][1].tint then + item.picture.layers[1][1].tint = tint[tier] + end + + if item.picture.layers[1][1].hr_version then + item.picture.layers[1][1].hr_version.tint = tint[tier] + end + end + + if tier > 1 then + if item.icons and item.icons[1] and item.icons[1][1] then + item.icons[1][1].tint = tint[tier] + end + end + ]] + -- item.animation.layers[1].filename = graphics_location .. source .. '-e.png' -- item.animation.layers[1].hr_version.filename = graphics_location .. source ..'-eh.png' -- item.icon = graphics_location .. source .. '-i.png' @@ -199,11 +271,11 @@ function main.EEQ(source, tier) elseif (source.name == 'night-vision') then w = 2 h = 2 - item['energy_source'] = {type = 'electric', usage_priority = 'primary-input', buffer_capacity = '1MJ'} + item['energy_source'] = {type = 'electric', usage_priority = 'primary-input', buffer_capacity = '240kJ'} item['energy_input'] = '20kW' item['activate_sound'] = {filename = '__base__/sound/nightvision-on.ogg', volume = 0.5} item['deactivate_sound'] = {filename = '__base__/sound/nightvision-off.ogg', volume = 0.5} - item['darkness_to_turn_on'] = source.base + item['darkness_to_turn_on'] = 0 item['color_lookup'] = {{0, '__core__/graphics/color_luts/lut-sunset.png'}} elseif (source.name == 'exoskeleton') then @@ -215,7 +287,21 @@ function main.EEQ(source, tier) end item['shape'] = {width = w, height = h, type = 'full'} - item['sprite'] = {filename = '__base__/graphics/equipment/' .. source.graphics_name .. '.png', width = w * 32, height = h * 32, priority = 'medium', hr_version = {filename = '__base__/graphics/equipment/hr-' .. source.graphics_name .. '.png', width = w * 64, height = h * 64, priority = 'medium', scale = 0.5}} + item['sprite'] = { + filename = '__base__/graphics/equipment/' .. source.graphics_name .. '.png', + width = w * 32, + height = h * 32, + priority = 'medium', + -- tint = tint[tier], + hr_version = { + filename = '__base__/graphics/equipment/hr-' .. source.graphics_name .. '.png', + width = w * 64, + height = h * 64, + priority = 'medium', + -- tint = tint[tier], + scale = 0.5 + } + } data:extend({item}) end @@ -240,7 +326,12 @@ function main.EI(source, tier) else item.name = source.name item.place_result = source.name - -- item.icons = {{icon = graphics_location .. source.name .. '-i.png', icon_mipmaps = 4, icon_size = 64}} + + --[[ + if item.icons then + item.icons[1][1].tint = tint[tier] + end + ]] end end @@ -274,21 +365,27 @@ function main.ER(source, tier) result_name = result_name .. '-' .. tier end - local ingredient_amount = 2 - - if (source.type == 'solar-panel') or (source.type == 'accumulator') then - ingredient_amount = 4 - end - if (source.tech == 'compound-energy') and (tier > 2) then - data:extend({{ - type = 'recipe', - name = new_name , - energy_required = 2, - enabled = false, - ingredients = {{ingredient_name, 1}, {source.name, 1}}, - result = result_name, - }}) + if (source.type == 'solar-panel') or (source.type == 'accumulator') then + data:extend({{ + type = 'recipe', + name = new_name , + energy_required = 2, + enabled = false, + ingredients = {{name=ingredient_name, amount=4}}, + result = result_name, + }}) + + else + data:extend({{ + type = 'recipe', + name = new_name , + energy_required = 2, + enabled = false, + ingredients = {{name=ingredient_name, amount=1}, {name=source.name, amount=1}}, + result = result_name, + }}) + end else data:extend({{ @@ -296,7 +393,7 @@ function main.ER(source, tier) name = new_name, energy_required = 2, enabled = false, - ingredients = {{ingredient_name, ingredient_amount}}, + ingredients = {{name=ingredient_name, amount=2}}, result = result_name, }}) end diff --git a/PHI-CL/migrations/migrations.lua b/PHI-CL/migrations/migrations.lua index 2f84108..33e46b3 100644 --- a/PHI-CL/migrations/migrations.lua +++ b/PHI-CL/migrations/migrations.lua @@ -86,4 +86,28 @@ for _, force in pairs(game.forces) do recipes['basic-logistic-chest-requester'].reload() end end + + if settings.startup['PHI-CT'].value then + recipes['wood-production'].enabled = true + recipes['wood-production'].reload() + recipes['fish-production'].enabled = true + recipes['fish-production'].reload() + + if settings.startup['PHI-CT-OIL'].value then + recipes['oil-pump'].enabled = true + recipes['oil-pump'].reload() + end + + if settings.startup['PHI-CT-RADAR'].value then + recipes['super-radar'].enabled = true + recipes['super-radar'].reload() + end + + if settings.startup['PHI-CT-TRASH'].value then + recipes['trash-chest'].enabled = true + recipes['trash-chest'].reload() + recipes['trash-pipe'].enabled = true + recipes['trash-pipe'].reload() + end + end end diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index d066763..f898479 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -4,274 +4,308 @@ data:extend({ name = 'PHI-EN', setting_type = 'startup', default_value = true, - order = 'A1' + order = 'A01' }, { type = 'bool-setting', name = 'PHI-MB', setting_type = 'startup', default_value = false, - order = 'A2' + order = 'A02' }, { type = 'bool-setting', name = 'PHI-WE', setting_type = 'startup', default_value = false, - order = 'A3' + order = 'A03' }, { type = 'bool-setting', name = 'PHI-EQ', setting_type = 'startup', default_value = false, - order = 'A4' + order = 'A04' }, { type = 'bool-setting', name = 'PHI-MI', setting_type = 'startup', default_value = false, - order = 'A5' + order = 'A05' }, { type = 'bool-setting', name = 'PHI-RS', setting_type = 'startup', default_value = false, - order = 'A6' + order = 'A06' }, { type = 'int-setting', name = 'PHI-XW-WATER', setting_type = 'startup', default_value = 0, allowed_values = {0, 1, 2, 3, 4, 5}, - order = 'A7' + order = 'A07' }, { type = 'bool-setting', name = 'PHI-XC', setting_type = 'startup', default_value = false, - order = 'A8' + order = 'A08' }, { type = 'bool-setting', name = 'PHI-PB', setting_type = 'startup', default_value = false, - order = 'A9' + order = 'A09' + }, { + type = 'bool-setting', + name = 'PHI-CT', + setting_type = 'startup', + default_value = false, + order = 'A10' }, { type = 'int-setting', name = 'PHI-EN-SOLAR-TIER', setting_type = 'startup', default_value = 8, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'B1' + order = 'B01' }, { type = 'int-setting', name = 'PHI-EN-STEAM-TIER', setting_type = 'startup', default_value = 5, allowed_values = {1, 2, 3, 4, 5}, - order = 'B2' + order = 'B02' }, { type = 'int-setting', name = 'PHI-EN-NUCLEAR-TIER', setting_type = 'startup', default_value = 5, allowed_values = {1, 2, 3, 4, 5}, - order = 'B3' + order = 'B03' }, { type = 'int-setting', name = 'PHI-MB-ASSEMBLING-TIER', setting_type = 'startup', default_value = 5, allowed_values = {3, 4, 5}, - order = 'C1' + order = 'C01' }, { type = 'int-setting', name = 'PHI-MB-FURNACE-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'C2' + order = 'C02' }, { type = 'int-setting', name = 'PHI-MB-OIL-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'C3' + order = 'C03' }, { type = 'int-setting', name = 'PHI-MB-CENTRIFUGE-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'C4' + order = 'C04' }, { type = 'int-setting', name = 'PHI-MB-LAB-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'C5' + order = 'C05' }, { type = 'int-setting', name = 'PHI-MB-MINING-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'C6' + order = 'C06' }, { type = 'int-setting', name = 'PHI-MB-SE-ASSEMBLING-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'C7' + order = 'C07' }, { type = 'int-setting', name = 'PHI-WE-LASER-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'D1' + order = 'D01' }, { type = 'int-setting', name = 'PHI-WE-FLAME-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'D2' + order = 'D02' }, { type = 'int-setting', name = 'PHI-WE-GUN-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'D3' + order = 'D03' }, { type = 'int-setting', name = 'PHI-WE-RADAR-TIER', setting_type = 'startup', default_value = 3, allowed_values = {1, 2, 3}, - order = 'D4' + order = 'D04' }, { type = 'int-setting', name = 'PHI-EQ-SOLAR-TIER', setting_type = 'startup', default_value = 8, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'E1' + order = 'E01' }, { type = 'int-setting', name = 'PHI-EQ-BATTERY-TIER', setting_type = 'startup', default_value = 8, allowed_values = {2, 3, 4, 5, 6, 7, 8}, - order = 'E2' + order = 'E02' }, { type = 'int-setting', name = 'PHI-EQ-REACTOR-TIER', setting_type = 'startup', default_value = 8, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'E3' + order = 'E03' }, { type = 'int-setting', name = 'PHI-EQ-LASER-TIER', setting_type = 'startup', default_value = 8, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, - order = 'E4' + order = 'E04' }, { type = 'int-setting', name = 'PHI-EQ-ROBOPORT-TIER', setting_type = 'startup', default_value = 8, allowed_values = {2, 3, 4, 5, 6, 7, 8}, - order = 'E5' + order = 'E05' }, { type = 'int-setting', name = 'PHI-EQ-SHIELD-TIER', setting_type = 'startup', default_value = 8, allowed_values = {2, 3, 4, 5, 6, 7, 8}, - order = 'E6' + order = 'E06' }, { type = 'int-setting', name = 'PHI-EQ-NIGHT-TIER', setting_type = 'startup', default_value = 2, allowed_values = {1, 2}, - order = 'E7' + order = 'E07' }, { type = 'int-setting', name = 'PHI-EQ-EXO-TIER', setting_type = 'startup', default_value = 2, allowed_values = {1, 2}, - order = 'E8' + order = 'E08' }, { type = 'bool-setting', name = 'PHI-EQ-ARMOR', setting_type = 'startup', default_value = true, - order = 'E9' + order = 'E09' }, { type = 'bool-setting', name = 'PHI-MI-LOADER', setting_type = 'startup', default_value = true, - order = 'F1' + order = 'F01' }, { type = 'int-setting', name = 'PHI-MI-LANDFILL', setting_type = 'startup', - default_value = 5, + default_value = 20, minimum_value = 1, maximum_value = 40, - order = 'F2' + order = 'F02' }, { type = 'bool-setting', name = 'PHI-MI-EFFCY', setting_type = 'startup', default_value = true, - order = 'F3' + order = 'F03' }, { type = 'bool-setting', name = 'PHI-MI-NUCLEAR', setting_type = 'startup', default_value = true, - order = 'F4' + order = 'F04' }, { type = 'bool-setting', name = 'PHI-MI-BOILER', setting_type = 'startup', default_value = true, - order = 'F5' + order = 'F05' }, { type = 'bool-setting', name = 'PHI-MI-CHEST', setting_type = 'startup', default_value = true, - order = 'F6' + order = 'F06' + }, { + 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' + }, { + 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' + }, { + 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' + }, { + 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' }, { type = 'int-setting', name = 'PHI-RS-RECIPE-1', setting_type = 'startup', default_value = 4, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, - order = 'G1' + order = 'G01' }, { type = 'int-setting', name = 'PHI-RS-RECIPE-2', setting_type = 'startup', default_value = 8, allowed_values = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}, - order = 'G2' + order = 'G02' }, { type = 'bool-setting', name = 'PHI-RS-MODULE', setting_type = 'startup', default_value = true, - order = 'G3' + order = 'G03' }, { type = 'int-setting', name = 'PHI-RS-RECIPE-DROF', @@ -279,7 +313,7 @@ data:extend({ default_value = 1, minimum_value = 1, maximum_value = 100, - order = 'G4' + order = 'G04' }, { type = 'int-setting', name = 'PHI-RS-RECIPE-MINROM', @@ -287,7 +321,7 @@ data:extend({ default_value = 2, minimum_value = 1, maximum_value = 100, - order = 'G5' + order = 'G05' }, { type = 'int-setting', name = 'PHI-RS-RECIPE-MAXROM', @@ -295,14 +329,14 @@ data:extend({ default_value = 100, minimum_value = 1, maximum_value = 100, - order = 'G6' + order = 'G06' }, { type = 'int-setting', name = 'PHI-XW-WATER', setting_type = 'startup', - default_value = 5, - allowed_values = {1, 2, 3, 4, 5}, - order = 'H1' + default_value = 1, + allowed_values = {1, 2, 3, 4, 5, 6, 7, 8}, + order = 'H01' }, { type = 'int-setting', name = 'PHI-PB-CMMS', @@ -310,7 +344,7 @@ data:extend({ default_value = 2, minimum_value = 0, maximum_value = 4, - order = 'IA1' + order = 'IA01' }, { type = 'double-setting', name = 'PHI-PB-CRS', @@ -318,7 +352,7 @@ data:extend({ default_value = 1.5, minimum_value = 0, maximum_value = 5, - order = 'IA2' + order = 'IA02' }, { type = 'int-setting', name = 'PHI-PB-CCS', @@ -326,7 +360,7 @@ data:extend({ default_value = 5, minimum_value = 0, maximum_value = 10, - order = 'IA3' + order = 'IA03' }, { type = 'int-setting', name = 'PHI-PB-CISB', @@ -334,7 +368,7 @@ data:extend({ default_value = 100, minimum_value = 0, maximum_value = 120, - order = 'IA4' + order = 'IA04' }, { type = 'int-setting', name = 'PHI-PB-CHB', @@ -342,7 +376,7 @@ data:extend({ default_value = 200, minimum_value = 0, maximum_value = 400, - order = 'IA5' + order = 'IA05' }, { type = 'int-setting', name = 'PHI-PB-CRDB', @@ -350,8 +384,8 @@ data:extend({ default_value = 10, minimum_value = 0, maximum_value = 20, - order = 'IA6' - } + order = 'IA06' + }, --[[, { type = 'int-setting', name = 'PHI-PB-FMMS', @@ -359,7 +393,7 @@ data:extend({ default_value = 2, minimum_value = 0, maximum_value = 10, - order = 'IB1' + order = 'IB01' }, { type = 'double-setting', name = 'PHI-PB-FRS', @@ -367,7 +401,7 @@ data:extend({ default_value = 1.5, minimum_value = 0, maximum_value = 10, - order = 'IB2' + order = 'IB02' }, { type = 'int-setting', name = 'PHI-PB-FCS', @@ -375,7 +409,7 @@ data:extend({ default_value = 5, minimum_value = 0, maximum_value = 20, - order = 'IB3' + order = 'IB03' }, { type = 'int-setting', name = 'PHI-PB-FISB', @@ -383,7 +417,7 @@ data:extend({ default_value = 100, minimum_value = 0, maximum_value = 200, - order = 'IB4' + order = 'IB04' }, { type = 'int-setting', name = 'PHI-PB-FHB', @@ -391,7 +425,7 @@ data:extend({ default_value = 200, minimum_value = 0, maximum_value = 1000, - order = 'IB5' + order = 'IB05' }, { type = 'double-setting', name = 'PHI-PB-FWRSM', @@ -399,7 +433,7 @@ data:extend({ default_value = 1.3, minimum_value = 0, maximum_value = 20, - order = 'IB6' + order = 'IB06' }, { type = 'double-setting', name = 'PHI-PB-FWRBM', @@ -407,7 +441,7 @@ data:extend({ default_value = 1, minimum_value = 0, maximum_value = 20, - order = 'IB7' + order = 'IB07' }, { type = 'int-setting', name = 'PHI-PB-FWRSB', @@ -415,7 +449,7 @@ data:extend({ default_value = 1, minimum_value = 0, maximum_value = 40, - order = 'IB8' + order = 'IB08' }, { type = 'int-setting', name = 'PHI-PB-FFRLM', @@ -423,8 +457,40 @@ data:extend({ default_value = 1, minimum_value = 0, maximum_value = 20, - order = 'IB9' - } + order = 'IB09' + }, ]] + { + type = 'bool-setting', + name = 'PHI-CT-OIL', + setting_type = 'startup', + default_value = true, + order = 'JA01' + }, { + type = 'bool-setting', + name = 'PHI-CT-RADAR', + setting_type = 'startup', + default_value = true, + order = 'JA02' + }, { + type = 'bool-setting', + name = 'PHI-CT-TRASH', + setting_type = 'startup', + default_value = true, + order = 'JA03' + }, { + type = 'bool-setting', + name = 'PHI-CT-TILE', + setting_type = 'startup', + default_value = false, + order = 'JB01' + }, { + type = 'string-setting', + name = 'PHI-CT-TILE-CHOICE', + setting_type = 'startup', + default_value = 'grass-1', + allowed_values = {'concrete', 'deepwater', 'deepwater-green', 'dirt-1', 'dirt-2', 'dirt-3', 'dirt-4', 'dirt-5', 'dirt-6', 'dirt-7', 'dry-dirt', 'grass-1', 'grass-2', 'grass-3', 'grass-4', 'hazard-concrete-left', 'hazard-concrete-right', 'lab-dark-1', 'lab-dark-2', 'lab-white', 'landfill', 'out-of-map', 'red-desert-0', 'red-desert-1', 'red-desert-2', 'red-desert-3', 'refined-concrete', 'refined-hazard-concrete-left', 'refined-hazard-concrete-right', 'sand-1', 'sand-2', 'sand-3', 'stone-path', 'tutorial-grid', 'water', 'water-green', 'water-mud', 'water-shallow'}, + order = 'JB02' + } } ) \ No newline at end of file diff --git a/PHI-CL_2.0.2.zip b/PHI-CL_2.0.2.zip deleted file mode 100644 index d3a86a0..0000000 Binary files a/PHI-CL_2.0.2.zip and /dev/null differ