From 397661728f19dce56054170911f9c4cf3f75b773 Mon Sep 17 00:00:00 2001
From: PHIDIAS <phidias@aperx.org>
Date: Thu, 9 Jan 2025 23:21:54 +0900
Subject: [PATCH] .

---
 exp_legacy/module/config/vlayer.lua          | 22 --------------------
 exp_legacy/module/modules/control/vlayer.lua | 14 +++++++------
 exp_legacy/module/modules/gui/vlayer.lua     |  1 +
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/exp_legacy/module/config/vlayer.lua b/exp_legacy/module/config/vlayer.lua
index e6058863..74a000bd 100644
--- a/exp_legacy/module/config/vlayer.lua
+++ b/exp_legacy/module/config/vlayer.lua
@@ -83,29 +83,7 @@ return {
             surface_area = 0,
             fuel_value = 100, -- MJ
             power = true, -- turn all rocket fuel to power to reduce trash
-        }
-        --[[
-        ["iron-ore"] = {
-            starting_value = 0,
-            required_area = 0,
-            surface_area = 0,
         },
-        ["copper-ore"] = {
-            starting_value = 0,
-            required_area = 0,
-            surface_area = 0,
-        },
-        ["stone"] = {
-            starting_value = 0,
-            required_area = 0,
-            surface_area = 0,
-        },
-        ["uranium-ore"] = {
-            starting_value = 0,
-            required_area = 0,
-            surface_area = 0,
-        },
-        ]]
     },
 
     modded_items = { --- @setting modded_items List of all modded items allowed in vlayer storage and their base game equivalent
diff --git a/exp_legacy/module/modules/control/vlayer.lua b/exp_legacy/module/modules/control/vlayer.lua
index 6819ed69..a7e02181 100644
--- a/exp_legacy/module/modules/control/vlayer.lua
+++ b/exp_legacy/module/modules/control/vlayer.lua
@@ -362,23 +362,25 @@ local function handle_input_interfaces()
         else
             local inventory = interface.get_inventory(defines.inventory.chest)
 
-            for name, count in pairs(inventory.get_contents()) do
+            for name, v in pairs(inventory.get_contents()) do
                 if config.allowed_items[name] then
                     if config.allowed_items[name].modded then
                         if config.modded_auto_downgrade then
-                            vlayer.insert_item(config.modded_items[name].base_game_equivalent, count * config.modded_items[name].multiplier)
+                            -- TODO Quality Insert 7 + 3N items based on quailty level.
+                            -- For example, level 1: 10 = 10, level 2: 10 = 13
+                            vlayer.insert_item(config.modded_items[name].base_game_equivalent, v.count * config.modded_items[name].multiplier)
                         else
-                            vlayer.insert_item(name, count)
+                            vlayer.insert_item(name, v.count)
                         end
                     else
                         if vlayer_data.storage.power_items[name] then
-                            vlayer_data.storage.power_items[name].count = vlayer_data.storage.power_items[name].count + count
+                            vlayer_data.storage.power_items[name].count = vlayer_data.storage.power_items[name].count + v.count
                         else
-                            vlayer.insert_item(name, count)
+                            vlayer.insert_item(name, v.count)
                         end
                     end
 
-                    inventory.remove{ name = name, count = count }
+                    inventory.remove{ name = name, count = v.count, quality = v.quality }
                 end
             end
         end
diff --git a/exp_legacy/module/modules/gui/vlayer.lua b/exp_legacy/module/modules/gui/vlayer.lua
index a99860bb..974570fb 100644
--- a/exp_legacy/module/modules/gui/vlayer.lua
+++ b/exp_legacy/module/modules/gui/vlayer.lua
@@ -43,6 +43,7 @@ local function format_energy(amount, unit)
 
     local suffix = ""
     local suffix_list = {
+        ["P"] = 1000000000000000,
         ["T"] = 1000000000000,
         ["G"] = 1000000000,
         ["M"] = 1000000,