1
0
Fork 0

Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2

This commit is contained in:
AFCMS 2021-05-11 15:23:46 +02:00
commit 3097df731d
4 changed files with 9 additions and 17 deletions

View File

@ -22,6 +22,7 @@
* Nicu * Nicu
* aligator * aligator
* Code-Sploit * Code-Sploit
* NO11
## Contributors ## Contributors
* Laurent Rocher * Laurent Rocher
@ -40,7 +41,6 @@
* Jared Moody * Jared Moody
* Li0n * Li0n
* Midgard * Midgard
* NO11
* Saku Laesvuori * Saku Laesvuori
* Yukitty * Yukitty
* ZedekThePD * ZedekThePD
@ -102,6 +102,7 @@
* leorockway * leorockway
* xMrVizzy * xMrVizzy
* yutyo * yutyo
* NO11
## Translations ## Translations
* Wuzzy * Wuzzy

View File

@ -28,6 +28,7 @@ mcl_credits.people = {
"Nicu", "Nicu",
"aligator", "aligator",
"Code-Sploit", "Code-Sploit",
"NO11",
}}, }},
{"Contributors", 0x52FF00, { {"Contributors", 0x52FF00, {
"Laurent Rocher", "Laurent Rocher",
@ -46,7 +47,6 @@ mcl_credits.people = {
"Jared Moody", "Jared Moody",
"Li0n", "Li0n",
"Midgard", "Midgard",
"NO11",
"Saku Laesvuori", "Saku Laesvuori",
"Yukitty", "Yukitty",
"ZedekThePD", "ZedekThePD",
@ -107,7 +107,8 @@ mcl_credits.people = {
"kingoscargames", "kingoscargames",
"leorockway", "leorockway",
"xMrVizzy", "xMrVizzy",
"yutyo" "yutyo",
"NO11",
}}, }},
{"Translations", 0x00FF60, { {"Translations", 0x00FF60, {
"Wuzzy", "Wuzzy",

View File

@ -118,16 +118,6 @@ ARROW_ENTITY.on_step = function(self, dtime)
dpos = vector.round(dpos) dpos = vector.round(dpos)
local node = minetest.get_node(dpos) local node = minetest.get_node(dpos)
if self.object:get_attach() ~= nil and self.object:get_attach(parent):get_hp() < 1 then
self.object:remove()
end
minetest.register_on_leaveplayer(function(player)
if self.object:get_attach(parent) == player then
self.object:remove()
end
end)
if self._stuck then if self._stuck then
self._stucktimer = self._stucktimer + dtime self._stucktimer = self._stucktimer + dtime
self._stuckrechecktimer = self._stuckrechecktimer + dtime self._stuckrechecktimer = self._stuckrechecktimer + dtime

View File

@ -137,14 +137,14 @@ local timerMult = 1 -- Cycles from 0 to 7, each time when timer hits half a seco
minetest.register_globalstep(function(dtime) minetest.register_globalstep(function(dtime)
main_timer = main_timer + dtime main_timer = main_timer + dtime
timer = timer + dtime timer = timer + dtime
if main_timer > mcl_hunger.HUD_TICK or timer > 0.5 then if main_timer > mcl_hunger.HUD_TICK or timer > 0.25 then
if main_timer > mcl_hunger.HUD_TICK then main_timer = 0 end if main_timer > mcl_hunger.HUD_TICK then main_timer = 0 end
for _,player in pairs(minetest.get_connected_players()) do for _,player in pairs(minetest.get_connected_players()) do
local name = player:get_player_name() local name = player:get_player_name()
local h = tonumber(mcl_hunger.get_hunger(player)) local h = tonumber(mcl_hunger.get_hunger(player))
local hp = player:get_hp() local hp = player:get_hp()
if timer > 0.5 then if timer > 0.25 then
-- Slow health regeneration, and hunger damage (every 4s). -- Slow health regeneration, and hunger damage (every 4s).
-- Regeneration rate based on tutorial video <https://www.youtube.com/watch?v=zs2t-xCVHBo>. -- Regeneration rate based on tutorial video <https://www.youtube.com/watch?v=zs2t-xCVHBo>.
-- Minecraft Wiki seems to be wrong in claiming that full hunger gives 0.5s regen rate. -- Minecraft Wiki seems to be wrong in claiming that full hunger gives 0.5s regen rate.
@ -166,9 +166,9 @@ minetest.register_globalstep(function(dtime)
end end
end end
end end
if timer > 0.5 then if timer > 0.25 then
timer = 0 timer = 0
timerMult = timerMult + 1 timerMult = timerMult + 2
if timerMult > 7 then if timerMult > 7 then
timerMult = 0 timerMult = 0
end end