Merge remote-tracking branch 'upstream/master'

README.md

@@ -1,12 +1,12 @@
 # Hunger with HUD bar [`hbhunger`]
 
-* Version: 0.7.1
+* Version: 1.1.2
 
 ## Using the mod
 
 This mod adds a mechanic for hunger.
 This mod depends on the HUD bars mod [`hudbars`], version 1.4.1 or any later version
-starting with “1.”.
+starting with “1.” or “2.”.
 
 ## About hunger
 This mod adds a hunger mechanic to the game. Players get a new attribute called “satiation”:
@@ -39,7 +39,7 @@ All mods which add food through standard measures (`minetest.item_eat`) are alre
 supported automatically. Poisoned food needs special support.
 
 ### Known supported food mods
-* Apple from Minetest Game [`default`]
+* Apple and Blueberries from Minetest Game [`default`]
 * Red and brown mushroom from Minetest Game [`flowers`]
 * Bread from Minetest Game [`farming`]
 * [`animalmaterials`] (Mob Framework (`mobf` modpack))
@@ -72,10 +72,9 @@ supported automatically. Poisoned food needs special support.
 * Food ([`food`], [`food_basic`])
 * Sweet Foods [`food_sweet`]
 
-### Examples
+### Example
 
 * Eating an apple (from Minetest Game) increases your satiation by 2;
-* eating a bread (from Minetest Game) increases your satiation by 4.
 
 ## Licensing
 This mod is free software.
