Rebased update of hud/hunger

mods/hud/.gitattributes

@@ -1,22 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain

mods/hud/.gitignore

@@ -1,215 +0,0 @@
-#################
-## Eclipse
-#################
-
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
-
-#################
-## Visual Studio
-#################
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-
-[Dd]ebug/
-[Rr]elease/
-x64/
-build/
-[Bb]in/
-[Oo]bj/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.log
-*.scc
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.Publish.xml
-*.pubxml
-
-# NuGet Packages Directory
-## TODO: If you have NuGet Package Restore enabled, uncomment the next line
-#packages/
-
-# Windows Azure Build Output
-csx
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-sql/
-*.Cache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.[Pp]ublish.xml
-*.pfx
-*.publishsettings
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-App_Data/*.mdf
-App_Data/*.ldf
-
-#############
-## Windows detritus
-#############
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Mac crap
-.DS_Store
-
-
-#############
-## Python
-#############
-
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist/
-build/
-eggs/
-parts/
-var/
-sdist/
-develop-eggs/
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg

mods/hud/builtin.lua

@@ -1,13 +1,13 @@
 HUD_SB_SIZE = {x = 24, y = 24}
 
-HUD_ARMOR_POS = {x=0.5,y=1}
-HUD_ARMOR_OFFSET= {x=-320, y=-154}
-HUD_HEALTH_POS = {x=0.5,y=1}
-HUD_HEALTH_OFFSET = {x=-320, y=-122}
-HUD_HUNGER_POS = {x=0.5,y=1}
-HUD_HUNGER_OFFSET = {x=80, y=-122}
-HUD_AIR_POS= {x=0.5,y=1}
-HUD_AIR_OFFSET = {x=80, y=-154}
+HUD_HEALTH_POS = {x = 0.5,y = 1}
+HUD_HEALTH_OFFSET = {x = -262, y = -87}
+HUD_AIR_POS = {x = 0.5, y = 1}
+HUD_AIR_OFFSET = {x = 15, y = -87}
+HUD_HUNGER_POS = {x = 0.5, y = 1}
+HUD_HUNGER_OFFSET = {x = 15, y = -110}
+HUD_ARMOR_POS = {x = 0.5, y = 1}
+HUD_ARMOR_OFFSET = {x = -262, y = -110}
 
 -- read hud.conf settings
 hud.read_conf()

mods/hud/hud.conf

@@ -1,9 +1,7 @@
 --##Better HUD example config file##
 ------------------------------------
-
 HUD_ENABLE_HUNGER = true
 HUD_HUNGER_TICK = 300
-
 HUD_ARMOR_POS = {x=0.5,y=1}
 HUD_ARMOR_OFFSET= {x=-320, y=-154}
 HUD_HEALTH_POS = {x=0.5,y=1}

mods/hud/hud.conf.old

@@ -1,33 +0,0 @@
---##Better HUD example config file##
-------------------------------------
--- This example moves the health bar in the top left corner and the hunger bar in the top right corner
-
-
---
--- general settings
---
-HUD_ENABLE_HUNGER = true		--enables/disables hunger
-HUD_HUNGER_TICK = 300			--sets time for loosing 1/2 bread (of 10) (in seconds)
-
-
---!NOTICE!--
--- >>if damage is disabled neither health bar nor hunger bar or breath bar is shown
-
---
--- health bar
---
-HUD_HEALTH_POS = {x=0.5,y=0.9}			--min 0, max 1
-HUD_HEALTH_OFFSET = {x=-262, y=-50}		--offset in pixel
-
---
--- hunger bar
---
-HUD_HUNGER_POS = {x=0.5,y=0.9}			--min 0, max 1
-HUD_HUNGER_OFFSET = {x=25, y=-50}		--offset in pixel
-
---
--- breath bar
---
-HUD_AIR_POS = {x=0.5,y=0.9}		--min 0, max 1
-HUD_AIR_OFFSET = {x=25,y=-10}		--offset in pixel
-

mods/hunger/food.lua

@@ -4,6 +4,7 @@ register_food("default:apple", 2)
 
 if minetest.get_modpath("farming") ~= nil then
 	register_food("farming:bread", 4)
+	register_food("farming:rhubarb_pie", 6)
 end
 
 if minetest.get_modpath("maptools") then