diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs index 5da481e..60a76fe 100644 --- a/overrides/scripts/Earlygame.zs +++ b/overrides/scripts/Earlygame.zs @@ -210,9 +210,6 @@ recipes.addShaped(, [[, [[,]]); recipes.addShaped(, [[,]]); -//Rubber Sheet -compressor.recipeBuilder().inputs().outputs().duration(20).EUt(8).buildAndRegister(); - compressor.recipeBuilder().inputs( * 2).outputs().duration(20).EUt(4).buildAndRegister(); assembler.recipeBuilder().inputs( * 4).circuit(14).outputs().duration(20).EUt(16).buildAndRegister(); diff --git a/overrides/scripts/expertmode.zs b/overrides/scripts/expertmode.zs index 7f718be..1c335d9 100644 --- a/overrides/scripts/expertmode.zs +++ b/overrides/scripts/expertmode.zs @@ -22,7 +22,7 @@ import scripts.common.makeShapeless3 as makeShapeless3; // Nether Cake -recipes.addShaped(, [[,,], [, , ],[,,]]); +recipes.addShaped(, [[,,], [, , ],[,,]]); // Remove Terracotta maceration // Clay Dust * 4 diff --git a/overrides/scripts/multiblocks_expert.zs b/overrides/scripts/multiblocks_expert.zs index f8c4069..d2aef54 100644 --- a/overrides/scripts/multiblocks_expert.zs +++ b/overrides/scripts/multiblocks_expert.zs @@ -240,6 +240,7 @@ val naquadah_reactor_1 = Builder.start("naquadah_reactor_1") .where('O', ) .where('C', CTPredicate.states() | CTPredicate.abilities().setMinGlobalLimited(1).setPreviewCount(1) + | CTPredicate.abilities().setMinGlobalLimited(1).setPreviewCount(1) | CTPredicate.abilities().setMinGlobalLimited(1).setMaxGlobalLimited(3).setPreviewCount(1) ) .build(); @@ -257,9 +258,11 @@ naquadah_reactor_1.hasMufflerMechanics = false; naquadah_reactor_1.hasMaintenanceMechanics = false; naquadah_reactor_1.runOverclockingLogic = function(recipelogic as IRecipeLogic, recipe as IRecipe, negativeEU as bool, maxOverclocks as int) as int[] { - return [recipe.getEUt(), recipe.getDuration()]; + return IRecipeLogic.standardOverclockingLogic(recipe.getEUt() * (negativeEU ? -1 : 1), recipelogic.maxVoltage, recipe.getDuration(), 1, 1, 0); // 1x duration, 1x voltage, 0 overclocks } as IRunOverclockingLogicFunction; +.addTooltip(format.yellow("Produces exactly 2A ZPM, does not overclock")); + // Naquadah Reactor 2 val naquadah_reactor_2 = Builder.start("naquadah_reactor_2") .withPattern(function(controller as IControllerTile) as IBlockPattern { @@ -294,6 +297,7 @@ val naquadah_reactor_2 = Builder.start("naquadah_reactor_2") .where('O', ) .where('C', CTPredicate.states() | CTPredicate.abilities().setMinGlobalLimited(1).setPreviewCount(1) + | CTPredicate.abilities().setMinGlobalLimited(1).setPreviewCount(1) | CTPredicate.abilities().setMinGlobalLimited(1).setMaxGlobalLimited(3).setPreviewCount(1) ) .build(); @@ -312,9 +316,10 @@ naquadah_reactor_2.hasMufflerMechanics = false; naquadah_reactor_2.hasMaintenanceMechanics = false; naquadah_reactor_2.runOverclockingLogic = function(recipelogic as IRecipeLogic, recipe as IRecipe, negativeEU as bool, maxOverclocks as int) as int[] { - return [recipe.getEUt(), recipe.getDuration()]; + return IRecipeLogic.standardOverclockingLogic(recipe.getEUt() * (negativeEU ? -1 : 1), recipelogic.maxVoltage, recipe.getDuration(), 1, 1, 0); // 1x duration, 1x voltage, 0 overclocks } as IRunOverclockingLogicFunction; +.addTooltip(format.yellow("Produces exactly 2A UV, does not overclock")); // Actualization Chamber val actualization_chamber = Builder.start("actualization_chamber") diff --git a/overrides/scripts/multiblocks_normal.zs b/overrides/scripts/multiblocks_normal.zs index ee3cb3a..30a9798 100644 --- a/overrides/scripts/multiblocks_normal.zs +++ b/overrides/scripts/multiblocks_normal.zs @@ -232,6 +232,7 @@ creative_tank_provider.hasMufflerMechanics = false; creative_tank_provider.hasMaintenanceMechanics = false; + // Naquadah Reactor 1 .displayName = "Reaction-Safe Casing"; val naquadah_reactor_1 = Builder.start("naquadah_reactor_1") @@ -264,6 +265,7 @@ val naquadah_reactor_1 = Builder.start("naquadah_reactor_1") .where('O', ) .where('C', CTPredicate.states() | CTPredicate.abilities().setMinGlobalLimited(1).setPreviewCount(1) + | CTPredicate.abilities().setMinGlobalLimited(1).setPreviewCount(1) | CTPredicate.abilities().setMinGlobalLimited(1).setMaxGlobalLimited(3).setPreviewCount(1) ) .build(); @@ -281,9 +283,11 @@ naquadah_reactor_1.hasMufflerMechanics = false; naquadah_reactor_1.hasMaintenanceMechanics = false; naquadah_reactor_1.runOverclockingLogic = function(recipelogic as IRecipeLogic, recipe as IRecipe, negativeEU as bool, maxOverclocks as int) as int[] { - return [recipe.getEUt(), recipe.getDuration()]; + return IRecipeLogic.standardOverclockingLogic(recipe.getEUt() * (negativeEU ? -1 : 1), recipelogic.maxVoltage, recipe.getDuration(), 1, 1, 0); // 1x duration, 1x voltage, 0 overclocks } as IRunOverclockingLogicFunction; +.addTooltip(format.yellow("Produces exactly 2A ZPM, does not overclock")); + // Naquadah Reactor 2 val naquadah_reactor_2 = Builder.start("naquadah_reactor_2") .withPattern(function(controller as IControllerTile) as IBlockPattern { @@ -318,6 +322,7 @@ val naquadah_reactor_2 = Builder.start("naquadah_reactor_2") .where('O', ) .where('C', CTPredicate.states() | CTPredicate.abilities().setMinGlobalLimited(1).setPreviewCount(1) + | CTPredicate.abilities().setMinGlobalLimited(1).setPreviewCount(1) | CTPredicate.abilities().setMinGlobalLimited(1).setMaxGlobalLimited(3).setPreviewCount(1) ) .build(); @@ -336,9 +341,10 @@ naquadah_reactor_2.hasMufflerMechanics = false; naquadah_reactor_2.hasMaintenanceMechanics = false; naquadah_reactor_2.runOverclockingLogic = function(recipelogic as IRecipeLogic, recipe as IRecipe, negativeEU as bool, maxOverclocks as int) as int[] { - return [recipe.getEUt(), recipe.getDuration()]; + return IRecipeLogic.standardOverclockingLogic(recipe.getEUt() * (negativeEU ? -1 : 1), recipelogic.maxVoltage, recipe.getDuration(), 1, 1, 0); // 1x duration, 1x voltage, 0 overclocks } as IRunOverclockingLogicFunction; +.addTooltip(format.yellow("Produces exactly 2A UV, does not overclock")); // multiblock controller recipes recipes.addShaped("microverse_projector_basic", , [ diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs index 9ee4186..68298c1 100644 --- a/overrides/scripts/normalmode.zs +++ b/overrides/scripts/normalmode.zs @@ -290,6 +290,8 @@ makeShaped("of_nc_water_source", , //Rubber by hand recipes.addShaped(,[[],[],[]]); +//Rubber Sheet +compressor.recipeBuilder().inputs().outputs().duration(20).EUt(8).buildAndRegister(); //Item conduit - by hand recipes.addShaped( * 4, [