From aa43ab2ca67ecfd6fb18935fd9be0d8b60ef0fc8 Mon Sep 17 00:00:00 2001 From: Evert Prants Date: Fri, 14 Sep 2018 17:29:34 +0300 Subject: [PATCH] Alpha 7 --- elepower_dynamics/crafting.lua | 8 +-- elepower_dynamics/craftitems.lua | 2 +- elepower_dynamics/depends.txt | 2 +- elepower_dynamics/mod.conf | 4 +- elepower_dynamics/worldgen.lua | 64 +++++++++----------- elepower_farming/machines/tree_processor.lua | 10 +-- elepower_machines/crafting.lua | 23 +++---- elepower_solar/crafting.lua | 2 +- elepower_solar/generator.lua | 1 + 9 files changed, 52 insertions(+), 64 deletions(-) diff --git a/elepower_dynamics/crafting.lua b/elepower_dynamics/crafting.lua index a3a5854..81c06fa 100644 --- a/elepower_dynamics/crafting.lua +++ b/elepower_dynamics/crafting.lua @@ -198,7 +198,7 @@ minetest.register_craft({ output = "elepower_dynamics:chip 6", recipe = { {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}, - {"default:mese_crystal", "dye:black", "default:mese_crystal"}, + {"default:mese_crystal", "group:color_black", "default:mese_crystal"}, {"default:copper_ingot", "moreores:silver_ingot", "default:copper_ingot"}, } }) @@ -208,7 +208,7 @@ minetest.register_craft({ recipe = { {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}, {"moreores:silver_ingot", "default:mese_crystal", "moreores:silver_ingot"}, - {"default:copper_ingot", "dye:violet", "default:copper_ingot"}, + {"default:copper_ingot", "group:color_violet", "default:copper_ingot"}, } }) @@ -292,7 +292,7 @@ minetest.register_craft({ minetest.register_craft({ output = "elepower_dynamics:lcd_panel", recipe = { - {"dye:red", "dye:green", "dye:blue"}, + {"group:color_red", "group:color_green", "group:color_blue"}, {"moreores:silver_ingot", "elepower_dynamics:wound_copper_coil", "moreores:silver_ingot"}, {"", "default:meselamp", ""} } @@ -302,7 +302,7 @@ minetest.register_craft({ output = "elepower_dynamics:pv_cell", recipe = { {"group:glass", "group:glass", "group:glass"}, - {"dye:blue", "elepower_dynamics:silicon_wafer_doped", "dye:blue"}, + {"group:color_blue", "elepower_dynamics:silicon_wafer_doped", "group:color_blue"}, {"default:mese_crystal_fragment", "elepower_dynamics:wound_copper_coil", "default:mese_crystal_fragment"} } }) diff --git a/elepower_dynamics/craftitems.lua b/elepower_dynamics/craftitems.lua index bc79251..66c58b9 100644 --- a/elepower_dynamics/craftitems.lua +++ b/elepower_dynamics/craftitems.lua @@ -112,7 +112,7 @@ minetest.register_craftitem("elepower_dynamics:silicon_wafer", { }) minetest.register_craftitem("elepower_dynamics:silicon_wafer_doped", { - description = "Doped Silicon Wafer\nFor Solar Panel Crafting", + description = "Doped Silicon Wafer", inventory_image = "elepower_silicon_wafer_solar.png", groups = {wafer = 2} }) diff --git a/elepower_dynamics/depends.txt b/elepower_dynamics/depends.txt index 4e3a699..e1bfefc 100644 --- a/elepower_dynamics/depends.txt +++ b/elepower_dynamics/depends.txt @@ -2,7 +2,7 @@ elepower_papi elepower_fapi default fluid_tanks -dye +dye? moreores? pipeworks? homedecor? diff --git a/elepower_dynamics/mod.conf b/elepower_dynamics/mod.conf index 536550d..4af6f48 100644 --- a/elepower_dynamics/mod.conf +++ b/elepower_dynamics/mod.conf @@ -1,4 +1,4 @@ name = elepower_dynamics description = Elepower Dynamics. Conduits and materials! -depends = elepower_papi,elepower_fapi,default,fluid_tanks,dye -optional_depends = moreores,pipeworks,homedecor +depends = elepower_papi,elepower_fapi,default,fluid_tanks +optional_depends = moreores,pipeworks,homedecor,dye diff --git a/elepower_dynamics/worldgen.lua b/elepower_dynamics/worldgen.lua index a1e6f4a..77a97b0 100644 --- a/elepower_dynamics/worldgen.lua +++ b/elepower_dynamics/worldgen.lua @@ -1,6 +1,4 @@ -local easycrafting = minetest.settings:get("elepower_easy_crafting") == true - -------------- -- Worldgen -- -------------- @@ -66,40 +64,38 @@ minetest.register_ore({ -- Viridisium -if not easycrafting then - minetest.register_ore({ - ore_type = "scatter", - ore = "elepower_dynamics:stone_with_viridisium", - wherein = "default:stone", - clust_scarcity = 25 * 25 * 25, - clust_num_ores = 5, - clust_size = 3, - y_max = -1028, - y_min = -31000, - }) +minetest.register_ore({ + ore_type = "scatter", + ore = "elepower_dynamics:stone_with_viridisium", + wherein = "default:stone", + clust_scarcity = 25 * 25 * 25, + clust_num_ores = 5, + clust_size = 3, + y_max = -1028, + y_min = -31000, +}) - minetest.register_ore({ - ore_type = "scatter", - ore = "elepower_dynamics:stone_with_viridisium", - wherein = "default:stone", - clust_scarcity = 20 * 20 * 20, - clust_num_ores = 5, - clust_size = 3, - y_max = -8096, - y_min = -31000, - }) +minetest.register_ore({ + ore_type = "scatter", + ore = "elepower_dynamics:stone_with_viridisium", + wherein = "default:stone", + clust_scarcity = 20 * 20 * 20, + clust_num_ores = 5, + clust_size = 3, + y_max = -8096, + y_min = -31000, +}) - minetest.register_ore({ - ore_type = "scatter", - ore = "elepower_dynamics:stone_with_viridisium", - wherein = "default:stone", - clust_scarcity = 10 * 10 * 10, - clust_num_ores = 5, - clust_size = 3, - y_max = -12000, - y_min = -31000, - }) -end +minetest.register_ore({ + ore_type = "scatter", + ore = "elepower_dynamics:stone_with_viridisium", + wherein = "default:stone", + clust_scarcity = 10 * 10 * 10, + clust_num_ores = 5, + clust_size = 3, + y_max = -12000, + y_min = -31000, +}) -- Zinc diff --git a/elepower_farming/machines/tree_processor.lua b/elepower_farming/machines/tree_processor.lua index f921000..2727ebf 100644 --- a/elepower_farming/machines/tree_processor.lua +++ b/elepower_farming/machines/tree_processor.lua @@ -1,17 +1,17 @@ local tree_fluid_recipes = { ["elepower_farming:tree_sap_source"] = { - water = 100, - amount = 100, + water = 1000, + amount = 1000, time = 5, output = { fluid = "elepower_farming:biomass_source", - amount = 80, + amount = 40, }, }, ["elepower_farming:resin_source"] = { - water = 100, - amount = 100, + water = 1000, + amount = 1000, time = 5, output = { fluid = "elepower_farming:biomass_source", diff --git a/elepower_machines/crafting.lua b/elepower_machines/crafting.lua index eb8f578..9c636a4 100644 --- a/elepower_machines/crafting.lua +++ b/elepower_machines/crafting.lua @@ -197,21 +197,12 @@ for name in pairs(minetest.registered_nodes) do end end -if easycrafting then - elepm.register_craft({ - type = "compress", - recipe = { "default:steel_block 9" }, - output = "elepower_dynamics:xycrone_lump", - time = 20, - }) -else - elepm.register_craft({ - type = "compress", - recipe = { "elepower_dynamics:viridisium_block 9" }, - output = "elepower_dynamics:xycrone_lump", - time = 20, - }) -end +elepm.register_craft({ + type = "compress", + recipe = { "elepower_dynamics:viridisium_block 9" }, + output = "elepower_dynamics:xycrone_lump", + time = 20, +}) elepm.register_craft({ type = "compress", @@ -533,7 +524,7 @@ minetest.register_craft({ minetest.register_craft({ output = "elepower_machines:canning_machine", recipe = { - {"elepower_dynamics:wound_copper_coil", "elepower_dynamics:tree_tap", "elepower_dynamics:wound_copper_coil"}, + {"elepower_dynamics:wound_copper_coil", "elepower_machines:compressor_piston", "elepower_dynamics:wound_copper_coil"}, {"elepower_dynamics:tin_can", "elepower_machines:machine_block", "elepower_dynamics:tin_can"}, {"elepower_dynamics:steel_gear", "elepower_dynamics:tin_gear", "elepower_dynamics:steel_gear"}, } diff --git a/elepower_solar/crafting.lua b/elepower_solar/crafting.lua index f9692dd..db67cc3 100644 --- a/elepower_solar/crafting.lua +++ b/elepower_solar/crafting.lua @@ -5,6 +5,6 @@ minetest.register_craft({ recipe = { {"group:glass", "elepower_dynamics:pv_cell", "group:glass"}, {"elepower_dynamics:pv_cell", "group:glass", "elepower_dynamics:pv_cell"}, - {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, + {"default:steel_ingot", "elepower_dynamics:battery", "default:steel_ingot"}, } }) diff --git a/elepower_solar/generator.lua b/elepower_solar/generator.lua index b8964c9..dce02e7 100644 --- a/elepower_solar/generator.lua +++ b/elepower_solar/generator.lua @@ -34,6 +34,7 @@ function elesolar.register_solar_generator(nodename, nodedef) }, tube = false, ele_usage = 8, + ele_capacity = 64, on_timer = function (pos, elapsed) local refresh = true local meta = minetest.get_meta(pos)