TMC/modded7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

fix Nq reactors and ste sulfur bypass

Browse Source
This commit is contained in:
m2r1k5 2022-04-02 21:25:22 +08:00
parent 4a6df11cc0
commit 48ac3e0b74
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
overrides/scripts/Earlygame.zs
View File

@ -210,9 +210,6 @@ recipes.addShaped(<actuallyadditions:block_placer>, [[<metaitem:electric.piston.
recipes.addShaped(<actuallyadditions:block_fluid_placer>, [[<metaitem:electric.pump.lv>,<actuallyadditions:item_misc:7>]]);
recipes.addShaped(<actuallyadditions:block_fluid_collector>, [[<actuallyadditions:item_misc:7>,<metaitem:electric.pump.lv>]]);
//Rubber Sheet
compressor.recipeBuilder().inputs(<metaitem:rubber_drop>).outputs(<metaitem:plateRubber>).duration(20).EUt(8).buildAndRegister();
compressor.recipeBuilder().inputs(<metaitem:dustCalcium> * 2).outputs(<minecraft:dye:15>).duration(20).EUt(4).buildAndRegister();
assembler.recipeBuilder().inputs(<minecraft:bone> * 4).circuit(14).outputs(<minecraft:skull>).duration(20).EUt(16).buildAndRegister();

2
overrides/scripts/expertmode.zs
View File

@ -22,7 +22,7 @@ import scripts.common.makeShapeless3 as makeShapeless3;
// Nether Cake
recipes.addShaped(<dimensionaledibles:nether_cake>, [[<metaitem:dustNetherrack>,<metaitem:dustNetherrack>,<metaitem:dustNetherrack>], [<minecraft:obsidian>, <enderio:item_material:70>, <minecraft:obsidian>],[<metaitem:blockLead>,<extrautils2:simpledecorative:1>,<metaitem:blockLead>]]);
recipes.addShaped(<dimensionaledibles:nether_cake>, [[<metaitem:dustSteel>,<metaitem:dustSteel>,<metaitem:dustSteel>], [<minecraft:obsidian>, <enderio:item_material:70>, <minecraft:obsidian>],[<metaitem:blockLead>,<ore:blockGold>,<metaitem:blockLead>]]);
// Remove Terracotta maceration
// Clay Dust * 4

9
overrides/scripts/multiblocks_expert.zs
View File

@ -240,6 +240,7 @@ val naquadah_reactor_1 = Builder.start("naquadah_reactor_1")
.where('O', <metastate:extendedcrafting:trimmed:5>)
.where('C', CTPredicate.states(<metastate:gcym:large_multiblock_casing:9>)
| CTPredicate.abilities(<mte_ability:IMPORT_ITEMS>).setMinGlobalLimited(1).setPreviewCount(1)
| CTPredicate.abilities(<mte_ability:EXPORT_ITEMS>).setMinGlobalLimited(1).setPreviewCount(1)
| CTPredicate.abilities(<mte_ability:OUTPUT_ENERGY>).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;
<metaitem:multiblocktweaker:naquadah_reactor_1>.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', <metastate:extendedcrafting:storage:4>)
.where('C', CTPredicate.states(<metastate:gcym:large_multiblock_casing:9>)
| CTPredicate.abilities(<mte_ability:IMPORT_ITEMS>).setMinGlobalLimited(1).setPreviewCount(1)
| CTPredicate.abilities(<mte_ability:EXPORT_ITEMS>).setMinGlobalLimited(1).setPreviewCount(1)
| CTPredicate.abilities(<mte_ability:OUTPUT_ENERGY>).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;
<metaitem:multiblocktweaker:naquadah_reactor_2>.addTooltip(format.yellow("Produces exactly 2A UV, does not overclock"));
// Actualization Chamber
val actualization_chamber = Builder.start("actualization_chamber")

10
overrides/scripts/multiblocks_normal.zs
View File

@ -232,6 +232,7 @@ creative_tank_provider.hasMufflerMechanics = false;
creative_tank_provider.hasMaintenanceMechanics = false;
// Naquadah Reactor 1
<gcym:large_multiblock_casing:9>.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', <metastate:extendedcrafting:trimmed:5>)
.where('C', CTPredicate.states(<metastate:gcym:large_multiblock_casing:9>)
| CTPredicate.abilities(<mte_ability:IMPORT_ITEMS>).setMinGlobalLimited(1).setPreviewCount(1)
| CTPredicate.abilities(<mte_ability:EXPORT_ITEMS>).setMinGlobalLimited(1).setPreviewCount(1)
| CTPredicate.abilities(<mte_ability:OUTPUT_ENERGY>).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;
<metaitem:multiblocktweaker:naquadah_reactor_1>.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', <metastate:extendedcrafting:storage:4>)
.where('C', CTPredicate.states(<metastate:gcym:large_multiblock_casing:9>)
| CTPredicate.abilities(<mte_ability:IMPORT_ITEMS>).setMinGlobalLimited(1).setPreviewCount(1)
| CTPredicate.abilities(<mte_ability:EXPORT_ITEMS>).setMinGlobalLimited(1).setPreviewCount(1)
| CTPredicate.abilities(<mte_ability:OUTPUT_ENERGY>).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;
<metaitem:multiblocktweaker:naquadah_reactor_2>.addTooltip(format.yellow("Produces exactly 2A UV, does not overclock"));
// multiblock controller recipes
recipes.addShaped("microverse_projector_basic", <metaitem:mbt:microverse_projector_basic>, [

2
overrides/scripts/normalmode.zs
View File

@ -290,6 +290,8 @@ makeShaped("of_nc_water_source", <nuclearcraft:water_source>,
//Rubber by hand
recipes.addShaped(<metaitem:plateRubber>,[[<ore:gtceHardHammers>],[<metaitem:rubber_drop>],[<metaitem:rubber_drop>]]);
//Rubber Sheet
compressor.recipeBuilder().inputs(<metaitem:rubber_drop>).outputs(<metaitem:plateRubber>).duration(20).EUt(8).buildAndRegister();
//Item conduit - by hand
recipes.addShaped(<enderio:item_item_conduit> * 4, [