From 7c8165ac598e9993522bb250d06aad57349713c0 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Sun, 12 Jan 2025 06:30:37 +0700 Subject: [PATCH 1/3] fix stoiks --- groovy/postInit/chemistry/ChemistryOverhaul.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy index 312591712..4fa62eb60 100644 --- a/groovy/postInit/chemistry/ChemistryOverhaul.groovy +++ b/groovy/postInit/chemistry/ChemistryOverhaul.groovy @@ -786,7 +786,7 @@ ROASTER.recipeBuilder() BR.recipeBuilder() .inputs(ore('dustQuicklime') * 2) .circuitMeta(1) - .fluidInputs(fluid('carbon_dioxide') * 3000) + .fluidInputs(fluid('carbon_dioxide') * 1000) .outputs(metaitem('dustCalcite') * 5) .duration(120) .EUt(7) From 67f54af7dfa16ff154cad72bb261127cc2f30049 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Sun, 12 Jan 2025 06:30:52 +0700 Subject: [PATCH 2/3] workstation now only uses SMD diodes now --- .../components/IntegratedCircuits.groovy | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/groovy/postInit/components/IntegratedCircuits.groovy b/groovy/postInit/components/IntegratedCircuits.groovy index 6273a6ffe..62c0f864d 100644 --- a/groovy/postInit/components/IntegratedCircuits.groovy +++ b/groovy/postInit/components/IntegratedCircuits.groovy @@ -40,7 +40,7 @@ Globals.solders.each { key, val -> .inputs(metaitem('component.smd.diode') * 2) .inputs(metaitem('wireFineCopper') * 2) .inputs(metaitem('boltTin') * 2) - .fluidInputs(fluid(key) * val) + .fluidInputs(fluid(key) * val) .outputs(metaitem('circuit.microprocessor') * 5) .duration(200) .EUt(120) @@ -53,7 +53,7 @@ Globals.solders.each { key, val -> .inputs(metaitem('component.smd.capacitor') * 4) .inputs(metaitem('component.smd.transistor') * 4) .inputs(metaitem('wireFineAnnealedCopper') * 4) - .fluidInputs(fluid(key) * val) + .fluidInputs(fluid(key) * val) .outputs(metaitem('circuit.processor') * 2) .duration(200) .EUt(120) @@ -66,25 +66,25 @@ Globals.solders.each { key, val -> .inputs(metaitem('component.smd.transistor') * 4) .inputs(metaitem('wireFineElectrum') * 8) .inputs(metaitem('boltAnnealedCopper') * 8) - .fluidInputs(fluid(key) * (val * 2)) + .fluidInputs(fluid(key) * (val * 2)) .outputs(metaitem('circuit.assembly') * 1) .duration(300) .EUt(120) .buildAndRegister() - CIRCUIT_ASSEMBLER.recipeBuilder() - .inputs(metaitem('frameAluminium')) - .inputs(metaitem('circuit.assembly') * 2) - .inputs(ore('componentDiode') * 4) - .inputs(metaitem('plate.random_access_memory') * 4) - .inputs(metaitem('plate.central_processing_unit') * 4) - .inputs(ore('cableGtSingleElectrum') * 4) - .fluidInputs(fluid(key) * (val * 2)) - .outputs(metaitem('circuit.workstation')) - .cleanroom(CleanroomType.CLEANROOM) - .duration(400) - .EUt(120) - .buildAndRegister(); + CIRCUIT_ASSEMBLER.recipeBuilder() + .inputs(metaitem('frameAluminium')) + .inputs(metaitem('circuit.assembly') * 2) + .inputs(metaitem('component.smd.diode') * 4) + .inputs(metaitem('plate.random_access_memory') * 4) + .inputs(metaitem('plate.central_processing_unit') * 4) + .inputs(ore('cableGtSingleElectrum') * 4) + .fluidInputs(fluid(key) * (val * 2)) + .outputs(metaitem('circuit.workstation')) + .cleanroom(CleanroomType.CLEANROOM) + .duration(400) + .EUt(120) + .buildAndRegister(); CIRCUIT_ASSEMBLER.recipeBuilder() .inputs(metaitem('frameAluminium') * 2) @@ -96,7 +96,7 @@ Globals.solders.each { key, val -> .fluidInputs(fluid(key) * (val * 4)) .outputs(metaitem('circuit.mainframe')) .duration(500) - .EUt(480) - .buildAndRegister(); + .EUt(480) + .buildAndRegister(); } From e071baca5e71859f85ed924aa2c7e02e7d1c35b1 Mon Sep 17 00:00:00 2001 From: trainvoi Date: Sun, 12 Jan 2025 07:38:40 +0700 Subject: [PATCH 3/3] Update IntegratedCircuits.groovy --- .../components/IntegratedCircuits.groovy | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/groovy/postInit/components/IntegratedCircuits.groovy b/groovy/postInit/components/IntegratedCircuits.groovy index 62c0f864d..a48cfd25e 100644 --- a/groovy/postInit/components/IntegratedCircuits.groovy +++ b/groovy/postInit/components/IntegratedCircuits.groovy @@ -40,7 +40,7 @@ Globals.solders.each { key, val -> .inputs(metaitem('component.smd.diode') * 2) .inputs(metaitem('wireFineCopper') * 2) .inputs(metaitem('boltTin') * 2) - .fluidInputs(fluid(key) * val) + .fluidInputs(fluid(key) * val) .outputs(metaitem('circuit.microprocessor') * 5) .duration(200) .EUt(120) @@ -53,7 +53,7 @@ Globals.solders.each { key, val -> .inputs(metaitem('component.smd.capacitor') * 4) .inputs(metaitem('component.smd.transistor') * 4) .inputs(metaitem('wireFineAnnealedCopper') * 4) - .fluidInputs(fluid(key) * val) + .fluidInputs(fluid(key) * val) .outputs(metaitem('circuit.processor') * 2) .duration(200) .EUt(120) @@ -66,25 +66,25 @@ Globals.solders.each { key, val -> .inputs(metaitem('component.smd.transistor') * 4) .inputs(metaitem('wireFineElectrum') * 8) .inputs(metaitem('boltAnnealedCopper') * 8) - .fluidInputs(fluid(key) * (val * 2)) + .fluidInputs(fluid(key) * (val * 2)) .outputs(metaitem('circuit.assembly') * 1) .duration(300) .EUt(120) .buildAndRegister() - CIRCUIT_ASSEMBLER.recipeBuilder() - .inputs(metaitem('frameAluminium')) - .inputs(metaitem('circuit.assembly') * 2) + CIRCUIT_ASSEMBLER.recipeBuilder() + .inputs(metaitem('frameAluminium')) + .inputs(metaitem('circuit.assembly') * 2) .inputs(metaitem('component.smd.diode') * 4) - .inputs(metaitem('plate.random_access_memory') * 4) - .inputs(metaitem('plate.central_processing_unit') * 4) - .inputs(ore('cableGtSingleElectrum') * 4) - .fluidInputs(fluid(key) * (val * 2)) - .outputs(metaitem('circuit.workstation')) - .cleanroom(CleanroomType.CLEANROOM) - .duration(400) - .EUt(120) - .buildAndRegister(); + .inputs(metaitem('plate.random_access_memory') * 4) + .inputs(metaitem('plate.central_processing_unit') * 4) + .inputs(ore('cableGtSingleElectrum') * 4) + .fluidInputs(fluid(key) * (val * 2)) + .outputs(metaitem('circuit.workstation')) + .cleanroom(CleanroomType.CLEANROOM) + .duration(400) + .EUt(120) + .buildAndRegister(); CIRCUIT_ASSEMBLER.recipeBuilder() .inputs(metaitem('frameAluminium') * 2) @@ -96,7 +96,7 @@ Globals.solders.each { key, val -> .fluidInputs(fluid(key) * (val * 4)) .outputs(metaitem('circuit.mainframe')) .duration(500) - .EUt(480) - .buildAndRegister(); + .EUt(480) + .buildAndRegister(); }