From 7de297dace6e13a17c2505855c2adbd95adeca6f Mon Sep 17 00:00:00 2001 From: Evert Prants Date: Tue, 22 Jan 2019 23:14:38 +0200 Subject: [PATCH] Fix enrichment plant, add speed and efficiency upgrades --- elepower_machines/craft.lua | 4 +- elepower_machines/crafting.lua | 15 ++++ elepower_machines/craftitems.lua | 82 +++++++++++++++--- elepower_machines/machines/storage.lua | 5 ++ .../textures/elepower_upgrade_efficiency.png | Bin 0 -> 521 bytes .../elepower_upgrade_efficiency_2.png | Bin 0 -> 515 bytes .../textures/elepower_upgrade_speed.png | Bin 0 -> 460 bytes elepower_machines/upgrading.lua | 40 ++++++--- .../machines/enrichment_plant.lua | 2 +- 9 files changed, 124 insertions(+), 24 deletions(-) create mode 100644 elepower_machines/textures/elepower_upgrade_efficiency.png create mode 100644 elepower_machines/textures/elepower_upgrade_efficiency_2.png create mode 100644 elepower_machines/textures/elepower_upgrade_speed.png diff --git a/elepower_machines/craft.lua b/elepower_machines/craft.lua index f617b83..e508a2f 100644 --- a/elepower_machines/craft.lua +++ b/elepower_machines/craft.lua @@ -79,6 +79,8 @@ function elepm.register_craft(craftdef) output = craftresult, time = time } + + table.insert(elepm.craft[ctype], recipe) if have_ui or have_cg then local spec = {} @@ -133,8 +135,6 @@ function elepm.register_craft(craftdef) }) end end - - table.insert(elepm.craft[ctype], recipe) end local no_recipe = { diff --git a/elepower_machines/crafting.lua b/elepower_machines/crafting.lua index 565f214..5aad3f0 100644 --- a/elepower_machines/crafting.lua +++ b/elepower_machines/crafting.lua @@ -330,6 +330,21 @@ local soldering_recipes = { recipe = { "elepower_machines:resonant_power_cell_0", "elepower_machines:super_capacitor 2", "elepower_dynamics:xycrone_lump" }, output = "elepower_machines:super_power_cell_0", time = 24, + }, + { + recipe = { "elepower_dynamics:integrated_circuit", "elepower_dynamics:induction_coil 2", "elepower_dynamics:soc" }, + output = "elepower_machines:upgrade_speed", + time = 16, + }, + { + recipe = { "elepower_dynamics:integrated_circuit", "elepower_machines:hardened_capacitor 2", "elepower_dynamics:soc" }, + output = "elepower_machines:upgrade_efficiency", + time = 16, + }, + { + recipe = { "elepower_machines:upgrade_efficiency", "elepower_machines:resonant_capacitor 2", "elepower_dynamics:soc" }, + output = "elepower_machines:upgrade_efficiency_2", + time = 16, } } diff --git a/elepower_machines/craftitems.lua b/elepower_machines/craftitems.lua index f2ddcf6..0bdf803 100644 --- a/elepower_machines/craftitems.lua +++ b/elepower_machines/craftitems.lua @@ -9,33 +9,101 @@ minetest.register_craftitem("elepower_machines:turbine_blades", { inventory_image = "elepower_turbine.png" }) +-- Pump Tube Roll +minetest.register_craftitem("elepower_machines:opaque_duct_roll", { + description = "Retractable Opaque Fluid Duct\nA Pump uses this to reach fluids.", + inventory_image = "elepower_opaque_duct.png", +}) + --------------- -- Upgrading -- --------------- -- Capacitors + minetest.register_craftitem("elepower_machines:hardened_capacitor", { description = "Hardened Capacitor\nTier 2 Capacitor", groups = {capacitor = 2, ele_upgrade_component = 1}, - inventory_image = "elepower_upgrade_hardened_capacitor.png" + inventory_image = "elepower_upgrade_hardened_capacitor.png", + ele_upgrade = { + capacity = { + multiplier = 1, + }, + }, }) minetest.register_craftitem("elepower_machines:reinforced_capacitor", { description = "Reinforced Capacitor\nIt will probably obliterate you if you touched it while charged\nTier 3 Capacitor", groups = {capacitor = 3, ele_upgrade_component = 1}, - inventory_image = "elepower_upgrade_reinforced_capacitor.png" + inventory_image = "elepower_upgrade_reinforced_capacitor.png", + ele_upgrade = { + capacity = { + multiplier = 10, + }, + }, }) minetest.register_craftitem("elepower_machines:resonant_capacitor", { description = "Resonant Capacitor\nTier 4 Capacitor", groups = {capacitor = 4, ele_upgrade_component = 1}, - inventory_image = "elepower_upgrade_resonant_capacitor.png" + inventory_image = "elepower_upgrade_resonant_capacitor.png", + ele_upgrade = { + capacity = { + multiplier = 100, + }, + }, }) minetest.register_craftitem("elepower_machines:super_capacitor", { description = "Supercapacitor\nAmazing energy density in a small container! Wow!\nTier 5 Capacitor", groups = {capacitor = 5, ele_upgrade_component = 1}, - inventory_image = "elepower_upgrade_supercapacitor.png" + inventory_image = "elepower_upgrade_supercapacitor.png", + ele_upgrade = { + capacity = { + multiplier = 1000, + }, + }, +}) + +-- Machine chips + +minetest.register_craftitem("elepower_machines:upgrade_speed", { + description = "Speed Upgrade\nCrafting Speed +1\nPower Usage +50%", + groups = {machine_chip = 2, ele_upgrade_component = 1}, + inventory_image = "elepower_upgrade_speed.png", + ele_upgrade = { + craft_speed = { + add = 1 + }, + usage = { + multiplier = 0.5 + }, + inrush = { + multiplier = 0.5 + } + } +}) + +minetest.register_craftitem("elepower_machines:upgrade_efficiency", { + description = "Efficiency Upgrade\nReduces power usage by 25%", + groups = {machine_chip = 2, ele_upgrade_component = 1}, + inventory_image = "elepower_upgrade_efficiency.png", + ele_upgrade = { + usage = { + divider = 0.25 + } + } +}) + +minetest.register_craftitem("elepower_machines:upgrade_efficiency_2", { + description = "Efficiency Upgrade\nReduces power usage by 50%", + groups = {machine_chip = 2, ele_upgrade_component = 1}, + inventory_image = "elepower_upgrade_efficiency_2.png", + ele_upgrade = { + usage = { + divider = 0.50 + } + } }) -- Accumulator filter @@ -62,9 +130,3 @@ minetest.register_craftitem("elepower_machines:heavy_filter", { return itemstack end }) - --- Pump Tube Roll -minetest.register_craftitem("elepower_machines:opaque_duct_roll", { - description = "Retractable Opaque Fluid Duct\nA Pump uses this to reach fluids.", - inventory_image = "elepower_opaque_duct.png", -}) diff --git a/elepower_machines/machines/storage.lua b/elepower_machines/machines/storage.lua index 2afbb8a..6f60837 100644 --- a/elepower_machines/machines/storage.lua +++ b/elepower_machines/machines/storage.lua @@ -7,6 +7,7 @@ elepm.register_storage("elepower_machines:power_cell", { description = "Power Cell", ele_capacity = 16000, ele_inrush = 128, + ele_output = 128, tiles = { "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", "elepower_machine_side.png", "elepower_machine_side.png", "elepower_power_cell.png", @@ -18,6 +19,7 @@ elepm.register_storage("elepower_machines:hardened_power_cell", { description = "Hardened Power Cell", ele_capacity = 64000, ele_inrush = 640, + ele_output = 640, tiles = { "elepower_machine_top.png^elepower_overlay_hardened.png", "elepower_machine_base.png^elepower_overlay_hardened.png", @@ -33,6 +35,7 @@ elepm.register_storage("elepower_machines:reinforced_power_cell", { description = "Reinforced Power Cell", ele_capacity = 128000, ele_inrush = 1024, + ele_output = 1024, tiles = { "elepower_machine_top.png^elepower_overlay_reinforced.png", "elepower_machine_base.png^elepower_overlay_reinforced.png", @@ -48,6 +51,7 @@ elepm.register_storage("elepower_machines:resonant_power_cell", { description = "Resonant Power Cell", ele_capacity = 640000, ele_inrush = 2048, + ele_output = 2048, tiles = { "elepower_machine_top.png^elepower_overlay_resonant.png", "elepower_machine_base.png^elepower_overlay_resonant.png", @@ -63,6 +67,7 @@ elepm.register_storage("elepower_machines:super_power_cell", { description = "Supercapacitor Cell", ele_capacity = 1280000, ele_inrush = 4096, + ele_output = 4096, tiles = { "elepower_machine_top.png^elepower_overlay_super.png", "elepower_machine_base.png^elepower_overlay_super.png", diff --git a/elepower_machines/textures/elepower_upgrade_efficiency.png b/elepower_machines/textures/elepower_upgrade_efficiency.png new file mode 100644 index 0000000000000000000000000000000000000000..bee34d09fbc55b23d1742d251031e5b0e2d0029c GIT binary patch literal 521 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Q_u zEIx);6XpYH&H|6fVg?31We{epSZZGe6l5>)^mS!_%qS+pr1$V<+dQC`Ki;O^-gkfN8$4zw=8)5S5w;`G%?d%X?^h#aps_vQ4= zUUe;LBG<8l2Ym|)1kBxQ+qs%1TXgTT`o-4uLu_AT-cjERL93TW1oedFulE&hzp&-% zqc!O}#n1hJJ*WEN{plU~(Jd|e7r1>rC-6(**gP+T+~tq=&AhU+)Hdb#f6s4=l*J6b zulai@6w2QXD+diQ&n zCc3NF{6*@8ef1KIEQ%bAi6>6Tu2wMmqgl`uao?4r?PUG#eGHOCX literal 0 HcmV?d00001 diff --git a/elepower_machines/textures/elepower_upgrade_efficiency_2.png b/elepower_machines/textures/elepower_upgrade_efficiency_2.png new file mode 100644 index 0000000000000000000000000000000000000000..84b33f5321a4fa9749434c0c78c86fe28de09452 GIT binary patch literal 515 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Q_u zEIx);6XpYH&H|6fVg?31We{epSZZGe6l5>)^mS!_%qS+Jt0A>a`WR41HZvrm#5q4V zH#M&W$Yo$~E=o--Nlj5G&n(GMaQE~LNYP7W2U-{9>Eak-ar)|{-F{4g0&V*@r0sC?IIe_qM3guzn%$;&jut2<-fZmNBKSt*5evY4`0=*b)XhPrXH_!)03I>xuW zq1(h{?i#t-!Y4|WtomLT^i1>dN2UgQqY94QERRcVXS0c&%W*j7Wma-LbyfG)aED_} zZnqbPd^maQVvfW4>1*D8<5+ApcizcoRr7znmJw&?OM0^KEsy$j!CG&IgZ>VS-)@*C zFXVP|M}92#@jlBvQk(W9d@}sN>EwBS`T+&r05495`SO}_qB%Qip0}&zh&euu zpPQSSR|4cRFgO>bCYGe8D3oWGWGJ|M`Ua%vrLqI9Q}%Rm46!(Ub&|awQ=q`H`p@?c ziHQkx?&iFau&1Hde8U%}2nid8@{deOs-5m1#I}e9y$A~6$T69CV&BG!mb*uLH(try zXa0ZR&wD8k?$6GN57+qR92%O}!4mDRm~+Uh-m>cDL6PJ@hUM4$9VC;v+rP8BlnZ{; z(91M;Wj#ONbyv)(I|pz53<~|KxqWxDofmVTvwUpog$)UfAK8yAmIzff_;79Z#C=TL zkILrg$hviKtUC3n$nEs69b3f&4@&9wE%jL-a4maB@2^^J{p=gUD`I^zSvQzEklG;yp5i;cPW=Pln3$8&5Q0eSy!e`7Tih