From 7e67ae50682cebd72b7cae48b9bee64c503c6ec8 Mon Sep 17 00:00:00 2001 From: TheAIBot Date: Sat, 1 Oct 2016 02:44:45 +0200 Subject: [PATCH] fixed up the last things about the output tank --- clusterio_0.0.2/control.lua | 1 + clusterio_0.0.2/data.lua | 43 ++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/clusterio_0.0.2/control.lua b/clusterio_0.0.2/control.lua index 5294d3a2..cb2ab1b1 100644 --- a/clusterio_0.0.2/control.lua +++ b/clusterio_0.0.2/control.lua @@ -42,6 +42,7 @@ function AddEntity(entity) global.outputTanks = global.outputTanks or {} --add the chests to a lists if these chests so they can be interated over global.outputTanks[HashPosition(entity.position)] = entity + entity.active = false end end diff --git a/clusterio_0.0.2/data.lua b/clusterio_0.0.2/data.lua index 9c52891e..fa1bb0a4 100644 --- a/clusterio_0.0.2/data.lua +++ b/clusterio_0.0.2/data.lua @@ -84,15 +84,31 @@ MakeLogisticEntity(table.deepcopy(data.raw["logistic-container"]["logistic-chest MakeLogisticEntity(table.deepcopy(data.raw["container"]["iron-chest"]), INPUT_CHEST_NAME, INPUT_CHEST_PICTURE_PATH, { "picture" }, INPUT_CHEST_ICON_PATH) --make tanks ---MakeLogisticEntity(table.deepcopy(data.raw["storage-tank"]["storage-tank"]), OUTPUT_TANK_NAME, OUTPUT_TANK_PICTURE_PATH, { "pictures", "picture", "sheet" }, OUTPUT_TANK_ICON_PATH) MakeLogisticEntity(table.deepcopy(data.raw["storage-tank"]["storage-tank"]), INPUT_TANK_NAME, INPUT_TANK_PICTURE_PATH, { "pictures", "picture", "sheet" }, INPUT_TANK_ICON_PATH) + + + + + +-------------------------------------------------------- +--[[This section is purely to create the output tank]]-- +-------------------------------------------------------- + + + + + + + +local CRAFING_FLUID_CATEGORY_NAME = "crafting-fluids" + data:extend( { { type = "recipe-category", - name = "crafting-fluids" + name = CRAFING_FLUID_CATEGORY_NAME } }) @@ -114,8 +130,7 @@ fluidCreator.fluid_boxes = }, off_when_no_fluid_recipe = false } -fluidCreator.crafting_categories = {"crafting-fluids"} ---fluidCreator.energy_source = nil +fluidCreator.crafting_categories = {CRAFING_FLUID_CATEGORY_NAME} fluidCreator.energy_usage = "1kW" fluidCreator.ingredient_count = 1 fluidCreator.module_specification.module_slots = 0 @@ -127,15 +142,12 @@ for k,v in pairs(data.raw.fluid) do type = "recipe", name = v.name, icon = v.icon, - category = "crafting-fluids", + category = CRAFING_FLUID_CATEGORY_NAME, energy_required = 1, subgroup = "barrel", order = "b[fill-crude-oil-barrel]", enabled = true, - ingredients = - { - {type="item", name="none", amount=1} - }, + ingredients = {}, results= { {type="fluid", name=v.name, amount=-1} @@ -144,19 +156,6 @@ for k,v in pairs(data.raw.fluid) do }) end -data:extend( -{ - { - type = "item", - name = "none", - icon = "__clusterio__/graphics/icons/none.png", - flags = { "goes-to-quickbar" }, - subgroup = "intermediate-product", - order = "c[other]-a[power-switch]", - stack_size= 1, - } -}) -