From 718a5beda197cd0a775fd41aedfb5b1bbd5d1d8b Mon Sep 17 00:00:00 2001 From: ZettaScript <contact@zettascript.org> Date: Thu, 20 Oct 2022 17:56:10 +0200 Subject: [PATCH] Supply converter: demany only the needed power (#577) --- technic/radiation.lua | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/technic/radiation.lua b/technic/radiation.lua index a4c49c6..7092b69 100644 --- a/technic/radiation.lua +++ b/technic/radiation.lua @@ -146,7 +146,7 @@ ["moreores:mithril_block"] = 26, ["moreores:silver_block"] = 53, ["snow:snow_brick"] = 2.8, - ["technic:brass_block"] = 43, + ["basic_materials:brass_block"] = 43, ["technic:carbon_steel_block"] = 40, ["technic:cast_iron_block"] = 40, ["technic:chernobylite_block"] = 40, @@ -244,7 +244,6 @@ need to be considered. --]] local abdomen_offset = 1 -local cache_scaled_shielding = {} local rad_dmg_cutoff = 0.2 local radiated_players = {} @@ -294,6 +293,8 @@ end if ag.radiation then return 0.01 * ag.radiation + elseif armor_enabled then + return 0 end if ag.fleshy then return math.sqrt(0.01 * ag.fleshy) @@ -309,7 +310,7 @@ end local function dmg_object(pos, object, strength) - local obj_pos = vector.add(object:getpos(), calculate_object_center(object)) + local obj_pos = vector.add(object:get_pos(), calculate_object_center(object)) local mul if armor_enabled or entity_damage then -- we need to check may the object be damaged even if armor is disabled @@ -338,7 +339,7 @@ local max_dist = strength * rad_dmg_mult_sqrt for _, o in pairs(minetest.get_objects_inside_radius(pos, max_dist + abdomen_offset)) do - if entity_damage or o:is_player() then + if (entity_damage or o:is_player()) and o:get_hp() > 0 then dmg_object(pos, o, strength) end end @@ -427,7 +428,7 @@ liquidtype = state, liquid_alternative_flowing = "technic:corium_flowing", liquid_alternative_source = "technic:corium_source", - liquid_viscosity = LAVA_VISC, + liquid_viscosity = 7, -- like lava liquid_renewable = false, damage_per_second = 6, post_effect_color = {a=192, r=80, g=160, b=80}, @@ -513,4 +514,3 @@ end, }) end - -- Gitblit v1.8.0