diff --git a/elepower_dynamics/crafting.lua b/elepower_dynamics/crafting.lua index 6c3de74..c6b27fa 100644 --- a/elepower_dynamics/crafting.lua +++ b/elepower_dynamics/crafting.lua @@ -193,7 +193,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "elepower_dynamics:chip 3", + output = "elepower_dynamics:chip 6", recipe = { {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}, {"default:mese_crystal", "dye:black", "default:mese_crystal"}, @@ -202,7 +202,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "elepower_dynamics:capacitor 3", + output = "elepower_dynamics:capacitor 6", recipe = { {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}, {"moreores:silver_ingot", "default:mese_crystal", "moreores:silver_ingot"}, @@ -244,6 +244,15 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = "elepower_dynamics:motor 3", + recipe = { + {"default:steel_ingot", "elepower_dynamics:wound_copper_coil", "default:steel_ingot"}, + {"elepower_dynamics:copper_wire", "elepower_dynamics:wound_copper_coil", "elepower_dynamics:copper_wire"}, + {"default:steel_ingot", "elepower_dynamics:capacitor", "default:steel_ingot"}, + } +}) + -------------- -- Smelting -- -------------- diff --git a/elepower_dynamics/craftitems.lua b/elepower_dynamics/craftitems.lua index 87dbfe6..d973e45 100644 --- a/elepower_dynamics/craftitems.lua +++ b/elepower_dynamics/craftitems.lua @@ -214,6 +214,12 @@ minetest.register_craftitem("elepower_dynamics:capacitor", { -- Assembled Components +minetest.register_craftitem("elepower_dynamics:motor", { + description = "Motor", + inventory_image = "elepower_motor.png", + groups = {motor = 1, component = 1} +}) + minetest.register_craftitem("elepower_dynamics:servo_valve", { description = "Servo Valve", inventory_image = "elepower_servo_valve.png", diff --git a/elepower_dynamics/textures/elepower_motor.png b/elepower_dynamics/textures/elepower_motor.png new file mode 100644 index 0000000..83f60b3 Binary files /dev/null and b/elepower_dynamics/textures/elepower_motor.png differ diff --git a/elepower_farming/crafting.lua b/elepower_farming/crafting.lua index b52ba16..1049e52 100644 --- a/elepower_farming/crafting.lua +++ b/elepower_farming/crafting.lua @@ -19,7 +19,7 @@ minetest.register_craft({ recipe = { {"elepower_dynamics:viridisium_ingot", "elepower_dynamics:control_circuit", "elepower_dynamics:viridisium_ingot"}, {"farming:hoe_steel", "elepower_farming:device_frame", "farming:hoe_steel"}, - {"elepower_dynamics:wound_copper_coil", "elepower_dynamics:diamond_gear", "elepower_dynamics:wound_copper_coil"}, + {"elepower_dynamics:wound_copper_coil", "elepower_dynamics:motor", "elepower_dynamics:wound_copper_coil"}, } }) @@ -29,7 +29,7 @@ minetest.register_craft({ recipe = { {"elepower_dynamics:viridisium_ingot", "elepower_dynamics:control_circuit", "elepower_dynamics:viridisium_ingot"}, {"default:axe_steel", "elepower_farming:device_frame", "farming:hoe_steel"}, - {"elepower_dynamics:wound_copper_coil", "elepower_dynamics:diamond_gear", "elepower_dynamics:wound_copper_coil"}, + {"elepower_dynamics:motor", "elepower_dynamics:diamond_gear", "elepower_dynamics:motor"}, } }) @@ -37,7 +37,7 @@ minetest.register_craft({ minetest.register_craft({ output = "elepower_farming:tree_extractor", recipe = { - {"default:steel_ingot", "bucket:bucket_empty", "default:steel_ingot"}, + {"elepower_dynamics:motor", "bucket:bucket_empty", "elepower_dynamics:motor"}, {"elepower_dynamics:tree_tap", "elepower_farming:device_frame", "elepower_dynamics:tree_tap"}, {"elepower_dynamics:copper_gear", "elepower_dynamics:servo_valve", "elepower_dynamics:copper_gear"}, } diff --git a/elepower_machines/crafting.lua b/elepower_machines/crafting.lua index a92781f..2f2c9c3 100644 --- a/elepower_machines/crafting.lua +++ b/elepower_machines/crafting.lua @@ -267,7 +267,7 @@ minetest.register_craft({ recipe = { {"elepower_dynamics:viridisium_ingot", "default:steel_ingot", "elepower_dynamics:viridisium_ingot"}, {"default:steel_ingot", "default:mese_crystal", "default:steel_ingot"}, - {"elepower_dynamics:viridisium_ingot", "elepower_dynamics:tin_gear", "elepower_dynamics:viridisium_ingot"}, + {"elepower_dynamics:viridisium_ingot", "elepower_dynamics:motor", "elepower_dynamics:viridisium_ingot"}, } }) diff --git a/elepower_tools/crafting.lua b/elepower_tools/crafting.lua new file mode 100644 index 0000000..9a6828e --- /dev/null +++ b/elepower_tools/crafting.lua @@ -0,0 +1,17 @@ + +minetest.register_craft({ + output = "elepower_tools:drill_bit", + recipe = { + {"", "default:steel_ingot", ""}, + {"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"}, + } +}) + +minetest.register_craft({ + output = "elepower_tools:hand_drill", + recipe = { + {"", "elepower_dynamics:wound_copper_coil", "elepower_tools:drill_bit"}, + {"default:steel_ingot", "elepower_dynamics:wound_copper_coil", "default:steel_ingot"}, + {"elepower_dynamics:motor", "elepower_dynamics:capacitor", ""}, + } +}) diff --git a/elepower_tools/craftitems.lua b/elepower_tools/craftitems.lua new file mode 100644 index 0000000..3ed8860 --- /dev/null +++ b/elepower_tools/craftitems.lua @@ -0,0 +1,5 @@ + +minetest.register_craftitem("elepower_tools:drill_bit", { + description = "Drill Bit", + inventory_image = "eletools_drill_bit.png", +}) diff --git a/elepower_tools/init.lua b/elepower_tools/init.lua index b3c49c7..00b5eb9 100644 --- a/elepower_tools/init.lua +++ b/elepower_tools/init.lua @@ -6,15 +6,6 @@ local modpath = minetest.get_modpath(minetest.get_current_modname()) eletool = rawget(_G, "eletool") or {} eletool.modpath = modpath -ele.register_tool("elepower_tools:test_tool", { - description = "Powertool", - inventory_image = "elepower_tool_ironpick.png", - tool_capabilities = { - full_punch_interval = 1.0, - max_drop_level=1, - groupcaps={ - cracky = {times={[1]=3.90, [2]=1.50, [3]=0.60}, maxlevel=2}, - }, - damage_groups = {fleshy=4}, - }, -}) +dofile(modpath .. "/tools.lua") +dofile(modpath .. "/craftitems.lua") +dofile(modpath .. "/crafting.lua") diff --git a/elepower_tools/textures/eletools_drill_bit.png b/elepower_tools/textures/eletools_drill_bit.png new file mode 100644 index 0000000..701270f Binary files /dev/null and b/elepower_tools/textures/eletools_drill_bit.png differ diff --git a/elepower_tools/textures/eletools_hand_drill.png b/elepower_tools/textures/eletools_hand_drill.png new file mode 100644 index 0000000..56f0a6b Binary files /dev/null and b/elepower_tools/textures/eletools_hand_drill.png differ diff --git a/elepower_tools/tools.lua b/elepower_tools/tools.lua new file mode 100644 index 0000000..c3539c0 --- /dev/null +++ b/elepower_tools/tools.lua @@ -0,0 +1,15 @@ + +ele.register_tool("elepower_tools:hand_drill", { + description = "Hand Drill", + inventory_image = "eletools_hand_drill.png", + wield_image = "eletools_hand_drill.png^[transformFX", + tool_capabilities = { + full_punch_interval = 0.2, + max_drop_level = 1, + groupcaps={ + cracky = {times={[1]=5, [2]=2, [3]=1}, maxlevel=4}, + }, + damage_groups = {fleshy=4}, + }, + ele_capacity = 8000 +})