fixing small mistakes for 0.1.24

The check for the better save soul DLC for workers was incorrectly checking for the game of crone DLC.

You can now also decide how many skulls bodies in graves should have.

Upgrading decorations now correctly displays both the sculpture / grave stone and the fence

Author: NetroScript

changelog.md

@@ -4,10 +4,12 @@
 Improved:
 
 * It is now possible to have a worker zombie of any efficiency
+* At the same time you can now decide how many skulls the bodies in the graves should have
 * Utility functions can now be collapsed and expanded
 
 Fixed:
 
+* Before when upgrading to the highest grave decoration, you still had to manually "repair" the top part, this is now fixed and it directly display correctly
 * When saving new indexed strings now, they get added correctly to the save file (Unless you used the application to export your save to JSON and then edit yourself and then reimported it, this problem doesn't matter for you)
 
 0.1.23

data/html/css/main.css

@@ -768,7 +768,7 @@ ul.collapsible {
     pointer-events: initial;
 }
 
-input#worker-efficiency {
+input#worker-efficiency, input#gravebody-skulls {
     margin: 0!important;
     height: 20px;
     width: 50px;

data/html/index.html

@@ -302,7 +302,13 @@
                     <div class="note hover col s12"><b>WARNING:</b><br>
                     You can ignore the following warning if the worker you are using is a "big brain" worker (meaning custom efficiency) <br/><br/>
                     For the perfect bodies/workers/graves to work it is necessary to have the technologies / crafting recipes like embalming because otherwise the game "resets" those bodies / decorations to a state which you could have done with your current tech tree / advancement (exception for this is the big brain worker). For this reason a "Unlock the entire tech tree" button was added. <b>BUT</b> the game save is rather complex, meaning even if you have all technologies and theoretically you couldn't have advanced this far the bodies will be bugged, f.e. broken in the morgue table. I assume (without having looked at the game code) that you need a certain progress in the game. F.e. when I used all technologies + perfect bodies on a completely new save, the bodies had 7 skulls, but actually (when taking a look at the exported save) the bodies where the correct bodies. So progress normally and use the unlock tech tree button or perfect worker button on a late game save (or where you already manually could produce the perfect bodies, but are lacking the resources)</div>
-                    <div class="btn perbody col s12">Replace all the bodies in graves with perfect bodies</div>
+                    <div class="btn perbody col s12">Replace bodies in graves with a body with
+                      <div class="input-field inline worker-efficiency-container">
+                        <input id="gravebody-skulls" type="number" step="1" min="0" value="26">
+                      </div>
+                      <div class="gameicon i-white-skull">
+                        <img src="/rsc/White_Skull_Symbol.png">
+                      </div></div>
                     <div class="note col s12"><b>Note:</b><br>This is pre version 1.200</div>
                     <div class="btn perdeco col s12">Set all grave decorations to the highest</div>
                     <div class="btn perempty col s12">Replace all empty graves with perfect graves</div>
@@ -841,8 +847,20 @@
                 $("#skull-amount").text(data.workerskullamount);
             })
 
+            // When setting skulls for the graves change the internal value
+            $("#gravebody-skulls").change((e) => {
+
+                // Round to steps of 2.5
+                data.gravebodyskullamount = Math.round(Math.max(0, Number($("#gravebody-skulls").val())));
+
+                // Force the value to be steps of 2.5
+                $("#worker-efficiency").val(data.gravebodyskullamount)
+            })
+
+
+
             // Prevent the button from firing if we just change the text value
