Mirrorlandia_minetest/MineClone2
1
0
Fork 0
mirror of https://git.minetest.land/MineClone2/MineClone2.git synced 2024-11-24 20:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Final (hopefully) megre of XP to master, sorry for all possible conflicts

Browse Source
This commit is contained in:
kay27 2020-10-24 13:48:39 +04:00
parent 730e5f6998
commit c4f038ab77
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mods/HUD/mcl_experience/init.lua
View File

@ -181,7 +181,6 @@ minetest.register_on_joinplayer(function(player)
offset = {x = 0, y = -(48 + 24 + 24)}, offset = {x = 0, y = -(48 + 24 + 24)},
z_index = 12, z_index = 12,
}) })
end) end)
function mcl_experience.xp_to_level(xp) function mcl_experience.xp_to_level(xp)
@ -237,13 +236,15 @@ function mcl_experience.add_experience(player, experience)
local temp_pool = pool[name] local temp_pool = pool[name]
local old_bar, old_xp, old_level = temp_pool.bar, temp_pool.xp, temp_pool.level local old_bar, old_xp, old_level = temp_pool.bar, temp_pool.xp, temp_pool.level
temp_pool.xp = math.max(temp_pool.xp + experience, 0) temp_pool.xp = math.min(math.max(temp_pool.xp + experience, 0), max_xp)
if (temp_pool.xp >= temp_pool.xp_next_level) or (experience < 1) then if (temp_pool.xp >= temp_pool.xp_next_level) or (experience < 1) then
temp_pool.level = mcl_experience.xp_to_level(temp_pool.xp) temp_pool.level = mcl_experience.xp_to_level(temp_pool.xp)
temp_pool.bar, temp_pool.bar_step, temp_pool.xp_next_level = mcl_experience.xp_to_bar(temp_pool.xp, temp_pool.level) temp_pool.bar, temp_pool.bar_step, temp_pool.xp_next_level = mcl_experience.xp_to_bar(temp_pool.xp, temp_pool.level)
if old_level ~= temp_pool.level then if old_level ~= temp_pool.level then
if minetest.get_us_time()/1000000 - temp_pool.last_time > 0.04 then if minetest.get_us_time()/1000000 - temp_pool.last_time > 0.04 then
minetest.sound_play("level_up",{gain=0.2,to_player = name}) if experience > 0 then
minetest.sound_play("level_up",{gain=0.2,to_player = name})
end
temp_pool.last_time = minetest.get_us_time()/1000000 temp_pool.last_time = minetest.get_us_time()/1000000
end end
hud_manager.change_hud({player = player, hud_name = "xp_level", element = "text", data = tostring(temp_pool.level)}) hud_manager.change_hud({player = player, hud_name = "xp_level", element = "text", data = tostring(temp_pool.level)})
@ -251,7 +252,9 @@ function mcl_experience.add_experience(player, experience)
else else
if minetest.get_us_time()/1000000 - temp_pool.last_time > 0.01 then if minetest.get_us_time()/1000000 - temp_pool.last_time > 0.01 then
temp_pool.last_time = minetest.get_us_time()/1000000 temp_pool.last_time = minetest.get_us_time()/1000000
minetest.sound_play("experience",{gain=0.1,to_player = name,pitch=math.random(75,99)/100}) if experience > 0 then
minetest.sound_play("experience",{gain=0.1,to_player = name,pitch=math.random(75,99)/100})
end
end end
temp_pool.bar = temp_pool.bar + temp_pool.bar_step * experience temp_pool.bar = temp_pool.bar + temp_pool.bar_step * experience
end end
@ -478,7 +481,7 @@ minetest.register_entity("mcl_experience:orb", {
}) })
minetest.register_chatcommand("xp", { minetest.register_chatcommand("xp", {
params = S("[<player>] [<xp>]"), params = S("[[<player>] <xp>]"),
description = S("Gives a player some XP"), description = S("Gives a player some XP"),
privs = {server=true}, privs = {server=true},
func = function(name, params) func = function(name, params)

4
mods/HUD/mcl_experience/locale/mcl_experience.ru.tr
View File

@ -1,5 +1,5 @@
[<player>] [<xp>]=[<игрок>] [<xp>] [[<player>] <xp>]=[[<игрок>] <xp>]
Gives a player some XP= Gives a player some XP=Даёт игроку XP
Error: Too many parameters!=Ошибка: слишком много параметров! Error: Too many parameters!=Ошибка: слишком много параметров!
Error: Incorrect value of XP=Ошибка: Недопустимое значение XP Error: Incorrect value of XP=Ошибка: Недопустимое значение XP
Error: Player not found=Ошибка: Игрок не найден Error: Player not found=Ошибка: Игрок не найден

2
mods/HUD/mcl_experience/locale/template.txt
View File

@ -1,4 +1,4 @@
[<player>] [<xp>]= [[<player>] <xp>]=
Gives a player some XP= Gives a player some XP=
Error: Too many parameters!= Error: Too many parameters!=
Error: Incorrect value of XP= Error: Incorrect value of XP=