From 88f42539bb378ec25410967634c1e3ae274473a3 Mon Sep 17 00:00:00 2001 From: dokutan <54861821+dokutan@users.noreply.github.com> Date: Sun, 03 May 2020 19:53:43 +0200 Subject: [PATCH] Fix error caused by locked chest recipes (#548) --- technic/items.lua | 65 ++++++++++++++++++-------------- 1 files changed, 37 insertions(+), 28 deletions(-) diff --git a/technic/items.lua b/technic/items.lua index b974b95..cf57229 100644 --- a/technic/items.lua +++ b/technic/items.lua @@ -35,7 +35,7 @@ fleshy = {times={}, uses=10000, maxlevel=0} } } -}) +}) minetest.register_tool("technic:green_energy_crystal", { description = S("Green Energy Crystal"), @@ -51,7 +51,7 @@ fleshy = {times={}, uses=10000, maxlevel=0} } } -}) +}) minetest.register_tool("technic:red_energy_crystal", { description = S("Red Energy Crystal"), @@ -67,22 +67,6 @@ fleshy = {times={}, uses=10000, maxlevel=0} } } -}) - - -minetest.register_craftitem("technic:fine_copper_wire", { - description = S("Fine Copper Wire"), - inventory_image = "technic_fine_copper_wire.png", -}) - -minetest.register_craftitem("technic:fine_gold_wire", { - description = S("Fine Gold Wire"), - inventory_image = "technic_fine_gold_wire.png", -}) - -minetest.register_craftitem("technic:fine_silver_wire", { - description = S("Fine Silver Wire"), - inventory_image = "technic_fine_silver_wire.png", }) minetest.register_craftitem("technic:copper_coil", { @@ -90,20 +74,11 @@ inventory_image = "technic_copper_coil.png", }) -minetest.register_craftitem("technic:motor", { - description = S("Electric Motor"), - inventory_image = "technic_motor.png", -}) - minetest.register_craftitem("technic:lv_transformer", { description = S("Low Voltage Transformer"), inventory_image = "technic_lv_transformer.png", }) -minetest.register_craftitem("technic:lv_transformer", { - description = S("Low Voltage Transformer"), - inventory_image = "technic_lv_transformer.png", -}) minetest.register_craftitem("technic:mv_transformer", { description = S("Medium Voltage Transformer"), inventory_image = "technic_mv_transformer.png", @@ -170,11 +145,44 @@ inventory_image = "technic_uranium_ingot.png", groups = {uranium_ingot=1, not_in_creative_inventory=nici}, }); + -- Note on radioactivity of blocks: + -- Source: <http://www.wise-uranium.org/rup.html> + -- The baseline radioactivity of an isotope is not especially + -- correlated with whether it's fissile (i.e., suitable as + -- reactor fuel). Natural uranium consists mainly of fissile + -- U-235 and non-fissile U-238, and both U-235 and U-238 are + -- significantly radioactive. U-235's massic activity is + -- about 80.0 MBq/kg, and U-238's is about 12.4 MBq/kg, which + -- superficially suggests that 3.5%-fissile uranium should have + -- only 1.19 times the activity of fully-depleted uranium. + -- But a third isotope affects the result hugely: U-234 has + -- massic activity of 231 GBq/kg. Natural uranium has massic + -- composition of 99.2837% U-238, 0.711% U-235, and 0.0053% U-234, + -- so its activity comes roughly 49% each from U-234 and U-238 + -- and only 2% from U-235. During enrichment via centrifuge, + -- the U-234 fraction is concentrated along with the U-235, with + -- the U-234:U-235 ratio remaining close to its original value. + -- (Actually the U-234 gets separated from U-238 slightly more + -- than the U-235 is, so the U-234:U-235 ratio is slightly + -- higher in enriched uranium.) A typical massic composition + -- for 3.5%-fissile uranium is 96.47116% U-238, 3.5% U-235, and + -- 0.02884% U-234. This gives 3.5%-fissile uranium about 6.55 + -- times the activity of fully-depleted uranium. The values we + -- compute here for the "radioactive" group value are based on + -- linear interpolation of activity along that scale, rooted at + -- a natural (0.7%-fissile) uranium block having the activity of + -- 9 uranium ore blocks (due to 9 ingots per block). The group + -- value is proportional to the square root of the activity, and + -- uranium ore has radioactive=1. This yields radioactive=1.0 + -- for a fully-depleted uranium block and radioactive=2.6 for + -- a 3.5%-fissile uranium block. + local radioactivity = math.floor(math.sqrt((1+5.55*p/35) * 18 / (1+5.55*7/35)) + 0.5); (ov or minetest.register_node)(block, { description = string.format(S("%.1f%%-Fissile Uranium Block"), p/10), tiles = {"technic_uranium_block.png"}, is_ground_content = true, - groups = {uranium_block=1, not_in_creative_inventory=nici, cracky=1, level=2, radioactive=math.floor(math.sqrt(p) + 0.5)}, + groups = {uranium_block=1, not_in_creative_inventory=nici, + cracky=1, level=2, radioactive=radioactivity}, sounds = default.node_sound_stone_defaults(), }); if not ov then @@ -192,3 +200,4 @@ }) end end + -- Gitblit v1.8.0