From 2089c24fda283f3e8eb6271401d843410b74403b Mon Sep 17 00:00:00 2001 From: tracer4b <61507029+tracer4b@users.noreply.github.com> Date: Fri, 19 Aug 2022 23:30:26 +0800 Subject: [PATCH] qb update --- .../normal/betterquesting/DefaultQuests.json | 717 ++++++++++-------- .../config/betterquesting/DefaultQuests.json | 42 +- 2 files changed, 430 insertions(+), 329 deletions(-) diff --git a/overrides/config-overrides/normal/betterquesting/DefaultQuests.json b/overrides/config-overrides/normal/betterquesting/DefaultQuests.json index 1be0da5..45f28fa 100644 --- a/overrides/config-overrides/normal/betterquesting/DefaultQuests.json +++ b/overrides/config-overrides/normal/betterquesting/DefaultQuests.json @@ -3,13 +3,12 @@ "questDatabase:9": { "0:10": { "preRequisites:11": [ - 26, - 490 + 26 ], "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "The main purpose for this device is to turn §6Activated Certus Quartz Crystal§r into §6Charged Certus Quartz Crystal§r.\n\nThis device can be powered with RF via energy conduits or use AE energy from a network via ME conduits or cables.\n\nIt accepts power from two sides. Which two sides? It\u0027s pretty easy to guess.\n\n\n\n\n\n\n\n\nOk, ok. It\u0027s the top and bottom.\n\n", + "desc:8": "The main purpose for this device is to turn §6Certus Quartz§r into §6Charged Certus Quartz Crystal§r.\n\nThis device can be powered with RF via energy conduits or use AE energy from a network via ME conduits or cables.\n\nIt accepts power from two sides. Which two sides? It\u0027s pretty easy to guess.\n\n\n\n\n\n\n\n\nOk, ok. It\u0027s the top and bottom.\n\n", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -58,9 +57,9 @@ "requiredItems:9": { "0:10": { "Count:3": 1, - "Damage:2": 0, + "Damage:2": 214, "OreDict:8": "", - "id:8": "appliedenergistics2:material" + "id:8": "gregtech:meta_gem" }, "1:10": { "Count:3": 1, @@ -3614,19 +3613,21 @@ } }, "52:10": { - "preRequisites:11": [], + "preRequisites:11": [ + 98 + ], "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§2Coming soon!", + "desc:8": "The §2Cleanroom§r is a hollow multiblock free of contaminants. Going forward, most new circuit-related recipes, as well as some unique things like §3Fusion Casings§r, will need to be run in machines inside a Cleanroom. This is another ported §5GT5u§r feature, but just like with Maintenance, it won\u0027t be as harsh.\n\nOnce built, it must be well-maintained and powered for a while to clean the inside. The Cleanroom\u0027s power draw will decrease once it fully cleans itself. Recipes requiring the Cleanroom will §conly§r run when inside a §cfully-cleaned§r Cleanroom; if not, the recipe will not start, or recipe progress might be lost. (Recipe inputs will §enever be voided§r.)\n\nThe Cleanroom can be built in any size between 5x5x5 and 15x15x15. The Controller is placed in the center of the top face, and the rest of the top face is built from §3Filter Casings§r. The rest of the wall space is filled with §3Plascrete§r.\n\nFor transfer between the clean environment and the outside world:\n- Items and fluids through §3Passthrough Hatches§r. They automatically input from one side and output from the opposite side.\n- Energy through §3Hulls§r or §3Diodes§r (of any tier).\n- AE2 channels through §3Hulls§r.\n- Players through regular §3Doors§r. The room remains clean when doors are opened.\n\nApart from the \"official\" solutions, non-physical methods of transfer such as §3Ender Chests§r might be effective.\n\nYou will also need an §3Energy §rand §3Maintenance Hatch §rfor cleaning. §3Cleanroom Glass§r can replace any §3Plascrete§r, except in the edges.\n\nIf you\u0027re facing issues forming the Cleanroom:\n- The wall space must be at least 75% §3Plascrete§r or §3Cleanroom Glass§r. The floor block directly under the controller must also be §3Plascrete§r or §3Cleanroom Glass§r.\n- GT generators and Muffler Hatches are §cnot allowed§r in Cleanrooms.\n- Try rotating the controller with a wrench, or for even side lengths, try the other central positions.", "globalshare:1": 0, "icon:10": { "Count:3": 1, - "Damage:2": 0, + "Damage:2": 1035, "OreDict:8": "", - "id:8": "minecraft:concrete" + "id:8": "gregtech:machine" }, - "ismain:1": 0, + "ismain:1": 1, "issilent:1": 0, "lockedprogress:1": 0, "name:8": "§2Cleanroom", @@ -3641,11 +3642,49 @@ } }, "questID:3": 52, - "rewards:9": {}, - "tasks:9": { + "rewards:9": { "0:10": { "index:3": 0, - "taskID:8": "bq_standard:checkbox" + "rewardID:8": "bq_standard:item", + "rewards:9": { + "0:10": { + "Count:3": 2, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "contenttweaker:omnicoin25" + } + } + } + }, + "tasks:9": { + "0:10": { + "autoConsume:1": 0, + "consume:1": 0, + "groupDetect:1": 0, + "ignoreNBT:1": 0, + "index:3": 0, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 1035, + "OreDict:8": "", + "id:8": "gregtech:machine" + }, + "1:10": { + "Count:3": 8, + "Damage:2": 1, + "OreDict:8": "", + "id:8": "gregtech:cleanroom_casing" + }, + "2:10": { + "Count:3": 44, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "gregtech:cleanroom_casing" + } + }, + "taskID:8": "bq_standard:retrieval" } } }, @@ -5502,7 +5541,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "Cuts things up.\n\nThe §3Cutting Machine§r is able to cut wafers, rods, wood, and various other things for you, making it a versatile crafting tool. Cutting blocks into 9 plates may be faster than using a §2Metal Bender §rto make them one at a time.\n\nThe MV version is required for cutting §6Silicon Boules§r for easier §6Diodes§r, and for cutting §6Wafers§r into usable components. \n\nThe blade will require you to make §2Vanadiumsteel§r.\n\nCutting Machines work with plain §9Water§r for all recipes. You can also use §9Distilled Water§r which speeds up the processing somewhat, or §9Lubricant§r that speeds it up greatly (and uses very little per operation). These might be a little tricky to make right now, but are very worthwhile upgrades in the future.\n\nYou might consider waiting until you have §2Integrated Circuits§r before progressing too far down the path of MV machines, since these circuits are much easier to make than §2Electronic Circuits§r.", + "desc:8": "Cuts things up.\n\nThe §3Cutting Machine§r is able to cut wafers, rods, wood, and various other things for you, making it a versatile crafting tool. Cutting blocks into 9 plates may be faster than using a §2Metal Bender §rto make them one at a time.\n\nThe MV version is required for cutting §6Silicon Boules§r for easier §6Diodes§r, and for cutting §6Wafers§r into usable components. \n\nThe blade will require you to make §2Vanadiumsteel§r.\n\nCutting Machines work with plain §9Water§r for all recipes. You can also use §9Distilled Water§r which speeds up the processing somewhat, or §9Lubricant§r that speeds it up greatly (and uses very little per operation). These might be a little tricky to make right now, but are very worthwhile upgrades in the future.\n", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -5944,7 +5983,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "Much easier to mass produce than §6Electronic Circuits§r, and they fulfill the same function in nearly all cases.\n\nYou should be batch crafting these.", + "desc:8": "These aren\u0027t necessarily easier to mass produce than §6Electronic Circuits§r, but they\u0027re required to produce the §6Advanced Integrated Circuit§r, your first §6HV§r circuit.\n\nOtherwise, they fulfill the same requirements.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -12828,7 +12867,8 @@ "192:10": { "preRequisites:11": [ 132, - 532 + 532, + 52 ], "properties:10": { "betterquesting:10": { @@ -21773,7 +21813,8 @@ "327:10": { "preRequisites:11": [ 279, - 537 + 537, + 914 ], "properties:10": { "betterquesting:10": { @@ -29910,7 +29951,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "An §3Autoclave§r is a machine that uses liquids (usually water) to polish stones, carve gems into lenses, infuse gems with special liquids, and crystallize various dusts.\n\nYou\u0027ll need an Autoclave for many recipes, but right now you want it to make §6Activated Certus Quartz Crystals§r for §bApplied Energistics§r out of the §bGregTech§r §6Certus Quartz§r and its dust you get from mining and ore processing.", + "desc:8": "An §3Autoclave§r is a machine that uses liquids (usually water) to polish stones, carve gems into lenses, infuse gems with special liquids, and crystallize various dusts.\n\nYou\u0027ll need an Autoclave for many recipes, but most presently you will need it to make §6Pulsating Crystal§r and §6Vibrant Crystal§r from EnderIO.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -41070,7 +41111,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "Thorium is another basic fissile material that can be used to get into the fissile chain. Thorium comes from §6Pitchblende Ore§r, §6Thorium Ore§r, and even §2Black Granite§r (with a few processing steps).\n\nThorium-Bred Uranium, or §6TBU§r for short, is made from nine clumps of §6Thorium 232§r enriched in a §3Thermal Centrifuge§r.\n\nThe depleted fuel provides tiny clumps of §6Uranium 233§r, §6Uranium 235§r, §6§6Neptunium 236§r, and §6Neptunium 237§r.", + "desc:8": "Thorium is another basic fissile material that can be used to get into the fissile chain. Thorium comes from §6Pitchblende Ore§r, §6Thorium Ore§r, and even §2(Black) Granite§r (with a few processing steps).\n\nThorium-Bred Uranium, or §6TBU§r for short, is made from nine clumps of §6Thorium 232§r enriched in a §3Thermal Centrifuge§r.\n\nThe depleted fuel provides tiny clumps of §6Uranium 233§r, §6Uranium 235§r, §6§6Neptunium 236§r, and §6Neptunium 237§r.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -41197,13 +41238,13 @@ "0:10": { "Count:3": 1, "Damage:2": 116, - "OreDict:8": "ingotUranium238", + "OreDict:8": "ingotUranium", "id:8": "gregtech:meta_ingot" }, "1:10": { "Count:3": 1, "Damage:2": 117, - "OreDict:8": "ingotUranium235", + "OreDict:8": "", "id:8": "gregtech:meta_ingot" } }, @@ -41422,9 +41463,9 @@ "requiredItems:9": { "0:10": { "Count:3": 1, - "Damage:2": 4, + "Damage:2": 81, "OreDict:8": "", - "id:8": "nuclearcraft:plutonium" + "id:8": "gregtech:meta_ingot" }, "1:10": { "Count:3": 8, @@ -48870,12 +48911,6 @@ "Damage:2": 0, "OreDict:8": "", "id:8": "appliedenergistics2:quartz_vibrant_glass" - }, - "6:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "deepmoblearning:simulation_chamber" } }, "taskID:8": "bq_standard:retrieval" @@ -52332,7 +52367,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§2Upgraded forms of the EBF and Vacuum Freezer. Can run up to 2,048 recipes in parallel.\n\nThe Rotary Hearth Furnace is quite big!", + "desc:8": "§2Upgraded forms of the EBF and Vacuum Freezer. Can accept Parallel Control Hatches.\n\nThe Rotary Hearth Furnace is quite big!", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -54298,7 +54333,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§2Certain multiblocks in CEu will require a Maintenance Hatch and/or Muffler Hatch. These cannot be shared between multiblocks. If you knew Maintenance in GT5u, fret not - Maintenance mechanics are far less punishing in CEu.\n\n§r- §aMuffler§r: This hatch must be §cunobstructed§r so it can output its beautiful smoke particles. When a recipe is performed, there is a small chance for the §3Muffler Hatch§r to give bonus items, typically tiny Dusts of Ash. It voids excess when full, so do not worry about it stopping machines from running.\n\n- §aMaintenance§r: You will need to do Maintenance for the Multiblock to begin operating. This is done by having a §9Wrench§r, a §9Screwdriver§r, a §9Soft Mallet§r, a §9Hammer§r, a §9Wire Cutter§r, and a §9Crowbar§r in your inventory, opening the Maintenance Hatch and §eclicking the center spot once§r. §cNo need to move tools individually§r. Alternatively, you can fix problems by placing §9Tape§r in the Maintenance Hatch. \n\nMaintenance problems may occur after §d48 real hours of activity§r. Needless to say, they are very rare. Each problem increases the recipe durations by 10%. Fixing the problems is done the same way as above.\n\nAt §6HV§r age, you will unlock other Maintenance Hatches that do not enforce fixing the problems manually. Both start with §6no Maintenance required§r:\n\n- §3Automatic Maintenance Hatch§r: Eliminates the need for Maintenance, §6forever§r.\n\n- §3Configurable Maintenance Hatch§r: You can configure it to cut off §a10% duration§r on recipes, at the cost of making Maintenance issues happen three times as fast. That is §d16 real hours§r of activity. §9Tape§r can fix problems in this Hatch as well.\n", + "desc:8": "§2Certain multiblocks in CEu will require a Maintenance Hatch and/or Muffler Hatch. These cannot be shared between multiblocks. If you knew Maintenance in GT5u, fret not - Maintenance mechanics are far less punishing in CEu.\n\n§r- §aMuffler§r: This hatch must be §cunobstructed§r so it can output its beautiful smoke particles. When a recipe is performed, there is a small chance for the §3Muffler Hatch§r to give bonus items, typically tiny Dusts of Ash. It voids excess when full, so do not worry about it stopping machines from running.\n\n- §aMaintenance§r: You will need to do Maintenance for the Multiblock to begin operating. This is done by having a §9Wrench§r, a §9Screwdriver§r, a §9Soft Mallet§r, a §9Hammer§r, a §9Wire Cutter§r, and a §9Crowbar§r in your inventory, opening the Maintenance Hatch and §eclicking the center spot once§r. §cNo need to move tools individually§r. Alternatively, you can fix problems by placing §9Tape§r in the Maintenance Hatch. \n\nMaintenance problems may occur after §d48 real hours of activity§r. Needless to say, they are very rare. Each problem increases the recipe durations by 10%. Fixing the problems is done the same way as above.\n\nLater, you will unlock other Maintenance Hatches that do not enforce fixing the problems manually. Both start with §6no Maintenance required§r:\n\n- §3Automatic Maintenance Hatch§r (§6HV§r): Eliminates the need for Maintenance, §6forever§r.\n\n- §3Configurable Maintenance Hatch§r (§6HV§r): You can configure it to cut off §a10% duration§r on recipes, at the cost of making Maintenance issues happen three times as fast. That is §d16 real hours§r of activity. §9Tape§r can fix problems in this Hatch as well.\n\n- §3Automatic Filtration Maintenance Hatch§r (§3UV§r): Eliminates the need for Maintenance, and provides a §6Cleanroom§r environment to recipes run within it.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -54939,7 +54974,8 @@ }, "904:10": { "preRequisites:11": [ - 339 + 339, + 914 ], "properties:10": { "betterquesting:10": { @@ -55502,6 +55538,70 @@ "taskID:8": "bq_standard:checkbox" } } + }, + "914:10": { + "preRequisites:11": [ + 255 + ], + "properties:10": { + "betterquesting:10": { + "autoclaim:1": 0, + "desc:8": "Wetware-related processes require some stronger sterilisation. You will need to build another §3Cleanroom§r to run these recipes inside. Instead of §3Filter Casings§r, use §3Sterilizing Filter Casings§r in the top face.\n\nNote that a Sterile Cleanroom cannot handle recipes which require regular Cleanrooms.", + "globalshare:1": 0, + "icon:10": { + "Count:3": 1, + "Damage:2": 2, + "OreDict:8": "", + "id:8": "gregtech:cleanroom_casing" + }, + "ismain:1": 1, + "issilent:1": 0, + "lockedprogress:1": 0, + "name:8": "Cleaner Room", + "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": "NORMAL" + } + }, + "questID:3": 914, + "rewards:9": { + "0:10": { + "index:3": 0, + "rewardID:8": "bq_standard:item", + "rewards:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "contenttweaker:omnicoin5" + } + } + } + }, + "tasks:9": { + "0:10": { + "autoConsume:1": 0, + "consume:1": 0, + "groupDetect:1": 0, + "ignoreNBT:1": 0, + "index:3": 0, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 8, + "Damage:2": 2, + "OreDict:8": "", + "id:8": "gregtech:cleanroom_casing" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } } }, "questLines:9": { @@ -55528,7 +55628,7 @@ "id:3": 0, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -516, + "x:3": -560, "y:3": 136 }, "1:10": { @@ -55577,8 +55677,8 @@ "id:3": 29, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -792, - "y:3": 40 + "x:3": -736, + "y:3": 8 }, "8:10": { "id:3": 30, @@ -55612,8 +55712,8 @@ "id:3": 39, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -840, - "y:3": 40 + "x:3": -692, + "y:3": 8 }, "13:10": { "id:3": 41, @@ -55689,15 +55789,15 @@ "id:3": 215, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -840, - "y:3": 88 + "x:3": -792, + "y:3": 40 }, "24:10": { "id:3": 228, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -560, - "y:3": 88 + "x:3": -840, + "y:3": 40 }, "25:10": { "id:3": 231, @@ -55745,7 +55845,7 @@ "id:3": 282, "sizeX:3": 48, "sizeY:3": 48, - "x:3": -480, + "x:3": -520, "y:3": 124 }, "32:10": { @@ -55794,8 +55894,8 @@ "id:3": 490, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -560, - "y:3": 136 + "x:3": -840, + "y:3": 88 }, "39:10": { "id:3": 497, @@ -56092,678 +56192,671 @@ "y:3": 460 }, "10:10": { - "id:3": 52, - "sizeX:3": 32, - "sizeY:3": 32, - "x:3": -592, - "y:3": 492 - }, - "11:10": { "id:3": 55, "sizeX:3": 24, "sizeY:3": 24, "x:3": -336, "y:3": 20 }, - "12:10": { + "11:10": { "id:3": 57, "sizeX:3": 24, "sizeY:3": 24, "x:3": -248, "y:3": 532 }, - "13:10": { + "12:10": { "id:3": 67, "sizeX:3": 24, "sizeY:3": 24, "x:3": -164, "y:3": 496 }, - "14:10": { + "13:10": { "id:3": 70, "sizeX:3": 24, "sizeY:3": 24, "x:3": -292, "y:3": -16 }, - "15:10": { + "14:10": { "id:3": 71, "sizeX:3": 24, "sizeY:3": 24, "x:3": -248, "y:3": 68 }, - "16:10": { + "15:10": { "id:3": 72, "sizeX:3": 32, "sizeY:3": 32, "x:3": -656, "y:3": 16 }, - "17:10": { + "16:10": { "id:3": 74, "sizeX:3": 24, "sizeY:3": 24, "x:3": -200, "y:3": 104 }, - "18:10": { + "17:10": { "id:3": 75, "sizeX:3": 24, "sizeY:3": 24, "x:3": -200, "y:3": 68 }, - "19:10": { + "18:10": { "id:3": 76, "sizeX:3": 24, "sizeY:3": 24, "x:3": -604, "y:3": 68 }, - "20:10": { + "19:10": { "id:3": 78, "sizeX:3": 24, "sizeY:3": 24, "x:3": -464, "y:3": 20 }, - "21:10": { + "20:10": { "id:3": 79, "sizeX:3": 24, "sizeY:3": 24, "x:3": -336, "y:3": 104 }, - "22:10": { + "21:10": { "id:3": 80, "sizeX:3": 24, "sizeY:3": 24, "x:3": -464, "y:3": 68 }, - "23:10": { + "22:10": { "id:3": 81, "sizeX:3": 24, "sizeY:3": 24, "x:3": -464, "y:3": 104 }, - "24:10": { + "23:10": { "id:3": 82, "sizeX:3": 24, "sizeY:3": 24, "x:3": -528, "y:3": 20 }, - "25:10": { + "24:10": { "id:3": 83, "sizeX:3": 24, "sizeY:3": 24, "x:3": -384, "y:3": 140 }, - "26:10": { + "25:10": { "id:3": 84, "sizeX:3": 24, "sizeY:3": 24, "x:3": -464, "y:3": 140 }, - "27:10": { + "26:10": { "id:3": 86, - "sizeX:3": 48, - "sizeY:3": 48, - "x:3": -540, - "y:3": 128 + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": -528, + "y:3": 140 }, - "28:10": { + "27:10": { "id:3": 87, "sizeX:3": 24, "sizeY:3": 24, "x:3": -528, - "y:3": 188 + "y:3": 180 }, - "29:10": { + "28:10": { "id:3": 88, "sizeX:3": 24, "sizeY:3": 24, "x:3": -424, "y:3": 140 }, - "30:10": { + "29:10": { "id:3": 89, - "sizeX:3": 24, - "sizeY:3": 24, - "x:3": -528, - "y:3": 228 + "sizeX:3": 32, + "sizeY:3": 32, + "x:3": -532, + "y:3": 224 }, - "31:10": { + "30:10": { "id:3": 90, "sizeX:3": 48, "sizeY:3": 48, "x:3": -540, "y:3": 364 }, - "32:10": { + "31:10": { "id:3": 91, "sizeX:3": 24, "sizeY:3": 24, "x:3": -248, "y:3": 104 }, - "33:10": { + "32:10": { "id:3": 92, "sizeX:3": 24, "sizeY:3": 24, "x:3": -152, "y:3": 188 }, - "34:10": { + "33:10": { "id:3": 93, "sizeX:3": 48, "sizeY:3": 48, "x:3": -260, "y:3": 328 }, - "35:10": { + "34:10": { "id:3": 94, "sizeX:3": 24, "sizeY:3": 24, "x:3": -324, "y:3": 264 }, - "36:10": { + "35:10": { "id:3": 95, "sizeX:3": 40, "sizeY:3": 40, "x:3": -412, "y:3": 332 }, - "37:10": { + "36:10": { "id:3": 96, "sizeX:3": 24, "sizeY:3": 24, "x:3": -404, "y:3": 388 }, - "38:10": { + "37:10": { "id:3": 98, "sizeX:3": 36, "sizeY:3": 36, "x:3": -254, "y:3": 222 }, - "39:10": { + "38:10": { "id:3": 104, "sizeX:3": 40, "sizeY:3": 40, "x:3": -316, "y:3": 380 }, - "40:10": { + "39:10": { "id:3": 107, "sizeX:3": 24, "sizeY:3": 24, "x:3": -152, "y:3": 104 }, - "41:10": { + "40:10": { "id:3": 112, "sizeX:3": 24, "sizeY:3": 24, "x:3": -104, "y:3": 104 }, - "42:10": { + "41:10": { "id:3": 126, "sizeX:3": 24, "sizeY:3": 24, "x:3": -152, "y:3": 340 }, - "43:10": { + "42:10": { "id:3": 129, "sizeX:3": 24, "sizeY:3": 24, "x:3": -384, "y:3": 88 }, - "44:10": { + "43:10": { "id:3": 130, "sizeX:3": 32, "sizeY:3": 32, - "x:3": -580, + "x:3": -592, "y:3": 336 }, - "45:10": { + "44:10": { "id:3": 131, "sizeX:3": 24, "sizeY:3": 24, "x:3": -404, "y:3": 432 }, - "46:10": { + "45:10": { "id:3": 132, "sizeX:3": 24, "sizeY:3": 24, "x:3": -360, "y:3": 496 }, - "47:10": { + "46:10": { "id:3": 133, "sizeX:3": 32, "sizeY:3": 32, "x:3": -532, "y:3": 428 }, - "48:10": { + "47:10": { "id:3": 134, "sizeX:3": 24, "sizeY:3": 24, "x:3": -472, "y:3": 432 }, - "49:10": { + "48:10": { "id:3": 135, "sizeX:3": 40, "sizeY:3": 40, "x:3": -536, "y:3": 488 }, - "50:10": { + "49:10": { "id:3": 154, "sizeX:3": 40, "sizeY:3": 40, "x:3": -208, "y:3": 220 }, - "51:10": { + "50:10": { "id:3": 165, "sizeX:3": 24, "sizeY:3": 24, "x:3": -324, "y:3": 192 }, - "52:10": { + "51:10": { "id:3": 184, "sizeX:3": 24, "sizeY:3": 24, "x:3": -364, "y:3": 192 }, - "53:10": { + "52:10": { "id:3": 187, "sizeX:3": 36, "sizeY:3": 36, "x:3": -254, "y:3": 14 }, - "54:10": { + "53:10": { "id:3": 203, "sizeX:3": 24, "sizeY:3": 24, "x:3": -404, "y:3": 496 }, - "55:10": { + "54:10": { "id:3": 213, "sizeX:3": 24, "sizeY:3": 24, "x:3": -288, "y:3": 460 }, - "56:10": { + "55:10": { "id:3": 227, "sizeX:3": 24, "sizeY:3": 24, "x:3": -152, "y:3": -16 }, - "57:10": { + "56:10": { "id:3": 233, "sizeX:3": 32, "sizeY:3": 32, "x:3": -156, "y:3": 136 }, - "58:10": { + "57:10": { "id:3": 236, "sizeX:3": 24, "sizeY:3": 24, "x:3": -472, "y:3": 284 }, - "59:10": { + "58:10": { "id:3": 237, "sizeX:3": 24, "sizeY:3": 24, "x:3": -104, "y:3": 140 }, - "60:10": { + "59:10": { "id:3": 319, "sizeX:3": 32, "sizeY:3": 32, "x:3": -640, "y:3": 312 }, - "61:10": { + "60:10": { "id:3": 338, "sizeX:3": 24, "sizeY:3": 24, "x:3": -200, "y:3": 388 }, - "62:10": { + "61:10": { "id:3": 398, "sizeX:3": 36, "sizeY:3": 36, - "x:3": -582, + "x:3": -594, "y:3": 222 }, - "63:10": { + "62:10": { "id:3": 502, "sizeX:3": 24, "sizeY:3": 24, "x:3": -472, "y:3": 388 }, - "64:10": { + "63:10": { "id:3": 504, "sizeX:3": 24, "sizeY:3": 24, "x:3": -444, "y:3": 264 }, - "65:10": { + "64:10": { "id:3": 505, "sizeX:3": 24, "sizeY:3": 24, "x:3": -404, "y:3": 264 }, - "66:10": { + "65:10": { "id:3": 507, "sizeX:3": 24, "sizeY:3": 24, "x:3": -360, "y:3": 432 }, - "67:10": { + "66:10": { "id:3": 509, "sizeX:3": 24, "sizeY:3": 24, "x:3": -248, "y:3": -16 }, - "68:10": { + "67:10": { "id:3": 540, "sizeX:3": 24, "sizeY:3": 24, "x:3": -336, "y:3": 140 }, - "69:10": { + "68:10": { "id:3": 541, "sizeX:3": 32, "sizeY:3": 32, "x:3": -640, "y:3": 356 }, - "70:10": { + "69:10": { "id:3": 546, "sizeX:3": 24, "sizeY:3": 24, "x:3": -404, "y:3": 192 }, - "71:10": { + "70:10": { "id:3": 549, "sizeX:3": 24, "sizeY:3": 24, "x:3": -292, "y:3": 68 }, - "72:10": { + "71:10": { "id:3": 551, "sizeX:3": 24, "sizeY:3": 24, "x:3": -184, "y:3": 140 }, - "73:10": { + "72:10": { "id:3": 556, "sizeX:3": 32, "sizeY:3": 32, "x:3": -640, "y:3": 268 }, - "74:10": { + "73:10": { "id:3": 609, "sizeX:3": 32, "sizeY:3": 32, "x:3": -640, "y:3": 224 }, - "75:10": { + "74:10": { "id:3": 727, "sizeX:3": 24, "sizeY:3": 24, "x:3": -384, "y:3": 20 }, - "76:10": { + "75:10": { "id:3": 728, "sizeX:3": 24, "sizeY:3": 24, "x:3": -112, "y:3": 20 }, - "77:10": { + "76:10": { "id:3": 730, "sizeX:3": 24, "sizeY:3": 24, "x:3": -152, "y:3": 20 }, - "78:10": { + "77:10": { "id:3": 731, "sizeX:3": 24, "sizeY:3": 24, "x:3": -192, "y:3": 20 }, - "79:10": { + "78:10": { "id:3": 747, "sizeX:3": 24, "sizeY:3": 24, "x:3": -152, "y:3": 68 }, - "80:10": { + "79:10": { "id:3": 781, "sizeX:3": 32, "sizeY:3": 32, "x:3": -252, "y:3": 456 }, - "81:10": { + "80:10": { "id:3": 787, "sizeX:3": 24, "sizeY:3": 24, "x:3": -424, "y:3": 88 }, - "82:10": { + "81:10": { "id:3": 801, "sizeX:3": 24, "sizeY:3": 24, "x:3": -200, "y:3": 188 }, - "83:10": { + "82:10": { "id:3": 810, "sizeX:3": 24, "sizeY:3": 24, "x:3": -284, "y:3": 264 }, - "84:10": { + "83:10": { "id:3": 812, "sizeX:3": 0, "sizeY:3": 0, "x:3": -392, "y:3": 352 }, - "85:10": { + "84:10": { "id:3": 816, "sizeX:3": 48, "sizeY:3": 48, "x:3": -616, "y:3": 128 }, - "86:10": { + "85:10": { "id:3": 818, "sizeX:3": 24, "sizeY:3": 24, "x:3": -652, "y:3": 68 }, - "87:10": { + "86:10": { "id:3": 819, "sizeX:3": 24, "sizeY:3": 24, "x:3": -292, "y:3": 20 }, - "88:10": { + "87:10": { "id:3": 820, "sizeX:3": 24, "sizeY:3": 24, "x:3": -604, "y:3": 20 }, - "89:10": { + "88:10": { "id:3": 821, "sizeX:3": 24, "sizeY:3": 24, "x:3": -464, "y:3": -17 }, - "90:10": { + "89:10": { "id:3": 822, "sizeX:3": 24, "sizeY:3": 24, "x:3": -528, "y:3": 68 }, - "91:10": { + "90:10": { "id:3": 823, "sizeX:3": 24, "sizeY:3": 24, "x:3": -384, "y:3": 48 }, - "92:10": { + "91:10": { "id:3": 824, "sizeX:3": 24, "sizeY:3": 24, "x:3": -404, "y:3": 464 }, - "93:10": { + "92:10": { "id:3": 830, "sizeX:3": 32, "sizeY:3": 32, "x:3": -156, "y:3": 292 }, - "94:10": { + "93:10": { "id:3": 831, "sizeX:3": 24, "sizeY:3": 24, "x:3": -200, "y:3": 296 }, - "95:10": { + "94:10": { "id:3": 832, "sizeX:3": 24, "sizeY:3": 24, "x:3": -104, "y:3": 296 }, - "96:10": { + "95:10": { "id:3": 833, "sizeX:3": 24, "sizeY:3": 24, "x:3": -104, "y:3": 340 }, - "97:10": { + "96:10": { "id:3": 834, "sizeX:3": 24, "sizeY:3": 24, "x:3": -360, "y:3": 388 }, - "98:10": { + "97:10": { "id:3": 835, "sizeX:3": 24, "sizeY:3": 24, "x:3": -248, "y:3": 388 }, - "99:10": { + "98:10": { "id:3": 836, "sizeX:3": 24, "sizeY:3": 24, "x:3": -292, "y:3": 140 }, - "100:10": { + "99:10": { "id:3": 837, "sizeX:3": 24, "sizeY:3": 24, "x:3": -292, "y:3": 104 }, - "101:10": { + "100:10": { "id:3": 886, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -552, - "y:3": 268 + "x:3": -556, + "y:3": 264 }, - "102:10": { + "101:10": { "id:3": 887, "sizeX:3": 24, "sizeY:3": 24, "x:3": -364, "y:3": 264 }, - "103:10": { + "102:10": { "id:3": 894, "sizeX:3": 24, "sizeY:3": 24, "x:3": -472, "y:3": 340 }, - "104:10": { + "103:10": { "id:3": 895, "sizeX:3": 24, "sizeY:3": 24, "x:3": -472, - "y:3": 188 + "y:3": 180 }, - "105:10": { + "104:10": { "id:3": 896, "sizeX:3": 24, "sizeY:3": 24, "x:3": -104, "y:3": 256 }, - "106:10": { + "105:10": { "id:3": 897, "sizeX:3": 24, "sizeY:3": 24, @@ -56806,993 +56899,1000 @@ "y:3": -48 }, "2:10": { + "id:3": 52, + "sizeX:3": 40, + "sizeY:3": 40, + "x:3": -724, + "y:3": 32 + }, + "3:10": { "id:3": 54, "sizeX:3": 24, "sizeY:3": 24, "x:3": -636, "y:3": 204 }, - "3:10": { + "4:10": { "id:3": 65, "sizeX:3": 48, "sizeY:3": 48, "x:3": -560, "y:3": 216 }, - "4:10": { + "5:10": { "id:3": 68, "sizeX:3": 24, "sizeY:3": 24, "x:3": -456, "y:3": 276 }, - "5:10": { + "6:10": { "id:3": 132, "sizeX:3": 32, "sizeY:3": 32, "x:3": -640, "y:3": -52 }, - "6:10": { + "7:10": { "id:3": 139, "sizeX:3": 24, "sizeY:3": 24, "x:3": -228, "y:3": 132 }, - "7:10": { + "8:10": { "id:3": 144, "sizeX:3": 24, "sizeY:3": 24, "x:3": -228, "y:3": 168 }, - "8:10": { + "9:10": { "id:3": 148, "sizeX:3": 36, "sizeY:3": 36, "x:3": -762, "y:3": 102 }, - "9:10": { + "10:10": { "id:3": 149, "sizeX:3": 24, "sizeY:3": 24, "x:3": -756, "y:3": 72 }, - "10:10": { + "11:10": { "id:3": 150, "sizeX:3": 48, "sizeY:3": 48, "x:3": -576, "y:3": -12 }, - "11:10": { + "12:10": { "id:3": 151, "sizeX:3": 24, "sizeY:3": 24, "x:3": -756, "y:3": -48 }, - "12:10": { + "13:10": { "id:3": 152, "sizeX:3": 24, "sizeY:3": 24, "x:3": -756, "y:3": 0 }, - "13:10": { + "14:10": { "id:3": 153, "sizeX:3": 24, "sizeY:3": 24, "x:3": -684, "y:3": -48 }, - "14:10": { + "15:10": { "id:3": 156, "sizeX:3": 24, "sizeY:3": 24, "x:3": -564, "y:3": 40 }, - "15:10": { + "16:10": { "id:3": 157, "sizeX:3": 24, "sizeY:3": 24, "x:3": -564, "y:3": 72 }, - "16:10": { + "17:10": { "id:3": 158, "sizeX:3": 24, "sizeY:3": 24, "x:3": -512, "y:3": 72 }, - "17:10": { + "18:10": { "id:3": 159, "sizeX:3": 24, "sizeY:3": 24, "x:3": -456, "y:3": 72 }, - "18:10": { + "19:10": { "id:3": 161, "sizeX:3": 24, "sizeY:3": 24, "x:3": -56, "y:3": -48 }, - "19:10": { + "20:10": { "id:3": 162, "sizeX:3": 24, "sizeY:3": 24, "x:3": -240, "y:3": 40 }, - "20:10": { + "21:10": { "id:3": 163, "sizeX:3": 24, "sizeY:3": 24, "x:3": -276, "y:3": 8 }, - "21:10": { + "22:10": { "id:3": 164, "sizeX:3": 24, "sizeY:3": 24, "x:3": -124, "y:3": -12 }, - "22:10": { + "23:10": { "id:3": 165, "sizeX:3": 24, "sizeY:3": 24, "x:3": -92, "y:3": -12 }, - "23:10": { + "24:10": { "id:3": 166, "sizeX:3": 24, "sizeY:3": 24, "x:3": -56, "y:3": -12 }, - "24:10": { + "25:10": { "id:3": 167, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": -12 }, - "25:10": { + "26:10": { "id:3": 168, "sizeX:3": 24, "sizeY:3": 24, "x:3": -124, "y:3": 24 }, - "26:10": { + "27:10": { "id:3": 170, "sizeX:3": 20, "sizeY:3": 20, "x:3": -302, "y:3": 74 }, - "27:10": { + "28:10": { "id:3": 171, "sizeX:3": 48, "sizeY:3": 48, "x:3": -420, "y:3": -12 }, - "28:10": { + "29:10": { "id:3": 172, "sizeX:3": 24, "sizeY:3": 24, "x:3": -276, "y:3": 72 }, - "29:10": { + "30:10": { "id:3": 173, "sizeX:3": 24, "sizeY:3": 24, "x:3": -360, "y:3": 0 }, - "30:10": { + "31:10": { "id:3": 174, "sizeX:3": 24, "sizeY:3": 24, "x:3": -408, "y:3": -48 }, - "31:10": { + "32:10": { "id:3": 175, "sizeX:3": 24, "sizeY:3": 24, "x:3": -408, "y:3": 40 }, - "32:10": { + "33:10": { "id:3": 176, "sizeX:3": 24, "sizeY:3": 24, "x:3": -306, "y:3": -48 }, - "33:10": { + "34:10": { "id:3": 177, "sizeX:3": 24, "sizeY:3": 24, "x:3": -258, "y:3": -48 }, - "34:10": { + "35:10": { "id:3": 178, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": 24 }, - "35:10": { + "36:10": { "id:3": 179, "sizeX:3": 32, "sizeY:3": 32, "x:3": -160, "y:3": 68 }, - "36:10": { + "37:10": { "id:3": 180, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": -12 }, - "37:10": { + "38:10": { "id:3": 181, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": -48 }, - "38:10": { + "39:10": { "id:3": 182, "sizeX:3": 24, "sizeY:3": 24, "x:3": -276, "y:3": 108 }, - "39:10": { + "40:10": { "id:3": 184, "sizeX:3": 24, "sizeY:3": 24, "x:3": -108, "y:3": -48 }, - "40:10": { + "41:10": { "id:3": 185, "sizeX:3": 48, "sizeY:3": 48, "x:3": -420, "y:3": 96 }, - "41:10": { + "42:10": { "id:3": 186, "sizeX:3": 24, "sizeY:3": 24, "x:3": -684, "y:3": 276 }, - "42:10": { + "43:10": { "id:3": 188, "sizeX:3": 24, "sizeY:3": 24, "x:3": -600, "y:3": 108 }, - "43:10": { + "44:10": { "id:3": 190, "sizeX:3": 24, "sizeY:3": 24, "x:3": -684, "y:3": 240 }, - "44:10": { + "45:10": { "id:3": 192, "sizeX:3": 24, "sizeY:3": 24, "x:3": -636, - "y:3": 88 + "y:3": 40 }, - "45:10": { + "46:10": { "id:3": 194, "sizeX:3": 24, "sizeY:3": 24, "x:3": -600, "y:3": 40 }, - "46:10": { + "47:10": { "id:3": 197, "sizeX:3": 24, "sizeY:3": 24, "x:3": -456, "y:3": 204 }, - "47:10": { + "48:10": { "id:3": 198, "sizeX:3": 24, "sizeY:3": 24, "x:3": -420, "y:3": 240 }, - "48:10": { + "49:10": { "id:3": 199, "sizeX:3": 24, "sizeY:3": 24, "x:3": -228, "y:3": 204 }, - "49:10": { + "50:10": { "id:3": 201, "sizeX:3": 24, "sizeY:3": 24, "x:3": -456, "y:3": 144 }, - "50:10": { + "51:10": { "id:3": 234, "sizeX:3": 24, "sizeY:3": 24, "x:3": -264, "y:3": 168 }, - "51:10": { + "52:10": { "id:3": 235, "sizeX:3": 24, "sizeY:3": 24, "x:3": -840, "y:3": 108 }, - "52:10": { + "53:10": { "id:3": 245, "sizeX:3": 24, "sizeY:3": 24, "x:3": -792, "y:3": 156 }, - "53:10": { + "54:10": { "id:3": 246, "sizeX:3": 24, "sizeY:3": 24, "x:3": -548, "y:3": 180 }, - "54:10": { + "55:10": { "id:3": 248, "sizeX:3": 24, "sizeY:3": 24, "x:3": -774, "y:3": 246 }, - "55:10": { + "56:10": { "id:3": 249, "sizeX:3": 24, "sizeY:3": 24, "x:3": -792, "y:3": 276 }, - "56:10": { + "57:10": { "id:3": 250, "sizeX:3": 24, "sizeY:3": 24, "x:3": -810, "y:3": 246 }, - "57:10": { + "58:10": { "id:3": 255, "sizeX:3": 24, "sizeY:3": 24, "x:3": -548, "y:3": 144 }, - "58:10": { + "59:10": { "id:3": 261, "sizeX:3": 24, "sizeY:3": 24, "x:3": -288, "y:3": 276 }, - "59:10": { + "60:10": { "id:3": 267, "sizeX:3": 24, "sizeY:3": 24, "x:3": -744, "y:3": 204 }, - "60:10": { + "61:10": { "id:3": 275, "sizeX:3": 24, "sizeY:3": 24, "x:3": -924, "y:3": 60 }, - "61:10": { + "62:10": { "id:3": 297, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": 108 }, - "62:10": { + "63:10": { "id:3": 298, "sizeX:3": 24, "sizeY:3": 24, "x:3": -840, "y:3": 60 }, - "63:10": { + "64:10": { "id:3": 299, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": 144 }, - "64:10": { + "65:10": { "id:3": 300, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": 180 }, - "65:10": { + "66:10": { "id:3": 301, "sizeX:3": 24, "sizeY:3": 24, "x:3": -804, "y:3": 24 }, - "66:10": { + "67:10": { "id:3": 302, "sizeX:3": 24, "sizeY:3": 24, "x:3": -840, "y:3": 24 }, - "67:10": { + "68:10": { "id:3": 303, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": 24 }, - "68:10": { + "69:10": { "id:3": 304, "sizeX:3": 24, "sizeY:3": 24, "x:3": -924, "y:3": 24 }, - "69:10": { + "70:10": { "id:3": 305, "sizeX:3": 24, "sizeY:3": 24, "x:3": -924, "y:3": -12 }, - "70:10": { + "71:10": { "id:3": 306, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": -12 }, - "71:10": { + "72:10": { "id:3": 307, "sizeX:3": 24, "sizeY:3": 24, "x:3": -840, "y:3": -12 }, - "72:10": { + "73:10": { "id:3": 308, "sizeX:3": 24, "sizeY:3": 24, "x:3": -804, "y:3": -12 }, - "73:10": { + "74:10": { "id:3": 309, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": -48 }, - "74:10": { + "75:10": { "id:3": 310, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": 216 }, - "75:10": { + "76:10": { "id:3": 311, "sizeX:3": 24, "sizeY:3": 24, "x:3": -288, "y:3": 204 }, - "76:10": { + "77:10": { "id:3": 312, "sizeX:3": 24, "sizeY:3": 24, "x:3": -324, "y:3": 240 }, - "77:10": { + "78:10": { "id:3": 318, "sizeX:3": 24, "sizeY:3": 24, "x:3": -330, "y:3": 108 }, - "78:10": { + "79:10": { "id:3": 328, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": 132 }, - "79:10": { + "80:10": { "id:3": 339, "sizeX:3": 24, "sizeY:3": 24, "x:3": -720, "y:3": 156 }, - "80:10": { + "81:10": { "id:3": 340, "sizeX:3": 24, "sizeY:3": 24, "x:3": -756, "y:3": 156 }, - "81:10": { + "82:10": { "id:3": 341, "sizeX:3": 20, "sizeY:3": 20, "x:3": -418, "y:3": 279 }, - "82:10": { + "83:10": { "id:3": 344, "sizeX:3": 24, "sizeY:3": 24, "x:3": -508, "y:3": 180 }, - "83:10": { + "84:10": { "id:3": 347, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": 204 }, - "84:10": { + "85:10": { "id:3": 350, "sizeX:3": 32, "sizeY:3": 32, "x:3": -160, "y:3": 236 }, - "85:10": { + "86:10": { "id:3": 390, "sizeX:3": 24, "sizeY:3": 24, "x:3": -924, "y:3": 216 }, - "86:10": { + "87:10": { "id:3": 391, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": 60 }, - "87:10": { + "88:10": { "id:3": 416, "sizeX:3": 24, "sizeY:3": 24, "x:3": -312, "y:3": 40 }, - "88:10": { + "89:10": { "id:3": 500, "sizeX:3": 24, "sizeY:3": 24, "x:3": -600, "y:3": 240 }, - "89:10": { + "90:10": { "id:3": 512, "sizeX:3": 24, "sizeY:3": 24, "x:3": -456, "y:3": 240 }, - "90:10": { + "91:10": { "id:3": 526, "sizeX:3": 48, "sizeY:3": 48, "x:3": -648, "y:3": 144 }, - "91:10": { + "92:10": { "id:3": 527, "sizeX:3": 24, "sizeY:3": 24, "x:3": -288, "y:3": 240 }, - "92:10": { + "93:10": { "id:3": 532, "sizeX:3": 48, "sizeY:3": 48, "x:3": -648, "y:3": -12 }, - "93:10": { + "94:10": { "id:3": 542, "sizeX:3": 24, "sizeY:3": 24, "x:3": -492, "y:3": 240 }, - "94:10": { + "95:10": { "id:3": 549, "sizeX:3": 48, "sizeY:3": 48, "x:3": -520, "y:3": 368 }, - "95:10": { + "96:10": { "id:3": 555, "sizeX:3": 24, "sizeY:3": 24, "x:3": -924, "y:3": 252 }, - "96:10": { + "97:10": { "id:3": 580, "sizeX:3": 48, "sizeY:3": 48, "x:3": -460, "y:3": 368 }, - "97:10": { + "98:10": { "id:3": 610, "sizeX:3": 24, "sizeY:3": 24, "x:3": -192, "y:3": 168 }, - "98:10": { + "99:10": { "id:3": 611, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": 168 }, - "99:10": { + "100:10": { "id:3": 669, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": 276 }, - "100:10": { + "101:10": { "id:3": 671, "sizeX:3": 24, "sizeY:3": 24, "x:3": -108, "y:3": 276 }, - "101:10": { + "102:10": { "id:3": 672, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": 276 }, - "102:10": { + "103:10": { "id:3": 673, "sizeX:3": 24, "sizeY:3": 24, "x:3": -108, "y:3": 312 }, - "103:10": { + "104:10": { "id:3": 674, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": 312 }, - "104:10": { + "105:10": { "id:3": 675, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": 312 }, - "105:10": { + "106:10": { "id:3": 676, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": 348 }, - "106:10": { + "107:10": { "id:3": 677, "sizeX:3": 24, "sizeY:3": 24, "x:3": -108, "y:3": 348 }, - "107:10": { + "108:10": { "id:3": 678, "sizeX:3": 24, "sizeY:3": 24, "x:3": -204, "y:3": 396 }, - "108:10": { + "109:10": { "id:3": 679, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": 348 }, - "109:10": { + "110:10": { "id:3": 680, "sizeX:3": 48, "sizeY:3": 48, "x:3": -168, "y:3": 384 }, - "110:10": { + "111:10": { "id:3": 693, "sizeX:3": 24, "sizeY:3": 24, "x:3": -492, "y:3": 276 }, - "111:10": { + "112:10": { "id:3": 694, "sizeX:3": 24, "sizeY:3": 24, "x:3": -524, "y:3": 276 }, - "112:10": { + "113:10": { "id:3": 732, "sizeX:3": 24, "sizeY:3": 24, "x:3": -120, "y:3": 168 }, - "113:10": { + "114:10": { "id:3": 745, "sizeX:3": 24, "sizeY:3": 24, "x:3": -252, "y:3": 240 }, - "114:10": { + "115:10": { "id:3": 746, "sizeX:3": 24, "sizeY:3": 24, "x:3": -852, "y:3": 216 }, - "115:10": { + "116:10": { "id:3": 748, "sizeX:3": 24, "sizeY:3": 24, "x:3": -852, "y:3": 252 }, - "116:10": { + "117:10": { "id:3": 751, "sizeX:3": 24, "sizeY:3": 24, "x:3": -852, "y:3": 180 }, - "117:10": { + "118:10": { "id:3": 756, "sizeX:3": 24, "sizeY:3": 24, "x:3": -840, "y:3": -48 }, - "118:10": { + "119:10": { "id:3": 773, "sizeX:3": 0, "sizeY:3": 0, "x:3": -144, "y:3": 84 }, - "119:10": { + "120:10": { "id:3": 783, "sizeX:3": 48, "sizeY:3": 48, "x:3": -340, "y:3": 368 }, - "120:10": { + "121:10": { "id:3": 785, "sizeX:3": 24, "sizeY:3": 24, "x:3": -420, "y:3": 180 }, - "121:10": { + "122:10": { "id:3": 798, "sizeX:3": 24, "sizeY:3": 24, "x:3": -252, "y:3": 348 }, - "122:10": { + "123:10": { "id:3": 799, "sizeX:3": 24, "sizeY:3": 24, "x:3": -252, "y:3": 276 }, - "123:10": { + "124:10": { "id:3": 800, "sizeX:3": 0, "sizeY:3": 0, "x:3": -264, "y:3": 84 }, - "124:10": { + "125:10": { "id:3": 806, "sizeX:3": 24, "sizeY:3": 24, "x:3": -56, "y:3": 108 }, - "125:10": { + "126:10": { "id:3": 807, "sizeX:3": 24, "sizeY:3": 24, "x:3": -276, "y:3": 40 }, - "126:10": { + "127:10": { "id:3": 825, "sizeX:3": 24, "sizeY:3": 24, "x:3": -684, "y:3": -100 }, - "127:10": { + "128:10": { "id:3": 826, "sizeX:3": 40, "sizeY:3": 40, "x:3": -64, "y:3": -108 }, - "128:10": { + "129:10": { "id:3": 827, "sizeX:3": 24, "sizeY:3": 24, "x:3": -258, "y:3": -79 }, - "129:10": { + "130:10": { "id:3": 828, "sizeX:3": 32, "sizeY:3": 32, "x:3": -384, "y:3": 272 }, - "130:10": { + "131:10": { "id:3": 835, "sizeX:3": 24, "sizeY:3": 24, "x:3": -156, "y:3": -48 }, - "131:10": { + "132:10": { "id:3": 838, "sizeX:3": 24, "sizeY:3": 24, "x:3": -600, "y:3": 156 }, - "132:10": { + "133:10": { "id:3": 841, "sizeX:3": 24, "sizeY:3": 24, "x:3": -324, "y:3": 312 }, - "133:10": { + "134:10": { "id:3": 849, "sizeX:3": 24, "sizeY:3": 24, "x:3": -380, "y:3": 240 }, - "134:10": { + "135:10": { "id:3": 850, "sizeX:3": 32, "sizeY:3": 32, "x:3": -384, "y:3": 308 }, - "135:10": { + "136:10": { "id:3": 851, "sizeX:3": 24, "sizeY:3": 24, "x:3": -324, "y:3": 276 }, - "136:10": { + "137:10": { "id:3": 852, "sizeX:3": 24, "sizeY:3": 24, "x:3": -56, "y:3": 348 }, - "137:10": { + "138:10": { "id:3": 857, "sizeX:3": 24, "sizeY:3": 24, "x:3": -720, "y:3": 312 }, - "138:10": { + "139:10": { "id:3": 858, "sizeX:3": 32, "sizeY:3": 32, "x:3": -552, "y:3": 308 }, - "139:10": { + "140:10": { "id:3": 859, "sizeX:3": 32, "sizeY:3": 32, "x:3": -424, "y:3": 308 }, - "140:10": { + "141:10": { "id:3": 888, "sizeX:3": 32, "sizeY:3": 32, "x:3": -60, "y:3": 68 }, - "141:10": { + "142:10": { "id:3": 892, "sizeX:3": 48, "sizeY:3": 48, "x:3": -400, "y:3": 368 }, - "142:10": { + "143:10": { "id:3": 899, "sizeX:3": 24, "sizeY:3": 24, "x:3": -888, "y:3": -100 }, - "143:10": { + "144:10": { "id:3": 900, "sizeX:3": 24, "sizeY:3": 24, @@ -59394,6 +59494,13 @@ "sizeY:3": 24, "x:3": -576, "y:3": 264 + }, + "123:10": { + "id:3": 914, + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": -312, + "y:3": 156 } } }, @@ -61416,9 +61523,9 @@ "desc:8": "Convert between matter and energy with §bApplied Energistics§r§r.\n\nAutomate ALL the things! o/", "icon:10": { "Count:3": 1, - "Damage:2": 2, + "Damage:2": 0, "OreDict:8": "", - "id:8": "chisel:futura" + "id:8": "appliedenergistics2:controller" }, "name:8": "Matter-Energy", "visibility:8": "ALWAYS" @@ -61696,7 +61803,7 @@ }, "questSettings:10": { "betterquesting:10": { - "editmode:1": 0, + "editmode:1": 1, "hardcore:1": 0, "home_anchor_x:5": 0.5, "home_anchor_y:5": 0.0, diff --git a/overrides/config/betterquesting/DefaultQuests.json b/overrides/config/betterquesting/DefaultQuests.json index 978467a..45f28fa 100644 --- a/overrides/config/betterquesting/DefaultQuests.json +++ b/overrides/config/betterquesting/DefaultQuests.json @@ -5541,7 +5541,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "Cuts things up.\n\nThe §3Cutting Machine§r is able to cut wafers, rods, wood, and various other things for you, making it a versatile crafting tool. Cutting blocks into 9 plates may be faster than using a §2Metal Bender §rto make them one at a time.\n\nThe MV version is required for cutting §6Silicon Boules§r for easier §6Diodes§r, and for cutting §6Wafers§r into usable components. \n\nThe blade will require you to make §2Vanadiumsteel§r.\n\nCutting Machines work with plain §9Water§r for all recipes. You can also use §9Distilled Water§r which speeds up the processing somewhat, or §9Lubricant§r that speeds it up greatly (and uses very little per operation). These might be a little tricky to make right now, but are very worthwhile upgrades in the future.\n\nYou might consider waiting until you have §2Integrated Circuits§r before progressing too far down the path of MV machines, since these circuits are much easier to make than §2Electronic Circuits§r.", + "desc:8": "Cuts things up.\n\nThe §3Cutting Machine§r is able to cut wafers, rods, wood, and various other things for you, making it a versatile crafting tool. Cutting blocks into 9 plates may be faster than using a §2Metal Bender §rto make them one at a time.\n\nThe MV version is required for cutting §6Silicon Boules§r for easier §6Diodes§r, and for cutting §6Wafers§r into usable components. \n\nThe blade will require you to make §2Vanadiumsteel§r.\n\nCutting Machines work with plain §9Water§r for all recipes. You can also use §9Distilled Water§r which speeds up the processing somewhat, or §9Lubricant§r that speeds it up greatly (and uses very little per operation). These might be a little tricky to make right now, but are very worthwhile upgrades in the future.\n", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -5983,7 +5983,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "Much easier to mass produce than §6Electronic Circuits§r, and they fulfill the same function in nearly all cases.\n\nYou should be batch crafting these.", + "desc:8": "These aren\u0027t necessarily easier to mass produce than §6Electronic Circuits§r, but they\u0027re required to produce the §6Advanced Integrated Circuit§r, your first §6HV§r circuit.\n\nOtherwise, they fulfill the same requirements.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -48911,12 +48911,6 @@ "Damage:2": 0, "OreDict:8": "", "id:8": "appliedenergistics2:quartz_vibrant_glass" - }, - "6:10": { - "Count:3": 1, - "Damage:2": 0, - "OreDict:8": "", - "id:8": "deepmoblearning:simulation_chamber" } }, "taskID:8": "bq_standard:retrieval" @@ -52373,7 +52367,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§2Upgraded forms of the EBF and Vacuum Freezer. Can run up to 2,048 recipes in parallel.\n\nThe Rotary Hearth Furnace is quite big!", + "desc:8": "§2Upgraded forms of the EBF and Vacuum Freezer. Can accept Parallel Control Hatches.\n\nThe Rotary Hearth Furnace is quite big!", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -54339,7 +54333,7 @@ "properties:10": { "betterquesting:10": { "autoclaim:1": 0, - "desc:8": "§2Certain multiblocks in CEu will require a Maintenance Hatch and/or Muffler Hatch. These cannot be shared between multiblocks. If you knew Maintenance in GT5u, fret not - Maintenance mechanics are far less punishing in CEu.\n\n§r- §aMuffler§r: This hatch must be §cunobstructed§r so it can output its beautiful smoke particles. When a recipe is performed, there is a small chance for the §3Muffler Hatch§r to give bonus items, typically tiny Dusts of Ash. It voids excess when full, so do not worry about it stopping machines from running.\n\n- §aMaintenance§r: You will need to do Maintenance for the Multiblock to begin operating. This is done by having a §9Wrench§r, a §9Screwdriver§r, a §9Soft Mallet§r, a §9Hammer§r, a §9Wire Cutter§r, and a §9Crowbar§r in your inventory, opening the Maintenance Hatch and §eclicking the center spot once§r. §cNo need to move tools individually§r. Alternatively, you can fix problems by placing §9Tape§r in the Maintenance Hatch. \n\nMaintenance problems may occur after §d48 real hours of activity§r. Needless to say, they are very rare. Each problem increases the recipe durations by 10%. Fixing the problems is done the same way as above.\n\nAt §6HV§r age, you will unlock other Maintenance Hatches that do not enforce fixing the problems manually. Both start with §6no Maintenance required§r:\n\n- §3Automatic Maintenance Hatch§r: Eliminates the need for Maintenance, §6forever§r.\n\n- §3Configurable Maintenance Hatch§r: You can configure it to cut off §a10% duration§r on recipes, at the cost of making Maintenance issues happen three times as fast. That is §d16 real hours§r of activity. §9Tape§r can fix problems in this Hatch as well.\n", + "desc:8": "§2Certain multiblocks in CEu will require a Maintenance Hatch and/or Muffler Hatch. These cannot be shared between multiblocks. If you knew Maintenance in GT5u, fret not - Maintenance mechanics are far less punishing in CEu.\n\n§r- §aMuffler§r: This hatch must be §cunobstructed§r so it can output its beautiful smoke particles. When a recipe is performed, there is a small chance for the §3Muffler Hatch§r to give bonus items, typically tiny Dusts of Ash. It voids excess when full, so do not worry about it stopping machines from running.\n\n- §aMaintenance§r: You will need to do Maintenance for the Multiblock to begin operating. This is done by having a §9Wrench§r, a §9Screwdriver§r, a §9Soft Mallet§r, a §9Hammer§r, a §9Wire Cutter§r, and a §9Crowbar§r in your inventory, opening the Maintenance Hatch and §eclicking the center spot once§r. §cNo need to move tools individually§r. Alternatively, you can fix problems by placing §9Tape§r in the Maintenance Hatch. \n\nMaintenance problems may occur after §d48 real hours of activity§r. Needless to say, they are very rare. Each problem increases the recipe durations by 10%. Fixing the problems is done the same way as above.\n\nLater, you will unlock other Maintenance Hatches that do not enforce fixing the problems manually. Both start with §6no Maintenance required§r:\n\n- §3Automatic Maintenance Hatch§r (§6HV§r): Eliminates the need for Maintenance, §6forever§r.\n\n- §3Configurable Maintenance Hatch§r (§6HV§r): You can configure it to cut off §a10% duration§r on recipes, at the cost of making Maintenance issues happen three times as fast. That is §d16 real hours§r of activity. §9Tape§r can fix problems in this Hatch as well.\n\n- §3Automatic Filtration Maintenance Hatch§r (§3UV§r): Eliminates the need for Maintenance, and provides a §6Cleanroom§r environment to recipes run within it.", "globalshare:1": 0, "icon:10": { "Count:3": 1, @@ -56311,17 +56305,17 @@ }, "26:10": { "id:3": 86, - "sizeX:3": 48, - "sizeY:3": 48, - "x:3": -540, - "y:3": 128 + "sizeX:3": 24, + "sizeY:3": 24, + "x:3": -528, + "y:3": 140 }, "27:10": { "id:3": 87, "sizeX:3": 24, "sizeY:3": 24, "x:3": -528, - "y:3": 188 + "y:3": 180 }, "28:10": { "id:3": 88, @@ -56332,10 +56326,10 @@ }, "29:10": { "id:3": 89, - "sizeX:3": 24, - "sizeY:3": 24, - "x:3": -528, - "y:3": 228 + "sizeX:3": 32, + "sizeY:3": 32, + "x:3": -532, + "y:3": 224 }, "30:10": { "id:3": 90, @@ -56432,7 +56426,7 @@ "id:3": 130, "sizeX:3": 32, "sizeY:3": 32, - "x:3": -580, + "x:3": -592, "y:3": 336 }, "44:10": { @@ -56558,7 +56552,7 @@ "id:3": 398, "sizeX:3": 36, "sizeY:3": 36, - "x:3": -582, + "x:3": -594, "y:3": 222 }, "62:10": { @@ -56831,8 +56825,8 @@ "id:3": 886, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -552, - "y:3": 268 + "x:3": -556, + "y:3": 264 }, "101:10": { "id:3": 887, @@ -56853,7 +56847,7 @@ "sizeX:3": 24, "sizeY:3": 24, "x:3": -472, - "y:3": 188 + "y:3": 180 }, "104:10": { "id:3": 896,