@@ -91,7 +90,7 @@ This mod is free software.
 
 * `hbhunger_icon.png`—PilzAdam ([MIT License](https://opensource.org/licenses/MIT)), modified by BlockMen
 * `hbhunger_bgicon.png`—PilzAdam (MIT License), modified by BlockMen
-* `hbhunger_bar.png—Wuzzy` (MIT License)
+* `hbhunger_bar.png`—Wuzzy (MIT License)
 * `hbhunger_icon_health_poison.png`—celeron55 ([CC BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)), modified by BlockMen, modified again by Wuzzy
 * Everything else: MIT License, by BlockMen and Wuzzy
 

changelog.txt

@@ -1,51 +0,0 @@
-0.1.0
------
-Initial release
-
-0.2.0
------
-- Change “saturation” to “satiation”
-- Rename global table to “hbhunger” to avoid collisions
-- General cleanup
-
-0.3.0
------
-- Play simple eating sound when something is eaten
-
-0.3.1
------
-- Add Ethereal orange
-- Fix exhaus variable
-
-0.3.2
------
-- Fix another crash
-
-0.4.0
------
-- Generic eating functionality, items using the minetest.item_eat are automatically supported
-- Change health bar and icon when poisoned
-- Special support for red and brown mushroom from Minetest Game [flowers]
-- Special support for [pizza]
-- Special support for beans from Farming Redo [farming]
-- Fix crash when poisoned player leaves server
-- Changed license to LGPL v2.1
-
-0.4.1
------
-- Add foods from Not So Simple Mobs [nssm]
-
-0.5.0
------
-- Fix custom sound not working
-- Add Portuguese translation
-
-0.5.1
------
-- Fix incompability problem with pipeworks mod
-
-0.5.2
------
-- Fix mod not working with both intllib and mod security enabled
-- Add missing screenshot
-- Rewrite README and use Markdown format

depends.txt

@@ -1,32 +0,0 @@
-hudbars
-intllib?
-default?
-flowers?
-animalmaterials?
-bucket?
-bushes?
-bushes_classic?
-cooking?
-creatures?
-docfarming?
-dwarves?
-ethereal?
-farming?
-farming_plus?
-ferns?
-fishing?
-fruit?
-glooptest?
-jkanimals?
-jkfarming?
-jkwine?
-kpgmobs?
-mobfcooking?
-mobs?
-moretrees?
-mtfoods?
-mush45?
-mushroom?
-seaplants?
-pizza?
-nssm?

description.txt

@@ -1 +0,0 @@
-Adds a simple hunger meachanic with satiation, food poisoning and different healing.

hunger.lua

@@ -7,11 +7,11 @@ function hbhunger.load_hunger(player)
 end
 
 -- wrapper for minetest.item_eat (this way we make sure other mods can't break this one)
-local org_eat = core.do_item_eat
+local org_eat = minetest.do_item_eat
-core.do_item_eat = function(hp_change, replace_with_item, itemstack, user, pointed_thing)
+minetest.do_item_eat = function(hp_change, replace_with_item, itemstack, user, pointed_thing)
 	local old_itemstack = itemstack
 	itemstack = hbhunger.eat(hp_change, replace_with_item, itemstack, user, pointed_thing)
-	for _, callback in pairs(core.registered_on_item_eats) do
+	for _, callback in pairs(minetest.registered_on_item_eats) do
 		local result = callback(hp_change, replace_with_item, itemstack, user, pointed_thing, old_itemstack)
 		if result then
 			return result
@@ -39,7 +39,7 @@ function hbhunger.eat(hp_change, replace_with_item, itemstack, user, pointed_thi
 		def = {}
 		if type(hp_change) ~= "number" then
 			hp_change = 1
-			core.log("error", "Wrong on_use() definition for item '" .. item .. "'")
+			minetest.log("error", "Wrong on_use() definition for item '" .. item .. "'")
 		end
 		def.saturation = hp_change * 1.3
 		def.replace = replace_with_item
@@ -79,12 +79,29 @@ function hbhunger.item_eat(hunger_change, replace_with_item, poisen, heal, sound
 			if h == nil or hp == nil then
 				return
 			end
-			minetest.sound_play({name = sound or "hbhunger_eat_generic", gain = 1}, {pos=user:getpos(), max_hear_distance = 16})
+			if user:is_player() then
+				local object, object_pos
+				-- Check if user is a "fake player" (unofficial imitation of a the player data structure)
+				if type(user) == "userdata" then
+					object = user
+				else
+					object_pos = user:get_pos()
+				end
+				minetest.sound_play(
+					{name = sound or "hbhunger_eat_generic",
+					gain = 1},
+					{object=object,
+					pos=object_pos,
+					max_hear_distance = 16,
+					pitch = 1 + math.random(-10, 10)*0.005,},
+					true
+				)
+			end
 
 			-- Saturation
-			if h < 30 and hunger_change then
+			if h < hbhunger.SAT_MAX and hunger_change then
 				h = h + hunger_change
-				if h > 30 then h = 30 end
+				if h > hbhunger.SAT_MAX then h = hbhunger.SAT_MAX end
 				hbhunger.hunger[name] = h
 				hbhunger.set_hunger_raw(user)
 			end
@@ -109,7 +126,7 @@ function hbhunger.item_eat(hunger_change, replace_with_item, poisen, heal, sound
 				if inv:room_for_item("main", replace_with_item) then
 					inv:add_item("main", replace_with_item)
 				else
-					minetest.add_item(user:getpos(), replace_with_item)
+					minetest.add_item(user:get_pos(), replace_with_item)
 				end
 			end
 		end
@@ -117,336 +134,6 @@ function hbhunger.item_eat(hunger_change, replace_with_item, poisen, heal, sound
 	end
 end
 
-if minetest.get_modpath("default") ~= nil then
-	hbhunger.register_food("default:apple", 2)
-end
-if minetest.get_modpath("flowers") ~= nil then
-	hbhunger.register_food("flowers:mushroom_brown", 1)
-	hbhunger.register_food("flowers:mushroom_red", 1, "", 3)
-end
-if minetest.get_modpath("farming") ~= nil then
-	hbhunger.register_food("farming:bread", 4)
-end
-
-if minetest.get_modpath("mobs") ~= nil then
-	if mobs.mod ~= nil and mobs.mod == "redo" then
-		hbhunger.register_food("mobs:cheese", 4)
-		hbhunger.register_food("mobs:meat", 8)
-		hbhunger.register_food("mobs:meat_raw", 4)
-		hbhunger.register_food("mobs:rat_cooked", 4)
-		hbhunger.register_food("mobs:honey", 2)
-		hbhunger.register_food("mobs:pork_raw", 3, "", 3)
-		hbhunger.register_food("mobs:pork_cooked", 8)
-		hbhunger.register_food("mobs:chicken_cooked", 6)
-		hbhunger.register_food("mobs:chicken_raw", 2, "", 3)
-		hbhunger.register_food("mobs:chicken_egg_fried", 2)
-		if minetest.get_modpath("bucket") then 
-			hbhunger.register_food("mobs:bucket_milk", 3, "bucket:bucket_empty")
-		end
-	else
-		hbhunger.register_food("mobs:meat", 6)
-		hbhunger.register_food("mobs:meat_raw", 3)
-		hbhunger.register_food("mobs:rat_cooked", 5)
-	end
-end
-
-if minetest.get_modpath("moretrees") ~= nil then
-	hbhunger.register_food("moretrees:coconut_milk", 1)
-	hbhunger.register_food("moretrees:raw_coconut", 2)
-	hbhunger.register_food("moretrees:acorn_muffin", 3)
-	hbhunger.register_food("moretrees:spruce_nuts", 1)
-	hbhunger.register_food("moretrees:pine_nuts", 1)
-	hbhunger.register_food("moretrees:fir_nuts", 1)
-end
-
-if minetest.get_modpath("dwarves") ~= nil then
-	hbhunger.register_food("dwarves:beer", 2)
-	hbhunger.register_food("dwarves:apple_cider", 1)
-	hbhunger.register_food("dwarves:midus", 2)
-	hbhunger.register_food("dwarves:tequila", 2)
-	hbhunger.register_food("dwarves:tequila_with_lime", 2)
-	hbhunger.register_food("dwarves:sake", 2)
-end
-
-if minetest.get_modpath("animalmaterials") ~= nil then
-	hbhunger.register_food("animalmaterials:milk", 2)
-	hbhunger.register_food("animalmaterials:meat_raw", 3)
-	hbhunger.register_food("animalmaterials:meat_pork", 3)
-	hbhunger.register_food("animalmaterials:meat_beef", 3)
-	hbhunger.register_food("animalmaterials:meat_chicken", 3)
-	hbhunger.register_food("animalmaterials:meat_lamb", 3)
-	hbhunger.register_food("animalmaterials:meat_venison", 3)
-	hbhunger.register_food("animalmaterials:meat_undead", 3, "", 3)
-	hbhunger.register_food("animalmaterials:meat_toxic", 3, "", 5)
-	hbhunger.register_food("animalmaterials:meat_ostrich", 3)
-	hbhunger.register_food("animalmaterials:fish_bluewhite", 2)
-	hbhunger.register_food("animalmaterials:fish_clownfish", 2)
-end
-
-if minetest.get_modpath("fishing") ~= nil then
-	hbhunger.register_food("fishing:fish_raw", 2)
-	hbhunger.register_food("fishing:fish_cooked", 5)
-	hbhunger.register_food("fishing:sushi", 6)
-	hbhunger.register_food("fishing:shark", 4)
-	hbhunger.register_food("fishing:shark_cooked", 8)
-	hbhunger.register_food("fishing:pike", 4)
-	hbhunger.register_food("fishing:pike_cooked", 8)
-end
-
-if minetest.get_modpath("glooptest") ~= nil then
-	hbhunger.register_food("glooptest:kalite_lump", 1)
-end
-
-if minetest.get_modpath("bushes") ~= nil then
-	hbhunger.register_food("bushes:sugar", 1)
-	hbhunger.register_food("bushes:strawberry", 2)
-	hbhunger.register_food("bushes:berry_pie_raw", 3)
-	hbhunger.register_food("bushes:berry_pie_cooked", 4)
-	hbhunger.register_food("bushes:basket_pies", 15)
-end
-
-if minetest.get_modpath("bushes_classic") then
-	-- bushes_classic mod, as found in the plantlife modpack
-	local berries = {
-	    "strawberry",
-		"blackberry",
-		"blueberry",
-		"raspberry",
-		"gooseberry",
-		"mixed_berry"}
-	for _, berry in ipairs(berries) do
-		if berry ~= "mixed_berry" then
-			hbhunger.register_food("bushes:"..berry, 1)
-		end
-		hbhunger.register_food("bushes:"..berry.."_pie_raw", 2)
-		hbhunger.register_food("bushes:"..berry.."_pie_cooked", 5)
-		hbhunger.register_food("bushes:basket_"..berry, 15)
-	end
-end
-
-if minetest.get_modpath("mushroom") ~= nil then
-	hbhunger.register_food("mushroom:brown", 1)
-	hbhunger.register_food("mushroom:red", 1, "", 3)
-	-- mushroom potions: red = strong poison, brown = light restorative
-	if minetest.get_modpath("vessels") then
-		hbhunger.register_food("mushroom:brown_essence", 1, "vessels:glass_bottle", nil, 4)
-		hbhunger.register_food("mushroom:poison", 1, "vessels:glass_bottle", 10)
-	end
-end
-
-if minetest.get_modpath("docfarming") ~= nil then
-	hbhunger.register_food("docfarming:carrot", 3)
-	hbhunger.register_food("docfarming:cucumber", 2)
-	hbhunger.register_food("docfarming:corn", 3)
-	hbhunger.register_food("docfarming:potato", 4)
-	hbhunger.register_food("docfarming:bakedpotato", 5)
-	hbhunger.register_food("docfarming:raspberry", 3)
-end
-
-if minetest.get_modpath("farming_plus") ~= nil then
-	hbhunger.register_food("farming_plus:carrot_item", 3)
-	hbhunger.register_food("farming_plus:banana", 2)
-	hbhunger.register_food("farming_plus:orange_item", 2)
-	hbhunger.register_food("farming:pumpkin_bread", 4)
-	hbhunger.register_food("farming_plus:strawberry_item", 2)
-	hbhunger.register_food("farming_plus:tomato_item", 2)
-	hbhunger.register_food("farming_plus:potato_item", 4)
-	hbhunger.register_food("farming_plus:rhubarb_item", 2)
-end
-
-if minetest.get_modpath("mtfoods") ~= nil then
-	hbhunger.register_food("mtfoods:dandelion_milk", 1)
-	hbhunger.register_food("mtfoods:sugar", 1)
-	hbhunger.register_food("mtfoods:short_bread", 4)
-	hbhunger.register_food("mtfoods:cream", 1)
-	hbhunger.register_food("mtfoods:chocolate", 2)
-	hbhunger.register_food("mtfoods:cupcake", 2)
-	hbhunger.register_food("mtfoods:strawberry_shortcake", 2)
-	hbhunger.register_food("mtfoods:cake", 3)
-	hbhunger.register_food("mtfoods:chocolate_cake", 3)
-	hbhunger.register_food("mtfoods:carrot_cake", 3)
-	hbhunger.register_food("mtfoods:pie_crust", 3)
-	hbhunger.register_food("mtfoods:apple_pie", 3)
-	hbhunger.register_food("mtfoods:rhubarb_pie", 2)
-	hbhunger.register_food("mtfoods:banana_pie", 3)
-	hbhunger.register_food("mtfoods:pumpkin_pie", 3)
-	hbhunger.register_food("mtfoods:cookies", 2)
-	hbhunger.register_food("mtfoods:mlt_burger", 5)
-	hbhunger.register_food("mtfoods:potato_slices", 2)
-	hbhunger.register_food("mtfoods:potato_chips", 3)
-	--mtfoods:medicine
-	hbhunger.register_food("mtfoods:casserole", 3)
-	hbhunger.register_food("mtfoods:glass_flute", 2)
-	hbhunger.register_food("mtfoods:orange_juice", 2)
-	hbhunger.register_food("mtfoods:apple_juice", 2)
-	hbhunger.register_food("mtfoods:apple_cider", 2)
-	hbhunger.register_food("mtfoods:cider_rack", 2)
-end
-
-if minetest.get_modpath("fruit") ~= nil then
-	hbhunger.register_food("fruit:apple", 2)
-	hbhunger.register_food("fruit:pear", 2)
-	hbhunger.register_food("fruit:bananna", 3)
-	hbhunger.register_food("fruit:orange", 2)
-end
-
-if minetest.get_modpath("mush45") ~= nil then
-	hbhunger.register_food("mush45:meal", 4)
-end
-
-if minetest.get_modpath("seaplants") ~= nil then
-	hbhunger.register_food("seaplants:kelpgreen", 1)
-	hbhunger.register_food("seaplants:kelpbrown", 1)
-	hbhunger.register_food("seaplants:seagrassgreen", 1)
-	hbhunger.register_food("seaplants:seagrassred", 1)
-	hbhunger.register_food("seaplants:seasaladmix", 6)
-	hbhunger.register_food("seaplants:kelpgreensalad", 1)
-	hbhunger.register_food("seaplants:kelpbrownsalad", 1)
-	hbhunger.register_food("seaplants:seagrassgreensalad", 1)
-	hbhunger.register_food("seaplants:seagrassgreensalad", 1)
-end
-
-if minetest.get_modpath("mobfcooking") ~= nil then
-	hbhunger.register_food("mobfcooking:cooked_pork", 6)
-	hbhunger.register_food("mobfcooking:cooked_ostrich", 6)
-	hbhunger.register_food("mobfcooking:cooked_beef", 6)
-	hbhunger.register_food("mobfcooking:cooked_chicken", 6)
-	hbhunger.register_food("mobfcooking:cooked_lamb", 6)
-	hbhunger.register_food("mobfcooking:cooked_venison", 6)
-	hbhunger.register_food("mobfcooking:cooked_fish", 6)
-end
-
-if minetest.get_modpath("creatures") ~= nil then
-	hbhunger.register_food("creatures:meat", 6)
-	hbhunger.register_food("creatures:flesh", 3)
-	hbhunger.register_food("creatures:rotten_flesh", 3, "", 3)
-end
-
-if minetest.get_modpath("ethereal") then
-   hbhunger.register_food("ethereal:strawberry", 1)
-   hbhunger.register_food("ethereal:banana", 4)
-   hbhunger.register_food("ethereal:pine_nuts", 1)
-   hbhunger.register_food("ethereal:bamboo_sprout", 0, "", 3)
-   hbhunger.register_food("ethereal:fern_tubers", 1)
-   hbhunger.register_food("ethereal:banana_bread", 7)
-   hbhunger.register_food("ethereal:mushroom_plant", 2)
-   hbhunger.register_food("ethereal:coconut_slice", 2)
-   hbhunger.register_food("ethereal:golden_apple", 4, "", nil, 10)
-   hbhunger.register_food("ethereal:wild_onion_plant", 2)
-   hbhunger.register_food("ethereal:mushroom_soup", 4, "ethereal:bowl")
-   hbhunger.register_food("ethereal:mushroom_soup_cooked", 6, "ethereal:bowl")
-   hbhunger.register_food("ethereal:hearty_stew", 6, "ethereal:bowl", 3)
-   hbhunger.register_food("ethereal:hearty_stew_cooked", 10, "ethereal:bowl")
-   if minetest.get_modpath("bucket") then
-  	hbhunger.register_food("ethereal:bucket_cactus", 2, "bucket:bucket_empty")
-   end
-   hbhunger.register_food("ethereal:fish_raw", 2)
-   hbhunger.register_food("ethereal:fish_cooked", 5)
-   hbhunger.register_food("ethereal:seaweed", 1)
-   hbhunger.register_food("ethereal:yellowleaves", 1, "", nil, 1)
-   hbhunger.register_food("ethereal:sashimi", 4)
-   hbhunger.register_food("ethereal:orange", 2)
-end
-
-if minetest.get_modpath("farming") and farming.mod == "redo" then
-   hbhunger.register_food("farming:bread", 6)
-   hbhunger.register_food("farming:potato", 1)
-   hbhunger.register_food("farming:baked_potato", 6)
-   hbhunger.register_food("farming:cucumber", 4)
-   hbhunger.register_food("farming:tomato", 4)
-   hbhunger.register_food("farming:carrot", 3)
-   hbhunger.register_food("farming:carrot_gold", 6, "", nil, 8)
-   hbhunger.register_food("farming:corn", 3)
-   hbhunger.register_food("farming:corn_cob", 5)
-   hbhunger.register_food("farming:melon_slice", 2)
-   hbhunger.register_food("farming:pumpkin_slice", 1)
-   hbhunger.register_food("farming:pumpkin_bread", 9)
-   hbhunger.register_food("farming:coffee_cup", 2, "farming:drinking_cup")
-   hbhunger.register_food("farming:coffee_cup_hot", 3, "farming:drinking_cup", nil, 2)
-   hbhunger.register_food("farming:cookie", 2)
-   hbhunger.register_food("farming:chocolate_dark", 3)
-   hbhunger.register_food("farming:donut", 4)
-   hbhunger.register_food("farming:donut_chocolate", 6)
-   hbhunger.register_food("farming:donut_apple", 6)
-   hbhunger.register_food("farming:raspberries", 1)
-   hbhunger.register_food("farming:blueberries", 1)
-   hbhunger.register_food("farming:muffin_blueberry", 4)
-   if minetest.get_modpath("vessels") then
-	hbhunger.register_food("farming:smoothie_raspberry", 2, "vessels:drinking_glass")
-   end
-   hbhunger.register_food("farming:rhubarb", 1)
-   hbhunger.register_food("farming:rhubarb_pie", 6)
-   hbhunger.register_food("farming:beans", 1)
-end
-
-if minetest.get_modpath("kpgmobs") ~= nil then
-	hbhunger.register_food("kpgmobs:uley", 3)
-	hbhunger.register_food("kpgmobs:meat", 6)
-	hbhunger.register_food("kpgmobs:rat_cooked", 5)
-	hbhunger.register_food("kpgmobs:med_cooked", 4)
-  	if minetest.get_modpath("bucket") then
-	   hbhunger.register_food("kpgmobs:bucket_milk", 4, "bucket:bucket_empty")
-	end
-end
-
-if minetest.get_modpath("jkfarming") ~= nil then
-	hbhunger.register_food("jkfarming:carrot", 3)
-	hbhunger.register_food("jkfarming:corn", 3)
-	hbhunger.register_food("jkfarming:melon_part", 2)
-	hbhunger.register_food("jkfarming:cake", 3)
-end
-
-if minetest.get_modpath("jkanimals") ~= nil then
-	hbhunger.register_food("jkanimals:meat", 6)
-end
-
-if minetest.get_modpath("jkwine") ~= nil then
-	hbhunger.register_food("jkwine:grapes", 2)
-	hbhunger.register_food("jkwine:winebottle", 1)
-end
-
-if minetest.get_modpath("cooking") ~= nil then
-	hbhunger.register_food("cooking:meat_beef_cooked", 4)
-	hbhunger.register_food("cooking:fish_bluewhite_cooked", 3)
-	hbhunger.register_food("cooking:fish_clownfish_cooked", 1)
-	hbhunger.register_food("cooking:meat_chicken_cooked", 2)
-	hbhunger.register_food("cooking:meat_cooked", 2)
-	hbhunger.register_food("cooking:meat_pork_cooked", 3)
-	hbhunger.register_food("cooking:meat_toxic_cooked", -3)
-	hbhunger.register_food("cooking:meat_venison_cooked", 3)
-	hbhunger.register_food("cooking:meat_undead_cooked", 1)
-end
-
--- ferns mod of plantlife_modpack
-if minetest.get_modpath("ferns") ~= nil then
-	hbhunger.register_food("ferns:fiddlehead", 1, "", 1)
-	hbhunger.register_food("ferns:fiddlehead_roasted", 3)
-	hbhunger.register_food("ferns:ferntuber_roasted", 3)
-	hbhunger.register_food("ferns:horsetail_01", 1)
-end
-
-if minetest.get_modpath("pizza") ~= nil then
-	hbhunger.register_food("pizza:pizza", 30, "", nil, 30)
-	hbhunger.register_food("pizza:pizzaslice", 5, "", nil, 5)
-end
-
-if minetest.get_modpath("nssm") then
-	hbhunger.register_food("nssm:werewolf_leg", 3)
-	hbhunger.register_food("nssm:heron_leg", 2)
-	hbhunger.register_food("nssm:chichibios_heron_leg", 4)
-	hbhunger.register_food("nssm:crocodile_tail", 3)
-	hbhunger.register_food("nssm:duck_legs", 1)
-	hbhunger.register_food("nssm:ant_leg", 1)
-	hbhunger.register_food("nssm:spider_leg", 1)
-	hbhunger.register_food("nssm:tentacle", 2)
-	hbhunger.register_food("nssm:worm_flesh", 2, "", 2) -- poisonous
-	hbhunger.register_food("nssm:amphibian_heart", 1)
-	hbhunger.register_food("nssm:raw_scrausics_wing", 1)
-	-- superfoods
-	hbhunger.register_food("nssm:phoenix_nuggets", 20, "", nil, 20)
-	hbhunger.register_food("nssm:phoenix_tear", 20, "", nil, 20)
-end
-
 -- player-action based hunger changes
 function hbhunger.handle_node_actions(pos, oldnode, player, ext)
 	-- is_fake_player comes from the pipeworks, we are not interested in those

init.lua

@@ -1,9 +1,4 @@
-local S
+local S = minetest.get_translator("hbhunger")
-if (minetest.get_modpath("intllib")) then
-	S = intllib.Getter()
-else
-	S = function ( s ) return s end
-end
 
 if minetest.settings:get_bool("enable_damage") then
 
@@ -30,6 +25,9 @@ hbhunger.EXHAUST_DIG = 3  -- exhaustion increased this value after digged node
 hbhunger.EXHAUST_PLACE = 1 -- exhaustion increased this value after placed
 hbhunger.EXHAUST_MOVE = 0.3 -- exhaustion increased this value if player movement detected
 hbhunger.EXHAUST_LVL = 160 -- at what exhaustion player satiation gets lowerd
+hbhunger.SAT_MAX = 30 -- maximum satiation points
+hbhunger.SAT_INIT = 20 -- initial satiation points
+hbhunger.SAT_HEAL = 15 -- required satiation points to start healing
 
 
 --load custom settings
@@ -44,9 +42,10 @@ local function custom_hud(player)
 end
 
 dofile(minetest.get_modpath("hbhunger").."/hunger.lua")
+dofile(minetest.get_modpath("hbhunger").."/register_foods.lua")
 
 -- register satiation hudbar
-hb.register_hudbar("satiation", 0xFFFFFF, S("Satiation"), { icon = "hbhunger_icon.png", bgicon = "hbhunger_bgicon.png",  bar = "hbhunger_bar.png" }, 20, 30, false)
+hb.register_hudbar("satiation", 0xFFFFFF, S("Satiation"), { icon = "hbhunger_icon.png", bgicon = "hbhunger_bgicon.png",  bar = "hbhunger_bar.png" }, hbhunger.SAT_INIT, hbhunger.SAT_MAX, false, nil, { format_value = "%.1f", format_max_value = "%d" })
 
 -- update hud elemtens if value has changed
 local function update_hud(player)
@@ -78,7 +77,7 @@ hbhunger.set_hunger_raw = function(player)
 	local name = player:get_player_name()
 	local value = hbhunger.hunger[name]
 	if not inv  or not value then return nil end
-	if value > 30 then value = 30 end
+	if value > hbhunger.SAT_MAX then value = hbhunger.SAT_MAX end
 	if value < 0 then value = 0 end
 	
 	inv:set_stack("hunger", 1, ItemStack({name=":", count=value+1}))
@@ -101,7 +100,7 @@ end)
 minetest.register_on_respawnplayer(function(player)
 	-- reset hunger (and save)
 	local name = player:get_player_name()
-	hbhunger.hunger[name] = 20
+	hbhunger.hunger[name] = hbhunger.SAT_INIT
 	hbhunger.set_hunger_raw(player)
 	hbhunger.exhaustion[name] = 0
 end)
@@ -121,10 +120,10 @@ minetest.register_globalstep(function(dtime)
 		local h = tonumber(hbhunger.hunger[name])
 		local hp = player:get_hp()
 		if timer > 4 then
-			-- heal player by 1 hp if not dead and satiation is > 15 (of 30)
+			-- heal player by 1 hp if not dead and satiation is > hbhunger.SAT_HEAL
-			if h > 15 and hp > 0 and player:get_breath() > 0 then
+			if h > hbhunger.SAT_HEAL and hp > 0 and player:get_breath() > 0 then
 				player:set_hp(hp+1)
-				-- or damage player by 1 hp if satiation is < 2 (of 30)
+				-- or damage player by 1 hp if satiation is < 2
 				elseif h <= 1 then
 					if hp-1 >= 0 then player:set_hp(hp-1) end
 				end
@@ -152,4 +151,40 @@ minetest.register_globalstep(function(dtime)
 	if timer2 > hbhunger.HUNGER_TICK then timer2 = 0 end
 end)
 
+minetest.register_chatcommand("satiation", {
+	privs = {["server"]=true},
+	params = S("[<player>] <satiation>"),
+	description = S("Set satiation of player or yourself"),
+	func = function(name, param)
+		if minetest.settings:get_bool("enable_damage") == false then
+			return false, S("Not possible, damage is disabled.")
+		end
+		local targetname, satiation = string.match(param, "(%S+) (%S+)")
+		if not targetname then
+			satiation = param
+		end
+		satiation = tonumber(satiation)
+		if not satiation then
+			return false, S("Invalid satiation!")
+		end
+		if not targetname then
+			targetname = name
+		end
+		local target = minetest.get_player_by_name(targetname)
+		if target == nil then
+			return false, S("Player @1 does not exist.", targetname)
+		end
+		if satiation > hbhunger.SAT_MAX then
+			satiation = hbhunger.SAT_MAX
+		elseif satiation < 0 then
+			satiation = 0
+		end
+		hbhunger.hunger[targetname] = satiation
+		hbhunger.set_hunger_raw(target)
+		return true
+	end,
+})
+
 end
+
+minetest.log("action", "[hbhunger] loaded.")

locale/de.txt

@@ -1 +0,0 @@
-Satiation = Sättigung

locale/hbhunger.de.tr

@@ -0,0 +1,7 @@
+# textdomain:hbhunger
+Satiation=Sättigung
+Set satiation of player or yourself=Sättigung von Spieler oder Ihnen selbst setzen
+Not possible, damage is disabled.=Nicht möglich, Schaden ist deaktiviert.
+Invalid satiation!=Ungültige Sättigung!
+Player @1 does not exist.=Spieler @1 existiert nicht.
+[<player>] <satiation>=[<Spieler>] <Sättigung>

locale/hbhunger.fr.tr

@@ -0,0 +1,2 @@
+# textdomain:hbhunger
+Satiation=Satiété

locale/hbhunger.it.tr

@@ -0,0 +1,2 @@
+# textdomain:hbhunger
+Satiation=Sazietà

locale/hbhunger.ms.tr

@@ -0,0 +1,2 @@
+# textdomain:hbhunger
+Satiation=Kekenyangan

locale/hbhunger.pt.tr

@@ -0,0 +1,2 @@
+# textdomain:hbhunger
+Satiation=Saciedade

locale/hbhunger.ru.tr

@@ -0,0 +1,2 @@
+# textdomain:hbhunger
+Satiation=голод

locale/it.txt

@@ -1 +0,0 @@
-Satiation = Sazietà

locale/ms.txt

@@ -1 +0,0 @@
-Satiation = Kekenyangan

locale/pt.txt

@@ -1 +0,0 @@
-Satiation = Saciedade

locale/template.txt

@@ -1 +1,7 @@
-Satiation
+# textdomain:hbhunger
+Satiation=
+Set satiation of player or yourself=
+Not possible, damage is disabled.=
+Invalid satiation!=
+Player @1 does not exist.=
+[<player>] <satiation>=

mod.conf

@@ -1 +1,4 @@
 name = hbhunger
+description = Adds a simple hunger meachanic with satiation, food poisoning and different healing.
+depends = hudbars
+optional_depends = default, flowers, animalmaterials, bucket, bushes, bushes_classic, cooking, creatures, docfarming, dwarves, ethereal, farming, farming_plus, ferns, fishing, fruit, glooptest, jkanimals, jkfarming, jkwine, kpgmobs, mobfcooking, mobs, moretrees, mtfoods, mush45, mushroom, seaplants, pizza, nssm

register_foods.lua

@@ -0,0 +1,331 @@
+if minetest.get_modpath("default") ~= nil then
+	hbhunger.register_food("default:apple", 2)
+	hbhunger.register_food("default:blueberries", 2)
+end
+if minetest.get_modpath("flowers") ~= nil then
+	hbhunger.register_food("flowers:mushroom_brown", 1)
+	hbhunger.register_food("flowers:mushroom_red", 1, "", 3)
+end
+if minetest.get_modpath("farming") ~= nil then
+	hbhunger.register_food("farming:bread", 5)
+end
+
+if minetest.get_modpath("mobs") ~= nil then
+	if mobs.mod ~= nil and mobs.mod == "redo" then
+		hbhunger.register_food("mobs:cheese", 4)
+		hbhunger.register_food("mobs:meat", 8)
+		hbhunger.register_food("mobs:meat_raw", 4)
+		hbhunger.register_food("mobs:rat_cooked", 4)
+		hbhunger.register_food("mobs:honey", 2)
+		hbhunger.register_food("mobs:pork_raw", 3, "", 3)
+		hbhunger.register_food("mobs:pork_cooked", 8)
+		hbhunger.register_food("mobs:chicken_cooked", 6)
+		hbhunger.register_food("mobs:chicken_raw", 2, "", 3)
+		hbhunger.register_food("mobs:chicken_egg_fried", 2)
+		if minetest.get_modpath("bucket") then 
+			hbhunger.register_food("mobs:bucket_milk", 3, "bucket:bucket_empty")
+		end
+	else
+		hbhunger.register_food("mobs:meat", 6)
+		hbhunger.register_food("mobs:meat_raw", 3)
+		hbhunger.register_food("mobs:rat_cooked", 5)
+	end
+end
+
+if minetest.get_modpath("moretrees") ~= nil then
+	hbhunger.register_food("moretrees:coconut_milk", 1)
+	hbhunger.register_food("moretrees:raw_coconut", 2)
+	hbhunger.register_food("moretrees:acorn_muffin", 3)
+	hbhunger.register_food("moretrees:spruce_nuts", 1)
+	hbhunger.register_food("moretrees:pine_nuts", 1)
+	hbhunger.register_food("moretrees:fir_nuts", 1)
+end
+
+if minetest.get_modpath("dwarves") ~= nil then
+	hbhunger.register_food("dwarves:beer", 2)
+	hbhunger.register_food("dwarves:apple_cider", 1)
+	hbhunger.register_food("dwarves:midus", 2)
+	hbhunger.register_food("dwarves:tequila", 2)
+	hbhunger.register_food("dwarves:tequila_with_lime", 2)
+	hbhunger.register_food("dwarves:sake", 2)
+end
+
+if minetest.get_modpath("animalmaterials") ~= nil then
+	hbhunger.register_food("animalmaterials:milk", 2)
+	hbhunger.register_food("animalmaterials:meat_raw", 3)
+	hbhunger.register_food("animalmaterials:meat_pork", 3)
+	hbhunger.register_food("animalmaterials:meat_beef", 3)
+	hbhunger.register_food("animalmaterials:meat_chicken", 3)
+	hbhunger.register_food("animalmaterials:meat_lamb", 3)
+	hbhunger.register_food("animalmaterials:meat_venison", 3)
+	hbhunger.register_food("animalmaterials:meat_undead", 3, "", 3)
+	hbhunger.register_food("animalmaterials:meat_toxic", 3, "", 5)
+	hbhunger.register_food("animalmaterials:meat_ostrich", 3)
+	hbhunger.register_food("animalmaterials:fish_bluewhite", 2)
+	hbhunger.register_food("animalmaterials:fish_clownfish", 2)
+end
+
+if minetest.get_modpath("fishing") ~= nil then
+	hbhunger.register_food("fishing:fish_raw", 2)
+	hbhunger.register_food("fishing:fish_cooked", 5)
+	hbhunger.register_food("fishing:sushi", 6)
+	hbhunger.register_food("fishing:shark", 4)
+	hbhunger.register_food("fishing:shark_cooked", 8)
+	hbhunger.register_food("fishing:pike", 4)
+	hbhunger.register_food("fishing:pike_cooked", 8)
+end
+
+if minetest.get_modpath("glooptest") ~= nil then
+	hbhunger.register_food("glooptest:kalite_lump", 1)
+end
+
+if minetest.get_modpath("bushes") ~= nil then
+	hbhunger.register_food("bushes:sugar", 1)
+	hbhunger.register_food("bushes:strawberry", 2)
+	hbhunger.register_food("bushes:berry_pie_raw", 3)
+	hbhunger.register_food("bushes:berry_pie_cooked", 4)
+	hbhunger.register_food("bushes:basket_pies", 15)
+end
+
+if minetest.get_modpath("bushes_classic") then
+	-- bushes_classic mod, as found in the plantlife modpack
+	local berries = {
+		"strawberry",
+		"blackberry",
+		"blueberry",
+		"raspberry",
+		"gooseberry",
+		"mixed_berry"}
+	for _, berry in ipairs(berries) do
+		if berry ~= "mixed_berry" then
+			hbhunger.register_food("bushes:"..berry, 1)
+		end
+		hbhunger.register_food("bushes:"..berry.."_pie_raw", 2)
+		hbhunger.register_food("bushes:"..berry.."_pie_cooked", 5)
+		hbhunger.register_food("bushes:basket_"..berry, 15)
+	end
+end
+
+if minetest.get_modpath("mushroom") ~= nil then
+	hbhunger.register_food("mushroom:brown", 1)
+	hbhunger.register_food("mushroom:red", 1, "", 3)
+	-- mushroom potions: red = strong poison, brown = light restorative
+	if minetest.get_modpath("vessels") then
+		hbhunger.register_food("mushroom:brown_essence", 1, "vessels:glass_bottle", nil, 4)
+		hbhunger.register_food("mushroom:poison", 1, "vessels:glass_bottle", 10)
+	end
+end
+
+if minetest.get_modpath("docfarming") ~= nil then
+	hbhunger.register_food("docfarming:carrot", 3)
+	hbhunger.register_food("docfarming:cucumber", 2)
+	hbhunger.register_food("docfarming:corn", 3)
+	hbhunger.register_food("docfarming:potato", 4)
+	hbhunger.register_food("docfarming:bakedpotato", 5)
+	hbhunger.register_food("docfarming:raspberry", 3)
+end
+
+if minetest.get_modpath("farming_plus") ~= nil then
+	hbhunger.register_food("farming_plus:carrot_item", 3)
+	hbhunger.register_food("farming_plus:banana", 2)
+	hbhunger.register_food("farming_plus:orange_item", 2)
+	hbhunger.register_food("farming:pumpkin_bread", 4)
+	hbhunger.register_food("farming_plus:strawberry_item", 2)
+	hbhunger.register_food("farming_plus:tomato_item", 2)
+	hbhunger.register_food("farming_plus:potato_item", 4)
+	hbhunger.register_food("farming_plus:rhubarb_item", 2)
+end
+
+if minetest.get_modpath("mtfoods") ~= nil then
+	hbhunger.register_food("mtfoods:dandelion_milk", 1)
+	hbhunger.register_food("mtfoods:sugar", 1)
+	hbhunger.register_food("mtfoods:short_bread", 4)
+	hbhunger.register_food("mtfoods:cream", 1)
+	hbhunger.register_food("mtfoods:chocolate", 2)
+	hbhunger.register_food("mtfoods:cupcake", 2)
+	hbhunger.register_food("mtfoods:strawberry_shortcake", 2)
+	hbhunger.register_food("mtfoods:cake", 3)
+	hbhunger.register_food("mtfoods:chocolate_cake", 3)
+	hbhunger.register_food("mtfoods:carrot_cake", 3)
+	hbhunger.register_food("mtfoods:pie_crust", 3)
+	hbhunger.register_food("mtfoods:apple_pie", 3)
+	hbhunger.register_food("mtfoods:rhubarb_pie", 2)
+	hbhunger.register_food("mtfoods:banana_pie", 3)
+	hbhunger.register_food("mtfoods:pumpkin_pie", 3)
+	hbhunger.register_food("mtfoods:cookies", 2)
+	hbhunger.register_food("mtfoods:mlt_burger", 5)
+	hbhunger.register_food("mtfoods:potato_slices", 2)
+	hbhunger.register_food("mtfoods:potato_chips", 3)
+	--mtfoods:medicine
+	hbhunger.register_food("mtfoods:casserole", 3)
+	hbhunger.register_food("mtfoods:glass_flute", 2)
+	hbhunger.register_food("mtfoods:orange_juice", 2)
+	hbhunger.register_food("mtfoods:apple_juice", 2)
+	hbhunger.register_food("mtfoods:apple_cider", 2)
+	hbhunger.register_food("mtfoods:cider_rack", 2)
+end
+
+if minetest.get_modpath("fruit") ~= nil then
+	hbhunger.register_food("fruit:apple", 2)
+	hbhunger.register_food("fruit:pear", 2)
+	hbhunger.register_food("fruit:bananna", 3)
+	hbhunger.register_food("fruit:orange", 2)
+end
+
+if minetest.get_modpath("mush45") ~= nil then
+	hbhunger.register_food("mush45:meal", 4)
+end
+
+if minetest.get_modpath("seaplants") ~= nil then
+	hbhunger.register_food("seaplants:kelpgreen", 1)
+	hbhunger.register_food("seaplants:kelpbrown", 1)
+	hbhunger.register_food("seaplants:seagrassgreen", 1)
+	hbhunger.register_food("seaplants:seagrassred", 1)
+	hbhunger.register_food("seaplants:seasaladmix", 6)
+	hbhunger.register_food("seaplants:kelpgreensalad", 1)
+	hbhunger.register_food("seaplants:kelpbrownsalad", 1)
+	hbhunger.register_food("seaplants:seagrassgreensalad", 1)
+	hbhunger.register_food("seaplants:seagrassgreensalad", 1)
+end
+
+if minetest.get_modpath("mobfcooking") ~= nil then
+	hbhunger.register_food("mobfcooking:cooked_pork", 6)
+	hbhunger.register_food("mobfcooking:cooked_ostrich", 6)
+	hbhunger.register_food("mobfcooking:cooked_beef", 6)
+	hbhunger.register_food("mobfcooking:cooked_chicken", 6)
+	hbhunger.register_food("mobfcooking:cooked_lamb", 6)
+	hbhunger.register_food("mobfcooking:cooked_venison", 6)
+	hbhunger.register_food("mobfcooking:cooked_fish", 6)
+end
+
+if minetest.get_modpath("creatures") ~= nil then
+	hbhunger.register_food("creatures:meat", 6)
+	hbhunger.register_food("creatures:flesh", 3)
+	hbhunger.register_food("creatures:rotten_flesh", 3, "", 3)
+end
+
+if minetest.get_modpath("ethereal") then
+	hbhunger.register_food("ethereal:strawberry", 1)
+	hbhunger.register_food("ethereal:banana", 4)
+	hbhunger.register_food("ethereal:pine_nuts", 1)
+	hbhunger.register_food("ethereal:bamboo_sprout", 0, "", 3)
+	hbhunger.register_food("ethereal:fern_tubers", 1)
+	hbhunger.register_food("ethereal:banana_bread", 7)
+	hbhunger.register_food("ethereal:mushroom_plant", 2)
+	hbhunger.register_food("ethereal:coconut_slice", 2)
+	hbhunger.register_food("ethereal:golden_apple", 4, "", nil, 10)
+	hbhunger.register_food("ethereal:wild_onion_plant", 2)
+	hbhunger.register_food("ethereal:mushroom_soup", 4, "ethereal:bowl")
+	hbhunger.register_food("ethereal:mushroom_soup_cooked", 6, "ethereal:bowl")
+	hbhunger.register_food("ethereal:hearty_stew", 6, "ethereal:bowl")
+	hbhunger.register_food("ethereal:hearty_stew_cooked", 10, "ethereal:bowl")
+	if minetest.get_modpath("bucket") then
+  	hbhunger.register_food("ethereal:bucket_cactus", 2, "bucket:bucket_empty")
+	end
+	hbhunger.register_food("ethereal:fish_raw", 2)
+	hbhunger.register_food("ethereal:fish_cooked", 5)
+	hbhunger.register_food("ethereal:seaweed", 1)
+	hbhunger.register_food("ethereal:yellowleaves", 1, "", nil, 1)
+	hbhunger.register_food("ethereal:sashimi", 4)
+	hbhunger.register_food("ethereal:orange", 2)
+end
+
+if minetest.get_modpath("farming") and farming.mod == "redo" then
+	hbhunger.register_food("farming:bread", 6)
+	hbhunger.register_food("farming:potato", 1)
+	hbhunger.register_food("farming:baked_potato", 6)
+	hbhunger.register_food("farming:cucumber", 4)
+	hbhunger.register_food("farming:tomato", 4)
+	hbhunger.register_food("farming:carrot", 3)
+	hbhunger.register_food("farming:carrot_gold", 6, "", nil, 8)
+	hbhunger.register_food("farming:corn", 3)
+	hbhunger.register_food("farming:corn_cob", 5)
+	hbhunger.register_food("farming:melon_slice", 2)
+	hbhunger.register_food("farming:pumpkin_slice", 1)
+	hbhunger.register_food("farming:pumpkin_bread", 9)
+	hbhunger.register_food("farming:coffee_cup", 2, "farming:drinking_cup")
+	hbhunger.register_food("farming:coffee_cup_hot", 3, "farming:drinking_cup", nil, 2)
+	hbhunger.register_food("farming:cookie", 2)
+	hbhunger.register_food("farming:chocolate_dark", 3)
+	hbhunger.register_food("farming:donut", 4)
+	hbhunger.register_food("farming:donut_chocolate", 6)
+	hbhunger.register_food("farming:donut_apple", 6)
+	hbhunger.register_food("farming:raspberries", 1)
+	hbhunger.register_food("farming:blueberries", 1)
+	hbhunger.register_food("farming:muffin_blueberry", 4)
+	if minetest.get_modpath("vessels") then
+		hbhunger.register_food("farming:smoothie_raspberry", 2, "vessels:drinking_glass")
+	end
+	hbhunger.register_food("farming:rhubarb", 1)
+	hbhunger.register_food("farming:rhubarb_pie", 6)
+	hbhunger.register_food("farming:beans", 1)
+end
+
+if minetest.get_modpath("kpgmobs") ~= nil then
+	hbhunger.register_food("kpgmobs:uley", 3)
+	hbhunger.register_food("kpgmobs:meat", 6)
+	hbhunger.register_food("kpgmobs:rat_cooked", 5)
+	hbhunger.register_food("kpgmobs:med_cooked", 4)
+  	if minetest.get_modpath("bucket") then
+		hbhunger.register_food("kpgmobs:bucket_milk", 4, "bucket:bucket_empty")
+	end
+end
+
+if minetest.get_modpath("jkfarming") ~= nil then
+	hbhunger.register_food("jkfarming:carrot", 3)
+	hbhunger.register_food("jkfarming:corn", 3)
+	hbhunger.register_food("jkfarming:melon_part", 2)
+	hbhunger.register_food("jkfarming:cake", 3)
+end
+
+if minetest.get_modpath("jkanimals") ~= nil then
+	hbhunger.register_food("jkanimals:meat", 6)
+end
+
+if minetest.get_modpath("jkwine") ~= nil then
+	hbhunger.register_food("jkwine:grapes", 2)
+	hbhunger.register_food("jkwine:winebottle", 1)
+end
+
+if minetest.get_modpath("cooking") ~= nil then
+	hbhunger.register_food("cooking:meat_beef_cooked", 4)
+	hbhunger.register_food("cooking:fish_bluewhite_cooked", 3)
+	hbhunger.register_food("cooking:fish_clownfish_cooked", 1)
+	hbhunger.register_food("cooking:meat_chicken_cooked", 2)
+	hbhunger.register_food("cooking:meat_cooked", 2)
+	hbhunger.register_food("cooking:meat_pork_cooked", 3)
+	hbhunger.register_food("cooking:meat_toxic_cooked", -3)
+	hbhunger.register_food("cooking:meat_venison_cooked", 3)
+	hbhunger.register_food("cooking:meat_undead_cooked", 1)
+end
+
+-- ferns mod of plantlife_modpack
+if minetest.get_modpath("ferns") ~= nil then
+	hbhunger.register_food("ferns:fiddlehead", 1, "", 1)
+	hbhunger.register_food("ferns:fiddlehead_roasted", 3)
+	hbhunger.register_food("ferns:ferntuber_roasted", 3)
+	hbhunger.register_food("ferns:horsetail_01", 1)
+end
+
+if minetest.get_modpath("pizza") ~= nil then
+	hbhunger.register_food("pizza:pizza", 30, "", nil, 30)
+	hbhunger.register_food("pizza:pizzaslice", 5, "", nil, 5)
+end
+
+if minetest.get_modpath("nssm") then
+	hbhunger.register_food("nssm:werewolf_leg", 3)
+	hbhunger.register_food("nssm:heron_leg", 2)
+	hbhunger.register_food("nssm:chichibios_heron_leg", 4)
+	hbhunger.register_food("nssm:crocodile_tail", 3)
+	hbhunger.register_food("nssm:duck_legs", 1)
+	hbhunger.register_food("nssm:ant_leg", 1)
+	hbhunger.register_food("nssm:spider_leg", 1)
+	hbhunger.register_food("nssm:tentacle", 2)
+	hbhunger.register_food("nssm:worm_flesh", 2, "", 2) -- poisonous
+	hbhunger.register_food("nssm:amphibian_heart", 1)
+	hbhunger.register_food("nssm:raw_scrausics_wing", 1)
+	-- superfoods
+	hbhunger.register_food("nssm:phoenix_nuggets", 20, "", nil, 20)
+	hbhunger.register_food("nssm:phoenix_tear", 20, "", nil, 20)
+end
+