From 2d5da7beafb4721acbe5fad8a7abfc743e5c5d08 Mon Sep 17 00:00:00 2001 From: Evert Prants Date: Sun, 1 Jul 2018 18:56:31 +0300 Subject: [PATCH] New machine: Solderer; Crafting component tiers --- elepower_dynamics/crafting.lua | 13 +-- elepower_dynamics/craftitems.lua | 54 +++++++-- elepower_dynamics/dusts.lua | 105 ++++------------- elepower_dynamics/gears.lua | 107 +++++------------- .../textures/elepower_microcontroller.png | Bin 0 -> 1993 bytes .../textures/elepower_silicon.png | Bin 0 -> 367 bytes .../textures/elepower_silicon_wafer.png | Bin 0 -> 419 bytes .../textures/elepower_silicon_wafer_solar.png | Bin 0 -> 5913 bytes elepower_dynamics/textures/elepower_soc.png | Bin 0 -> 1448 bytes elepower_machines/crafting.lua | 71 +++++++++++- elepower_machines/formspec.lua | 4 +- elepower_machines/machines/assembler.lua | 17 --- elepower_machines/machines/init.lua | 4 +- elepower_machines/machines/solderer.lua | 17 +++ .../textures/elepower_solderer.png | Bin 0 -> 6712 bytes elepower_papi/machine.lua | 2 +- 16 files changed, 189 insertions(+), 205 deletions(-) create mode 100644 elepower_dynamics/textures/elepower_microcontroller.png create mode 100644 elepower_dynamics/textures/elepower_silicon.png create mode 100644 elepower_dynamics/textures/elepower_silicon_wafer.png create mode 100644 elepower_dynamics/textures/elepower_silicon_wafer_solar.png create mode 100644 elepower_dynamics/textures/elepower_soc.png delete mode 100644 elepower_machines/machines/assembler.lua create mode 100644 elepower_machines/machines/solderer.lua create mode 100644 elepower_machines/textures/elepower_solderer.png diff --git a/elepower_dynamics/crafting.lua b/elepower_dynamics/crafting.lua index 280cfe9..68177cd 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", + output = "elepower_dynamics:chip 3", 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", + output = "elepower_dynamics:capacitor 3", recipe = { {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}, {"moreores:silver_ingot", "default:mese_crystal", "moreores:silver_ingot"}, @@ -244,15 +244,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = "elepower_dynamics:control_circuit", - recipe = { - {"elepower_dynamics:chip", "elepower_dynamics:chip", "elepower_dynamics:chip"}, - {"elepower_dynamics:capacitor", "elepower_dynamics:integrated_circuit", "elepower_dynamics:capacitor"}, - {"default:gold_ingot", "elepower_dynamics:viridisium_ingot", "default:gold_ingot"}, - } -}) - -------------- -- Smelting -- -------------- diff --git a/elepower_dynamics/craftitems.lua b/elepower_dynamics/craftitems.lua index 90fb154..989e424 100644 --- a/elepower_dynamics/craftitems.lua +++ b/elepower_dynamics/craftitems.lua @@ -75,6 +75,24 @@ minetest.register_craftitem("elepower_dynamics:carbon_sheet", { groups = {carbon_fiber_sheet = 1, sheet = 1} }) +minetest.register_craftitem("elepower_dynamics:silicon", { + description = "Silicon", + inventory_image = "elepower_silicon.png", + groups = {silicon = 1, lump = 1} +}) + +minetest.register_craftitem("elepower_dynamics:silicon_wafer", { + description = "Silicon Wafer", + inventory_image = "elepower_silicon_wafer.png", + groups = {wafer = 1} +}) + +minetest.register_craftitem("elepower_dynamics:silicon_wafer_solar", { + description = "Silicon Wafer\nFor Solar Panel Crafting", + inventory_image = "elepower_silicon_wafer_solar.png", + groups = {wafer = 2} +}) + minetest.register_craftitem("elepower_dynamics:tree_tap", { description = "Steel Treetap", inventory_image = "elepower_tree_tap.png", @@ -117,13 +135,13 @@ minetest.register_craftitem("elepower_dynamics:acidic_compound", { -- Electronics minetest.register_craftitem("elepower_dynamics:wound_copper_coil", { - description = "Wound Copper Coil", + description = "Wound Copper Coil\nTier 1 Coil", inventory_image = "elepower_copper_coil.png", groups = {copper = 1, coil = 1, component = 1} }) minetest.register_craftitem("elepower_dynamics:wound_silver_coil", { - description = "Wound Silver Coil", + description = "Wound Silver Coil\nTier 2 Coil", inventory_image = "elepower_silver_coil.png", groups = {silver = 1, coil = 1, component = 1} }) @@ -135,21 +153,33 @@ minetest.register_craftitem("elepower_dynamics:copper_wire", { }) minetest.register_craftitem("elepower_dynamics:induction_coil", { - description = "Induction Coil", + description = "Induction Coil\nTier 3 Coil", inventory_image = "elepower_induction_coil.png", groups = {induction_coil = 1, component = 1} }) minetest.register_craftitem("elepower_dynamics:induction_coil_advanced", { - description = "Advanced Induction Coil\nSuitable for high-power applications", + description = "Advanced Induction Coil\nSuitable for high-power applications\nTier 4 Coil", inventory_image = "elepower_induction_coil_advanced.png", groups = {induction_coil = 1, component = 1} }) minetest.register_craftitem("elepower_dynamics:chip", { - description = "Chip", + description = "Chip\nTier 1 Chip", inventory_image = "elepower_chip.png", - groups = {ic = 2, component = 1} + groups = {chip = 1, component = 1} +}) + +minetest.register_craftitem("elepower_dynamics:microcontroller", { + description = "Microcontroller\nTier 2 Chip", + inventory_image = "elepower_microcontroller.png", + groups = {chip = 2, component = 1} +}) + +minetest.register_craftitem("elepower_dynamics:soc", { + description = "System on a Chip (SoC)\nTier 3 Chip", + inventory_image = "elepower_soc.png", + groups = {chip = 3, component = 1} }) minetest.register_craftitem("elepower_dynamics:capacitor", { @@ -167,21 +197,21 @@ minetest.register_craftitem("elepower_dynamics:servo_valve", { }) minetest.register_craftitem("elepower_dynamics:integrated_circuit", { - description = "Integrated Circuit", + description = "Integrated Circuit\nTier 1 Circuit", inventory_image = "elepower_ic.png", - groups = {ic = 1, assembled_component = 1} + groups = {circuit = 1, assembled_component = 1} }) minetest.register_craftitem("elepower_dynamics:control_circuit", { - description = "Integrated Control Circuit", + description = "Integrated Control Circuit\nTier 2 Circuit", inventory_image = "elepower_ic_2.png", - groups = {ic = 2, assembled_component = 1, control_circuit = 1} + groups = {circuit = 2, assembled_component = 1, control_circuit = 1} }) minetest.register_craftitem("elepower_dynamics:micro_circuit", { - description = "Microcontroller Circuit", + description = "Microcontroller Circuit\nTier 3 Circuit", inventory_image = "elepower_ic_3.png", - groups = {ic = 3, assembled_component = 1, control_circuit = 2} + groups = {circuit = 3, assembled_component = 1, control_circuit = 2} }) --------------- diff --git a/elepower_dynamics/dusts.lua b/elepower_dynamics/dusts.lua index 5a735e8..aafb057 100644 --- a/elepower_dynamics/dusts.lua +++ b/elepower_dynamics/dusts.lua @@ -29,84 +29,29 @@ function elepd.register_dust(mat, data) end -- Default dust list +local dusts = { + {"bronze", "Bronze", "#fa7b26"}, + {"copper", "Copper", "#fcb15f"}, + {"gold", "Gold", "#ffff47"}, + {"steel", "Steel", "#ffffff"}, + {"tin", "Tin", "#c1c1c1"}, + {"mithril", "Mithril", "#8686df"}, + {"silver", "Silver", "#d7e2e8"}, + {"lead", "Lead", "#aeaedc"}, + {"iron", "Iron", "#dddddd"}, + {"coal", "Coal", "#222222"}, + {"diamond", "Diamond", "#02c1e8"}, + {"nickel", "Nickel", "#d6d5ab"}, + {"invar", "Invar", "#9fa5b2"}, + {"electrum", "Electrum", "#ebeb90"}, + {"viridisium", "Viridisium", "#5b9751"}, + {"wood", "Sawdust", "#847454", true} +} -elepd.register_dust("bronze", { - description = "Bronze", - color = "#fa7b26" -}) - -elepd.register_dust("copper", { - description = "Copper", - color = "#fcb15f" -}) - -elepd.register_dust("gold", { - description = "Gold", - color = "#ffff47" -}) - -elepd.register_dust("steel", { - description = "Steel", - color = "#ffffff" -}) - -elepd.register_dust("tin", { - description = "Tin", - color = "#c1c1c1" -}) - -elepd.register_dust("mithril", { - description = "Mithril", - color = "#8686df" -}) - -elepd.register_dust("silver", { - description = "Silver", - color = "#d7e2e8" -}) - -elepd.register_dust("lead", { - description = "Lead", - color = "#aeaedc" -}) - -elepd.register_dust("iron", { - description = "Iron", - color = "#dddddd" -}) - -elepd.register_dust("coal", { - description = "Coal", - color = "#222222" -}) - -elepd.register_dust("diamond", { - description = "Diamond", - color = "#02c1e8" -}) - -elepd.register_dust("nickel", { - description = "Nickel", - color = "#d6d5ab" -}) - -elepd.register_dust("invar", { - description = "Invar", - color = "#9fa5b2" -}) - -elepd.register_dust("electrum", { - description = "Electrum", - color = "#ebeb90" -}) - -elepd.register_dust("viridisium", { - description = "Viridisium", - color = "#5b9751" -}) - -elepd.register_dust("wood", { - description = "Sawdust", - force_description = true, - color = "#847454" -}) +for _,dust in ipairs(dusts) do + elepd.register_dust(dust[1], { + description = dust[2], + color = dust[3], + force_description = dust[4], + }) +end diff --git a/elepower_dynamics/gears.lua b/elepower_dynamics/gears.lua index 069652c..3fda1ae 100644 --- a/elepower_dynamics/gears.lua +++ b/elepower_dynamics/gears.lua @@ -1,7 +1,7 @@ ----------------------- --- Ground materials -- ----------------------- +----------- +-- Gears -- +----------- elepd.registered_gears = {} @@ -19,84 +19,33 @@ function elepd.register_gear(mat, data) inventory_image = "elepower_gear.png^[multiply:" .. data.color, groups = { ["gear_" .. mat] = 1, - dust = 1 + gear = 1 } }) end --- Default dust list +-- Default gear list +local gears = { + {"bronze", "Bronze", "#fa7b26"}, + {"copper", "Copper", "#fcb15f"}, + {"gold", "Gold", "#ffff47"}, + {"steel", "Steel", "#ffffff"}, + {"tin", "Tin", "#c1c1c1"}, + {"mithril", "Mithril", "#8686df"}, + {"silver", "Silver", "#d7e2e8"}, + {"lead", "Lead", "#aeaedc"}, + {"iron", "Iron", "#dddddd"}, + {"coal", "Coal", "#222222"}, + {"diamond", "Diamond", "#02c1e8"}, + {"nickel", "Nickel", "#d6d5ab"}, + {"invar", "Invar", "#9fa5b2"}, + {"electrum", "Electrum", "#ebeb90"}, + {"viridisium", "Viridisium", "#5b9751"}, +} -elepd.register_gear("bronze", { - description = "Bronze", - color = "#fa7b26" -}) - -elepd.register_gear("copper", { - description = "Copper", - color = "#fcb15f" -}) - -elepd.register_gear("gold", { - description = "Gold", - color = "#ffff47" -}) - -elepd.register_gear("steel", { - description = "Steel", - color = "#ffffff" -}) - -elepd.register_gear("tin", { - description = "Tin", - color = "#c1c1c1" -}) - -elepd.register_gear("mithril", { - description = "Mithril", - color = "#8686df" -}) - -elepd.register_gear("silver", { - description = "Silver", - color = "#d7e2e8" -}) - -elepd.register_gear("lead", { - description = "Lead", - color = "#aeaedc" -}) - -elepd.register_gear("iron", { - description = "Iron", - color = "#dddddd" -}) - -elepd.register_gear("diamond", { - description = "Diamond", - color = "#02c1e8" -}) - -elepd.register_gear("wood", { - description = "Wood", - color = "#847454" -}) - -elepd.register_gear("nickel", { - description = "Nickel", - color = "#d6d5ab" -}) - -elepd.register_gear("invar", { - description = "Invar", - color = "#9fa5b2" -}) - -elepd.register_gear("electrum", { - description = "Electrum", - color = "#ebeb90" -}) - -elepd.register_gear("viridisium", { - description = "Viridisium", - color = "#5b9751" -}) +for _,gear in ipairs(gears) do + elepd.register_gear(gear[1], { + description = gear[2], + color = gear[3] + }) +end diff --git a/elepower_dynamics/textures/elepower_microcontroller.png b/elepower_dynamics/textures/elepower_microcontroller.png new file mode 100644 index 0000000000000000000000000000000000000000..d4236dd3ab12b7444a6f5e160ae6dfcbe533e524 GIT binary patch literal 1993 zcmV;)2R8VLP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|clI$i7{bvGMQBJ z8N0fTg%FaC9@vaOexK$yTT(9JW!AUQnU zdCgJj19S#IE4`_l0(y88Bts|a$BCkXIO_&?N8QNL*}$q`Q&f;+-Pxb_dd#v>a(XwR zDgV^@?FRhJ`tvSv43Uz@zh|3L6pS-lpWwH?6rGJ_tqWBJeR?;Sm7x<4N6zA(mxd1N zyX*>{Y5&7bpzt0qx^wCZpvA@}jOF_E`|CT+%~f3?{{ZPTqQ9WOA#Jup?}Yn=P<)I_Ns_G;TLRP z&R)0R&Pa)dIO+(pio1~z1I9_7Iu)8U_Onrgik=52JeeCiY6ip%FofHN+pn7@Cnv50 zWOfbV;6UX^7uws(-mX!`#+|Z3^bmxt`1n`1`3cjUE1`&NetZSJcx4*2SjZ6>OJD;c zG}WnLJNVw8uZ61vf?>Nk!@y$ek^uN?pjU9Y4YUJe!1E+9rLF?tB4`kx3^^cRBe_74 zY+^Qv2#(AEs6cggo-1IX5V%80_Rd9sgDk+_Sd(b8a^OQoAp{V?MT3OQK&SvL?*rl| z`HUDU!37^eh#`d>B$Vjl%CHzyTott>mwXB-rj&A$R7`f+=a6GgIcLd5SR5*D5agp| z5h(?m7Dz5wUBFOEO=11z{s*X$qQ)Dk#h4z{Kuzh2pjA%7!VHM9Cjg!n z0^|(y!pvs!o)>ZpGb_BxA4AEo!0EIQ1A=}Khe;21FXV!8@xQ^%00{mskTVOqA0YQD zZeO9+%WiaTBec?RIn_F3-;_CW;apay{Pt=7j^U@z{{?;X9CeS@X~eZgQOUk+vZd|= zd9+|&4?>9UM?e}V%PMe-1W}7%)*}8S#a?OkET+79ar~ereJu}tq@uE|O(A%*hG=VJ z1^t$X*!0uyA=eT7tii3kTCcsj5nBuT23w}bHikA2Cg;=( z3dNpEef4S@;ric|Pr$8h%$7}EH{m-NBj~c2wg#a{8&P!_Ebz9KqeDT_NQTdXR4nSl z3x>0Ml943({-(5lS6b3hZq{jVNLc3tRkB{dNzRB#(72QqjxFmzas1SLN@o`~U`$s- zC-${pg$w(!YE+pnCq9e`dP;sg9?lZeI7ta|@I+CEzZGf;2n*kCM4@`wjIcSOnX@Vi zmA8E+mxzcuKF%@Bhwm}%<@aRI;?xFZ)v4KW1x=5DTh)K>TpPmrm5?U~cRq4F9B43_ zi72L{C@iLIZ{%<@P;Riqw;%cN6Rqe@<(fh$9*r{;?^9t8sLq z@UUx!0GRtqhEn#a3>1nt+oQlF|b#*M-?mT|MZPeF09S4;E8C!5c`6`@ntcg!f} zt3cjbZV|@g#)xq!r2b^rSOxeAx1w>BEu1Zfqv7i1(!t-R;(;!LBzVn64d#vmT}vd&Iu_@+4WZ%l4JSONcR^1aMSj{S3hW7) zi0`mt!1|OEei`$!rNrH`aUyqZa6dwDhSU&ht3RnB=+sRmd-vr*!Fo6YKjU>bP8PXrcwG>NqXTz`770H8wf*5gH!qnL;;E z*eX5E4QFLl%=-~<34<#;hp1&_6~jDKKur1R$T++o&#oiA_*V|&v%ZV@6R;n8a_nat zI{*Lx24YJ`L;$1!YXBO>1YeQ>000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jT|- z2?!)+&;AMk000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0001_NklGi={Y}*E7OxA#M1|bA6GeqPq b5B|Ut9#cT7c!6U000000NkvXXu0mjf>{qM4 literal 0 HcmV?d00001 diff --git a/elepower_dynamics/textures/elepower_silicon.png b/elepower_dynamics/textures/elepower_silicon.png new file mode 100644 index 0000000000000000000000000000000000000000..9e1a35ad301c7c8ec8df69e9013ec6ff1f9c61a7 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=De8Ak0{?)V>TT$X?><>&pI!osmaeDCx=aXFwsz64!_l=ltB<)VvY~=c3falGGH1 z^30M91$R&1fbd2>aiF5>o-U3d7N?J1-Ye8(z{CEbJ}5e-+b~Hzg{$Vhb2% z^RxTE3vrln=8E_GI^WwYKgutpKPs^KnH?Lhs>{T8eDeFUYKDfH53Bb6ajD4KtZ^-0 z^emIh5_{XF9cR<5J8KwyFFz>Do)FY1Av~i}=qJ-1*>`;cOd(s(_bcW*#7<2~Gbo-R z>B7PwkUZx1Tup|BUGkdz9p+9tC=l!PC{xWt~$( F695~Hj4%KI literal 0 HcmV?d00001 diff --git a/elepower_dynamics/textures/elepower_silicon_wafer.png b/elepower_dynamics/textures/elepower_silicon_wafer.png new file mode 100644 index 0000000000000000000000000000000000000000..ba5bf981dac4f9f91ea3e4add2c908bb2cbdf66f GIT binary patch literal 419 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 GOa28UB+5qs literal 0 HcmV?d00001 diff --git a/elepower_dynamics/textures/elepower_soc.png b/elepower_dynamics/textures/elepower_soc.png new file mode 100644 index 0000000000000000000000000000000000000000..9de9dcc7e464a31d5b9993039b5144b09abf49d2 GIT binary patch literal 1448 zcmV;Z1y}lsP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+U-|clIti8{bv=k1SBCI%fURVW(TwUIbd+7-AO;{ z-p@7_3(G<}=tv|n?Z1D!`3D!1W#cqNpS-uYTylvsCefZ(o_Dft-q(ZOlXrS^yyYg2nGa|XL(WNWVS7y%!( zaU^?;gb~pa1$9(WWCuo}L<|}`IjWSYQ=76-0Yt}*10-`{p<^bh|OAbC4tz zO0 zUrE)O;63iw;8nn&&NN4CFxz8z0R4y3TXD%GT41PEC=q!#8&_b$Q0g|1F2RY~h#KxLH)0CA@H4Z`$q2di1GJ>HDvYb=YPjC@6 zlvUKJs@I@VlV&e|beQ+Sj}tWq2`*^xA%qxG$RI{RN4?g5@haUb2M?BJz3!5Uv6)nDm5=$z%a+QicuD*sEYpS_XLn$@awD}fV zY^mjrQtQ%P*Y11hu_x2>#oD6v!}tMfv{>WG)G!PeYtV+UUC=mAbZ`d7*bxX1g8>r5 zJUFwFoa4dV;LIjQS11Fd4st3D#=xL!#Ml_QgupB#}AWJ$|f%EN%D71 zFm;;aK;9GHlX!RdsWh1QW3LToB+p!@N?V}rSx>MqlP0L^>3}JXBA@2M&CDqdRCoEv zI^9OEZLUu-Ht(06UHkta%}s&Wdo>Q@dt~nV2$Uay0@1PU{RJx44XR&mFSF;lGoK{U zALk~)(&lfo6;@Vly>E^9rODnjf7-t0$&2dm-fKRyQM$BZgYE*+i8N#ziV1P6k8r9} z!y#nb24c@lcV}_zyoP7K>VONL_~lVbKW_f1BiUzOuL4ZnTYiQ;#Qwr%J9BjU{34Z4 zBeSad^gZEa<4bO1wg zWnpw>WFU8GbZ8()Nlj2!fese{007uYL_t(I%jJ^2PQx%1Mo(jVi1Ld9nNfKx_O?6` zya3OZfk?C|MNQ)Pc4`zy4FenETdZTrS32J{{Q0b=P!xp(K>&bK3TrLK7_7A(S5-B> z3#J3K)+AZZrfmtM7_Bu?k}?c~$J2NN!YHQMfAW6+z;pdU7{#294QYPI@vt9xQK2kL z5fPkoD5Y@D0U#nC*L8hc;hJ6Fv+cS?_O$00+rH=37?e`HbR7aC@7k6(W0n;j*H7}* z9Ej75TW6BxoWD=r7JlsD>Ob#f+QDjOAiw!P|2-Gvr*EFXT32=e0000= 3 then y = 0.5 + end + + if in_width >= 2 then x = 1 end diff --git a/elepower_machines/machines/assembler.lua b/elepower_machines/machines/assembler.lua deleted file mode 100644 index 1e849ed..0000000 --- a/elepower_machines/machines/assembler.lua +++ /dev/null @@ -1,17 +0,0 @@ - -elepm.register_craft_type("assembly", { - description = "Assembly", - inputs = 9, -}) - -elepm.register_crafter("elepower_machines:assembler", { - description = "Assembler", - craft_type = "assembly", - tiles = { - "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", - "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png", - }, - groups = {oddly_breakable_by_hand = 1}, - ele_capacity = 64000, - ele_usage = 124 -}) diff --git a/elepower_machines/machines/init.lua b/elepower_machines/machines/init.lua index 324ba32..f2b8903 100644 --- a/elepower_machines/machines/init.lua +++ b/elepower_machines/machines/init.lua @@ -11,6 +11,4 @@ dofile(elepm.modpath.."/machines/sawmill.lua") dofile(elepm.modpath.."/machines/generator.lua") dofile(elepm.modpath.."/machines/storage.lua") dofile(elepm.modpath.."/machines/lava_cooler.lua") - --- Hardened -dofile(elepm.modpath.."/machines/assembler.lua") +dofile(elepm.modpath.."/machines/solderer.lua") diff --git a/elepower_machines/machines/solderer.lua b/elepower_machines/machines/solderer.lua new file mode 100644 index 0000000..d12821f --- /dev/null +++ b/elepower_machines/machines/solderer.lua @@ -0,0 +1,17 @@ + +elepm.register_craft_type("solder", { + description = "Soldering", + inputs = 3, +}) + +elepm.register_crafter("elepower_machines:solderer", { + description = "Solderer", + craft_type = "solder", + tiles = { + "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_solderer.png", + }, + groups = {oddly_breakable_by_hand = 1, cracky = 2}, + ele_capacity = 28000, + ele_usage = 128, +}) diff --git a/elepower_machines/textures/elepower_solderer.png b/elepower_machines/textures/elepower_solderer.png new file mode 100644 index 0000000000000000000000000000000000000000..8d08f75829fea60b0576c708bf024a53f71e59bc GIT binary patch literal 6712 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 M;whs1@!@m-1uQtgW&i*H literal 0 HcmV?d00001 diff --git a/elepower_papi/machine.lua b/elepower_papi/machine.lua index b3a9289..0088a78 100644 --- a/elepower_papi/machine.lua +++ b/elepower_papi/machine.lua @@ -97,7 +97,7 @@ local function preserve_metadata(pos, oldnode, oldmeta, drops) for i,stack in pairs(drops) do local stack_meta = stack:get_meta() stack_meta:set_int("storage", storage) - stack_meta:set_string("description", nodedesc.."\nCharge: " .. storage .. "/" .. capacity .. " " .. ele.unit) + stack_meta:set_string("description", nodedesc .. "\n" .. ele.capacity_text(capacity, storage)) drops[i] = stack end