-            $("#worker-efficiency").click((e) => {
+            $("#worker-efficiency, #gravebody-skulls").click((e) => {
                 e.preventDefault();
                 e.stopPropagation();
             })

main.py

@@ -499,7 +499,7 @@ def modify_save(data, shash):
                 reference_inventory = jsongamedata["inventory"]
 
             # Otherwise if the user wants 65% and has the Better Save Soul DLC we use the prepared Worker of that DLC
-            if data["workerskullamount"] == 26 and options["gameofcrone"]:
+            if data["workerskullamount"] == 26 and options["bettersavesoul"]:
                 adjust_skull_value = False
                 reference_inventory = jsongamedata["worker_inventory_65%_1400+"]
 
@@ -543,7 +543,34 @@ def modify_save(data, shash):
             # We iterate the items until we found the body and then change the inventory of the body
             for item in it["-1126421579"]["v"]["inventory"]["v"]:
                 if item["v"]["id"]["v"] == "body":
-                    item["v"]["inventory"]["v"] = jsongamedata["inventory"]
+
+                    # By default we use the custom rating inventory
+                    reference_inventory = jsongamedata["worker_inventory_custom_rating"]
+
+                    # Whether we are using the an inventory with just one manipulated item
+                    adjust_skull_value = True
+
+                    # If the user wants 16 skulls and has the Game Of Crone DLC
+                    if data["gravebodyskullamount"] == 16 and options["gameofcrone"]:
+                        adjust_skull_value = False
+                        reference_inventory = jsongamedata["inventory"]
+
+                    # Otherwise if the user wants 26 skulls and has the Better Save Soul DLC
+                    if data["gravebodyskullamount"] == 26 and options["bettersavesoul"]:
+                        adjust_skull_value = False
+                        reference_inventory = jsongamedata["worker_inventory_65%_1400+"]
+
+                    # If we have the inventory with the single modified item
+                    if adjust_skull_value:
+                        # We create a copy of the object just to not modify the in memory version which is used
+                        reference_inventory = deepcopy(reference_inventory)
+
+                        # The inventory only contains 1 item, so we can directly access that item and its parameter
+                        # to set the correct skull amount
+                        # The -1 is caused because the brain already has one white skull
+                        reference_inventory[0]["v"]["_params"]["v"]["_res_v"]["v"][0]["v"] = data["workerskullamount"] - 1
+
+                    item["v"]["inventory"]["v"] = reference_inventory
                     item["v"]["_params"]["v"]["_durability"]["v"] = 1
                     break
 
@@ -554,19 +581,19 @@ def modify_save(data, shash):
             if options["bettersavesoul"]:
                 jsongamedata["fence"]["v"]["id"]["v"] = "grave_bot_mrb_8"
                 jsongamedata["decoration"]["v"]["id"]["v"] = "grave_top_sculpt_mrb_5"
-                jsongamedata["_res_type"]["v"][2]["v"] = "grave_top_sculpt_mrb_5"
+                jsongamedata["_res_type"]["v"][1]["v"] = "grave_top_sculpt_mrb_5"
                 jsongamedata["_res_type"]["v"][2]["v"] = "grave_bot_mrb_8"
             # Else If the game of crone DLC is enabled use its decorations
             elif options["gameofcrone"]:
                 jsongamedata["fence"]["v"]["id"]["v"] = "grave_bot_mrb_5"
                 jsongamedata["decoration"]["v"]["id"]["v"] = "grave_top_highangel_mrb_1"
-                jsongamedata["_res_type"]["v"][2]["v"] = "grave_top_highangel_mrb_1"
+                jsongamedata["_res_type"]["v"][1]["v"] = "grave_top_highangel_mrb_1"
                 jsongamedata["_res_type"]["v"][2]["v"] = "grave_bot_mrb_5"
             # Otherwise use base game decoration
             else:
                 jsongamedata["fence"]["v"]["id"]["v"] = "grave_bot_mrb_2"
                 jsongamedata["decoration"]["v"]["id"]["v"] = "grave_top_sculpt_mrb_1"
-                jsongamedata["_res_type"]["v"][2]["v"] = "grave_top_sculpt_mrb_1"
+                jsongamedata["_res_type"]["v"][1]["v"] = "grave_top_sculpt_mrb_1"
                 jsongamedata["_res_type"]["v"][2]["v"] = "grave_bot_mrb_2"
 
             # We iterate the items to delete all but the body so we can add the new ones
@@ -817,6 +844,7 @@ def editable_values(shash):
     }
 
     obj["workerskullamount"] = 26
+    obj["gravebodyskullamount"] = 26
 
     return obj