diff --git a/computer/13/machines.lua b/computer/13/machines.lua index 0bbe08b..902d900 100644 --- a/computer/13/machines.lua +++ b/computer/13/machines.lua @@ -122,6 +122,15 @@ function compact(extra_items) printError("unimplemented :3") sfx.fail() end +function make_water(_,_,yield) + selectFluidDevice("water_source") + connectTanks({"water"}) + pumpToTanks(true) + print("waiting 30s for water tanks to fill") + sleep(30) + pumpToTanks(false) + fluidInvAdd("water", yield) +end function alloy(parts, product) for _, item in pairs(parts) do if not isFluid[item.name] then @@ -222,4 +231,5 @@ return { melt = melt, saw = saw, spout = spout, + make_water = make_water, } \ No newline at end of file diff --git a/computer/13/recipes.txt b/computer/13/recipes.txt index 69af36e..983b92c 100644 --- a/computer/13/recipes.txt +++ b/computer/13/recipes.txt @@ -2,6 +2,7 @@ belt_connector base dried_kelp intermediate dried_kelp repeat 3 +yield 6 steps: deploy rubber press @@ -9,12 +10,13 @@ deploy dried_kelp press dried_kelp +yield 8 steps: furnace kelp:8 rubber steps: -mix sap:2 +mix sap polished_rose_quartz base rose_quartz @@ -35,6 +37,7 @@ steps: press glass +yield 8 steps: furnace sand:8 @@ -43,6 +46,7 @@ steps: mill gravel:2 fluid_pipe +yield 2 steps: craft nil copper_sheet nil rubber rubber rubber nil copper_sheet @@ -52,6 +56,7 @@ steps: press andesite_alloy +yield 9 steps: craft andesite_alloy_block @@ -60,10 +65,12 @@ steps: craft birch_planks birch_planks birch_planks birch_planks redstone birch_planks birch_planks birch_planks birch_planks birch_planks +yield 4 steps: craft birch_log redstone +yield 9 steps: craft redstone_block @@ -86,6 +93,7 @@ steps: deploy_tool flint_knife stick +yield 4 steps: craft birch_planks nil nil birch_planks @@ -95,10 +103,12 @@ steps: press iron_ingot +yield 9 steps: craft iron_block cogwheel +yield 3 steps: craft andesite_alloy bronze_sheet @@ -126,6 +136,7 @@ steps: mill black_concrete_powder +yield 8 steps: craft black_dye sand sand sand sand gravel gravel gravel gravel @@ -158,6 +169,7 @@ steps: craft birch_planks birch_slab birch_planks birch_planks nil birch_planks birch_planks birch_slab birch_planks birch_slab +yield 6 steps: craft birch_planks birch_planks birch_planks @@ -166,6 +178,7 @@ steps: craft andesite_alloy andesite_alloy andesite_alloy andesite_alloy polished_rose_quartz andesite_alloy andesite_alloy glass_pane andesite_alloy glass_pane +yield 16 steps: craft glass glass glass glass glass glass @@ -191,6 +204,7 @@ steps: craft charcoal nil nil stick kelp +yield 10 steps: mix water kelp bone_meal:2 @@ -252,3 +266,8 @@ yield 50 base rotten_flesh steps: melt + +water +yield 20000 +steps: +make_water diff --git a/computer/13/test.lua b/computer/13/test.lua deleted file mode 100644 index 3860de3..0000000 --- a/computer/13/test.lua +++ /dev/null @@ -1,12 +0,0 @@ -function bar() - error("mmm", 4) -end - -function foo() - bar() -end - -while true do -foo() - -- error("aaaaa") -end