Skip to content

Commit

Permalink
Merge pull request #1177 from SymmetricDevs/circuit-overhaul-2
Browse files Browse the repository at this point in the history 
circuit overhaul touchups
  • Loading branch information
@bruberu
bruberu authored Dec 28, 2024
2 parents 9bdef36 + af27351 commit 0678169
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 46 deletions.
4 changes: 2 additions & 2 deletions config/betterquesting/resources/supersymmetry/lang/en_us.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1883,10 +1883,10 @@ susy.quest.db.1610061980.title=Trip Hammer
susy.quest.db.1610061980.desc=The §6Trip Hammer§r can swing a hammer for you!%n%nA trip hammer needs a §6Cog§r and a §6Hammer§r to work. You can put §a4§r of them around one anvil to reach the maximum efficiency.%n%nYou can insert items into a anvil using hoppers or pipes, and the product will be dropped in-world unless a chest or another type of storage is placed next to the Trip Hammer, opposite of the side where you insert the Cog.
susy.quest.db.1677924297.title=Better Oven
susy.quest.db.1677924297.desc=The §6Refractory Oven§r is an upgraded version of the §7Stone Oven§r, which has §a2.5x§r processing speed and a lower change of failure.
susy.quest.db.1766408250.title=The Road to Rubylith
susy.quest.db.1766408250.desc=You may have noticed the rather complicated questline below. It all heads towards §7rubylith§r, which is essentially a really chemically complex sheet of plastic that you use to, essentially, stencil stencils.%n%nDo not worry about automating this; you will only need §76§r to get through HV! Even still, we wish you good luck.
susy.quest.db.1766162782.title=Extenders & Bridges
susy.quest.db.1766162782.desc=§3§6Bridges§r and §6extenders§r are §cdelegators§r; they can delegate one face of your §bmachine§r or §bpipes§r onto one or more equivalent faces.%n%nBoth bridges and extenders have four variants: §3inv§r, §3tank§r, §3invtank§r, and §5universal§r. As their names suggest, they allow automation of items, fluids, items plus fluids, and, for universal ones, energy as well. §oNone§r of them, however, can attach to other §cdelegators§r.%n%n§6Bridges§r will allow §bpipes§r or §bcables§r from different directions to pass through each other in one block without turning, which will be very useful for compact logistic designs.%n%n§6Extenders§r can expand one face on your §bmachine§r to five faces. An extender has three kinds of faces: §4primary§r, §4secondary§r, and §4normal§r faces. All import/extract actions on the §4normal§r or §4secondary§r faces will be delegated to the §bmachines§r or §bpipes§r adjacent to the §4primary§r face, and the actions on the §4primary§r face will be delegated to the §4secondary§r face.%n%nApart from the §5Universal Delegators§r that require aluminum, you can now craft all §cdelegators§r for your automation.
susy.quest.db.1766408250.title=The Road to Rubylith
susy.quest.db.1766408250.desc=You may have noticed the rather complicated questline below. It all heads towards §7rubylith§r, which is essentially a really chemically complex sheet of plastic that you use to, essentially, stencil stencils.%n%nDo not worry about automating this; you will only need §76§r to get through HV! Even still, we wish you good luck.
susy.quest.db.1767849062.title=Don't Take Granite for Granted
susy.quest.db.1767849062.desc=You might encounter some §dGranite§r while mining underground. §dGranite§r is a type of §cigneous rock§r that is hard and tough, making it an ideal material for crafting §7mortars§r. So, don't ignore it!
susy.quest.db.1786950658.title=Zener Diode
Expand Down
8 changes: 4 additions & 4 deletions groovy/postInit/components/IntegratedCircuits.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Globals.solders.each { key, val ->
.fluidInputs(fluid(key) * val)
.outputs(metaitem('circuit.microprocessor') * 5)
.duration(200)
.EUt(240)
.EUt(120)
.buildAndRegister()

CIRCUIT_ASSEMBLER.recipeBuilder()
Expand All @@ -56,7 +56,7 @@ Globals.solders.each { key, val ->
.fluidInputs(fluid(key) * val)
.outputs(metaitem('circuit.processor') * 2)
.duration(200)
.EUt(240)
.EUt(120)
.buildAndRegister()

CIRCUIT_ASSEMBLER.recipeBuilder()
Expand All @@ -69,7 +69,7 @@ Globals.solders.each { key, val ->
.fluidInputs(fluid(key) * (val * 2))
.outputs(metaitem('circuit.assembly') * 1)
.duration(300)
.EUt(360)
.EUt(120)
.buildAndRegister()

CIRCUIT_ASSEMBLER.recipeBuilder()
Expand All @@ -83,7 +83,7 @@ Globals.solders.each { key, val ->
.outputs(metaitem('circuit.workstation'))
.cleanroom(CleanroomType.CLEANROOM)
.duration(400)
.EUt(480)
.EUt(120)
.buildAndRegister();

CIRCUIT_ASSEMBLER.recipeBuilder()
Expand Down
104 changes: 65 additions & 39 deletions groovy/postInit/components/OpAmpCircuits.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(ore('componentDiode') * 2)
.inputs(metaitem('board.phenolic'))
.fluidInputs(fluid('soldering_alloy') * 72)
.outputs(metaitem('op_amp'))
.outputs(metaitem('op_amp') * 4)
.duration(100)
.EUt(30)
.buildAndRegister()
Expand All @@ -36,7 +36,7 @@ CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(ore('componentDiode') * 2)
.inputs(metaitem('board.phenolic'))
.fluidInputs(fluid('tin') * 144)
.outputs(metaitem('op_amp'))
.outputs(metaitem('op_amp') * 4)
.duration(100)
.EUt(30)
.buildAndRegister()
Expand All @@ -49,17 +49,17 @@ CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(ore('componentDiode') * 2)
.inputs(ore('foilEpoxyCresolNovolacs'))
.fluidInputs(fluid('silicone_rubber') * 72)
.outputs(metaitem('op_amp') * 4)
.outputs(metaitem('op_amp') * 8)
.duration(100)
.EUt(30)
.buildAndRegister()

ASSEMBLER.recipeBuilder()
.inputs(ore('plateAluminium') * 2)
.inputs(ore('plateAluminium'))
.circuitMeta(5)
.fluidInputs(fluid('soldering_alloy') * 72)
.outputs(metaitem('heat_sink'))
.duration(200)
.outputs(metaitem('heat_sink') * 2)
.duration(100)
.EUt(30)
.buildAndRegister()

Expand All @@ -68,7 +68,7 @@ ASSEMBLER.recipeBuilder()
.inputs(metaitem('wafer.n_doped.silicon'))
.fluidInputs(fluid('plastic') * 144)
.outputs(metaitem('zener_diode') * 16)
.duration(300)
.duration(100)
.EUt(30)
.buildAndRegister()

Expand All @@ -77,9 +77,9 @@ ASSEMBLER.recipeBuilder()
.inputs(ore('wireFineSilver'))
.inputs(ore('wireFineAnnealedCopper') * 2)
.fluidInputs(fluid('plastic') * 36)
.outputs(metaitem('fuse.hv'))
.outputs(metaitem('fuse.hv') * 4)
.duration(100)
.EUt(30)
.EUt(120)
.buildAndRegister()

CIRCUIT_ASSEMBLER.recipeBuilder()
Expand All @@ -90,9 +90,9 @@ CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('protector_chip'))
.inputs(metaitem('board.plastic'))
.fluidInputs(fluid('soldering_alloy') * 72)
.outputs(metaitem('voltage_regulator.hv.unsealed'))
.duration(400)
.EUt(30)
.outputs(metaitem('voltage_regulator.hv.unsealed') * 2)
.duration(200)
.EUt(120)
.buildAndRegister()

CIRCUIT_ASSEMBLER.recipeBuilder()
Expand All @@ -103,9 +103,9 @@ CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('protector_chip'))
.inputs(metaitem('board.plastic'))
.fluidInputs(fluid('tin') * 144)
.outputs(metaitem('voltage_regulator.hv.unsealed'))
.duration(400)
.EUt(30)
.outputs(metaitem('voltage_regulator.hv.unsealed') * 2)
.duration(200)
.EUt(120)
.buildAndRegister()

CIRCUIT_ASSEMBLER.recipeBuilder()
Expand All @@ -116,9 +116,9 @@ CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('protector_chip'))
.inputs(ore('plateEpoxyCresolNovolacs'))
.fluidInputs(fluid('silicone_rubber') * 72)
.outputs(metaitem('voltage_regulator.hv.unsealed') * 2)
.duration(400)
.EUt(30)
.outputs(metaitem('voltage_regulator.hv.unsealed') * 4)
.duration(200)
.EUt(120)
.buildAndRegister()

CIRCUIT_ASSEMBLER.recipeBuilder()
Expand All @@ -128,8 +128,8 @@ CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('zener_diode'))
.inputs(metaitem('circuit_board.good'))
.fluidInputs(fluid('soldering_alloy') * 72)
.outputs(metaitem('voltage_regulator.mv'))
.duration(400)
.outputs(metaitem('voltage_regulator.mv') * 2)
.duration(100)
.EUt(30)
.buildAndRegister()

