mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-11-22 18:41:09 +01:00
Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 into master
This commit is contained in:
commit
92c01628a9
2 changed files with 7 additions and 4 deletions
|
@ -183,7 +183,7 @@ local function furnace_get_delta_time(pos)
|
||||||
last_game_time = tonumber(last_game_time)
|
last_game_time = tonumber(last_game_time)
|
||||||
end
|
end
|
||||||
if not last_game_time or last_game_time < 1 then
|
if not last_game_time or last_game_time < 1 then
|
||||||
last_game_time = current_game_time
|
last_game_time = current_game_time - 0.1
|
||||||
elseif last_game_time == current_game_time then
|
elseif last_game_time == current_game_time then
|
||||||
current_game_time = current_game_time + 1.0
|
current_game_time = current_game_time + 1.0
|
||||||
end
|
end
|
||||||
|
@ -210,7 +210,7 @@ local function furnace_node_timer(pos, elapsed)
|
||||||
local srclist, fuellist
|
local srclist, fuellist
|
||||||
|
|
||||||
local cookable, cooked
|
local cookable, cooked
|
||||||
local active
|
local active = true
|
||||||
local fuel
|
local fuel
|
||||||
|
|
||||||
srclist = inv:get_list("src")
|
srclist = inv:get_list("src")
|
||||||
|
@ -321,7 +321,10 @@ local function furnace_node_timer(pos, elapsed)
|
||||||
local result = false
|
local result = false
|
||||||
|
|
||||||
if active then
|
if active then
|
||||||
local fuel_percent = math.floor(fuel_time / fuel_totaltime * 100)
|
local fuel_percent = 0
|
||||||
|
if fuel_totaltime > 0 then
|
||||||
|
fuel_percent = math.floor(fuel_time / fuel_totaltime * 100)
|
||||||
|
end
|
||||||
formspec = active_formspec(fuel_percent, item_percent)
|
formspec = active_formspec(fuel_percent, item_percent)
|
||||||
swap_node(pos, "mcl_furnaces:furnace_active")
|
swap_node(pos, "mcl_furnaces:furnace_active")
|
||||||
-- make sure timer restarts automatically
|
-- make sure timer restarts automatically
|
||||||
|
|
|
@ -84,7 +84,7 @@ Harming=урона
|
||||||
-12 HP=-12 HP
|
-12 HP=-12 HP
|
||||||
Instantly deals damage.=Вызывает мгновенную смерть.
|
Instantly deals damage.=Вызывает мгновенную смерть.
|
||||||
Night Vision=ночного зрения
|
Night Vision=ночного зрения
|
||||||
Increases the perceived brightness of light under a dark sky.=
|
Increases the perceived brightness of light under a dark sky.=Усиливает восприятие яркости освещени под тёмным небом.
|
||||||
Swiftness=ускорения
|
Swiftness=ускорения
|
||||||
Increases walking speed.=Увеличивает скорость ходьбы
|
Increases walking speed.=Увеличивает скорость ходьбы
|
||||||
Slowness=замедления
|
Slowness=замедления
|
||||||
|
|
Loading…
Reference in a new issue