Fixing bugs + adding 2 new NPC images

Author: NetroScript

README.md

@@ -125,13 +125,22 @@ For those interested, here is the command I use to generate the folder which I t
 (I have this saved as build.bat in the same folder)
 
 ```batch
-python -m eel main.py "./data/html" -n "Graveyard Keeper Savefile Editor" -i "./data/html/favicon.ico" --exclude PyQt5 --exclude win32com --exclude pydoc --exclude lib2to3 -y
+py -3.8  -m eel main.py "./data/html" -n "Graveyard Keeper Savefile Editor" -i "./data/html/favicon.ico" --exclude PyQt5 --exclude win32com --exclude pydoc --exclude lib2to3 -y --additional-hooks-dir=hooks
 
 copy "%cd%\data\hashes" "%cd%\dist\Graveyard Keeper Savefile Editor\data\hashes" /Y
 copy "%cd%\data\locals.json" "%cd%\dist\Graveyard Keeper Savefile Editor\data\locals.json" /Y
 copy "%cd%\data\data.json" "%cd%\dist\Graveyard Keeper Savefile Editor\data\data.json" /Y
 copy "%cd%\data\version" "%cd%\dist\Graveyard Keeper Savefile Editor\data\version" /Y
 copy "%cd%\data\itemversion" "%cd%\dist\Graveyard Keeper Savefile Editor\data\itemversion" /Y
+copy "%cd%\data\new_item_data.json" "%cd%\dist\Graveyard Keeper Savefile Editor\data\new_item_data.json" /Y
 
 pause
 ```
+
+In the hooks directory there is a file called `hook-eel.py` with the content:
+
+```py
+from PyInstaller.utils.hooks import collect_all
+
+datas, binaries, hiddenimports = collect_all('eel')
+```

data/html/index.html

@@ -1264,7 +1264,7 @@
                 $(this.el).parents(".item").find(".item_icon").attr("class", "item_icon " + sanitzize_item_id(id));;
 
                 if ( !settings["expert"]){
-                    if(!gamedata.items.includes(newid)){
+                    if(!gamedata.items.includes(id)){
                         $(this.el).parents(".item").addClass("unknown_item");
                     } else {
                         $(this.el).parents(".item").removeClass("unknown_item");

data/html/rsc/npc_refugee_coffin_maker.png

@@ -2338,5 +2338,7 @@
 	"recipe_bag_universal": "Recipe: Universal bag",
 	"recipe_bag_universal_big": "Recipe: Big universal bag",
 	"npc_marquis_teodoro_jr": "Marquis Teodoro Jr.",
-	"npc_refugee_cook": "Cook"
+	"npc_refugee_cook": "Cook",
+	"npc_refugee_tanner": "Tanner",
+	"npc_refugee_coffin_maker": "Undertaker"
 }

data/html/rsc/npc_refugee_tanner.png

@@ -414,7 +414,7 @@ def modify_save(data, shash):
                               savefiles[shash]["savedata"]["_inventory"]["v"]["_params"]["v"]["_res_v"]["v"][rel["s"]],
                               rel["cur"])
 
-    edit_inventory(savefiles[shash]["savedata"]["_inventory"]["v"]["inventory"]["v"], data["subinventory"], shash)
+    edit_inventory(savefiles[shash]["savedata"]["_inventory"]["v"]["inventory"]["v"], data["inventory"], shash)
 
     # Here we check if the save is from an older version which doesn't have this variable yet
     # If there is a second inventory (for tools) we update it
@@ -469,8 +469,7 @@ def modify_save(data, shash):
 
         # Check if the object id is the id of a storage unit, if so modify the values
         if it["obj_id"]["v"] in gamedata["storage"]:
-            edit_inventory(it["-1126421579"]["v"]["inventory"]["v"], data["subinventory"],
-                           data["additionalstorage"][i2]["items"])
+            edit_inventory(it["-1126421579"]["v"]["inventory"]["v"], data["additionalstorage"][i2]["items"], shash)
 
             # Set the inventory size to the new value - the modification of this was removed in the ui because it seems
             # that most if not all storage units have a fixed size which can not be changed in the save file