Expand All @@ -140,8 +140,8 @@ CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('zener_diode'))
.inputs(metaitem('circuit_board.good'))
.fluidInputs(fluid('tin') * 144)
.outputs(metaitem('voltage_regulator.mv'))
.duration(400)
.outputs(metaitem('voltage_regulator.mv') * 2)
.duration(100)
.EUt(30)
.buildAndRegister()

Expand All @@ -152,8 +152,8 @@ CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('zener_diode'))
.inputs(ore('plateEpoxyCresolNovolacs'))
.fluidInputs(fluid('silicone_rubber') * 144)
.outputs(metaitem('voltage_regulator.mv') * 2)
.duration(400)
.outputs(metaitem('voltage_regulator.mv') * 4)
.duration(100)
.EUt(30)
.buildAndRegister()

Expand All @@ -163,7 +163,7 @@ VACUUM.recipeBuilder()
.fluidInputs(fluid('plastic') * 144)
.outputs(metaitem('voltage_regulator.hv'))
.duration(200)
.EUt(64)
.EUt(120)
.buildAndRegister()

CIRCUIT_ASSEMBLER.recipeBuilder()
Expand All @@ -175,8 +175,8 @@ CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('circuit_board.good'))
.fluidInputs(fluid('soldering_alloy') * 72)
.outputs(metaitem('protector_chip'))
.duration(400)
.EUt(30)
.duration(200)
.EUt(120)
.buildAndRegister()

