Scarlet veil major id

builder.js

@@ -621,12 +621,18 @@ function updateBoosts(buttonId, recalcStats) {
             if (name === "warscream") {
                 player_build.defenseMultiplier -= .20;
             }
+            if (name === "vanish") {
+                player_build.defenseMultiplier -= .15;
+            }
             elem.classList.remove("toggleOn");
         }else{
             player_build.damageMultiplier += damageMultipliers.get(name);
             if (name === "warscream") {
                 player_build.defenseMultiplier += .20;
             }
+            if (name === "vanish") {
+                player_build.defenseMultiplier += .15;
+            }
             elem.classList.add("toggleOn");
         }
         updatePowderSpecials("skip", false); //jank pt 1
@@ -637,6 +643,7 @@ function updateBoosts(buttonId, recalcStats) {
                 elem.classList.remove("toggleOn");
                 player_build.damageMultiplier -= value;
                 if (key === "warscream") { player_build.defenseMultiplier -= .20 }
+                if (key === "vanish") { player_build.defenseMultiplier -= .15 }
             }
         }
     }

clean.json

@@ -541,6 +541,9 @@
       "aDefPct": -65,
       "tDefPct": -65,
       "eDefPct": -65,
+      "majorIds": [
+        "FISSION"
+      ],
       "id": 1693
     },
     {
@@ -91192,6 +91195,9 @@
       "aDefPct": -100,
       "tDefPct": -100,
       "eDefPct": -100,
+      "majorIds": [
+        "EXPLOSIVE_IMPACT"
+      ],
       "id": 3587
     },
     {

load.js

@@ -1,4 +1,4 @@
-const DB_VERSION = 70;
+const DB_VERSION = 71;
 // @See https://github.com/mdn/learning-area/blob/master/javascript/apis/client-side-storage/indexeddb/video-store/index.jsA
 
 let db;

py_script/ing_transform_combine.py

@@ -148,7 +148,6 @@ ing_delete_keys = [
 
 print("loaded all files.")
 
-print(ings[0])
 for ing in ings:
     for key in ing_delete_keys:
         if key in ing:
@@ -160,8 +159,30 @@ for ing in ings:
             del ing[k]
     
     for k, v in ing_metaID_mappings.items():
+        if 'consumableIDs' not in ing:
+            ing['consumableIDs'] = {
+                  "charges": 0,
+                  "dura": 0
+                }
+        if 'posMods' not in ing:
+            ing['posMods'] = {
+                  "left": 0,
+                  "right": 0,
+                  "above": 0,
+                  "under": 0,
+                  "touching": 0,
+                  "notTouching": 0
+                }
+        if 'itemIDs' not in ing:
+            ing['consumableIDs'] = {
+                  "dura": 0,
+                  "strReq": 0,
+                  "dexReq": 0,
+                  "intReq": 0,
+                  "defReq": 0,
+                  "agiReq": 0
+                }
         if k in ing['itemIDs']:
-            print(ing['name'])
             ing['itemIDs'][v] = ing['itemIDs'][k]
             del ing['itemIDs'][k]
         elif k in ing['consumableIDs']:
@@ -190,4 +211,4 @@ with open("../ing_map.json", "w") as ing_mapfile:
     json.dump(ing_map, ing_mapfile, indent = 2)
 
 
-print('All ing jsons updated.')
+print('All ing jsons updated.')

py_script/json_diff.py

@@ -13,6 +13,19 @@ def shorten(v):
 def is_basic(t):
     return t is int or t is str or t is float or t is bool or t is list
 
+def list_diff(list1, list2, path):
+    print(f"Encountered object list {path}, enter match key: ", end="", file=sys.stderr)
+    key = input()
+    if (key == ""):
+        if list1 != list2:
+            print(f"{path}.{k}: Value difference")
+            print(f"    Left: {shorten(str(v))}")
+            print(f"    Right: {shorten(str(obj))}")
+    else:
+        left = {x[key]: x for x in list1}
+        right = {x[key]: x for x in list2}
+        object_diff(left, right, path)
+
 def object_diff(obj1, obj2, path):
     for (k, v) in obj1.items():
         if k in obj2:
@@ -22,17 +35,7 @@ def object_diff(obj1, obj2, path):
             if type1 != type2:
                 print(f"{path}.{k}: Type difference [{str(type1)} != {str(type2)}]")
             elif type1 is list and type2 is list and not is_basic(type(v[0])):
-                print(f"Encountered object list {path}.{k}, enter match key: ", end="", file=sys.stderr)
-                key = input()
-                if (key == ""):
-                    if v != obj:
-                        print(f"{path}.{k}: Value difference")
-                        print(f"    Left: {shorten(str(v))}")
-                        print(f"    Right: {shorten(str(obj))}")
-                else:
-                    left = {x[key]: x for x in obj1[k]}
-                    right = {x[key]: x for x in obj2[k]}
-                    object_diff(left, right, path+"."+k)
+                list_diff(v, obj, path+"."+k)
             elif (type1 is list and is_basic(type(v[0]))) or is_basic(type1) or v is None or obj2 is None:
                 if v != obj:
                     print(f"{path}.{k}: Value difference")
@@ -48,4 +51,7 @@ def object_diff(obj1, obj2, path):
             print(f"{path}.{k}: Contained in right but not left")
             print(f"    Value: {shorten(str(v))}")
 
-object_diff(json1, json2, "$")
+if type(json1) is list and type(json2) is list:
+    list_diff(json1, json2, "$")
+else:
+    object_diff(json1, json2, "$")