From bd12e864bf431c99a278f11ae3eeb89a4ae9c66b Mon Sep 17 00:00:00 2001 From: PHIDIAS <10016767+PHIDIAS0303@users.noreply.github.com> Date: Sat, 18 Mar 2023 02:32:34 +0900 Subject: [PATCH] Update main.lua --- PHI-MB/main.lua | 66 ++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 36 deletions(-) diff --git a/PHI-MB/main.lua b/PHI-MB/main.lua index 9b6fb9d..d7c4d27 100644 --- a/PHI-MB/main.lua +++ b/PHI-MB/main.lua @@ -202,11 +202,6 @@ for i=1, #recipe_list, 1 do if data.raw.recipe[recipe_list[i]] ~= nil then local item = table.deepcopy(data.raw.recipe[recipe_list[i]]) local item_1 = item - local energy_required = 1 - local ingredients_1 = {} - local ingredients_2 = {} - local results_1 = {} - local results_2 = {} if item.energy_required ~= nil then item.energy_required = item.energy_required * 4 @@ -217,38 +212,35 @@ for i=1, #recipe_list, 1 do end if item.ingredients ~= nil then - for k, _ in pairs(item.ingredients) do - if (item.ingredients[k][1] ~= nil) and (item.ingredients[k][2] ~= nil) then + for k, v in pairs(item.ingredients) do + if (v[1] ~= nil) and (v[2] ~= nil) then -- table.insert(ingredients_2, {v[1], v[2] * 4}) - item.ingredients[k][2] = item.ingredients[k][2] * 4 - item_1.ingredients[k][2] = item_1.ingredients[k][2] * 16 + item.ingredients[k][2] = v[2] * 4 + item_1.ingredients[k][2] = v[2] * 16 else -- table.insert(ingredients_1, {type=v.type, name=v.name, amount=v.amount * 4, fluidbox_index=v.fluidbox_index}) - item.ingredients[k].amount = item.ingredients[k].amount * 4 - item_1.ingredients[k].amount = item_1.ingredients[k].amount * 16 + item.ingredients[k].amount = v.amount * 4 + item_1.ingredients[k].amount = v.amount * 16 end end - else - if item.normal ~= nil or item.normal ~= false then - for k, _ in pairs(item.normal.ingredients) do - if (item.normal.ingredients[k][1] ~= nil) and (item.normal.ingredients[k][2] ~= nil) then - item.normal.ingredients[k][2] = item.normal.ingredients[k][2] * 4 - item_1.normal.ingredients[k][2] = item_1.normal.ingredients[k][2] * 16 + elseif (item.normal ~= nil) and (item.normal ~= false) then + for k, v in pairs(item.normal.ingredients) do + if (v[1] ~= nil) and (v[2] ~= nil) then + item.normal.ingredients[k][2] = v[2] * 4 + item_1.normal.ingredients[k][2] = v[2] * 16 else - item.normal.ingredients[k].amount = item.normal.ingredients[k].amount * 4 - item_1.normal.ingredients[k].amount = item_1.normal.ingredients[k].amount * 16 + item.normal.ingredients[k].amount = v.amount * 4 + item_1.normal.ingredients[k].amount = v.amount * 16 end end - end - - if item.expensive ~= nil or item.expensive ~= false then - for k, _ in pairs(item.expensive.ingredients) do - if (item.expensive.ingredients[k][1] ~= nil) and (item.expensive.ingredients[k][2] ~= nil) then - item.expensive.ingredients[k][2] = item.expensive.ingredients[k][2] * 4 - item_1.expensive.ingredients[k][2] = item_1.expensive.ingredients[k][2] * 16 + elseif (item.expensive) ~= nil and (item.expensive ~= false) then + for k, v in pairs(item.expensive.ingredients) do + if (v[1] ~= nil) and (v[2] ~= nil) then + item.expensive.ingredients[k][2] = v[2] * 4 + item_1.expensive.ingredients[k][2] = v[2] * 16 else - item.expensive.ingredients[k].amount = item.expensive.ingredients[k].amount * 4 - item_1.expensive.ingredients[k].amount = item_1.expensive.ingredients[k].amount * 16 + item.expensive.ingredients[k].amount = v.amount * 4 + item_1.expensive.ingredients[k].amount = v.amount * 16 end end end @@ -260,17 +252,18 @@ for i=1, #recipe_list, 1 do item_1.enabled = true if item.results ~= nil then - for k, _ in pairs(item.results) do - if (item.results[k][1] ~= nil) and (item.results[k][2] ~= nil) then - item.results[k][2] = item.results[k][2] * 4 - item_1.results[k][2] = item_1.results[k][2] * 16 + for k, v in pairs(item.results) do + if (v[1] ~= nil) and (v[2] ~= nil) then + item.results[k][2] = v[2] * 4 + item_1.results[k][2] = v[2] * 16 else - item.results[k].amount = item.results[k].amount * 4 - item_1.results[k].amount = item_1.results[k].amount * 16 + item.results[k].amount = v.amount * 4 + item_1.results[k].amount = v.amount * 16 end end - data:extend({item, item_1}) + data:extend({item}) + data:extend({item_1}) else local result_count @@ -282,7 +275,8 @@ for i=1, #recipe_list, 1 do item_1.result_count = 16 end - data:extend({item, item_1}) + data:extend({item}) + data:extend({item_1}) end end end