diff --git a/computer/13/fluid_state.lua b/computer/13/fluid_state.lua index a006d42..0106ff2 100644 --- a/computer/13/fluid_state.lua +++ b/computer/13/fluid_state.lua @@ -1,7 +1,7 @@ return { { name = "water", - amount = 32700, + amount = 32300, }, { name = "blood", @@ -9,12 +9,16 @@ return { }, { name = "molten_brass", - amount = 192, + amount = 78, }, { name = "lava", amount = 1450, }, + { + name = "molten_silver", + amount = 0, + }, { name = "molten_copper", amount = 0, @@ -30,7 +34,4 @@ return { { amount = 0, }, - { - amount = 0, - }, } \ No newline at end of file diff --git a/computer/13/fluids.lua b/computer/13/fluids.lua index 07fbd96..353bfd6 100644 --- a/computer/13/fluids.lua +++ b/computer/13/fluids.lua @@ -15,6 +15,7 @@ isFluid = { molten_zinc = true, molten_brass = true, compound_mixture = true, + molten_silver = true, } fluidDevicePos = { diff --git a/computer/13/machines.lua b/computer/13/machines.lua index 1c3c401..470f8e7 100644 --- a/computer/13/machines.lua +++ b/computer/13/machines.lua @@ -28,7 +28,7 @@ function spout(extra_items) selectFluidDevice("spout") connectTank(fluid.name) pumpToDevices(true) - sleep(10) + sleep(8) pumpToDevices(false) goTo(spout_pos, "south") takeDepot() @@ -272,7 +272,7 @@ function mix(extra_items, product, yield) connectTankOrAssign(stripModname(tank.name)) pumpToTanks(true) goTo(mixer_pos, "south") - while getFluidAmountInTanks(tank.name, pFront("tanks")) > 0 do + while getFluidAmountInTanks(stripModname(tank.name), pFront("tanks")) > 0 do sleep(0.1) end pumpToTanks(false) diff --git a/computer/13/recipes.txt b/computer/13/recipes.txt index 04a7066..be99592 100644 --- a/computer/13/recipes.txt +++ b/computer/13/recipes.txt @@ -14,10 +14,6 @@ yield 8 steps: furnace kelp:8 -rubber -steps: -mix sap - polished_rose_quartz base rose_quartz steps: @@ -326,7 +322,7 @@ craft copper_casing nil nil dried_kelp brass_funnel steps: -craft filter golden_sheet nil comparator observer nil andesite_tunnel andesite_funnel +craft electron_tube nil nil brass_ingot nil nil rubber filter steps: @@ -500,3 +496,42 @@ mechanical_crafter steps: craft electron_tube nil nil brass_casing nil nil precision_mechanism +basic_machine_frame +base copper_casing +intermediate incomplete_basic_machine_frame +repeat 4 +steps: +spout molten_silver:111 +deploy rubber +press + +molten_silver +base silver_ingot +yield 111 +steps: +melt + +integrated_circuit +base lapis_sheet +intermediate transitional_lapis_sheet +repeat 4 +steps: +spout molten_silver:41.6 +deploy copper_wire +deploy copper_wire +press + +lapis_sheet +base lapis_block +steps: +press + +copper_wire +base copper_sheet +yield 2 +steps: +rolling_mill + +lapis_block +steps: +craft lapis_lazuli lapis_lazuli lapis_lazuli lapis_lazuli lapis_lazuli lapis_lazuli lapis_lazuli lapis_lazuli lapis_lazuli