From 8c2db4ce2bd5ddb5ae53eb178aca415cf75de91b Mon Sep 17 00:00:00 2001 From: Evert Prants Date: Fri, 3 Aug 2018 13:15:31 +0300 Subject: [PATCH] Motor component, hand drill --- elepower_dynamics/crafting.lua | 13 +++++++++++-- elepower_dynamics/craftitems.lua | 6 ++++++ elepower_dynamics/textures/elepower_motor.png | Bin 0 -> 443 bytes elepower_farming/crafting.lua | 6 +++--- elepower_machines/crafting.lua | 2 +- elepower_tools/crafting.lua | 17 +++++++++++++++++ elepower_tools/craftitems.lua | 5 +++++ elepower_tools/init.lua | 15 +++------------ elepower_tools/textures/eletools_drill_bit.png | Bin 0 -> 796 bytes .../textures/eletools_hand_drill.png | Bin 0 -> 1137 bytes elepower_tools/tools.lua | 15 +++++++++++++++ 11 files changed, 61 insertions(+), 18 deletions(-) create mode 100644 elepower_dynamics/textures/elepower_motor.png create mode 100644 elepower_tools/crafting.lua create mode 100644 elepower_tools/craftitems.lua create mode 100644 elepower_tools/textures/eletools_drill_bit.png create mode 100644 elepower_tools/textures/eletools_hand_drill.png create mode 100644 elepower_tools/tools.lua 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 0000000000000000000000000000000000000000..83f60b339da0f822027f36cd3bdeddf3726af1e5 GIT binary patch literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEc>7kFTyQ%j8;X%IcUfQ_@TGk5|IGKL@t8I>;R7 zIQ(JupDp|Rr;3T`_2Gh~_mRIxKCENyvSnULlZnBvVU zwRV}PQ$p4o!LJX)bvDqkZ&?v94mAI5 iUg$UNFaJ+}Vf}b3>|pAN`|-dqW$<+Mb6Mw<&;$UO?5gqr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..701270fe5b3a1f4fec4bcabcab6d3226c3dd40c9 GIT binary patch literal 796 zcmV+%1LOROP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00M+bL_t(o!|j$aYZO5g$N%$Y zb|>u2=GNSW134`0^aCh}q?gnoeTu|N5E2sXtPVni;5YCK7?2b~iZp_Sg*Fy~U}3@` z$+56IyO-?F%~+U55H5*_Hv6mRz4^Vz8{Pm74Gj(d8TL29+uPeDrIglM2qEB{0}-LB zDlo?E`uci3DTlc3>$-5d;D1x`uNO z-uvkY#BuDSC>kV5a=R=`L{S6)AR=h35r!f1JV%yg5JEr*0md#r+cfFG>gwvK*Xuot z<9Mu;`mJgJkWyl9ZVpM3fOC$bD8M;Sg%Af*>A*#`Ie=6t)v?yX7z6J;!Z3uC5}b2{ zVTd3I;GFZL(de`H{$MH{xZsob{;{=osFXsx-3AfC7=tuTaejV|@pug99P&K(*4lUD z@z_pHU}0gw8)Np0qFBlEd`Lu4N+FJ8IOk9l1+px|$;k=QH1*E8j{w{>JAlQ-MORhT zzO{BO%d(-h7E(&g&(A|^4FJfp%metq7<<39wKZJ<09aaDasc+MwJWEmr$b{5oO1|* z0N#7lb^W8R>n9r<8{en)3jQSFz2CRiu9amu%<~*&S)#6Mlw~Qas=9fVd~}^Xu)MtN zk|cTEYPD9PDEd~{^&m}C@4f#*L~sAuHat8$BmgrO`ncNqnDeTn_rtxMnglx aRrm?L!YEDY6G;UC0000e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00Y@cL_t(o!`+t6Ya~S&#(!^h zcY2cUnK54m!ZHUhll2c!5WzjH2f=?~J?w%=6j|JS30?#t5HN^22znCyFZL>kc<>}7 z9y~-skmwHS>G|yHDi2+qo$R{1&LnHVhNkAD>Uo~`d7r9oxZ+Em7x2!`jtavt)LP^F zKE@c7QVfSfL_`DG+S(faWs>gg?a}Y|5s_<3saKU!+rIDnN-0DH5kV=1G3Hy~Q{Zw0 z?C$QOlnO=UEfINLL|&VjnR%sNuX|AxVXZ|(Fvf6nbVQn_^X1wL3E1A=R={;2_B`)% z&+}ehSXh|#{Q@?MB5Ji7N+|%e)*K%npToG2fRDfXD&M_x_qRBX8%ilJj$>I`T0%tV zbULJIiq@JqjtPQ*EXy#)V6DYk3xJxKeWhUu;iGT9cxicg*{{`V631}?suXb?GdDK} zK$0Y!o}Q9r86rjQ%W-lCLSPPPLA6@VMZ`-EU<9HkUfQ&ZGxH7b>g?e%)USZnXE zudh!ipxLlYIr1Es0%~yMy?2PBi23<>lv1Q=N~_gkFc^^MImQ^;?Y7lgf1l^MF5$)( z-~qEEt34nt#+&coMkz%UMO3R*j4^aN9g-yBeVaVd*B4sd>B(cCxBJ#u5*4Bgq#8n@<$^nKz>cm7vOWyq84r!WVj3EdD zthHoW_D7awABxEDqmXK>-g~Z69wE0b3xPva@bNmT3WzUP*QDF+vbniA z!TUh7VW~L*11BJGcYg$>Bpf~@=HT#|`2I8d?z_JCfu181_gy*S+>v(wJ@MlLN~`xr z7MI(utgQS;yWr*SbI*-q5T9>BvtiHudT=N-8