From fd5fcf92ff8596fbf54e3c1f2183d4d1b378c422 Mon Sep 17 00:00:00 2001
From: Aaron Avdeev <117237424+Underio3298@users.noreply.github.com>
Date: Sat, 15 Jun 2024 22:32:43 -0400
Subject: [PATCH] Fix RTM-Alloy and Tungstensteel Related Quests (#750)

[QB]

[DETAILS]
detail = "Fixes #749"
[DETAILS]

[IGNORE]
checks = { compareNot = "1.7-alpha-4" }
[IGNORE]

---------

Co-authored-by: Integer Limit <103940576+IntegerLimit@users.noreply.github.com>
---
 .../expert/betterquesting/DefaultQuests.json  | 126 ++++++++++++++----
 .../normal/betterquesting/DefaultQuests.json  | 108 +++++++++++++--
 .../config/betterquesting/DefaultQuests.json  | 108 +++++++++++++--
 .../saved_quests/ExpertQuests.json            | 126 ++++++++++++++----
 tools/storage/savedQBPorter.json              |  20 +++
 5 files changed, 414 insertions(+), 74 deletions(-)

diff --git a/overrides/config-overrides/expert/betterquesting/DefaultQuests.json b/overrides/config-overrides/expert/betterquesting/DefaultQuests.json
index a0a7057..bea8d4c 100644
--- a/overrides/config-overrides/expert/betterquesting/DefaultQuests.json
+++ b/overrides/config-overrides/expert/betterquesting/DefaultQuests.json
@@ -11367,17 +11367,24 @@
       }
     },
     "197:10": {
+      "preRequisiteTypes:7": [
+        2,
+        0,
+        1
+      ],
       "preRequisites:11": [
-        311
+        159,
+        201,
+        827
       ],
       "properties:10": {
         "betterquesting:10": {
           "autoclaim:1": 0,
-          "desc:8": "§6Tungstensteel§r is an alloy of §6Tungsten§r and §6Steel§r.\n\nThis alloy is cooked in an §3Electric Blast Furnace§r and cooled in a §3Vacuum Freezer§r.",
+          "desc:8": "§6RTM-Alloy§r is an alloy of §6Ruthenium, Tungsten §rand §6Molybdenum§r.\n\nThis alloy is cooked in an §3Electric Blast Furnace§r and cooled in a §3Vacuum Freezer§r.",
           "globalshare:1": 0,
           "icon:10": {
             "Count:3": 1,
-            "Damage:2": 2013,
+            "Damage:2": 451,
             "OreDict:8": "",
             "id:8": "gregtech:meta_ingot"
           },
@@ -11385,7 +11392,7 @@
           "ismain:1": 1,
           "issilent:1": 0,
           "lockedprogress:1": 1,
-          "name:8": "Tungstensteel",
+          "name:8": "RTM-Alloy",
           "partysinglereward:1": 0,
           "questlogic:8": "AND",
           "repeat_relative:1": 1,
@@ -11411,7 +11418,7 @@
           "requiredItems:9": {
             "0:10": {
               "Count:3": 1,
-              "Damage:2": 2013,
+              "Damage:2": 451,
               "OreDict:8": "",
               "id:8": "gregtech:meta_ingot"
             }
@@ -11422,8 +11429,8 @@
     },
     "198:10": {
       "preRequisites:11": [
-        197,
-        785
+        785,
+        1053
       ],
       "properties:10": {
         "betterquesting:10": {
@@ -17875,6 +17882,7 @@
     },
     "311:10": {
       "preRequisites:11": [
+        197,
         201,
         827
       ],
@@ -27764,9 +27772,13 @@
       }
     },
     "512:10": {
+      "preRequisiteTypes:7": [
+        0,
+        1
+      ],
       "preRequisites:11": [
-        197,
-        296
+        296,
+        1053
       ],
       "properties:10": {
         "betterquesting:10": {
@@ -29401,10 +29413,15 @@
       }
     },
     "542:10": {
+      "preRequisiteTypes:7": [
+        0,
+        0,
+        1
+      ],
       "preRequisites:11": [
-        197,
         209,
-        296
+        296,
+        1053
       ],
       "properties:10": {
         "betterquesting:10": {
@@ -55581,6 +55598,60 @@
           "taskID:8": "bq_standard:checkbox"
         }
       }
+    },
+    "1053:10": {
+      "preRequisites:11": [
+        201,
+        311
+      ],
+      "properties:10": {
+        "betterquesting:10": {
+          "autoclaim:1": 0,
+          "desc:8": "§6Tungstensteel§r is an alloy of §6Tungsten §rand §6Steel.\n\n§rThis alloy is cooked in an §3Electric Blast Furnace§r and cooled in a §3Vacuum Freezer§r.",
+          "globalshare:1": 0,
+          "icon:10": {
+            "Count:3": 1,
+            "Damage:2": 2013,
+            "OreDict:8": "",
+            "id:8": "gregtech:meta_ingot"
+          },
+          "ignoresview:1": 0,
+          "ismain:1": 1,
+          "issilent:1": 0,
+          "lockedprogress:1": 0,
+          "name:8": "Tungstensteel",
+          "questlogic:8": "AND",
+          "repeat_relative:1": 1,
+          "repeattime:3": -1,
+          "simultaneous:1": 0,
+          "snd_complete:8": "minecraft:entity.player.levelup",
+          "snd_update:8": "minecraft:entity.player.levelup",
+          "tasklogic:8": "AND",
+          "visibility:8": "ALWAYS"
+        }
+      },
+      "questID:3": 1053,
+      "rewards:9": {},
+      "tasks:9": {
+        "0:10": {
+          "autoConsume:1": 0,
+          "consume:1": 0,
+          "entryLogic:8": "AND",
+          "groupDetect:1": 0,
+          "ignoreNBT:1": 0,
+          "index:3": 0,
+          "partialMatch:1": 1,
+          "requiredItems:9": {
+            "0:10": {
+              "Count:3": 1,
+              "Damage:2": 2013,
+              "OreDict:8": "",
+              "id:8": "gregtech:meta_ingot"
+            }
+          },
+          "taskID:8": "bq_standard:retrieval"
+        }
+      }
     }
   },
   "questLines:9": {
@@ -56958,8 +57029,8 @@
           "id:3": 68,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -424,
-          "y:3": 152
+          "x:3": -444,
+          "y:3": 150
         },
         "5:10": {
           "id:3": 132,
@@ -57253,7 +57324,7 @@
           "sizeX:3": 24,
           "sizeY:3": 24,
           "x:3": -360,
-          "y:3": 252
+          "y:3": 204
         },
         "47:10": {
           "id:3": 198,
@@ -57553,8 +57624,8 @@
           "id:3": 512,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -360,
-          "y:3": 152
+          "x:3": -384,
+          "y:3": 150
         },
         "90:10": {
           "id:3": 526,
@@ -57581,8 +57652,8 @@
           "id:3": 542,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -360,
-          "y:3": 184
+          "x:3": -384,
+          "y:3": 180
         },
         "94:10": {
           "id:3": 549,
@@ -57707,15 +57778,15 @@
           "id:3": 693,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -392,
-          "y:3": 184
+          "x:3": -414,
+          "y:3": 180
         },
         "112:10": {
           "id:3": 694,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -392,
-          "y:3": 152
+          "x:3": -414,
+          "y:3": 150
         },
         "113:10": {
           "id:3": 732,
@@ -57952,8 +58023,8 @@
           "id:3": 934,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -424,
-          "y:3": 184
+          "x:3": -444,
+          "y:3": 180
         },
         "147:10": {
           "id:3": 1032,
@@ -57982,6 +58053,13 @@
           "sizeY:3": 24,
           "x:3": -756,
           "y:3": 344
+        },
+        "151:10": {
+          "id:3": 1053,
+          "sizeX:3": 24,
+          "sizeY:3": 24,
+          "x:3": -360,
+          "y:3": 252
         }
       }
     },
diff --git a/overrides/config-overrides/normal/betterquesting/DefaultQuests.json b/overrides/config-overrides/normal/betterquesting/DefaultQuests.json
index 792ef00..76b7df9 100644
--- a/overrides/config-overrides/normal/betterquesting/DefaultQuests.json
+++ b/overrides/config-overrides/normal/betterquesting/DefaultQuests.json
@@ -13726,17 +13726,24 @@
       }
     },
     "197:10": {
+      "preRequisiteTypes:7": [
+        0,
+        0,
+        1
+      ],
       "preRequisites:11": [
-        311
+        159,
+        201,
+        827
       ],
       "properties:10": {
         "betterquesting:10": {
           "autoclaim:1": 0,
-          "desc:8": "§6Tungstensteel§r is an alloy of §6Tungsten§r and §6Steel§r.\n\nThis alloy is cooked in an §3Electric Blast Furnace§r and cooled in a §3Vacuum Freezer§r.",
+          "desc:8": "§6RTM-Alloy§r is an alloy of §6Ruthenium, Tungsten §rand §6Molybdenum§r.\n\nThis alloy is cooked in an §3Electric Blast Furnace§r and cooled in a §3Vacuum Freezer§r.",
           "globalshare:1": 0,
           "icon:10": {
             "Count:3": 1,
-            "Damage:2": 2013,
+            "Damage:2": 451,
             "OreDict:8": "",
             "id:8": "gregtech:meta_ingot"
           },
@@ -13744,7 +13751,7 @@
           "ismain:1": 1,
           "issilent:1": 0,
           "lockedprogress:1": 1,
-          "name:8": "Tungstensteel",
+          "name:8": "RTM-Alloy",
           "partysinglereward:1": 0,
           "questlogic:8": "AND",
           "repeat_relative:1": 1,
@@ -13783,7 +13790,7 @@
           "requiredItems:9": {
             "0:10": {
               "Count:3": 1,
-              "Damage:2": 2013,
+              "Damage:2": 451,
               "OreDict:8": "",
               "id:8": "gregtech:meta_ingot"
             }
@@ -13794,8 +13801,8 @@
     },
     "198:10": {
       "preRequisites:11": [
-        197,
-        785
+        785,
+        1051
       ],
       "properties:10": {
         "betterquesting:10": {
@@ -21645,6 +21652,7 @@
     },
     "311:10": {
       "preRequisites:11": [
+        197,
         201,
         827
       ],
@@ -32555,8 +32563,8 @@
     },
     "512:10": {
       "preRequisites:11": [
-        197,
-        296
+        296,
+        1051
       ],
       "properties:10": {
         "betterquesting:10": {
@@ -34533,9 +34541,9 @@
     },
     "542:10": {
       "preRequisites:11": [
-        197,
         209,
-        296
+        296,
+        1051
       ],
       "properties:10": {
         "betterquesting:10": {
@@ -65455,6 +65463,73 @@
           "taskID:8": "bq_standard:retrieval"
         }
       }
+    },
+    "1051:10": {
+      "preRequisites:11": [
+        201,
+        311
+      ],
+      "properties:10": {
+        "betterquesting:10": {
+          "autoclaim:1": 0,
+          "desc:8": "§6Tungstensteel§r is an alloy of §6Tungsten §rand §6Steel.\n\n§rThis alloy is cooked in an §3Electric Blast Furnace§r and cooled in a §3Vacuum Freezer§r.",
+          "globalshare:1": 0,
+          "icon:10": {
+            "Count:3": 1,
+            "Damage:2": 2013,
+            "OreDict:8": "",
+            "id:8": "gregtech:meta_ingot"
+          },
+          "ignoresview:1": 0,
+          "ismain:1": 1,
+          "issilent:1": 0,
+          "lockedprogress:1": 0,
+          "name:8": "Tungstensteel",
+          "questlogic:8": "AND",
+          "repeat_relative:1": 1,
+          "repeattime:3": -1,
+          "simultaneous:1": 0,
+          "snd_complete:8": "minecraft:entity.player.levelup",
+          "snd_update:8": "minecraft:entity.player.levelup",
+          "tasklogic:8": "AND",
+          "visibility:8": "ALWAYS"
+        }
+      },
+      "questID:3": 1051,
+      "rewards:9": {
+        "0:10": {
+          "index:3": 0,
+          "rewardID:8": "bq_standard:item",
+          "rewards:9": {
+            "0:10": {
+              "Count:3": 5,
+              "Damage:2": 0,
+              "OreDict:8": "",
+              "id:8": "nomilabs:nomicoin5"
+            }
+          }
+        }
+      },
+      "tasks:9": {
+        "0:10": {
+          "autoConsume:1": 0,
+          "consume:1": 0,
+          "entryLogic:8": "AND",
+          "groupDetect:1": 0,
+          "ignoreNBT:1": 0,
+          "index:3": 0,
+          "partialMatch:1": 1,
+          "requiredItems:9": {
+            "0:10": {
+              "Count:3": 1,
+              "Damage:2": 2013,
+              "OreDict:8": "",
+              "id:8": "gregtech:meta_ingot"
+            }
+          },
+          "taskID:8": "bq_standard:retrieval"
+        }
+      }
     }
   },
   "questLines:9": {
@@ -67126,8 +67201,8 @@
           "id:3": 197,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -360,
-          "y:3": 240
+          "x:3": -396,
+          "y:3": 192
         },
         "48:10": {
           "id:3": 198,
@@ -67863,6 +67938,13 @@
           "sizeY:3": 24,
           "x:3": -812,
           "y:3": 252
+        },
+        "153:10": {
+          "id:3": 1051,
+          "sizeX:3": 24,
+          "sizeY:3": 24,
+          "x:3": -360,
+          "y:3": 240
         }
       }
     },
diff --git a/overrides/config/betterquesting/DefaultQuests.json b/overrides/config/betterquesting/DefaultQuests.json
index 792ef00..76b7df9 100644
--- a/overrides/config/betterquesting/DefaultQuests.json
+++ b/overrides/config/betterquesting/DefaultQuests.json
@@ -13726,17 +13726,24 @@
       }
     },
     "197:10": {
+      "preRequisiteTypes:7": [
+        0,
+        0,
+        1
+      ],
       "preRequisites:11": [
-        311
+        159,
+        201,
+        827
       ],
       "properties:10": {
         "betterquesting:10": {
           "autoclaim:1": 0,
-          "desc:8": "§6Tungstensteel§r is an alloy of §6Tungsten§r and §6Steel§r.\n\nThis alloy is cooked in an §3Electric Blast Furnace§r and cooled in a §3Vacuum Freezer§r.",
+          "desc:8": "§6RTM-Alloy§r is an alloy of §6Ruthenium, Tungsten §rand §6Molybdenum§r.\n\nThis alloy is cooked in an §3Electric Blast Furnace§r and cooled in a §3Vacuum Freezer§r.",
           "globalshare:1": 0,
           "icon:10": {
             "Count:3": 1,
-            "Damage:2": 2013,
+            "Damage:2": 451,
             "OreDict:8": "",
             "id:8": "gregtech:meta_ingot"
           },
@@ -13744,7 +13751,7 @@
           "ismain:1": 1,
           "issilent:1": 0,
           "lockedprogress:1": 1,
-          "name:8": "Tungstensteel",
+          "name:8": "RTM-Alloy",
           "partysinglereward:1": 0,
           "questlogic:8": "AND",
           "repeat_relative:1": 1,
@@ -13783,7 +13790,7 @@
           "requiredItems:9": {
             "0:10": {
               "Count:3": 1,
-              "Damage:2": 2013,
+              "Damage:2": 451,
               "OreDict:8": "",
               "id:8": "gregtech:meta_ingot"
             }
@@ -13794,8 +13801,8 @@
     },
     "198:10": {
       "preRequisites:11": [
-        197,
-        785
+        785,
+        1051
       ],
       "properties:10": {
         "betterquesting:10": {
@@ -21645,6 +21652,7 @@
     },
     "311:10": {
       "preRequisites:11": [
+        197,
         201,
         827
       ],
@@ -32555,8 +32563,8 @@
     },
     "512:10": {
       "preRequisites:11": [
-        197,
-        296
+        296,
+        1051
       ],
       "properties:10": {
         "betterquesting:10": {
@@ -34533,9 +34541,9 @@
     },
     "542:10": {
       "preRequisites:11": [
-        197,
         209,
-        296
+        296,
+        1051
       ],
       "properties:10": {
         "betterquesting:10": {
@@ -65455,6 +65463,73 @@
           "taskID:8": "bq_standard:retrieval"
         }
       }
+    },
+    "1051:10": {
+      "preRequisites:11": [
+        201,
+        311
+      ],
+      "properties:10": {
+        "betterquesting:10": {
+          "autoclaim:1": 0,
+          "desc:8": "§6Tungstensteel§r is an alloy of §6Tungsten §rand §6Steel.\n\n§rThis alloy is cooked in an §3Electric Blast Furnace§r and cooled in a §3Vacuum Freezer§r.",
+          "globalshare:1": 0,
+          "icon:10": {
+            "Count:3": 1,
+            "Damage:2": 2013,
+            "OreDict:8": "",
+            "id:8": "gregtech:meta_ingot"
+          },
+          "ignoresview:1": 0,
+          "ismain:1": 1,
+          "issilent:1": 0,
+          "lockedprogress:1": 0,
+          "name:8": "Tungstensteel",
+          "questlogic:8": "AND",
+          "repeat_relative:1": 1,
+          "repeattime:3": -1,
+          "simultaneous:1": 0,
+          "snd_complete:8": "minecraft:entity.player.levelup",
+          "snd_update:8": "minecraft:entity.player.levelup",
+          "tasklogic:8": "AND",
+          "visibility:8": "ALWAYS"
+        }
+      },
+      "questID:3": 1051,
+      "rewards:9": {
+        "0:10": {
+          "index:3": 0,
+          "rewardID:8": "bq_standard:item",
+          "rewards:9": {
+            "0:10": {
+              "Count:3": 5,
+              "Damage:2": 0,
+              "OreDict:8": "",
+              "id:8": "nomilabs:nomicoin5"
+            }
+          }
+        }
+      },
+      "tasks:9": {
+        "0:10": {
+          "autoConsume:1": 0,
+          "consume:1": 0,
+          "entryLogic:8": "AND",
+          "groupDetect:1": 0,
+          "ignoreNBT:1": 0,
+          "index:3": 0,
+          "partialMatch:1": 1,
+          "requiredItems:9": {
+            "0:10": {
+              "Count:3": 1,
+              "Damage:2": 2013,
+              "OreDict:8": "",
+              "id:8": "gregtech:meta_ingot"
+            }
+          },
+          "taskID:8": "bq_standard:retrieval"
+        }
+      }
     }
   },
   "questLines:9": {
@@ -67126,8 +67201,8 @@
           "id:3": 197,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -360,
-          "y:3": 240
+          "x:3": -396,
+          "y:3": 192
         },
         "48:10": {
           "id:3": 198,
@@ -67863,6 +67938,13 @@
           "sizeY:3": 24,
           "x:3": -812,
           "y:3": 252
+        },
+        "153:10": {
+          "id:3": 1051,
+          "sizeX:3": 24,
+          "sizeY:3": 24,
+          "x:3": -360,
+          "y:3": 240
         }
       }
     },
diff --git a/overrides/config/betterquesting/saved_quests/ExpertQuests.json b/overrides/config/betterquesting/saved_quests/ExpertQuests.json
index a0a7057..bea8d4c 100644
--- a/overrides/config/betterquesting/saved_quests/ExpertQuests.json
+++ b/overrides/config/betterquesting/saved_quests/ExpertQuests.json
@@ -11367,17 +11367,24 @@
       }
     },
     "197:10": {
+      "preRequisiteTypes:7": [
+        2,
+        0,
+        1
+      ],
       "preRequisites:11": [
-        311
+        159,
+        201,
+        827
       ],
       "properties:10": {
         "betterquesting:10": {
           "autoclaim:1": 0,
-          "desc:8": "§6Tungstensteel§r is an alloy of §6Tungsten§r and §6Steel§r.\n\nThis alloy is cooked in an §3Electric Blast Furnace§r and cooled in a §3Vacuum Freezer§r.",
+          "desc:8": "§6RTM-Alloy§r is an alloy of §6Ruthenium, Tungsten §rand §6Molybdenum§r.\n\nThis alloy is cooked in an §3Electric Blast Furnace§r and cooled in a §3Vacuum Freezer§r.",
           "globalshare:1": 0,
           "icon:10": {
             "Count:3": 1,
-            "Damage:2": 2013,
+            "Damage:2": 451,
             "OreDict:8": "",
             "id:8": "gregtech:meta_ingot"
           },
@@ -11385,7 +11392,7 @@
           "ismain:1": 1,
           "issilent:1": 0,
           "lockedprogress:1": 1,
-          "name:8": "Tungstensteel",
+          "name:8": "RTM-Alloy",
           "partysinglereward:1": 0,
           "questlogic:8": "AND",
           "repeat_relative:1": 1,
@@ -11411,7 +11418,7 @@
           "requiredItems:9": {
             "0:10": {
               "Count:3": 1,
-              "Damage:2": 2013,
+              "Damage:2": 451,
               "OreDict:8": "",
               "id:8": "gregtech:meta_ingot"
             }
@@ -11422,8 +11429,8 @@
     },
     "198:10": {
       "preRequisites:11": [
-        197,
-        785
+        785,
+        1053
       ],
       "properties:10": {
         "betterquesting:10": {
@@ -17875,6 +17882,7 @@
     },
     "311:10": {
       "preRequisites:11": [
+        197,
         201,
         827
       ],
@@ -27764,9 +27772,13 @@
       }
     },
     "512:10": {
+      "preRequisiteTypes:7": [
+        0,
+        1
+      ],
       "preRequisites:11": [
-        197,
-        296
+        296,
+        1053
       ],
       "properties:10": {
         "betterquesting:10": {
@@ -29401,10 +29413,15 @@
       }
     },
     "542:10": {
+      "preRequisiteTypes:7": [
+        0,
+        0,
+        1
+      ],
       "preRequisites:11": [
-        197,
         209,
-        296
+        296,
+        1053
       ],
       "properties:10": {
         "betterquesting:10": {
@@ -55581,6 +55598,60 @@
           "taskID:8": "bq_standard:checkbox"
         }
       }
+    },
+    "1053:10": {
+      "preRequisites:11": [
+        201,
+        311
+      ],
+      "properties:10": {
+        "betterquesting:10": {
+          "autoclaim:1": 0,
+          "desc:8": "§6Tungstensteel§r is an alloy of §6Tungsten §rand §6Steel.\n\n§rThis alloy is cooked in an §3Electric Blast Furnace§r and cooled in a §3Vacuum Freezer§r.",
+          "globalshare:1": 0,
+          "icon:10": {
+            "Count:3": 1,
+            "Damage:2": 2013,
+            "OreDict:8": "",
+            "id:8": "gregtech:meta_ingot"
+          },
+          "ignoresview:1": 0,
+          "ismain:1": 1,
+          "issilent:1": 0,
+          "lockedprogress:1": 0,
+          "name:8": "Tungstensteel",
+          "questlogic:8": "AND",
+          "repeat_relative:1": 1,
+          "repeattime:3": -1,
+          "simultaneous:1": 0,
+          "snd_complete:8": "minecraft:entity.player.levelup",
+          "snd_update:8": "minecraft:entity.player.levelup",
+          "tasklogic:8": "AND",
+          "visibility:8": "ALWAYS"
+        }
+      },
+      "questID:3": 1053,
+      "rewards:9": {},
+      "tasks:9": {
+        "0:10": {
+          "autoConsume:1": 0,
+          "consume:1": 0,
+          "entryLogic:8": "AND",
+          "groupDetect:1": 0,
+          "ignoreNBT:1": 0,
+          "index:3": 0,
+          "partialMatch:1": 1,
+          "requiredItems:9": {
+            "0:10": {
+              "Count:3": 1,
+              "Damage:2": 2013,
+              "OreDict:8": "",
+              "id:8": "gregtech:meta_ingot"
+            }
+          },
+          "taskID:8": "bq_standard:retrieval"
+        }
+      }
     }
   },
   "questLines:9": {
@@ -56958,8 +57029,8 @@
           "id:3": 68,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -424,
-          "y:3": 152
+          "x:3": -444,
+          "y:3": 150
         },
         "5:10": {
           "id:3": 132,
@@ -57253,7 +57324,7 @@
           "sizeX:3": 24,
           "sizeY:3": 24,
           "x:3": -360,
-          "y:3": 252
+          "y:3": 204
         },
         "47:10": {
           "id:3": 198,
@@ -57553,8 +57624,8 @@
           "id:3": 512,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -360,
-          "y:3": 152
+          "x:3": -384,
+          "y:3": 150
         },
         "90:10": {
           "id:3": 526,
@@ -57581,8 +57652,8 @@
           "id:3": 542,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -360,
-          "y:3": 184
+          "x:3": -384,
+          "y:3": 180
         },
         "94:10": {
           "id:3": 549,
@@ -57707,15 +57778,15 @@
           "id:3": 693,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -392,
-          "y:3": 184
+          "x:3": -414,
+          "y:3": 180
         },
         "112:10": {
           "id:3": 694,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -392,
-          "y:3": 152
+          "x:3": -414,
+          "y:3": 150
         },
         "113:10": {
           "id:3": 732,
@@ -57952,8 +58023,8 @@
           "id:3": 934,
           "sizeX:3": 24,
           "sizeY:3": 24,
-          "x:3": -424,
-          "y:3": 184
+          "x:3": -444,
+          "y:3": 180
         },
         "147:10": {
           "id:3": 1032,
@@ -57982,6 +58053,13 @@
           "sizeY:3": 24,
           "x:3": -756,
           "y:3": 344
+        },
+        "151:10": {
+          "id:3": 1053,
+          "sizeX:3": 24,
+          "sizeY:3": 24,
+          "x:3": -360,
+          "y:3": 252
         }
       }
     },
diff --git a/tools/storage/savedQBPorter.json b/tools/storage/savedQBPorter.json
index e917924..3c50cdf 100644
--- a/tools/storage/savedQBPorter.json
+++ b/tools/storage/savedQBPorter.json
@@ -72,6 +72,10 @@
       "normal": 150,
       "expert": 150
     },
+    {
+      "normal": 159,
+      "expert": 159
+    },
     {
       "normal": 167,
       "expert": 167
@@ -84,6 +88,10 @@
       "normal": 197,
       "expert": 197
     },
+    {
+      "normal": 198,
+      "expert": 198
+    },
     {
       "normal": 201,
       "expert": 201
@@ -164,6 +172,10 @@
       "normal": 504,
       "expert": 504
     },
+    {
+      "normal": 512,
+      "expert": 512
+    },
     {
       "normal": 524,
       "expert": 524
@@ -176,6 +188,10 @@
       "normal": 535,
       "expert": 535
     },
+    {
+      "normal": 542,
+      "expert": 542
+    },
     {
       "normal": 549,
       "expert": 549
@@ -307,6 +323,10 @@
     {
       "normal": 1050,
       "expert": 1050
+    },
+    {
+      "normal": 1051,
+      "expert": 1053
     }
   ],
   "ignoreQuestsNormal": [