diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index fbf052f..eba0c7e 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -551,8 +551,9 @@ mesecon_lamp_box = { minetest.register_node("default:torch", { drawtype = "nodebox", - tiles = {"default_torch.png", "default_torch_side.png"}, - inventory_image = "default_torch.png", + description = "Electrical lamp", + tiles = {"default_torch.png"}, + inventory_image = "default_torch_inventory.png", wield_light = 5, paramtype = "light", paramtype2 = "wallmounted", diff --git a/mods/default/textures/default_bronze_block.png b/mods/default/textures/default_bronze_block.png index ca5f85b..32b4afa 100644 Binary files a/mods/default/textures/default_bronze_block.png and b/mods/default/textures/default_bronze_block.png differ diff --git a/mods/default/textures/default_copper_block.png b/mods/default/textures/default_copper_block.png index 1224685..e3b6537 100644 Binary files a/mods/default/textures/default_copper_block.png and b/mods/default/textures/default_copper_block.png differ diff --git a/mods/default/textures/default_diamond_block.png b/mods/default/textures/default_diamond_block.png index 7680335..a6206e0 100644 Binary files a/mods/default/textures/default_diamond_block.png and b/mods/default/textures/default_diamond_block.png differ diff --git a/mods/default/textures/default_gold_block.png b/mods/default/textures/default_gold_block.png index 4ed9ed7..1f6c9f0 100644 Binary files a/mods/default/textures/default_gold_block.png and b/mods/default/textures/default_gold_block.png differ diff --git a/mods/default/textures/default_steel_block.png b/mods/default/textures/default_steel_block.png index 8e20200..91a9c17 100644 Binary files a/mods/default/textures/default_steel_block.png and b/mods/default/textures/default_steel_block.png differ diff --git a/mods/default/textures/default_torch.png b/mods/default/textures/default_torch.png index 685a619..089e5af 100644 Binary files a/mods/default/textures/default_torch.png and b/mods/default/textures/default_torch.png differ diff --git a/mods/hungry/init.lua b/mods/hungry/init.lua index 70fef61..20aec70 100644 --- a/mods/hungry/init.lua +++ b/mods/hungry/init.lua @@ -1,51 +1,46 @@ --Simplest hunger mod ever by bas080 -local enabled = minetest.setting_getbool("enable_damage") -if enabled then - local timer = 0 +local hunger = {} +hunger.enabled = minetest.setting_getbool("enable_damage") +if hunger.enabled then local distance_interval = 15 --set distance check interval in seconds - local hunger_per_meter = 1/500 --1 hp per 500 meter walk local hunger_per_cubic = 1/100 --1 hp per 100 blocks dig - local hunger = 0 - - local player = nil - local pos_one minetest.register_on_joinplayer(function(joiner) - minetest.after(0.5, function(param) - player = joiner - pos_one = player:getpos() + local player = joiner + local name = player:get_player_name() + minetest.after(5, function() + hunger[name] = 0 + local pos_one = player:getpos() + hunger.update(player, pos_one) end) end) + hunger.update = function(player, pos_one) + if player == nil or pos_one == nil then return end + local pos_two = player:getpos() + if pos_two == nil then return end + local name = player:get_player_name() + minetest.after(distance_interval, function() + hunger.update(player,pos_two) + end) + print(hunger[name]) + hunger[name] = hunger[name] + (math.hypot(pos_one.x-pos_two.x, pos_one.y-pos_two.y)+math.abs(pos_one.y-pos_two.y))*hunger_per_meter + if hunger[name] >=0.5 then + player:set_hp(player:get_hp()-hunger[name]) + hunger[name] = 0 + minetest.sound_play({ name="hunger_stomach" }, { + gain = 1.0; + max_hear_distance = 16; + }); + end + end minetest.register_on_dignode(function(pos, oldnode, player) - hunger = hunger + hunger_per_cubic - if hunger >= 0.5 then - hunger = 0 - player:set_hp(player:get_hp()-hunger) - end - end) - - minetest.register_globalstep(function(dtime) - if player ~= nil then - timer = timer + dtime - if timer >= distance_interval then - timer = 0 - local pos_two = player:getpos() - hunger = hunger + (math.hypot(pos_one.x-pos_two.x, pos_one.y-pos_two.y)+math.abs(pos_one.y-pos_two.y))*hunger_per_meter - pos_one = pos_two - if hunger >=0.5 then - timer = 0 - player:set_hp(player:get_hp()-hunger) - hunger=0 - minetest.sound_play({ name="hunger_stomach" }, { - gain = 1.0; - max_hear_distance = 16; - }); - end - end + local name = player:get_player_name() + hunger[name] = hunger[name] + hunger_per_cubic + if hunger[name] >= 0.5 then + player:set_hp(player:get_hp()-hunger[name]) + hunger[name] = 0 end end) end - -