From 485f65050a087ad7b735e831ab200a89d151e203 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Mon, 8 May 2023 19:38:09 +0900 Subject: [PATCH] Update --- PHI-MB/data.lua | 10 ++++------ PHI-MI/data-updates.lua | 35 +++++++++++++++++++++++++++++++++++ PHI-MI/data.lua | 19 ++++++++----------- PHI-RS/data.lua | 11 ++++++++--- PHI-RS/info.json | 4 ++-- PHI-XW/data.lua | 10 +++++----- 6 files changed, 62 insertions(+), 27 deletions(-) diff --git a/PHI-MB/data.lua b/PHI-MB/data.lua index 3963868..b06c21e 100644 --- a/PHI-MB/data.lua +++ b/PHI-MB/data.lua @@ -21,13 +21,11 @@ local function EE(source, tier) for k, _ in pairs(item.fluid_boxes) do if item.fluid_boxes[k] ~= false and item.fluid_boxes[k] ~= true then if item.fluid_boxes[k].production_type ~= nil then - if item.fluid_boxes[k].base_area == nil then - item.fluid_boxes[k].base_area = 20 - else - item.fluid_boxes[k].base_area = item.fluid_boxes[k].base_area * 2 + item.fluid_boxes[k].height = 4 + + if item.fluid_boxes[k].base_level ~= nil then + item.fluid_boxes[k].base_level = item.fluid_boxes[k].base_level * 4 end - - item.fluid_boxes[k].height = 2 end end end diff --git a/PHI-MI/data-updates.lua b/PHI-MI/data-updates.lua index 75391a0..3679382 100644 --- a/PHI-MI/data-updates.lua +++ b/PHI-MI/data-updates.lua @@ -1,3 +1,38 @@ -- 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 + +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 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 + + 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 + end + end + end +end diff --git a/PHI-MI/data.lua b/PHI-MI/data.lua index 49787ca..352ea8b 100644 --- a/PHI-MI/data.lua +++ b/PHI-MI/data.lua @@ -47,16 +47,15 @@ data.raw['module']['effectivity-module-3'].effect = {consumption = {bonus = -1.5 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 -data.raw['pipe']['pipe'].fluid_box.base_area = 2 -data.raw['pipe']['pipe'].fluid_box.height = 2 -data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.base_area = 2 -data.raw['pipe-to-ground']['pipe-to-ground'].fluid_box.height = 2 +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.base_area = 2 -data.raw['pump']['pump'].fluid_box.height = 8 +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.base_area = 500 data.raw['storage-tank']['storage-tank'].fluid_box.height = 2 data.raw['locomotive']['locomotive'].max_health = 2000 @@ -81,14 +80,14 @@ 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 -data.raw['construction-robot']['construction-robot'].max_health = 400 +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'].max_health = 400 +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 @@ -126,9 +125,7 @@ local entity = table.deepcopy(data.raw['boiler']['boiler']) entity.name = 'electric-boiler' entity.energy_consumption = '7200kW' entity.target_temperature = 165 -entity.fluid_box.base_area = 2 entity.fluid_box.height = 4 -entity.output_fluid_box.base_area = 2 entity.output_fluid_box.height = 4 entity.minable = {hardness = 0.2, mining_time = 0.5, result = 'electric-boiler'} entity.emissions_per_minute = 0 diff --git a/PHI-RS/data.lua b/PHI-RS/data.lua index 008f9c3..4854c66 100644 --- a/PHI-RS/data.lua +++ b/PHI-RS/data.lua @@ -1,5 +1,4 @@ local recipe_multiplier = {4, 8} -local recipe_display = {true, false} local recipe_list = { { @@ -344,7 +343,7 @@ for i=1, #recipe_list, 1 do if (v[1] ~= nil) and (v[2] ~= nil) then item.expensive.results[k][2] = v[2] * recipe_multiplier[j] else - item.expensive.results[k].amount = v.amount * recipe_multiplier[j] + item.expensive.results[k].amount = v.amount * recipe_multiplier[j] end end @@ -394,7 +393,13 @@ for i=1, #recipe_list, 1 do item.energy_required = recipe_multiplier[j] / 2 end end - + + for _, v in pairs(data.raw.module) do + if v.limitation and string.find(item.name, 'productivity', 1, true) then + table.insert(v.limitation, item.name .. '-s' .. j) + end + end + item.name = item.name .. '-s' .. j data:extend({item}) diff --git a/PHI-RS/info.json b/PHI-RS/info.json index 85420c9..45c1f26 100644 --- a/PHI-RS/info.json +++ b/PHI-RS/info.json @@ -1,8 +1,8 @@ { "name": "PHI-RS", - "version": "1.0.2", + "version": "1.0.3", "factorio_version": "1.1", - "date": "2023-05-07", + "date": "2023-05-08", "title": "Phidias Recipe Scaling", "author": "PHIDIAS0303", "contributers": "", diff --git a/PHI-XW/data.lua b/PHI-XW/data.lua index 1269e1c..0bde793 100644 --- a/PHI-XW/data.lua +++ b/PHI-XW/data.lua @@ -1,6 +1,6 @@ data.raw['offshore-pump']['offshore-pump'].pumping_speed = 100 -data.raw['offshore-pump']['offshore-pump'].fluid_box.base_area = 2 -data.raw['offshore-pump']['offshore-pump'].fluid_box.height = 2 +data.raw['offshore-pump']['offshore-pump'].fluid_box.height = 4 +data.raw['offshore-pump']['offshore-pump'].fluid_box.level = 5 data.raw['offshore-pump']['offshore-pump'].flags = {'placeable-neutral', 'player-creation'} data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_box = {{-0.5, -0.25}, {0.5, 0.25}} data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'} @@ -8,9 +8,9 @@ data.raw['offshore-pump']['offshore-pump'].adjacent_tile_collision_mask = nil data.raw['offshore-pump']['offshore-pump'].placeable_position_visualization = nil if mods['angelsrefining'] then - data.raw['offshore-pump']['seafloor-pump'].pumping_speed = 25 - data.raw['offshore-pump']['seafloor-pump'].fluid_box.base_area = 2 - data.raw['offshore-pump']['seafloor-pump'].fluid_box.height = 2 + data.raw['offshore-pump']['seafloor-pump'].pumping_speed = 100 + data.raw['offshore-pump']['seafloor-pump'].fluid_box.height = 4 + data.raw['offshore-pump']['offshore-pump'].fluid_box.level = 5 data.raw['offshore-pump']['seafloor-pump'].flags = {'placeable-neutral', 'player-creation', 'filter-directions'} data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_box = {{-2, -3}, {2, -2}} data.raw['offshore-pump']['seafloor-pump'].adjacent_tile_collision_test = {'ground-tile', 'water-tile', 'object-layer'}