Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

Add hunger_ng support.

depends.txt

@@ -2,11 +2,12 @@ default
 vessels
 tnt
 fire
-player_physics
 playereffects
+player_monoids?
 farming?
 lightning?
 pmobs?
 hud_hunger?
+hunger_ng?
 moreplants?
 horror?

scrolls.lua

@@ -1,8 +1,7 @@
 --scrolls
 
-minetest.register_craftitem(
+
-	"witchcraft:scroll_day",
+minetest.register_craftitem("witchcraft:scroll_day", {
-	{
 	description = "Scroll of day",
 	inventory_image = "witchcraft_scroll.png^witchcraft_sun_over.png",
 	stack_max = 1,
@@ -13,9 +12,7 @@ minetest.register_craftitem(
 	end,
 })
 
-minetest.register_craftitem(
+minetest.register_craftitem("witchcraft:scroll_night", {
-	"witchcraft:scroll_night",
-	{
 	description = "Scroll of night",
 	inventory_image = "witchcraft_scroll.png^witchcraft_moon_over.png",
 	stack_max = 1,
@@ -27,42 +24,30 @@ minetest.register_craftitem(
 })
 
 if minetest.get_modpath("pmobs")then
-	minetest.register_craftitem(
+minetest.register_craftitem("witchcraft:scroll_wild", {
-		"witchcraft:scroll_wild",
-		{
 	description = "Scroll of Wild",
 	inventory_image = "witchcraft_scroll.png^witchcraft_dark_over.png",
 	stack_max = 1,
 	on_use = function(item, placer)
 	local pos = placer:getpos();
-				minetest.add_entity(pos, "pmobs:dog")
+	minetest.env:add_entity(pos, "pmobs:dog")
 	item:take_item()
 	return item
 	end,
 })
 end
 
-minetest.register_craftitem(
+minetest.register_craftitem("witchcraft:scroll_fireball", {
-	"witchcraft:scroll_fireball",
-	{
 	description = "Scroll of fireball",
 	inventory_image = "witchcraft_scroll.png^witchcraft_fire_over.png",
 	stack_max = 1,
 	on_use = function(item, placer, pos)
 	local dir = placer:get_look_dir();
 	local playerpos = placer:getpos();
-			local obj = minetest.add_entity(
+	local obj = minetest.env:add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:fireball")
-				{x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z},
+	local obj2 = minetest.env:add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:fireball")
-				"witchcraft:fireball")
+	local obj3 = minetest.env:add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:fireball")
-			local obj2 = minetest.add_entity(
+	local obj4 = minetest.env:add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:fireball")
-				{x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z},
-				"witchcraft:fireball")
-			local obj3 = minetest.add_entity(
-				{x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z},
-				"witchcraft:fireball")
-			local obj4 = minetest.add_entity(
-				{x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z},
-				"witchcraft:fireball")
 	obj2:setvelocity({x=dir.x*7+0.5,y=dir.y*7,z=dir.z*7+0.5})
 	obj3:setvelocity({x=dir.x*7-0.5,y=dir.y*7,z=dir.z*7-0.5})
 	obj4:setvelocity({x=dir.x*7,y=dir.y*7-0.5,z=dir.z*7})
@@ -73,9 +58,7 @@ minetest.register_craftitem(
 })
 
 if minetest.get_modpath("lightning") then
-	minetest.register_craftitem(
+minetest.register_craftitem("witchcraft:scroll_lightning", {
-		"witchcraft:scroll_lightning",
-		{
 	description = "Scroll of lightning",
 	inventory_image = "witchcraft_scroll.png^witchcraft_thunder_over.png",
 	stack_max = 1,
@@ -89,9 +72,7 @@ if minetest.get_modpath("lightning") then
 })
 end
 
-minetest.register_craftitem(
+minetest.register_craftitem("witchcraft:scroll_icicle", {
-	"witchcraft:scroll_icicle",
-	{
 	description = "Scroll of icicle",
 	inventory_image = "witchcraft_scroll.png^witchcraft_ice_over.png",
 	stack_max = 1,
@@ -99,9 +80,9 @@ minetest.register_craftitem(
 	local dir = placer:get_look_dir();
 	local playerpos = placer:getpos();
 	local vec = {x=dir.x*7,y=dir.y*7,z=dir.z*7}
-			local obj = minetest.add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:ice")
+	local obj = minetest.env:add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:ice")
-			local obj2 = minetest.add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+1+dir.z}, "witchcraft:ice")
+	local obj2 = minetest.env:add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+1+dir.z}, "witchcraft:ice")
-			local obj3 = minetest.add_entity({x=playerpos.x+1+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:ice")
+	local obj3 = minetest.env:add_entity({x=playerpos.x+1+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:ice")
 	obj:setvelocity(vec)
 	obj2:setvelocity(vec)
 	obj3:setvelocity(vec)
@@ -111,9 +92,8 @@ minetest.register_craftitem(
 	end,
 })
 
-minetest.register_craftitem(
+
-	"witchcraft:scroll_nature",
+minetest.register_craftitem("witchcraft:scroll_nature", {
-	{
 	description = "Scroll of nature",
 	inventory_image = "witchcraft_scroll.png^witchcraft_leaf_over.png",
 	stack_max = 1,
@@ -121,7 +101,7 @@ minetest.register_craftitem(
 	local dir = placer:get_look_dir();
 	local playerpos = placer:getpos();
 	local vec = {x=dir.x*6,y=dir.y*6,z=dir.z*6}
-			local obj = minetest.add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:tree")
+	local obj = minetest.env:add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:tree")
 	obj:setvelocity(vec)
 	
 		item:take_item()
@@ -129,29 +109,26 @@ minetest.register_craftitem(
 	end,
 })
 
-minetest.register_craftitem(
+minetest.register_craftitem("witchcraft:scroll", {
-	"witchcraft:scroll",
-	{
 	description = "Blank Scroll",
 	inventory_image = "witchcraft_scroll.png",
 })
 
-minetest.register_craftitem(
+minetest.register_craftitem("witchcraft:scroll_recipe", {
-	"witchcraft:scroll_recipe",
-	{
 	description = "Recipe Scroll",
 	inventory_image = "witchcraft_scroll.png^witchcraft_writing_over.png",
 	on_use = function(itemstack, user, pointed_thing)
+    
 	local formspec = "size[10,9]"..
 		"background[-0.6,-0.5;11.5,10.4;witchcraft_recipes.png]";
 	
     minetest.show_formspec(user:get_player_name(), "witchcraft:scroll", formspec);	
+	
 	end,
 })
 
 if minetest.get_modpath("pmobs")then
-	minetest.register_craft(
+minetest.register_craft({
-		{
 	output = 'witchcraft:scroll_wild',
 	recipe = {
 		{'mobs:meat_raw'},
@@ -161,8 +138,7 @@ if minetest.get_modpath("pmobs")then
 
 end
 
-minetest.register_craft(
+minetest.register_craft({
-	{
 	output = 'witchcraft:scroll',
 	recipe = {
 		{'default:paper', 'default:paper', ''},
@@ -170,8 +146,7 @@ minetest.register_craft(
 	}
 })
 
-minetest.register_craft(
+minetest.register_craft({
-	{
 	output = 'witchcraft:scroll_recipe',
 	recipe = {
 		{'dye:black'},
@@ -179,8 +154,7 @@ minetest.register_craft(
 	}
 })
 
-minetest.register_craft(
+minetest.register_craft({
-	{
 	output = 'witchcraft:scroll_icicle',
 	recipe = {
 		{'default:ice'},
@@ -189,8 +163,7 @@ minetest.register_craft(
 	}
 })
 
-minetest.register_craft(
+minetest.register_craft({
-	{
 	output = 'witchcraft:scroll_fireball',
 	recipe = {
 		{'default:obsidian_shard'},
@@ -199,8 +172,7 @@ minetest.register_craft(
 	}
 })
 
-minetest.register_craft(
+minetest.register_craft({
-	{
 	output = 'witchcraft:scroll_nature',
 	recipe = {
 		{'default:leaves'},
@@ -209,8 +181,7 @@ minetest.register_craft(
 	}
 })
 
-minetest.register_craft(
+minetest.register_craft({
-	{
 	output = 'witchcraft:scroll_day',
 	recipe = {
 		{'default:torch'},
@@ -219,8 +190,7 @@ minetest.register_craft(
 	}
 })
 
-minetest.register_craft(
+minetest.register_craft({
-	{
 	output = 'witchcraft:scroll_night',
 	recipe = {
 		{'default:coal_lump'},
@@ -230,8 +200,7 @@ minetest.register_craft(
 })
 
 
-minetest.register_craft(
+minetest.register_craft({
-	{
 	output = 'witchcraft:scroll_lightning',
 	recipe = {
 		{'default:steel_ingot'},
@@ -240,32 +209,24 @@ minetest.register_craft(
 	}
 })
 
+
 --scroll powers
 
-minetest.register_entity(
+minetest.register_entity("witchcraft:fireball", {
-	"witchcraft:fireball",
-	{
 	textures = {"tnt_boom.png"},
 	velocity = 0.1,
 	damage = 2,
 	collisionbox = {0, 0, 0, 0, 0, 0},
 	on_step = function(self, obj, pos)		
-			local remove = minetest.after(
+		local remove = minetest.after(2, function() 
-				2,
-				function() 
 		self.object:remove()
 		end)
 		local pos = self.object:getpos()
 		local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)	
 			for k, obj in pairs(objs) do
 				if obj:get_luaentity() ~= nil then
-					if obj:get_luaentity().name ~= "witchcraft:fireball"
+					if obj:get_luaentity().name ~= "witchcraft:fireball" and obj:get_luaentity().name ~= "__builtin:item" and obj:get_luaentity().name ~= "gauges:hp_bar" then
-						and obj:get_luaentity().name ~= "__builtin:item"
+						obj:punch(self.object, 1.0, {
-						and obj:get_luaentity().name ~= "gauges:hp_bar"
-					then
-						obj:punch(
-							self.object, 1.0,
-							{
 							full_punch_interval=1.0,
 							damage_groups={fleshy=3},
 						}, nil)
@@ -278,11 +239,10 @@ minetest.register_entity(
 							for dz=0,1 do
 								local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
 								local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-						local n = minetest.get_node(p).name
+								local n = minetest.env:get_node(p).name
-						if n ~= "witchcraft:fireball" and n ~="default:dirt_with_grass"
+								if n ~= "witchcraft:fireball" and n ~="default:dirt_with_grass" and n ~="default:dirt_with_dry_grass" and n ~="default:stone" and n ~= "gauges:hp_bar" then	
-						and n ~="default:dirt_with_dry_grass" and n ~="default:stone" then	
 									if minetest.registered_nodes[n].groups.flammable --[[or math.random(1, 100) <= 1]] then
-								minetest.set_node(t, {name="fire:basic_flame"})
+										minetest.env:set_node(t, {name="fire:basic_flame"})
 									self.object:remove()
 									return
 									end
@@ -297,12 +257,12 @@ minetest.register_entity(
 				for dz=-4,4 do
 					local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
 					local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-							local n = minetest.get_node(pos).name
+					local n = minetest.env:get_node(pos).name
 					if math.random(1, 50) <= 35 then
-								minetest.remove_node(p)
+						minetest.env:remove_node(p)
 					end
 					if minetest.registered_nodes[n].groups.flammable or math.random(1, 100) <=5 then
-								minetest.set_node(t, {name="fire:basic_flame"})
+										minetest.env:set_node(t, {name="fire:basic_flame"})
 					end
 				end
 			end
@@ -333,27 +293,20 @@ minetest.register_entity(
 
 
 
-minetest.register_entity(
+minetest.register_entity("witchcraft:tree", {
-	"witchcraft:tree",
-	{
 	textures = {"witchcraft_skin.png"},
 	velocity = 1,
 	damage = 2,
 	collisionbox = {0, 0, 0, 0, 0, 0},
 	on_step = function(self, obj, pos)		
-			local remove = minetest.after(
+		local remove = minetest.after(2, function() 
-				2,
-				function() 
 		self.object:remove()
 		end)
 		local pos = self.object:getpos()
 		local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)	
 			for k, obj in pairs(objs) do
 				if obj:get_luaentity() ~= nil then
-					if obj:get_luaentity().name ~= "witchcraft:tree"
+					if obj:get_luaentity().name ~= "witchcraft:tree" and obj:get_luaentity().name ~= "__builtin:item" and obj:get_luaentity().name ~= "gauges:hp_bar" then
-						and obj:get_luaentity().name ~= "__builtin:item"
-						and obj:get_luaentity().name ~= "gauges:hp_bar"
-					then
 						obj:remove()
 						local treepos = self.object:getpos()
 						default.grow_new_jungle_tree(treepos)
@@ -366,8 +319,8 @@ minetest.register_entity(
 							for dz=0,1 do
 								local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
 								local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-						local n = minetest.get_node(p).name
+								local n = minetest.env:get_node(p).name
-						if n ~= "witchcraft:tree" and n ~="air" then	
+								if n ~= "witchcraft:tree" and n ~="air" and n ~= "gauges:hp_bar" then	
 						local treepos = self.object:getpos()
 						default.grow_new_jungle_tree(treepos)
 						self.object:remove()
@@ -405,9 +358,7 @@ minetest.register_entity(
 	end,
 })
 
-minetest.register_entity(
+minetest.register_entity("witchcraft:ice", {
-	"witchcraft:ice",
-	{
 	visual="sprite",
 	visual_size={x=1,y=1},
 	physical=false,
@@ -425,13 +376,8 @@ minetest.register_entity(
 		local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)	
 			for k, obj in pairs(objs) do
 				if obj:get_luaentity() ~= nil then
-					if obj:get_luaentity().name ~= "witchcraft:ice"
+					if obj:get_luaentity().name ~= "witchcraft:ice" and obj:get_luaentity().name ~= "__builtin:item" and obj:get_luaentity().name ~= "gauges:hp_bar" then
-						and obj:get_luaentity().name ~= "__builtin:item"
+					obj:punch(self.object, 1.0, {
-						and obj:get_luaentity().name ~= "gauges:hp_bar"
-					then
-						obj:punch(
-							self.object, 1.0,
-							{
 							full_punch_interval=1.0,
 							damage_groups={fleshy=1},
 						}, nil)
@@ -443,12 +389,12 @@ minetest.register_entity(
 							for dz=0,1 do
 								local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
 								local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-							local n = minetest.get_node(p).name
+								local n = minetest.env:get_node(p).name
 								if n == "default:water_source" or n =="default:river_water_source" then	
 								local pos = self.object:getpos()
 								minetest.set_node(pos, {name="default:ice"})
 								self.object:remove()
-							elseif n ~= "air" then
+								elseif n ~= "air" and n ~= "gauges:hp_bar" then
 									local velo = self.object:getvelocity()
 									self.object:setvelocity({x=velo.x*-1, y=velo.y*0, z=velo.z*1})
 									--self.object:remove()