From ad40e6d507168e35113a1df5807b2757935c04d1 Mon Sep 17 00:00:00 2001
From: PHIDIAS <10016767+PHIDIAS0303@users.noreply.github.com>
Date: Sat, 18 Mar 2023 03:12:00 +0900
Subject: [PATCH] Update main.lua

---
 PHI-MB/main.lua | 109 ++++++++++++++++++++++++++++++++----------------
 1 file changed, 74 insertions(+), 35 deletions(-)

diff --git a/PHI-MB/main.lua b/PHI-MB/main.lua
index 2d7b667..e9c9dde 100644
--- a/PHI-MB/main.lua
+++ b/PHI-MB/main.lua
@@ -218,6 +218,9 @@ for i=1, #recipe_list, 1 do
         local item = table.deepcopy(data.raw.recipe[recipe_list[i]])
         local item_1 = table.deepcopy(data.raw.recipe[recipe_list[i]])
 
+        item.enabled = true
+        item_1.enabled = true
+
         if item.energy_required ~= nil then
             item.energy_required = item.energy_required * 4
             item_1.energy_required = item_1.energy_required * 16
@@ -225,18 +228,8 @@ for i=1, #recipe_list, 1 do
             item.energy_required = 2
             item_1.energy_required = 8
         end
-        
-        if item.ingredients ~= nil then
-            for k, v in pairs(item.ingredients) do
-                if (v[1] ~= nil) and (v[2] ~= nil) then
-                    item.ingredients[k][2] = v[2] * 4
-                    item_1.ingredients[k][2] = v[2] * 16
-                else
-                    item.ingredients[k].amount = v.amount * 4
-                    item_1.ingredients[k].amount = v.amount * 16
-                end
-            end
-        elseif (item.normal ~= nil) and (item.normal ~= false) then
+
+        if (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
@@ -246,6 +239,28 @@ for i=1, #recipe_list, 1 do
                     item_1.normal.ingredients[k].amount = v.amount * 16
                 end
             end
+
+            if item.normal.results ~= nil then
+                for k, v in pairs(item.normal.results) do
+                    if (v[1] ~= nil) and (v[2] ~= nil) then
+                        item.normal.results[k][2] = v[2] * 4
+                        item_1.normal.results[k][2] = v[2] * 16
+                    else
+                        item.normal.results[k].amount = v.amount * 4
+                        item_1.normal.results[k].amount = v.amount * 16         
+                    end
+                end
+
+            else
+                if item.normal.result_count ~= nil then
+                    item.normal.result_count = item.normal.result_count * 4
+                    item_1.normal.result_count = item_1.normal.result_count * 16
+                else
+                    item.normal.result_count = 4
+                    item_1.normal.result_count = 16
+                end
+            end
+
         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
@@ -256,38 +271,62 @@ for i=1, #recipe_list, 1 do
                     item_1.expensive.ingredients[k].amount = v.amount * 16
                 end
             end
-        end
-        
-        item.name = item.name .. '-04x'
-        item.enabled = true
-        item_1.name = item_1.name .. '-16x'
-        item_1.enabled = true
 
-        if item.results ~= nil then
-            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
+            if item.expensive.results ~= nil then
+                for k, v in pairs(item.expensive.results) do
+                    if (v[1] ~= nil) and (v[2] ~= nil) then
+                        item.expensive.results[k][2] = v[2] * 4
+                        item_1.expensive.results[k][2] = v[2] * 16
+                    else
+                        item.expensive.results[k].amount = v.amount * 4
+                        item_1.expensive.results[k].amount = v.amount * 16         
+                    end
+                end
+
+            else
+                if item.expensive.result_count ~= nil then
+                    item.expensive.result_count = item.expensive.result_count * 4
+                    item_1.expensive.result_count = item_1.expensive.result_count * 16
                 else
-                    item.results[k].amount = v.amount * 4
-                    item_1.results[k].amount = v.amount * 16         
+                    item.expensive.result_count = 4
+                    item_1.expensive.result_count = 16
                 end
             end
 
-            data:extend({item, item_1})
         else
-            local result_count
-
-            if item.result_count ~= nil then
-                item.result_count = item.result_count * 4
-                item_1.result_count = item_1.result_count * 16
-            else
-                item.result_count = 4
-                item_1.result_count = 16
+            for k, v in pairs(item.ingredients) do
+                if (v[1] ~= nil) and (v[2] ~= nil) then
+                    item.ingredients[k][2] = v[2] * 4
+                    item_1.ingredients[k][2] = v[2] * 16
+                else
+                    item.ingredients[k].amount = v.amount * 4
+                    item_1.ingredients[k].amount = v.amount * 16
+                end
             end
 
-            data:extend({item, item_1})
+            if item.results ~= nil then
+                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 = v.amount * 4
+                        item_1.results[k].amount = v.amount * 16         
+                    end
+                end
+
+            else
+                if item.result_count ~= nil then
+                    item.result_count = item.result_count * 4
+                    item_1.result_count = item_1.result_count * 16
+                else
+                    item.result_count = 4
+                    item_1.result_count = 16
+                end
+            end
         end
+    
+        data:extend({item, item_1})
     end
 end