diff --git a/overrides/config/betterquesting/DefaultQuests.json b/overrides/config/betterquesting/DefaultQuests.json index 45f28fa..cb51b69 100644 --- a/overrides/config/betterquesting/DefaultQuests.json +++ b/overrides/config/betterquesting/DefaultQuests.json @@ -3614,7 +3614,7 @@ }, "52:10": { "preRequisites:11": [ - 98 + 93 ], "properties:10": { "betterquesting:10": { @@ -9013,7 +9013,8 @@ "132:10": { "preRequisites:11": [ 35, - 203 + 203, + 52 ], "properties:10": { "betterquesting:10": { @@ -12867,8 +12868,7 @@ "192:10": { "preRequisites:11": [ 132, - 532, - 52 + 532 ], "properties:10": { "betterquesting:10": { @@ -56146,717 +56146,724 @@ "id:3": 31, "sizeX:3": 32, "sizeY:3": 32, - "x:3": -212, + "x:3": -108, "y:3": 528 }, "4:10": { "id:3": 32, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -208, + "x:3": -104, "y:3": 460 }, "5:10": { "id:3": 35, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -248, + "x:3": -144, "y:3": 496 }, "6:10": { "id:3": 42, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -288, + "x:3": -184, "y:3": 532 }, "7:10": { "id:3": 44, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -164, - "y:3": 460 + "x:3": -104, + "y:3": 420 }, "8:10": { "id:3": 47, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -120, - "y:3": 496 + "x:3": -144, + "y:3": 388 }, "9:10": { "id:3": 48, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -120, - "y:3": 460 + "x:3": -104, + "y:3": 388 }, "10:10": { + "id:3": 52, + "sizeX:3": 40, + "sizeY:3": 40, + "x:3": -256, + "y:3": 424 + }, + "11:10": { "id:3": 55, "sizeX:3": 24, "sizeY:3": 24, "x:3": -336, "y:3": 20 }, - "11:10": { + "12:10": { "id:3": 57, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -248, + "x:3": -144, "y:3": 532 }, - "12:10": { + "13:10": { "id:3": 67, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -164, - "y:3": 496 + "x:3": -144, + "y:3": 420 }, - "13:10": { + "14:10": { "id:3": 70, "sizeX:3": 24, "sizeY:3": 24, "x:3": -292, "y:3": -16 }, - "14:10": { + "15:10": { "id:3": 71, "sizeX:3": 24, "sizeY:3": 24, "x:3": -248, "y:3": 68 }, - "15:10": { + "16:10": { "id:3": 72, "sizeX:3": 32, "sizeY:3": 32, "x:3": -656, "y:3": 16 }, - "16:10": { + "17:10": { "id:3": 74, "sizeX:3": 24, "sizeY:3": 24, "x:3": -200, "y:3": 104 }, - "17:10": { + "18:10": { "id:3": 75, "sizeX:3": 24, "sizeY:3": 24, "x:3": -200, "y:3": 68 }, - "18:10": { + "19:10": { "id:3": 76, "sizeX:3": 24, "sizeY:3": 24, "x:3": -604, "y:3": 68 }, - "19:10": { + "20:10": { "id:3": 78, "sizeX:3": 24, "sizeY:3": 24, "x:3": -464, "y:3": 20 }, - "20:10": { + "21:10": { "id:3": 79, "sizeX:3": 24, "sizeY:3": 24, "x:3": -336, "y:3": 104 }, - "21:10": { + "22:10": { "id:3": 80, "sizeX:3": 24, "sizeY:3": 24, "x:3": -464, "y:3": 68 }, - "22:10": { + "23:10": { "id:3": 81, "sizeX:3": 24, "sizeY:3": 24, "x:3": -464, "y:3": 104 }, - "23:10": { + "24:10": { "id:3": 82, "sizeX:3": 24, "sizeY:3": 24, "x:3": -528, "y:3": 20 }, - "24:10": { + "25:10": { "id:3": 83, "sizeX:3": 24, "sizeY:3": 24, "x:3": -384, "y:3": 140 }, - "25:10": { + "26:10": { "id:3": 84, "sizeX:3": 24, "sizeY:3": 24, "x:3": -464, "y:3": 140 }, - "26:10": { + "27:10": { "id:3": 86, "sizeX:3": 24, "sizeY:3": 24, "x:3": -528, "y:3": 140 }, - "27:10": { + "28:10": { "id:3": 87, "sizeX:3": 24, "sizeY:3": 24, "x:3": -528, "y:3": 180 }, - "28:10": { + "29:10": { "id:3": 88, "sizeX:3": 24, "sizeY:3": 24, "x:3": -424, "y:3": 140 }, - "29:10": { + "30:10": { "id:3": 89, "sizeX:3": 32, "sizeY:3": 32, "x:3": -532, "y:3": 224 }, - "30:10": { + "31:10": { "id:3": 90, "sizeX:3": 48, "sizeY:3": 48, "x:3": -540, "y:3": 364 }, - "31:10": { + "32:10": { "id:3": 91, "sizeX:3": 24, "sizeY:3": 24, "x:3": -248, "y:3": 104 }, - "32:10": { + "33:10": { "id:3": 92, "sizeX:3": 24, "sizeY:3": 24, "x:3": -152, "y:3": 188 }, - "33:10": { + "34:10": { "id:3": 93, "sizeX:3": 48, "sizeY:3": 48, "x:3": -260, "y:3": 328 }, - "34:10": { + "35:10": { "id:3": 94, "sizeX:3": 24, "sizeY:3": 24, "x:3": -324, "y:3": 264 }, - "35:10": { + "36:10": { "id:3": 95, "sizeX:3": 40, "sizeY:3": 40, "x:3": -412, "y:3": 332 }, - "36:10": { + "37:10": { "id:3": 96, "sizeX:3": 24, "sizeY:3": 24, "x:3": -404, "y:3": 388 }, - "37:10": { + "38:10": { "id:3": 98, "sizeX:3": 36, "sizeY:3": 36, "x:3": -254, "y:3": 222 }, - "38:10": { + "39:10": { "id:3": 104, "sizeX:3": 40, "sizeY:3": 40, "x:3": -316, "y:3": 380 }, - "39:10": { + "40:10": { "id:3": 107, "sizeX:3": 24, "sizeY:3": 24, "x:3": -152, "y:3": 104 }, - "40:10": { + "41:10": { "id:3": 112, "sizeX:3": 24, "sizeY:3": 24, "x:3": -104, "y:3": 104 }, - "41:10": { + "42:10": { "id:3": 126, "sizeX:3": 24, "sizeY:3": 24, "x:3": -152, "y:3": 340 }, - "42:10": { + "43:10": { "id:3": 129, "sizeX:3": 24, "sizeY:3": 24, "x:3": -384, "y:3": 88 }, - "43:10": { + "44:10": { "id:3": 130, "sizeX:3": 32, "sizeY:3": 32, "x:3": -592, "y:3": 336 }, - "44:10": { + "45:10": { "id:3": 131, "sizeX:3": 24, "sizeY:3": 24, "x:3": -404, "y:3": 432 }, - "45:10": { - "id:3": 132, - "sizeX:3": 24, - "sizeY:3": 24, - "x:3": -360, - "y:3": 496 - }, "46:10": { + "id:3": 132, + "sizeX:3": 40, + "sizeY:3": 40, + "x:3": -256, + "y:3": 488 + }, + "47:10": { "id:3": 133, "sizeX:3": 32, "sizeY:3": 32, "x:3": -532, "y:3": 428 }, - "47:10": { + "48:10": { "id:3": 134, "sizeX:3": 24, "sizeY:3": 24, "x:3": -472, "y:3": 432 }, - "48:10": { + "49:10": { "id:3": 135, "sizeX:3": 40, "sizeY:3": 40, "x:3": -536, "y:3": 488 }, - "49:10": { + "50:10": { "id:3": 154, "sizeX:3": 40, "sizeY:3": 40, "x:3": -208, "y:3": 220 }, - "50:10": { + "51:10": { "id:3": 165, "sizeX:3": 24, "sizeY:3": 24, "x:3": -324, "y:3": 192 }, - "51:10": { + "52:10": { "id:3": 184, "sizeX:3": 24, "sizeY:3": 24, "x:3": -364, "y:3": 192 }, - "52:10": { + "53:10": { "id:3": 187, "sizeX:3": 36, "sizeY:3": 36, "x:3": -254, "y:3": 14 }, - "53:10": { + "54:10": { "id:3": 203, "sizeX:3": 24, "sizeY:3": 24, "x:3": -404, "y:3": 496 }, - "54:10": { + "55:10": { "id:3": 213, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -288, + "x:3": -184, "y:3": 460 }, - "55:10": { + "56:10": { "id:3": 227, "sizeX:3": 24, "sizeY:3": 24, "x:3": -152, "y:3": -16 }, - "56:10": { + "57:10": { "id:3": 233, "sizeX:3": 32, "sizeY:3": 32, "x:3": -156, "y:3": 136 }, - "57:10": { + "58:10": { "id:3": 236, "sizeX:3": 24, "sizeY:3": 24, "x:3": -472, "y:3": 284 }, - "58:10": { + "59:10": { "id:3": 237, "sizeX:3": 24, "sizeY:3": 24, "x:3": -104, "y:3": 140 }, - "59:10": { + "60:10": { "id:3": 319, "sizeX:3": 32, "sizeY:3": 32, "x:3": -640, "y:3": 312 }, - "60:10": { + "61:10": { "id:3": 338, "sizeX:3": 24, "sizeY:3": 24, "x:3": -200, "y:3": 388 }, - "61:10": { + "62:10": { "id:3": 398, "sizeX:3": 36, "sizeY:3": 36, "x:3": -594, "y:3": 222 }, - "62:10": { + "63:10": { "id:3": 502, "sizeX:3": 24, "sizeY:3": 24, "x:3": -472, "y:3": 388 }, - "63:10": { + "64:10": { "id:3": 504, "sizeX:3": 24, "sizeY:3": 24, "x:3": -444, "y:3": 264 }, - "64:10": { + "65:10": { "id:3": 505, "sizeX:3": 24, "sizeY:3": 24, "x:3": -404, "y:3": 264 }, - "65:10": { + "66:10": { "id:3": 507, "sizeX:3": 24, "sizeY:3": 24, "x:3": -360, "y:3": 432 }, - "66:10": { + "67:10": { "id:3": 509, "sizeX:3": 24, "sizeY:3": 24, "x:3": -248, "y:3": -16 }, - "67:10": { + "68:10": { "id:3": 540, "sizeX:3": 24, "sizeY:3": 24, "x:3": -336, "y:3": 140 }, - "68:10": { + "69:10": { "id:3": 541, "sizeX:3": 32, "sizeY:3": 32, "x:3": -640, "y:3": 356 }, - "69:10": { + "70:10": { "id:3": 546, "sizeX:3": 24, "sizeY:3": 24, "x:3": -404, "y:3": 192 }, - "70:10": { + "71:10": { "id:3": 549, "sizeX:3": 24, "sizeY:3": 24, "x:3": -292, "y:3": 68 }, - "71:10": { + "72:10": { "id:3": 551, "sizeX:3": 24, "sizeY:3": 24, "x:3": -184, "y:3": 140 }, - "72:10": { + "73:10": { "id:3": 556, "sizeX:3": 32, "sizeY:3": 32, "x:3": -640, "y:3": 268 }, - "73:10": { + "74:10": { "id:3": 609, "sizeX:3": 32, "sizeY:3": 32, "x:3": -640, "y:3": 224 }, - "74:10": { + "75:10": { "id:3": 727, "sizeX:3": 24, "sizeY:3": 24, "x:3": -384, "y:3": 20 }, - "75:10": { + "76:10": { "id:3": 728, "sizeX:3": 24, "sizeY:3": 24, "x:3": -112, "y:3": 20 }, - "76:10": { + "77:10": { "id:3": 730, "sizeX:3": 24, "sizeY:3": 24, "x:3": -152, "y:3": 20 }, - "77:10": { + "78:10": { "id:3": 731, "sizeX:3": 24, "sizeY:3": 24, "x:3": -192, "y:3": 20 }, - "78:10": { + "79:10": { "id:3": 747, "sizeX:3": 24, "sizeY:3": 24, "x:3": -152, "y:3": 68 }, - "79:10": { + "80:10": { "id:3": 781, "sizeX:3": 32, "sizeY:3": 32, - "x:3": -252, + "x:3": -148, "y:3": 456 }, - "80:10": { + "81:10": { "id:3": 787, "sizeX:3": 24, "sizeY:3": 24, "x:3": -424, "y:3": 88 }, - "81:10": { + "82:10": { "id:3": 801, "sizeX:3": 24, "sizeY:3": 24, "x:3": -200, "y:3": 188 }, - "82:10": { + "83:10": { "id:3": 810, "sizeX:3": 24, "sizeY:3": 24, "x:3": -284, "y:3": 264 }, - "83:10": { + "84:10": { "id:3": 812, "sizeX:3": 0, "sizeY:3": 0, "x:3": -392, "y:3": 352 }, - "84:10": { + "85:10": { "id:3": 816, "sizeX:3": 48, "sizeY:3": 48, "x:3": -616, "y:3": 128 }, - "85:10": { + "86:10": { "id:3": 818, "sizeX:3": 24, "sizeY:3": 24, "x:3": -652, "y:3": 68 }, - "86:10": { + "87:10": { "id:3": 819, "sizeX:3": 24, "sizeY:3": 24, "x:3": -292, "y:3": 20 }, - "87:10": { + "88:10": { "id:3": 820, "sizeX:3": 24, "sizeY:3": 24, "x:3": -604, "y:3": 20 }, - "88:10": { + "89:10": { "id:3": 821, "sizeX:3": 24, "sizeY:3": 24, "x:3": -464, "y:3": -17 }, - "89:10": { + "90:10": { "id:3": 822, "sizeX:3": 24, "sizeY:3": 24, "x:3": -528, "y:3": 68 }, - "90:10": { + "91:10": { "id:3": 823, "sizeX:3": 24, "sizeY:3": 24, "x:3": -384, "y:3": 48 }, - "91:10": { + "92:10": { "id:3": 824, "sizeX:3": 24, "sizeY:3": 24, "x:3": -404, "y:3": 464 }, - "92:10": { + "93:10": { "id:3": 830, "sizeX:3": 32, "sizeY:3": 32, "x:3": -156, "y:3": 292 }, - "93:10": { + "94:10": { "id:3": 831, "sizeX:3": 24, "sizeY:3": 24, "x:3": -200, "y:3": 296 }, - "94:10": { + "95:10": { "id:3": 832, "sizeX:3": 24, "sizeY:3": 24, "x:3": -104, "y:3": 296 }, - "95:10": { + "96:10": { "id:3": 833, "sizeX:3": 24, "sizeY:3": 24, "x:3": -104, "y:3": 340 }, - "96:10": { + "97:10": { "id:3": 834, "sizeX:3": 24, "sizeY:3": 24, "x:3": -360, "y:3": 388 }, - "97:10": { + "98:10": { "id:3": 835, "sizeX:3": 24, "sizeY:3": 24, - "x:3": -248, - "y:3": 388 + "x:3": -284, + "y:3": 296 }, - "98:10": { + "99:10": { "id:3": 836, "sizeX:3": 24, "sizeY:3": 24, "x:3": -292, "y:3": 140 }, - "99:10": { + "100:10": { "id:3": 837, "sizeX:3": 24, "sizeY:3": 24, "x:3": -292, "y:3": 104 }, - "100:10": { + "101:10": { "id:3": 886, "sizeX:3": 24, "sizeY:3": 24, "x:3": -556, "y:3": 264 }, - "101:10": { + "102:10": { "id:3": 887, "sizeX:3": 24, "sizeY:3": 24, "x:3": -364, "y:3": 264 }, - "102:10": { + "103:10": { "id:3": 894, "sizeX:3": 24, "sizeY:3": 24, "x:3": -472, "y:3": 340 }, - "103:10": { + "104:10": { "id:3": 895, "sizeX:3": 24, "sizeY:3": 24, "x:3": -472, "y:3": 180 }, - "104:10": { + "105:10": { "id:3": 896, "sizeX:3": 24, "sizeY:3": 24, "x:3": -104, "y:3": 256 }, - "105:10": { + "106:10": { "id:3": 897, "sizeX:3": 24, "sizeY:3": 24, @@ -56900,10 +56907,10 @@ }, "2:10": { "id:3": 52, - "sizeX:3": 40, - "sizeY:3": 40, - "x:3": -724, - "y:3": 32 + "sizeX:3": 32, + "sizeY:3": 32, + "x:3": -568, + "y:3": -52 }, "3:10": { "id:3": 54, diff --git a/overrides/scripts/electronics.zs b/overrides/scripts/electronics.zs index cb2c661..a87f293 100644 --- a/overrides/scripts/electronics.zs +++ b/overrides/scripts/electronics.zs @@ -261,6 +261,7 @@ circuit_assembler.recipeBuilder() .outputs() .duration(400) .EUt(120) + .property("cleanroom", "cleanroom") .buildAndRegister(); circuit_assembler.recipeBuilder() .inputs([, * 2, * 4, * 4, * 16, * 16]) @@ -268,6 +269,7 @@ circuit_assembler.recipeBuilder() .outputs() .duration(400) .EUt(120) + .property("cleanroom", "cleanroom") .buildAndRegister(); // topaz lens oredict @@ -301,6 +303,7 @@ circuit_assembler.recipeBuilder() .outputs() .duration(200) .EUt(600) + .property("cleanroom", "cleanroom") .buildAndRegister(); circuit_assembler.recipeBuilder() @@ -309,6 +312,7 @@ circuit_assembler.recipeBuilder() .outputs() .duration(200) .EUt(600) + .property("cleanroom", "cleanroom") .buildAndRegister(); circuit_assembler.recipeBuilder() @@ -317,6 +321,7 @@ circuit_assembler.recipeBuilder() .outputs() .duration(200) .EUt(600) + .property("cleanroom", "cleanroom") .buildAndRegister(); circuit_assembler.recipeBuilder() @@ -325,6 +330,7 @@ circuit_assembler.recipeBuilder() .outputs() .duration(200) .EUt(600) + .property("cleanroom", "cleanroom") .buildAndRegister(); // Crystal Supercomputer * 1