CIRCUIT_ASSEMBLER.recipeBuilder()
Expand All @@ -188,8 +188,8 @@ CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('circuit_board.good'))
.fluidInputs(fluid('tin') * 144)
.outputs(metaitem('protector_chip'))
.duration(400)
.EUt(30)
.duration(200)
.EUt(120)
.buildAndRegister()

CIRCUIT_ASSEMBLER.recipeBuilder()
Expand All @@ -200,19 +200,28 @@ CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('zener_diode'))
.fluidInputs(fluid('silicone_rubber') * 72)
.outputs(metaitem('protector_chip'))
.duration(400)
.EUt(30)
.duration(200)
.EUt(120)
.buildAndRegister()

// Integrated Logic Circuit * 2
mods.gregtech.circuit_assembler.removeByInput(16, [metaitem('circuit_board.basic'), metaitem('plate.integrated_logic_circuit'), metaitem('component.resistor') * 2, metaitem('component.diode') * 2, metaitem('wireFineCopper') * 2, metaitem('boltTin') * 2], [fluid('tin') * 144])

CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('circuit_board.basic'), metaitem('component.resistor') * 2, metaitem('component.diode') * 2, metaitem('wireFineCopper') * 2, metaitem('boltTin') * 2)
.inputs(metaitem('circuit_board.basic'), ore('componentResistor') * 2, ore('componentDiode') * 2, ore('wireFineCopper') * 2, ore('boltTin') * 2)
.inputs(metaitem('op_amp'))
.fluidInputs(fluid('soldering_alloy') * 72)
.outputs(metaitem('circuit.basic_integrated') * 6)
.duration(200)
.duration(100)
.EUt(16)
.buildAndRegister()

CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('circuit_board.basic'), ore('componentResistor') * 2, ore('componentDiode') * 2, ore('wireFineCopper') * 2, ore('boltTin') * 2)
.inputs(metaitem('op_amp'))
.fluidInputs(fluid('tin') * 144)
.outputs(metaitem('circuit.basic_integrated') * 6)
.duration(100)
.EUt(16)
.buildAndRegister()

Expand All @@ -221,24 +230,41 @@ mods.gregtech.circuit_assembler.removeByInput(24, [metaitem('circuit_board.good'
mods.gregtech.circuit_assembler.removeByInput(24, [metaitem('circuit_board.good'), metaitem('circuit.basic_integrated') * 2, metaitem('component.resistor') * 2, metaitem('component.diode') * 2, metaitem('wireFineGold') * 4, metaitem('boltSilver') * 4], [fluid('tin') * 144])

CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('circuit.basic_integrated') * 2, metaitem('component.resistor') * 2, metaitem('component.diode') * 2, metaitem('wireFineAnnealedCopper') * 4)
.inputs(metaitem('circuit.basic_integrated') * 2, ore('componentResistor') * 2, ore('componentDiode') * 2, ore('wireFineAnnealedCopper') * 4)
.inputs(metaitem('voltage_regulator.mv'))
.fluidInputs(fluid('soldering_alloy') * 72)
.outputs(metaitem('circuit.good_integrated') * 2)
.duration(400)
.duration(100)
.EUt(24)
.buildAndRegister()

CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('circuit.basic_integrated') * 2, ore('componentResistor') * 2, ore('componentDiode') * 2, ore('wireFineAnnealedCopper') * 4)
.inputs(metaitem('voltage_regulator.mv'))
.fluidInputs(fluid('tin') * 144)
.outputs(metaitem('circuit.good_integrated') * 2)
.duration(100)
.EUt(24)
.buildAndRegister()

// Advanced Integrated Circuit * 1
mods.gregtech.circuit_assembler.removeByInput(30, [metaitem('circuit.good_integrated') * 2, metaitem('plate.integrated_logic_circuit') * 2, metaitem('plate.random_access_memory') * 2, metaitem('component.transistor') * 4, metaitem('wireFineElectrum') * 8, metaitem('boltAnnealedCopper') * 8], [fluid('soldering_alloy') * 72])
mods.gregtech.circuit_assembler.removeByInput(30, [metaitem('circuit.good_integrated') * 2, metaitem('plate.integrated_logic_circuit') * 2, metaitem('plate.random_access_memory') * 2, metaitem('component.transistor') * 4, metaitem('wireFineElectrum') * 8, metaitem('boltAnnealedCopper') * 8], [fluid('tin') * 144])


CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('circuit.good_integrated') * 2, metaitem('component.inductor') * 2, metaitem('component.diode') * 2, metaitem('boltElectrum') * 8)
.inputs(metaitem('circuit.good_integrated') * 2, ore('componentInductor') * 2, ore('componentDiode') * 2, ore('boltElectrum') * 8)
.inputs(metaitem('voltage_regulator.hv'))
.fluidInputs(fluid('soldering_alloy') * 72)
.outputs(metaitem('circuit.advanced_integrated') * 2)
.duration(800)
.EUt(30)
.duration(200)
.EUt(120)
.buildAndRegister()

CIRCUIT_ASSEMBLER.recipeBuilder()
.inputs(metaitem('circuit.good_integrated') * 2, ore('componentInductor') * 2, ore('componentDiode') * 2, ore('boltElectrum') * 8)
.inputs(metaitem('voltage_regulator.hv'))
.fluidInputs(fluid('tin') * 144)
.outputs(metaitem('circuit.advanced_integrated') * 2)
.duration(120)
.EUt(120)
.buildAndRegister()
2 changes: 1 addition & 1 deletion groovy/postInit/components/Photomasks.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ ASSEMBLER.recipeBuilder()
.fluidInputs(fluid('glue') * 100)
.outputs(metaitem('rubylith'))
.duration(200)
.EUt(120)
.EUt(480)
.buildAndRegister()

// Early lithography masks
Expand Down

0 comments on commit 0678169

Please sign in to comment.