Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Illuna-Minetest
hudbars
Commits
c4ef44f1
Commit
c4ef44f1
authored
May 18, 2016
by
Milan
Browse files
Merge
https://github.com/tenplus1/hudbars
parents
85ba0cfd
89fba7a8
Pipeline
#172
skipped
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
hbhunger/hunger.lua
View file @
c4ef44f1
...
...
@@ -399,6 +399,7 @@ if minetest.get_modpath("xanadu") then
overwrite
(
"xanadu:iced_coffee"
,
3
,
"vessels:drinking_glass"
)
overwrite
(
"xanadu:pizza_slice"
,
3
)
overwrite
(
"xanadu:cupcake"
,
4
)
overwrite
(
"xanadu:cupcake_chocolate"
,
4
)
overwrite
(
"xanadu:juice_apple"
,
4
,
"vessels:drinking_glass"
)
overwrite
(
"xanadu:juice_coconut"
,
4
,
"vessels:drinking_glass"
)
overwrite
(
"xanadu:juice_orange"
,
4
,
"vessels:drinking_glass"
)
...
...
@@ -409,7 +410,10 @@ if minetest.get_modpath("xanadu") then
overwrite
(
"xanadu:bacon"
,
4
)
overwrite
(
"xanadu:burger"
,
7
)
overwrite
(
"xanadu:fries"
,
6
)
overwrite
(
"xanadu:glass_wine"
,
2
)
overwrite
(
"wine:glass_wine"
,
2
)
overwrite
(
"wine:glass_beer"
,
2
)
overwrite
(
"wine:glass_mead"
,
2
)
overwrite
(
"wine:glass_cider"
,
2
)
overwrite
(
"xanadu:potato_salad"
,
8
,
"ethereal:bowl"
,
nil
,
2
)
overwrite
(
"xanadu:gingerbread_man"
,
2
)
overwrite
(
"xanadu:taco"
,
4
)
...
...
@@ -446,5 +450,5 @@ function hbhunger.handle_node_actions(pos, oldnode, player, ext)
hbhunger
.
exhaustion
[
name
]
=
exhaus
end
minetest
.
register_on_placenode
(
hbhunger
.
handle_node_actions
)
--
minetest.register_on_placenode(hbhunger.handle_node_actions)
minetest
.
register_on_dignode
(
hbhunger
.
handle_node_actions
)
hudbars/init.lua
View file @
c4ef44f1
...
...
@@ -28,9 +28,9 @@ function hb.load_setting(sname, stype, defaultval, valid_values)
end
end
if
not
valid
then
minetest
.
log
(
"error"
,
"[hudbars] Invalid value for "
..
sname
..
"! Using default value ("
..
tostring
(
defaultval
)
..
")."
)
--
minetest.log("error", "[hudbars] Invalid value for "
--
..sname.."! Using default value ("
--
..tostring(defaultval)..").")
return
defaultval
else
return
sval
...
...
@@ -294,7 +294,7 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
local
main_error_text
=
"[hudbars] Bad initial values of HUD bar identifier “"
..
tostring
(
identifier
)
..
"” for player "
..
name
..
". "
--[[
if start_max < start_value then
minetest.log("error", main_error_text.."start_max ("
..start_max..") is smaller than start_value ("..start_value..")!")
...
...
@@ -307,7 +307,7 @@ function hb.register_hudbar(identifier, text_color, label, textures, default_sta
minetest.log("error", main_error_text.."start_value ("
..start_value..") is smaller than 0!")
end
]]
hb
.
hudtables
[
identifier
].
hudids
[
name
]
=
ids
hb
.
hudtables
[
identifier
].
hudstate
[
name
]
=
state
end
...
...
@@ -348,7 +348,7 @@ end
-- ADDED THIS TOO
if
not
hudtable
.
hudstate
[
name
]
then
print
(
"line 350 hudtab
k
e.hudstate[
name]
nil"
)
print
(
"
Warning: [hudbars init.lua]
line 350 hudtab
l
e.hudstate[
"
..
name
..
"] is
nil"
)
return
end
...
...
@@ -372,6 +372,7 @@ end
local
main_error_text
=
"[hudbars] Bad call to hb.change_hudbar, identifier: “"
..
tostring
(
identifier
)
..
"”, player name: “"
..
name
..
"”. "
--[[
if new_max_value < new_value then
minetest.log("error", main_error_text.."new_max_value ("
..new_max_value..") is smaller than new_value ("..new_value..")!")
...
...
@@ -384,7 +385,7 @@ end
minetest.log("error", main_error_text.."new_value ("
..new_value..") is smaller than 0!")
end
]]
if
hudtable
.
hudstate
[
name
].
hidden
==
false
then
if
max_changed
and
hb
.
settings
.
bar_type
==
"progress_bar"
then
if
hudtable
.
hudstate
[
name
].
max
==
0
then
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment